Allow building of the zlib component when the building takes place in the source...

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

From-SVN: r261739

diff --git a/ChangeLog b/ChangeLog
index 430b793bcdc7e2f33d8017175864f67f513fc3f8..7d1dd1faaca2a121211910ff886bfad404481ea8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2018-06-19  Nick Clifton  <nickc@redhat.com>
+
+       * zlib/configure.ac: Restore old behaviour of only enabling
+       multilibs when a target subdirectory is defined.  This allows
+       building with srcdir == builddir.
+       * zlib/configure: Regenerate.
+
 2018-06-18  Eric Botcazou  <ebotcazou@adacore.com>
 
        * Makefile.def (fortran): Add check-target-libgomp-fortran.

diff --git a/zlib/configure b/zlib/configure
index ee5527c4a404543a3f7270fc73887d0d5f5ee85e..bed9e3ea2bf56b153c12261833936d874dc9fce2 100755 (executable)
--- 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
@@ -10406,7 +10408,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10409 "configure"
+#line 10411 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10512,7 +10514,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10515 "configure"
+#line 10517 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H

diff --git a/zlib/configure.ac b/zlib/configure.ac
index fb8d943905e278f92a8552db634979b03016e741..57d6fa56b69b2a90d8a637309639b4ef5c90e196 100644 (file)
--- 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