aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--configure.in16
2 files changed, 22 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index d675054..4f9a018 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-04-25 Alexandre Oliva <aoliva@redhat.com>
+
+ * configure.in (libgcj_saved): Copy from $libgcj.
+ (libgcj): Zero out if --enable-libgcj; add to noconfigdirs is
+ --disable-libgcj.
+
2001-04-20 Alexandre Oliva <aoliva@redhat.com>
* ltconfig, ltmain.sh, ltcf-cxx.sh: Upgraded to libtool 1.4a
diff --git a/configure.in b/configure.in
index cc8f34f..d5db065 100644
--- a/configure.in
+++ b/configure.in
@@ -572,6 +572,22 @@ case "${host}" in
esac
+# Save it here so that, even in case of --enable-libgcj, if the Java
+# front-end isn't enabled, we still get libgcj disabled.
+libgcj_saved=$libgcj
+case $enable_libgcj in
+yes)
+ # If we reset it here, it won't get added to noconfigdirs in the
+ # target-specific build rules, so it will be forcibly enabled
+ # (unless the Java language itself isn't enabled).
+ libgcj=
+ ;;
+no)
+ # Make sure we get it printed in the list of not supported target libs.
+ noconfigdirs="$noconfigdirs ${libgcj}"
+ ;;
+esac
+
case "${target}" in
*-*-netware)
noconfigdirs="$noconfigdirs ${libstdcxx_version} target-newlib target-libiberty target-libgloss target-libffi"