49 lines
1.7 KiB
Diff
49 lines
1.7 KiB
Diff
Index: libjava/configure.ac
|
|
===================================================================
|
|
--- libjava/configure.ac.orig 2010-03-21 12:41:37.000000000 -0700
|
|
+++ libjava/configure.ac 2010-06-25 10:17:47.489886278 -0700
|
|
@@ -139,6 +139,13 @@
|
|
[allow rebuilding of .class and .h files]))
|
|
AM_CONDITIONAL(JAVA_MAINTAINER_MODE, test "$enable_java_maintainer_mode" = yes)
|
|
|
|
+AC_ARG_ENABLE(libjava-multilib,
|
|
+ AS_HELP_STRING([--enable-libjava-multilib], [build libjava as multilib]))
|
|
+if test "$enable_libjava_multilib" = no; then
|
|
+ multilib=no
|
|
+ ac_configure_args="$ac_configure_args --disable-multilib"
|
|
+fi
|
|
+
|
|
# It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX.
|
|
GCC_NO_EXECUTABLES
|
|
|
|
Index: libjava/configure
|
|
===================================================================
|
|
--- libjava/configure.orig 2010-04-02 11:18:06.000000000 -0700
|
|
+++ libjava/configure 2010-06-25 10:17:47.516381209 -0700
|
|
@@ -1609,6 +1609,8 @@
|
|
default=yes
|
|
--enable-java-maintainer-mode
|
|
allow rebuilding of .class and .h files
|
|
+ --enable-libjava-multilib
|
|
+ build libjava as multilib
|
|
--disable-dependency-tracking speeds up one-time build
|
|
--enable-dependency-tracking do not reject slow dependency extractors
|
|
--enable-maintainer-mode enable make rules and dependencies not useful
|
|
@@ -3346,6 +3348,16 @@
|
|
fi
|
|
|
|
|
|
+# Check whether --enable-libjava-multilib was given.
|
|
+if test "${enable_libjava_multilib+set}" = set; then
|
|
+ enableval=$enable_libjava_multilib;
|
|
+fi
|
|
+
|
|
+if test "$enable_libjava_multilib" = no; then
|
|
+ multilib=no
|
|
+ ac_configure_args="$ac_configure_args --disable-multilib"
|
|
+fi
|
|
+
|
|
# It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX.
|
|
|
|
|