From 0360bfa4c88d3dee8f643a355d9b485f78eecdc2 Mon Sep 17 00:00:00 2001
From: unknown author <cooker@mandrivalinux.org>
Date: Tue, 10 Feb 2009 15:47:48 +0000
Subject: gcc4 java nomulti

Rebased for 4.7.1 / tmb
Signed-off-by: Thomas Backlund <tmb@mageia.org>
---
 libjava/configure    |   22 ++++++++++++++++++++++
 libjava/configure.ac |   16 ++++++++++++++++
 2 files changed, 38 insertions(+)

diff -Nurp gcc-4.7.1/libjava/configure gcc-4.7.1-java-nomulti/libjava/configure
--- gcc-4.7.1/libjava/configure	2012-06-14 11:48:08.000000000 +0300
+++ gcc-4.7.1-java-nomulti/libjava/configure	2012-06-25 13:28:37.689376464 +0300
@@ -1611,6 +1611,9 @@ Optional Features:
   --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
@@ -3109,6 +3112,25 @@ fi
 
 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
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
 $as_echo_n "checking host system type... " >&6; }
diff -Nurp gcc-4.7.1/libjava/configure.ac gcc-4.7.1-java-nomulti/libjava/configure.ac
--- gcc-4.7.1/libjava/configure.ac	2012-05-21 21:14:01.000000000 +0300
+++ gcc-4.7.1-java-nomulti/libjava/configure.ac	2012-06-25 13:28:37.696375932 +0300
@@ -18,6 +18,22 @@ AC_ARG_WITH(target-subdir,
 # 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