yann@1948: diff -durN gcc-4.4.0.orig/libjava/configure gcc-4.4.0/libjava/configure
yann@1948: 
yann@1948: diff -durN gcc-4.4.4.orig/libjava/configure gcc-4.4.4/libjava/configure
yann@1948: --- gcc-4.4.4.orig/libjava/configure	2010-04-29 10:26:54.000000000 +0200
yann@1948: +++ gcc-4.4.4/libjava/configure	2010-05-16 19:10:49.000000000 +0200
yann@1948: @@ -1021,6 +1021,8 @@
yann@1948:                            default=yes
yann@1948:    --enable-java-maintainer-mode
yann@1948:                            allow rebuilding of .class and .h files
yann@1948: +  --enable-libjava-multilib
yann@1948: +                          build libjava as multilib
yann@1948:    --disable-dependency-tracking  speeds up one-time build
yann@1948:    --enable-dependency-tracking   do not reject slow dependency extractors
yann@1948:    --enable-maintainer-mode  enable make rules and dependencies not useful
yann@1948: @@ -1973,6 +1975,16 @@
yann@1948:  fi
yann@1948:  
yann@1948:  
yann@1948: +# Check whether --enable-libjava-multilib was given.
yann@1948: +if test "${enable_libjava_multilib+set}" = set; then
yann@1948: +  enableval=$enable_libjava_multilib;
yann@1948: +fi
yann@1948: +
yann@1948: +if test "$enable_libjava_multilib" = no; then
yann@1948: +  multilib=no
yann@1948: +  ac_configure_args="$ac_configure_args --disable-multilib"
yann@1948: +fi
yann@1948: +
yann@1948:  # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX.
yann@1948:  
yann@1948:  
yann@1948: diff -durN gcc-4.4.4.orig/libjava/configure.ac gcc-4.4.4/libjava/configure.ac
yann@1948: --- gcc-4.4.4.orig/libjava/configure.ac	2010-04-21 19:04:42.000000000 +0200
yann@1948: +++ gcc-4.4.4/libjava/configure.ac	2010-05-16 19:10:49.000000000 +0200
yann@1948: @@ -139,6 +139,13 @@
yann@1948:  	[allow rebuilding of .class and .h files]))
yann@1948:  AM_CONDITIONAL(JAVA_MAINTAINER_MODE, test "$enable_java_maintainer_mode" = yes)
yann@1948:  
yann@1948: +AC_ARG_ENABLE(libjava-multilib,
yann@1948: +	AS_HELP_STRING([--enable-libjava-multilib], [build libjava as multilib]))
yann@1948: +if test "$enable_libjava_multilib" = no; then
yann@1948: +  multilib=no
yann@1948: +  ac_configure_args="$ac_configure_args --disable-multilib"
yann@1948: +fi
yann@1948: +
yann@1948:  # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX.
yann@1948:  GCC_NO_EXECUTABLES
yann@1948: