From 102603be13d3cb9e6a410653042b581df7233dc9 Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <mpg@redhat.com>
Date: Wed, 22 Aug 2007 00:11:20 +0000
Subject: Adapt to latest xulrunner 1.9

---
(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index f590fe8..36b7094 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,20 +21,21 @@ PKG_CHECK_MODULES(PYGTK, pygtk-2.0)
 PYGTK_DEFSDIR=`$PKG_CONFIG --variable=defsdir pygtk-2.0`
 AC_SUBST(PYGTK_DEFSDIR)
 
-GECKO_INIT([MOZILLA])
-AC_SUBST(MOZILLA_INCLUDE_ROOT)
-AC_SUBST([MOZILLA_HOME])
-AC_SUBST([MOZILLA_EXTRA_LIBS])
-AC_SUBST([MOZILLA_GLUE_LIBS])
-AC_SUBST([AM_CXXFLAGS])
-
-GECKO_XPIDL()
-AC_SUBST([XPIDL])
-AC_SUBST([XPIDL_IDLDIR])
-
-PKG_CHECK_MODULES([GECKO],[${gecko_cv_gecko}-xpcom >= 1.9 ${gecko_cv_gecko}-js $gecko_cv_extra_pkg_dependencies])
-AC_SUBST([GECKO_CFLAGS])
-AC_SUBST([GECKO_LIBS])
+PKG_CHECK_MODULES([LIBXUL],[libxul])
+
+# FIXME To be able to use pyxpcom we currently need
+# to link to xpcom at build time. Which involves various hacks.
+LIBXUL_PREFIX=`$PKG_CONFIG --variable=prefix libxul`
+LIBXUL_SDK_DIR=`$PKG_CONFIG --variable=sdkdir libxul`
+LIBXUL_VERSION=`$PKG_CONFIG --modversion libxul`
+LIBXUL_DIR=$LIBXUL_PREFIX/lib/xulrunner-$LIBXUL_VERSION
+LIBXUL_LIBS="$LIBXUL_LIBS -L$LIBXUL_DIR -lpyxpcom"
+
+LIBXUL_CFLAGS=`$PKG_CONFIG --cflags --define-variable=includetype=unstable libxul`
+
+AC_SUBST([LIBXUL_CFLAGS])
+AC_SUBST([LIBXUL_LIBS])
+AC_SUBST([LIBXUL_DIR])
 
 AC_OUTPUT([
 Makefile
--
cgit v0.9.1