You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
42 lines
1.6 KiB
42 lines
1.6 KiB
--- libjava/configure.ac.jj 2007-12-07 17:55:50.000000000 +0100 |
|
+++ libjava/configure.ac 2007-12-07 18:36:56.000000000 +0100 |
|
@@ -82,6 +82,13 @@ AC_ARG_ENABLE(java-maintainer-mode, |
|
[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 |
|
|
|
--- libjava/configure.jj 2007-12-07 17:55:50.000000000 +0100 |
|
+++ libjava/configure 2007-12-07 18:39:58.000000000 +0100 |
|
@@ -1021,6 +1021,8 @@ Optional Features: |
|
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 |
|
@@ -1973,6 +1975,16 @@ else |
|
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.
|
|
|