Exclude target-zlib if target-libjava isn't built

	* configure.ac (target_configdirs): Exclude target-zlib if
	target-libjava isn't built.
	* configure: Regenerated.

diff --git a/ChangeLog b/ChangeLog
index f018cc4f2714848280413190d58126a8a6b1c4fb..9b1895b19376be2be8614b535a9dbaa43e056cda 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2015-03-17  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * configure.ac (target_configdirs): Exclude target-zlib if
+       target-libjava isn't built.
+       * configure: Regenerated.
+
 2015-03-17  H.J. Lu  <hongjiu.lu@intel.com>
 
        Sync with GCC

diff --git a/configure b/configure
index 9e543196ea77efdd118d81f0141eb22612c3945f..b719d386764f80331ed34d149f2f4a1ad2433016 100755 (executable)
--- a/configure
+++ b/configure
@@ -6432,9 +6432,6 @@ Supported languages are: ${potential_languages}" "$LINENO" 5
 
 
   ac_configure_args=`echo " $ac_configure_args" | sed -e "s/ '--enable-languages=[^ ]*'//g" -e "s/$/ '--enable-languages="$enable_languages"'/" `
-else
-  # Disable all target libraries if not building gcc.
-  target_configdirs=
 fi
 
 # Handle --disable-<component> generically.
@@ -6554,6 +6551,15 @@ for i in ${target_configdirs_all} ; do
   fi
 done
 
+# Exclude target-zlib if target-libjava isn't built.
+case ${target_configdirs} in
+*target-libjava*)
+  ;;
+*)
+  target_configdirs="`echo ${target_configdirs} | sed -e 's/target-zlib//'`"
+  ;;
+esac
+
 # libiberty-linker-plugin is special: it doesn't have its own source directory,
 # so we have to add it after the preceding checks.
 if test x"$extra_linker_plugin_flags$extra_linker_plugin_configure_flags" != x

diff --git a/configure.ac b/configure.ac
index eaf46615e4292784c3aa2948466b3690b8fbd129..a4e4c7d835a21e9b512a03997ec90ec734d53874 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2129,9 +2129,6 @@ Supported languages are: ${potential_languages}])
 
   AC_SUBST(stage1_languages)
   ac_configure_args=`echo " $ac_configure_args" | sed -e "s/ '--enable-languages=[[^ ]]*'//g" -e "s/$/ '--enable-languages="$enable_languages"'/" `
-else
-  # Disable all target libraries if not building gcc.
-  target_configdirs=
 fi
 
 # Handle --disable-<component> generically.
@@ -2251,6 +2248,15 @@ for i in ${target_configdirs_all} ; do
   fi
 done
 
+# Exclude target-zlib if target-libjava isn't built.
+case ${target_configdirs} in
+*target-libjava*)
+  ;;
+*)
+  target_configdirs="`echo ${target_configdirs} | sed -e 's/target-zlib//'`"
+  ;;
+esac
+
 # libiberty-linker-plugin is special: it doesn't have its own source directory,
 # so we have to add it after the preceding checks.
 if test x"$extra_linker_plugin_flags$extra_linker_plugin_configure_flags" != x