aboutsummaryrefslogtreecommitdiff
path: root/zlib/configure
diff options
context:
space:
mode:
authorNick Clifton <nickc@redhat.com>2017-01-23 15:57:59 +0000
committerNick Clifton <nickc@redhat.com>2017-01-23 15:57:59 +0000
commit93df7317eebbd081e8025545233ca3220bbd23d3 (patch)
treeb15a04faea7e4302bb8ae519f2d50dfa7a2e6b96 /zlib/configure
parent33eaf5de31b248f84ae108cf0cf4e1664db9ee51 (diff)
downloadfsf-binutils-gdb-93df7317eebbd081e8025545233ca3220bbd23d3.zip
fsf-binutils-gdb-93df7317eebbd081e8025545233ca3220bbd23d3.tar.gz
fsf-binutils-gdb-93df7317eebbd081e8025545233ca3220bbd23d3.tar.bz2
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.
Diffstat (limited to 'zlib/configure')
-rwxr-xr-xzlib/configure4
1 files changed, 3 insertions, 1 deletions
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