Sync toplevel configure with binutils-gdb

	Sync with binutils-gdb:
	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.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@225778 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/ChangeLog b/ChangeLog
index 27edb460dbcdfb550ccd26788085b4cbd07edaa9..c1582b9afdc3c3e3c0ef188daee5b776d60ff917 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2015-07-14  H.J. Lu  <hongjiu.lu@intel.com>
+
+       Sync with binutils-gdb:
+       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-07-14  H.J. Lu  <hongjiu.lu@intel.com>
 
        Sync with binutils-gdb:

diff --git a/configure b/configure
index f0609865f6f87fe6c5e98b9d30276364048a78e3..5ba9489d1e918ac399b9bc629fd5b3ca0b0d8413 100755 (executable)
--- a/configure
+++ b/configure
@@ -6575,6 +6575,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 603bdf6f9fb0c7f21e7515905208c8252727e544..2ff9be008cd0ab94e77db0afa559d46bb477c220 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2265,6 +2265,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