--- gcc-4.3-20070622/libjava/configure.ac.o 2007-05-29 17:30:42.000000000 +0300 +++ gcc-4.3-20070622/libjava/configure.ac 2007-06-25 22:35:07.000000000 +0300 @@ -18,6 +18,22 @@ # Find the rest of the source tree framework. AM_ENABLE_MULTILIB(, ..) +AC_ARG_ENABLE(libjava-multilib, + AC_HELP_STRING([--enable-libjava-multilib], + [build multilib libjava when multilib is enabled (default)]), + [case "$enableval" in + yes) java_multilib=yes ;; + no) java_multilib=no ;; + *) AC_MSG_ERROR([Unknown argument to enable/disable libjava multilib]);; + esac], + [java_multilib=yes] +) + +if test "$java_multilib" = "no"; then + multilib=no + ac_configure_args="$ac_configure_args --disable-multilib" +fi + AC_CANONICAL_SYSTEM _GCC_TOPLEV_NONCANONICAL_BUILD _GCC_TOPLEV_NONCANONICAL_TARGET --- gcc/libjava/configure.o 2007-06-26 08:06:43.000000000 +0300 +++ gcc/libjava/configure 2007-06-26 08:07:01.000000000 +0300 @@ -1607,6 +1607,9 @@ --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --enable-multilib build many library versions (default) + --enable-libjava-multilib + build multilib libjava when multilib is enabled + (default) --enable-version-specific-runtime-libs specify that runtime libraries should be installed in a compiler-specific directory @@ -2286,6 +2289,26 @@ ac_config_commands="$ac_config_commands default-1" +# Check whether --enable-libjava-multilib was given. +if test "${enable_libjava_multilib+set}" = set; then + enableval=$enable_libjava_multilib; case "$enableval" in + yes) java_multilib=yes ;; + no) java_multilib=no ;; + *) { { echo "$as_me:$LINENO: error: Unknown argument to enable/disable libjava multilib" >&5 +echo "$as_me: error: Unknown argument to enable/disable libjava multilib" >&2;} + { (exit 1); exit 1; }; };; + esac +else + java_multilib=yes + +fi + + +if test "$java_multilib" = "no"; then + multilib=no + ac_configure_args="$ac_configure_args --disable-multilib" +fi + echo "$as_me:$LINENO: checking host system type" >&5 echo $ECHO_N "checking host system type... $ECHO_C" >&6 if test "${ac_cv_host+set}" = set; then