gget r74 - in trunk: . epiphany-extension

[johans svn gnome org]

Author: johans
Date: Fri Aug 15 10:17:56 2008
New Revision: 74
URL: http://svn.gnome.org/viewvc/gget?rev=74&view=rev

Log:
Worked on installing Epiphany extension properly.

Added:
   trunk/epiphany-extension/Makefile.am
Removed:
   trunk/epiphany-extension/Makefile
Modified:
   trunk/   (props changed)
   trunk/configure.ac
   trunk/epiphany-extension/gget.ephy-extension

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Fri Aug 15 10:17:56 2008
@@ -43,6 +43,40 @@
 AM_PATH_PYTHON(2.5)
 AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
 
+dnl ========
+dnl Epiphany
+dnl ========
+
+AC_ARG_ENABLE([epiphany-extension],
+	[  --enable-epiphany-extension   Enable Epiphany Extension ],
+	enable_epiphany_extension=$enableval,
+	enable_epiphany_extension=yes)
+
+
+dnl Try to autodetect Epiphany >= 2.20
+EPIPHANY_VERSION=
+if pkg-config --exists epiphany-2.23; then
+	EPIPHANY_VERSION=2.23
+elif pkg-config --exists epiphany-2.22; then
+	EPIPHANY_VERSION=2.22
+elif pkg-config --exists epiphany-2.21; then
+	EPIPHANY_VERSION=2.21
+elif pkg-config --exists epiphany-2.20; then
+	EPIPHANY_VERSION=2.20
+else
+	AC_MSG_RESULT([no epiphany version >= 2.20 installed])
+fi
+
+if test -n "$EPIPHANY_VERSION"; then
+	EPIPHANY_EXTENSIONS_DIR="`$PKG_CONFIG --variable=extensionsdir epiphany-$EPIPHANY_VERSION`"
+	AC_SUBST([EPIPHANY_EXTENSIONS_DIR])
+else
+	enable_epiphany_extension=no
+fi
+
+AM_CONDITIONAL(ENABLE_EPIPHANY_EXTENSION, test "x$enable_epiphany_extension" = "
+xyes")
+
 dnl ============
 dnl Requirements
 dnl ============
@@ -61,6 +95,7 @@
 bin/Makefile
 data/Makefile
 data/images/Makefile
+epiphany-extension/Makefile
 gget/__init__.py
 gget/Makefile
 po/Makefile.in

Added: trunk/epiphany-extension/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/epiphany-extension/Makefile.am	Fri Aug 15 10:17:56 2008
@@ -0,0 +1,14 @@
+epiphanyggetdir = $(EXTENSIONS_DIR)
+epiphanygget_PYTHON = gget-epiphany.py
+
+extensionsinidir = $(EXTENSIONS_DIR)
+extensionsini_in_files = gget.ephy-extension.in
+extensionsini_DATA = $(extensionsini_in_files:.ephy-extension.in=.ephy-extension
+)
+
+ EPIPHANY_EXTENSION_RULE@
+
+EXTRA_DIST = $(extensionsini_in_files)
+
+CLEANFILES = $(extensionsini_DATA)
+DISTCLEANFILES = $(extensionsini_DATA)

Modified: trunk/epiphany-extension/gget.ephy-extension
==============================================================================
--- trunk/epiphany-extension/gget.ephy-extension	(original)
+++ trunk/epiphany-extension/gget.ephy-extension	Fri Aug 15 10:17:56 2008
@@ -1,6 +1,6 @@
 [Epiphany Extension]
 Name=GGet
-Description=Forward downloads to the GGet Download Manager
+_Description=Forward downloads to the GGet Download Manager
 Authors=Johan Svedberg <johan svedberg com>
 URL=http://live.gnome.org/GGet
 Version=1