diff options
Diffstat (limited to 'zlib/configure.in')
| -rw-r--r-- | zlib/configure.in | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/zlib/configure.in b/zlib/configure.in index d5f9a1edb8d..224f1de5834 100644 --- a/zlib/configure.in +++ b/zlib/configure.in @@ -113,7 +113,23 @@ AC_SUBST(target_all) AC_CHECK_HEADERS(unistd.h) -AM_CONDITIONAL(USE_LIBDIR, test -z "$with_cross_host") +if test -n "$with_cross_host" && + test x"$with_cross_host" != x"no"; then + toolexecdir='$(exec_prefix)/$(target_alias)' + toolexeclibdir='$(toolexecdir)/lib' +else + toolexecdir='$(libdir)/gcc-lib/$(target_alias)' + toolexeclibdir='$(libdir)' +fi +if test "$GCC" = yes && $CC -print-multi-os-directory > /dev/null 2>&1; then + multiosdir=/`$CC -print-multi-os-directory` +else + multiosdir= +fi +toolexeclibdir=${toolexeclibdir}${multiosdir} +AC_SUBST(toolexecdir) +AC_SUBST(toolexeclibdir) + AM_CONDITIONAL(TARGET_LIBRARY, test -n "$with_target_subdir") if test "${multilib}" = "yes"; then @@ -136,4 +152,5 @@ CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} zlib_basedir=${zlib_basedir} CC="${CC}" CXX="${CXX}" +ORIGINAL_LD_FOR_MULTILIBS="${ORIGINAL_LD_FOR_MULTILIBS}" ) |