3daebbc
--- libjava/configure.ac.jj	2007-12-07 17:55:50.000000000 +0100
3daebbc
+++ libjava/configure.ac	2007-12-07 18:36:56.000000000 +0100
3daebbc
@@ -82,6 +82,13 @@ AC_ARG_ENABLE(java-maintainer-mode,
3daebbc
 	[allow rebuilding of .class and .h files]))
3daebbc
 AM_CONDITIONAL(JAVA_MAINTAINER_MODE, test "$enable_java_maintainer_mode" = yes)
3daebbc
 
3daebbc
+AC_ARG_ENABLE(libjava-multilib,
3daebbc
+	AS_HELP_STRING([--enable-libjava-multilib], [build libjava as multilib]))
3daebbc
+if test "$enable_libjava_multilib" = no; then
3daebbc
+  multilib=no
3daebbc
+  ac_configure_args="$ac_configure_args --disable-multilib"
3daebbc
+fi
3daebbc
+
3daebbc
 # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX.
3daebbc
 GCC_NO_EXECUTABLES
3daebbc
 
3daebbc
--- libjava/configure.jj	2007-12-07 17:55:50.000000000 +0100
3daebbc
+++ libjava/configure	2007-12-07 18:39:58.000000000 +0100
7c07471
@@ -1021,6 +1021,8 @@ Optional Features:
7c07471
                           default=yes
3daebbc
   --enable-java-maintainer-mode
3daebbc
                           allow rebuilding of .class and .h files
3daebbc
+  --enable-libjava-multilib
3daebbc
+                          build libjava as multilib
3daebbc
   --disable-dependency-tracking  speeds up one-time build
3daebbc
   --enable-dependency-tracking   do not reject slow dependency extractors
3daebbc
   --enable-maintainer-mode  enable make rules and dependencies not useful
7c07471
@@ -1973,6 +1975,16 @@ else
3daebbc
 fi
3daebbc
 
3daebbc
 
3daebbc
+# Check whether --enable-libjava-multilib was given.
3daebbc
+if test "${enable_libjava_multilib+set}" = set; then
3daebbc
+  enableval=$enable_libjava_multilib;
3daebbc
+fi
3daebbc
+
3daebbc
+if test "$enable_libjava_multilib" = no; then
3daebbc
+  multilib=no
3daebbc
+  ac_configure_args="$ac_configure_args --disable-multilib"
3daebbc
+fi
3daebbc
+
3daebbc
 # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX.
3daebbc
 
3daebbc