From f26a212542b73730f869991e28720744d62e445c Mon Sep 17 00:00:00 2001
From: Christian Persch <chpe@src.gnome.org>
Date: Tue, 11 Mar 2008 10:15:17 +0000
Subject: Try to fix the build with 1.8

svn path=/trunk/; revision=8095
---
 configure.ac | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index b21883565..b90f1b020 100644
--- a/configure.ac
+++ b/configure.ac
@@ -245,9 +245,16 @@ esac
 
 # 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
 
-- 
cgit v1.2.3