gget r82 - in trunk: . epiphany-extension

[johans svn gnome org]

Author: johans
Date: Fri Aug 15 13:06:25 2008
New Revision: 82
URL: http://svn.gnome.org/viewvc/gget?rev=82&view=rev

Log:
Finally the epiphany extension autofoo should be working. Thanks goes to the Beagle project. :)

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

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Fri Aug 15 13:06:25 2008
@@ -43,39 +43,63 @@
 AM_PATH_PYTHON(2.5)
 AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)])
 
-dnl ========
-dnl Epiphany
-dnl ========
+dnl ==================
+dnl Epiphany extension
+dnl ==================
 
 AC_ARG_ENABLE([epiphany-extension],
-	[  --enable-epiphany-extension   Enable Epiphany Extension ],
+	AC_HELP_STRING([--enable-epiphany-extension], [Enable Epiphany Extension (default auto)]),
 	enable_epiphany_extension=$enableval,
-	enable_epiphany_extension=yes)
+	enable_epiphany_extension=auto)
 
-
-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
-
-EPIPHANY_EXTENSIONS_DIR=
-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
+use_new_epiphany_extension=no
+if test "x$enable_epiphany_extension" != "xno"; then
+	AC_MSG_CHECKING([for Epiphany])
+	AC_MSG_RESULT()
+
+	dnl If you want to add anything but a <major>.<minor> version here, you
+	dnl need to see the handling of the epiphany_version variable in the
+	dnl epiphany extension code
+	VALID_EPIPHANY_VERSIONS="2.23 2.22 2.20"
+	for v in $VALID_EPIPHANY_VERSIONS; do
+	
+		AC_MSG_CHECKING([for Epiphany $v])
+		PKG_CHECK_EXISTS(epiphany-$v, found_ephy=yes, found_ephy=no)
+		if test "x$found_ephy" = "xyes"; then
+			EPIPHANY_MAJOR=$v
+			AC_MSG_RESULT([yes])
+			break
+		else
+			AC_MSG_RESULT([no])
+		fi
+	done
+
+	if test "x$found_ephy" = "xno"; then
+		if test "x$enable_epiphany_extension" = "xyes"; then
+			AC_MSG_ERROR([Epiphany (and/or its development files) could not be found])
+		else
+			enable_epiphany_extension="no (Epiphany not installed)"
+		fi
+	else
+		EPIPHANY_EXTENSION_INIT($EPIPHANY_MAJOR)
+		if test "$EPIPHANY_HAS_PYTHON" != "1"; then
+			enable_epiphany_extension="no (Epiphany lacks Python support)"
+		else
+			enable_epiphany_extension="yes"
+		fi
+	fi
 fi
 
 AM_CONDITIONAL(ENABLE_EPIPHANY_EXTENSION, test "x$enable_epiphany_extension" = "xyes")
+AC_SUBST(EPIPHANY_MAJOR)
+
+# distcheck hack
+AC_ARG_ENABLE([epiphany-extension-install],
+	AS_HELP_STRING([--enable-epiphany-extension-install],[Install Epiphany Extension]),
+	[install_epiphany_extension=$enableval],
+	[install_epiphany_extension=yes])
+
+AM_CONDITIONAL([INSTALL_EPIPHANY_EXTENSION], [test "x$install_epiphany_extension" = "xyes"])
 
 dnl ============
 dnl Requirements
@@ -101,17 +125,13 @@
 po/Makefile.in
 ])
 
-echo
-echo $PACKAGE version $VERSION
-echo
-
-echo Epiphany extension: $enable_epiphany_extension
-echo
-echo Prefix: $prefix
-if test "x$enable_epiphany_extension" = "xyes"; then
-	echo Epiphany extensions dir: $EPIPHANY_EXTENSIONS_DIR
-fi
-echo
-echo "Now type make to compile"
-echo "Then su to root and type: make install"
-echo
+echo "
+GGet version:       $VERSION
+
+Prefix:             ${prefix}
+
+Epiphany extension: $enable_epiphany_extension
+
+Now type make to compile
+Then su to root and type: make install
+"

Modified: trunk/epiphany-extension/Makefile.am
==============================================================================
--- trunk/epiphany-extension/Makefile.am	(original)
+++ trunk/epiphany-extension/Makefile.am	Fri Aug 15 13:06:25 2008
@@ -1,13 +1,18 @@
-extensionsdir = $(EXTENSIONS_DIR)
-extensions_PYTHON = gget-epiphany.py
+ EPIPHANY_EXTENSION_RULE@
 
-extensionsinidir = $(EXTENSIONS_DIR)
-extensionsini_in_files = gget.ephy-extension.in
-extensionsini_DATA = $(extensionsini_in_files:.ephy-extension.in=.ephy-extension)
+extension_in_files = gget.ephy-extension.in
+extension_files = $(extension_in_files:.ephy-extension.in=.ephy-extension)
+
+# Hack to fix distcheck
+if INSTALL_EPIPHANY_EXTENSION
+extensiondir = $(EPIPHANY_EXTENSIONS_DIR)
+extension_DATA = $(extension_files) gget-epiphany.py
+else
+extensiondir = $(libdir)/epiphany/extensions
+extension_DATA = $(extension_files) gget-epiphany.py
+endif
 
- EPIPHANY_EXTENSION_RULE@
 
-EXTRA_DIST = $(extensionsini_in_files)
+EXTRA_DIST = $(extension_in_files)
 
-CLEANFILES = $(extensionsini_DATA)
-DISTCLEANFILES = $(extensionsini_DATA)
+CLEANFILES = $(extension_DATA)