Hi,

This patch makes sure that configure lets the user know when the plugin
should be disabled because no plugin headers/libraries and/or the gtk+
dependency is missing.

2007-03-13  Mark Wielaard  <[EMAIL PROTECTED]>

    * configure.ac (COMPILE_PLUGIN): Stop when no plugin headers found.
    Also check for gtk+ dependency.

Committed,

Mark
Index: configure.ac
===================================================================
RCS file: /cvsroot/classpath/classpath/configure.ac,v
retrieving revision 1.196
diff -u -r1.196 configure.ac
--- configure.ac	2 Mar 2007 21:49:33 -0000	1.196
+++ configure.ac	13 Mar 2007 13:40:34 -0000
@@ -601,12 +601,19 @@
     if test "x${MOZILLA_FOUND}" = xno; then
       PKG_CHECK_MODULES(MOZILLA, seamonkey-plugin seamonkey-xpcom, [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no])
     fi
+    if test "x${MOZILLA_FOUND}" = xno; then
+      AC_MSG_ERROR([Couldn't find plugin support headers and libraries, try --disable-plugin])
+    fi
+
     PKG_CHECK_MODULES(GLIB, glib-2.0)
+    PKG_CHECK_MODULES(GTK, gtk+-2.0)
 
     AC_SUBST(MOZILLA_CFLAGS)
     AC_SUBST(MOZILLA_LIBS)
     AC_SUBST(GLIB_CFLAGS)
     AC_SUBST(GLIB_LIBS)
+    AC_SUBST(GTK_CFLAGS)
+    AC_SUBST(GTK_LIBS)
 
     AC_SUBST(PLUGIN_DIR, $HOME/.mozilla/plugins/)
   fi

Reply via email to