From 93df7317eebbd081e8025545233ca3220bbd23d3 Mon Sep 17 00:00:00 2001
From: Nick Clifton <nickc@redhat.com>
Date: Mon, 23 Jan 2017 15:57:59 +0000
Subject: 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.
---
 zlib/configure | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'zlib/configure')

diff --git a/zlib/configure b/zlib/configure
index ee5527c..dc2d9ed 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
-- 
cgit v1.1