yann@2149: diff -durN gcc-4.4.5.orig/libjava/configure gcc-4.4.5/libjava/configure
yann@2149: --- gcc-4.4.5.orig/libjava/configure	2010-10-01 10:26:18.000000000 +0200
yann@2149: +++ gcc-4.4.5/libjava/configure	2010-10-09 22:58:04.000000000 +0200
yann@2149: @@ -1022,6 +1022,8 @@
yann@2149:                            default=yes
yann@2149:    --enable-java-maintainer-mode
yann@2149:                            allow rebuilding of .class and .h files
yann@2149: +  --enable-libjava-multilib
yann@2149: +                          build libjava as multilib
yann@2149:    --disable-dependency-tracking  speeds up one-time build
yann@2149:    --enable-dependency-tracking   do not reject slow dependency extractors
yann@2149:    --enable-maintainer-mode  enable make rules and dependencies not useful
yann@2149: @@ -1974,6 +1976,16 @@
yann@2149:  fi
yann@2149:  
yann@2149:  
yann@2149: +# Check whether --enable-libjava-multilib was given.
yann@2149: +if test "${enable_libjava_multilib+set}" = set; then
yann@2149: +  enableval=$enable_libjava_multilib;
yann@2149: +fi
yann@2149: +
yann@2149: +if test "$enable_libjava_multilib" = no; then
yann@2149: +  multilib=no
yann@2149: +  ac_configure_args="$ac_configure_args --disable-multilib"
yann@2149: +fi
yann@2149: +
yann@2149:  # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX.
yann@2149:  
yann@2149:  
yann@2149: diff -durN gcc-4.4.5.orig/libjava/configure.ac gcc-4.4.5/libjava/configure.ac
yann@2149: --- gcc-4.4.5.orig/libjava/configure.ac	2010-06-11 13:49:16.000000000 +0200
yann@2149: +++ gcc-4.4.5/libjava/configure.ac	2010-10-09 22:58:04.000000000 +0200
yann@2149: @@ -139,6 +139,13 @@
yann@2149:  	[allow rebuilding of .class and .h files]))
yann@2149:  AM_CONDITIONAL(JAVA_MAINTAINER_MODE, test "$enable_java_maintainer_mode" = yes)
yann@2149:  
yann@2149: +AC_ARG_ENABLE(libjava-multilib,
yann@2149: +	AS_HELP_STRING([--enable-libjava-multilib], [build libjava as multilib]))
yann@2149: +if test "$enable_libjava_multilib" = no; then
yann@2149: +  multilib=no
yann@2149: +  ac_configure_args="$ac_configure_args --disable-multilib"
yann@2149: +fi
yann@2149: +
yann@2149:  # It may not be safe to run linking tests in AC_PROG_CC/AC_PROG_CXX.
yann@2149:  GCC_NO_EXECUTABLES
yann@2149: