gget r77 - trunk

[johans svn gnome org]

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

Log:
More epiphany-extension build work.

Modified:
   trunk/Makefile.am
   trunk/configure.ac

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Fri Aug 15 10:57:52 2008
@@ -1,5 +1,9 @@
 SUBDIRS = bin data gget po
 
+if ENABLE_EPIPHANY_EXTENSION
+SUBDIRS += epiphany-extension
+endif
+
 DISTCLEANFILES =		\
 	intltool-extract	\
 	intltool-merge		\

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Fri Aug 15 10:57:52 2008
@@ -67,8 +67,9 @@
 	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`"
+	EPIPHANY_EXTENSIONS_DIR="`pkg-config --variable=extensionsdir epiphany-$EPIPHANY_VERSION`"
 	AC_SUBST([EPIPHANY_EXTENSIONS_DIR])
 else
 	enable_epiphany_extension=no
@@ -105,7 +106,12 @@
 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"