This is the mail archive of the java-patches@gcc.gnu.org mailing list for the Java project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[patch] fix configure for building the plugin


Seen with 2.0.0.2 (at least in Ubuntu):

$ pkg-config firefox-plugin --cflags -I/usr/include/firefox/java -I/usr/include/firefox/plugin -I/usr/include/firefox/nspr

resulting in:

In file included from
../../../../../../src/libjava/classpath/native/plugin/gcjwebplugin.cc:61: /usr/include/firefox/plugin/nsIPluginInstance.h:10:25: error: nsISupports.h: No such file or directory

which is installed in /usr/include/firefox

Got the answer that firefox-plugin will not depend on firefox-xpcom in
the future.

  Matthias


libjava/classpath/ChangeLog.gcj:

2007-03-03  Matthias Klose  <doko@debian.org>

	* configure.ac: Add xpcom flags to mozilla flags.
	* configure: Regenerate.

--- libjava/classpath/configure.ac~	2007-03-03 08:12:54.576868668 +0000
+++ libjava/classpath/configure.ac	2007-03-03 08:51:50.312102703 +0000
@@ -542,17 +542,23 @@
   dnl Check for plugin support headers and libraries.
   if test "x${COMPILE_PLUGIN}" = xyes; then
     PKG_CHECK_MODULES(MOZILLA, mozilla-plugin, [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no])
+    PKG_CHECK_MODULES(MOZILLA_XPCOM, mozilla-xpcom, [MOZILLA_XPCOM_FOUND=yes], [MOZILLA_XPCOM_FOUND=no])
     if test "x${MOZILLA_FOUND}" = xno; then
       PKG_CHECK_MODULES(MOZILLA, firefox-plugin, [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no])
+      PKG_CHECK_MODULES(MOZILLA_XPCOM, firefox-xpcom, [MOZILLA_XPCOM_FOUND=yes], [MOZILLA_XPCOM_FOUND=no])
     fi
     if test "x${MOZILLA_FOUND}" = xno; then
       PKG_CHECK_MODULES(MOZILLA, xulrunner-plugin, [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no])
+      PKG_CHECK_MODULES(MOZILLA_XPCOM, xulrunner-xpcom, [MOZILLA_XPCOM_FOUND=yes], [MOZILLA_XPCOM_FOUND=no])
     fi
     if test "x${MOZILLA_FOUND}" = xno; then
       PKG_CHECK_MODULES(MOZILLA, mozilla-firefox-plugin, [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no])
+      PKG_CHECK_MODULES(MOZILLA_XPCOM, mozilla-firefox-xpcom, [MOZILLA_XPCOM_FOUND=yes], [MOZILLA_XPCOM_FOUND=no])
     fi
     PKG_CHECK_MODULES(GLIB, glib-2.0)
 
+    MOZILLA_CFLAGS="$MOZILLA_CFLAGS $MOZILLA_XPCOM_CFLAGS"
+    MOZILLA_LIBS="$MOZILLA_LIBS $MOZILLA_XPCOM_LIBS"
     AC_SUBST(MOZILLA_CFLAGS)
     AC_SUBST(MOZILLA_LIBS)
     AC_SUBST(GLIB_CFLAGS)


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]