2010-05-07 Richard Guenther <rguenther@suse.de>

[pf3gnuchains/gcc-fork.git] / libjava / classpath / configure.ac

diff --git a/libjava/classpath/configure.ac b/libjava/classpath/configure.ac
index 18311ea..98a17f8 100644 (file)
--- a/libjava/classpath/configure.ac
+++ b/libjava/classpath/configure.ac
@@ -6,7 +6,7 @@ dnl -----------------------------------------------------------
 dnl define([AC_CACHE_LOAD], )dnl
 dnl define([AC_CACHE_SAVE], )dnl
 
-AC_INIT([GNU Classpath],[0.98-pre],[classpath@gnu.org],[classpath])
+AC_INIT([GNU Classpath],[0.98],[classpath@gnu.org],[classpath])
 AC_CONFIG_SRCDIR(java/lang/System.java)
 
 dnl GCJ LOCAL
@@ -46,6 +46,8 @@ dnl END GCJ LOCAL
 # Find the rest of the source tree framework.
 AM_ENABLE_MULTILIB(, ../..)
 
+AM_CONDITIONAL(INSTALL_BINARIES, test -z "${with_multisubdir}")
+
 dnl -----------------------------------------------------------
 dnl Fold all IA-32 CPU architectures into "x86"
 dnl -----------------------------------------------------------
@@ -71,7 +73,7 @@ AC_SUBST(CLASSPATH_MODULE)
 CLASSPATH_CONVENIENCE="-no-undefined"
 AC_SUBST(CLASSPATH_CONVENIENCE)
 
-AC_PREREQ(2.59)
+AC_PREREQ(2.64)
 AM_INIT_AUTOMAKE([1.9.0 gnu std-options tar-ustar -Wno-portability])
 AC_CONFIG_HEADERS([include/config.h])
 AC_PREFIX_DEFAULT(/usr/local/classpath)
@@ -769,7 +771,10 @@ if test "x${COMPILE_JNI}" = xyes; then
 
   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, mozilla-plugin libxul-unstable, [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no])
+    if test "x${MOZILLA_FOUND}" = xno; then
+      PKG_CHECK_MODULES(MOZILLA, mozilla-plugin, [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no])
+    fi
     if test "x${MOZILLA_FOUND}" = xno; then
       PKG_CHECK_MODULES(MOZILLA, firefox-plugin firefox-xpcom, [MOZILLA_FOUND=yes], [MOZILLA_FOUND=no])
     fi
@@ -1015,18 +1020,17 @@ AM_CONDITIONAL(USE_PREBUILT_GLIBJ_ZIP, test x$use_glibj_zip = xtrue)
 AC_SUBST(PATH_TO_GLIBJ_ZIP)
 
 if test "x${TOOLSDIR}" != x; then
+  dnl GCJ LOCAL
   if test "x${COMPILE_WRAPPERS}" = xno && test "x${enable_java_maintainer_mode}" = xyes; then
     AC_PROG_JAVA
   fi
+  dnl END GCJ LOCAL
   if test "x${COMPILE_GJDOC}" = xyes; then
     AC_LIB_ANTLR
-    if test "x${REGENERATE_GJDOC_PARSER}" = xyes; then
-dnl GCJ LOCAL
-      if test "x${enable_java_maintainer_mode}" = xyes; then
-        AC_PROG_JAVA
+    dnl GCJ LOCAL
+    if test "x${REGENERATE_GJDOC_PARSER}" = xyes && test "x${enable_java_maintainer_mode}" = xyes; then
+    dnl END GCJ LOCAL
        AC_PROG_ANTLR(2,7,1)
-      fi
-dnl END GCJ LOCAL
     fi
   fi
 fi