diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2015-03-31 11:35:30 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2015-03-31 13:13:13 -0700 |
| commit | f85997a697553fb7053de89bafe36e3d71c6f784 (patch) | |
| tree | 3d8cd63fbcb21d49670e76d397f19e0af6250585 /zlib | |
| parent | 890ba06fb1eae846984a5e56ff8a79ea59108f88 (diff) | |
| download | binutils-gdb-f85997a697553fb7053de89bafe36e3d71c6f784.tar.gz | |
Use AM_ENABLE_MULTILIB only if with_target_subdir isn't empty
* configure.ac (AM_ENABLE_MULTILIB): Use only if
${with_target_subdir} isn't empty.
* configure: Regenerated.
Diffstat (limited to 'zlib')
| -rwxr-xr-x | zlib/configure | 8 | ||||
| -rw-r--r-- | zlib/configure.ac | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/zlib/configure b/zlib/configure index 1a9d854e8d8..837885705d2 100755 --- a/zlib/configure +++ b/zlib/configure @@ -2181,7 +2181,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 @@ -2218,6 +2219,7 @@ fi ac_config_commands="$ac_config_commands default-1" +fi ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do @@ -10403,7 +10405,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10406 "configure" +#line 10408 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10509,7 +10511,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10512 "configure" +#line 10514 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/zlib/configure.ac b/zlib/configure.ac index fb8d943905e..57d6fa56b69 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 |