epiphany r8095 - trunk

[chpe svn gnome org]

Author: chpe
Date: Tue Mar 11 10:15:17 2008
New Revision: 8095
URL: http://svn.gnome.org/viewvc/epiphany?rev=8095&view=rev

Log:
Try to fix the build with 1.8

Modified:
   trunk/configure.ac

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Tue Mar 11 10:15:17 2008
@@ -245,9 +245,16 @@
 
 # Added $gecko_cv_gecko-js for debian xulrunner brokenness
 if test $gecko_cv_gecko != "libxul-embedding" -a $gecko_cv_gecko != "libxul"; then
-	PKG_CHECK_MODULES([GECKO],[ ${gecko_cv_gecko}-xpcom >= $min_version ${gecko_cv_gecko}-js $gecko_cv_extra_pkg_dependencies])
+	# debian xulrunner lacks -xpcom -> -js depends
+	if pkg-config --exists ${gecko_cv_gecko}-js; then
+		gecko_cv_extra_pkg_dependencies="$gecko_cv_extra_pkg_dependencies ${gecko_cv_gecko}-js"
+	fi
+	GECKO_CFLAGS=`pkg-config --cflags ${gecko_cv_gecko}-xpcom '>=' $min_version ${gecko_cv_gecko}-js $gecko_cv_extra_pkg_dependencies`
+	GECKO_LIBS=`pkg-config --libs ${gecko_cv_gecko}-xpcom '>=' $min_version ${gecko_cv_gecko}-js $gecko_cv_extra_pkg_dependencies`
+
+#	PKG_CHECK_MODULES([GECKO],[ ${gecko_cv_gecko}-xpcom >= $min_version ${gecko_cv_gecko}-js $gecko_cv_extra_pkg_dependencies])
 else
-	GECKO_CFLAGS="$GECKO_CFLAGS -UDEBUG"
+	GECKO_CFLAGS="$GECKO_CFLAGS"
 	GECKO_LIBS="$GECKO_LIBS `pkg-config --libs ${gecko_cv_gecko}`"
 fi