diff options
Diffstat (limited to 'libffi/configure.in')
| -rw-r--r-- | libffi/configure.in | 23 |
1 files changed, 17 insertions, 6 deletions
diff --git a/libffi/configure.in b/libffi/configure.in index 3dccbeb85b3..06b5fa936c9 100644 --- a/libffi/configure.in +++ b/libffi/configure.in @@ -22,15 +22,15 @@ dnl --with-target-subdir, --with-multisrctop, --with-multisubdir if test "${srcdir}" = "."; then if test "${with_target_subdir}" != "."; then - libffi_basedir="${srcdir}/${with_multisrctop}.." + libffi_basedir="${with_multisrctop}../" else - libffi_basedir="${srcdir}/${with_multisrctop}" + libffi_basedir="${with_multisrctop}" fi else - libffi_basedir="${srcdir}" + libffi_basedir= fi AC_SUBST(libffi_basedir) -AC_CONFIG_AUX_DIR(${libffi_basedir}/..) +AC_CONFIG_AUX_DIR(${libffi_basedir}..) AC_CANONICAL_HOST @@ -164,7 +164,17 @@ AC_ARG_ENABLE(purify-safety, AC_DEFINE(USING_PURIFY) fi) -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 +toolexeclibdir=$toolexeclibdir/`$CC -print-multi-os-directory` +AC_SUBST(toolexecdir) +AC_SUBST(toolexeclibdir) if test "${multilib}" = "yes"; then multilib_arg="--enable-multilib" @@ -176,7 +186,7 @@ AC_OUTPUT(include/Makefile include/ffi.h Makefile, [ if test -n "$CONFIG_FILES"; then LD="${ORIGINAL_LD_FOR_MULTILIBS}" - ac_file=Makefile . ${libffi_basedir}/../config-ml.in + ac_file=Makefile . ${srcdir}/${libffi_basedir}../config-ml.in fi ], srcdir=${srcdir} @@ -188,6 +198,7 @@ CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} libffi_basedir=${libffi_basedir} CC="${CC}" DEFS="$DEFS" +ORIGINAL_LD_FOR_MULTILIBS="${ORIGINAL_LD_FOR_MULTILIBS}" test ! -d include && mkdir include test ! -f include/fficonfig.h && cp fficonfig.h include/fficonfig.h if cmp -s fficonfig.h include/fficonfig.h 2>/dev/null; then |