Restore ability to build zlib in a srcdir == builddir configuration.

	* configure.ac: Restore old behaviour of only enabling multilibs
	when a target subdirectory is defined.  This allows building with
	srcdir == builddir.
	* configure: Regenerate.

3 files changed, 28 insertions, 2 deletions

diff --git a/zlib/ChangeLog.bin-gdb b/zlib/ChangeLog.bin-gdb
new file mode 100644
index 0000000000..10f514fcdb
--- /dev/null
+++ b/zlib/ChangeLog.bin-gdb
@@ -0,0 +1,22 @@
+2017-01-23  Nick Clifton  <nickc@redhat.com>
+
+	* configure.ac: Restore old behaviour of only enabling multilibs
+	when a target subdirectory is defined.  This allows building with
+	srcdir == builddir.
+	* configure: Regenerate.
+
+Copyright (C) 2017 Free Software Foundation, Inc.
+
+Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.
+
+Local Variables:
+mode: change-log
+left-margin: 8
+fill-column: 74
+version-control: never
+change-log-default-name: "ChangeLog.bin-gdb"
+End:
+
+
diff --git a/zlib/configure b/zlib/configure
index ee5527c4a4..dc2d9ed383 100755
--- a/zlib/configure
+++ b/zlib/configure
@@ -2182,7 +2182,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-# Default to --enable-multilib
+if test -n "${with_target_subdir}"; then
+  # Default to --enable-multilib
 # Check whether --enable-multilib was given.
 if test "${enable_multilib+set}" = set; then :
   enableval=$enable_multilib; case "$enableval" in
@@ -2219,6 +2220,7 @@ fi
 
 ac_config_commands="$ac_config_commands default-1"
 
+fi
 
 ac_aux_dir=
 for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
diff --git a/zlib/configure.ac b/zlib/configure.ac
index fb8d943905..57d6fa56b6 100644
--- a/zlib/configure.ac
+++ b/zlib/configure.ac
@@ -4,7 +4,9 @@ AC_PREREQ(2.64)
 AC_INIT
 AC_CONFIG_SRCDIR([zlib.h])
 
-AM_ENABLE_MULTILIB(, ..)
+if test -n "${with_target_subdir}"; then
+  AM_ENABLE_MULTILIB(, ..)
+fi
 
 AC_CANONICAL_SYSTEM