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
---
libjava/configure | 23 +++++++++++++++++++++++
libjava/configure.ac | 16 ++++++++++++++++
2 files changed, 39 insertions(+), 0 deletions(-)
diff --git a/libjava/configure b/libjava/configure
index 5e6adf1..a4885ac 100755
--- a/libjava/configure
+++ b/libjava/configure
@@ -1012,6 +1012,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
@@ -3094,6 +3094,25 @@
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 --git a/libjava/configure.ac b/libjava/configure.ac
index ae538fa..44b5afa 100644
--- a/libjava/configure.ac
+++ b/libjava/configure.ac
@@ -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
--
1.6.2.4
