1 diff -durN gcc-4.4.0.orig/libjava/configure gcc-4.4.0/libjava/configure
2 --- gcc-4.4.0.orig/libjava/configure 2009-04-21 11:08:08.000000000 +0200
3 +++ gcc-4.4.0/libjava/configure 2009-05-27 21:38:03.000000000 +0200
6 --enable-java-maintainer-mode
7 allow rebuilding of .class and .h files
8 + --enable-libjava-multilib
9 + build libjava as multilib
10 --disable-dependency-tracking speeds up one-time build
11 --enable-dependency-tracking do not reject slow dependency extractors
12 --enable-maintainer-mode enable make rules and dependencies not useful
13 @@ -1973,6 +1975,16 @@
17 +# Check whether --enable-libjava-multilib was given.
18 +if test "${enable_libjava_multilib+set}" = set; then
19 + enableval=$enable_libjava_multilib;
22 +if test "$enable_libjava_multilib" = no; then
24 + ac_configure_args="$ac_configure_args --disable-multilib"
27 # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX.
30 diff -durN gcc-4.4.0.orig/libjava/configure.ac gcc-4.4.0/libjava/configure.ac
31 --- gcc-4.4.0.orig/libjava/configure.ac 2009-04-09 23:54:28.000000000 +0200
32 +++ gcc-4.4.0/libjava/configure.ac 2009-05-27 21:38:03.000000000 +0200
34 [allow rebuilding of .class and .h files]))
35 AM_CONDITIONAL(JAVA_MAINTAINER_MODE, test "$enable_java_maintainer_mode" = yes)
37 +AC_ARG_ENABLE(libjava-multilib,
38 + AS_HELP_STRING([--enable-libjava-multilib], [build libjava as multilib]))
39 +if test "$enable_libjava_multilib" = no; then
41 + ac_configure_args="$ac_configure_args --disable-multilib"
44 # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX.