configure.in: Adjust command to source config-ml.in to account for changes to the...

2003-01-31  Christian Cornelssen  <ccorn@cs.tu-berlin.de>,
            Andreas Schwab  <schwab@suse.de>

        * configure.in: Adjust command to source config-ml.in to account
        for changes to the libffi_basedir definition.
        (libffi_basedir): Remove ${srcdir} from value and include trailing
        slash if nonempty.

        * configure: Regenerate.

Co-Authored-By: Andreas Schwab <schwab@suse.de>

From-SVN: r62193
This commit is contained in:
Christian Cornelssen 2003-01-31 20:35:22 +01:00 committed by Andreas Jaeger
parent aba4e92ee1
commit 63b87c2e8e
3 changed files with 21 additions and 11 deletions

View file

@ -1,3 +1,13 @@
2003-01-31 Christian Cornelssen <ccorn@cs.tu-berlin.de>,
Andreas Schwab <schwab@suse.de>
* configure.in: Adjust command to source config-ml.in to account
for changes to the libffi_basedir definition.
(libffi_basedir): Remove ${srcdir} from value and include trailing
slash if nonempty.
* configure: Regenerate.
2003-01-29 Franz Sirl <Franz.Sirl-kernel@lauterbach.com>
* src/powerpc/ppc_closure.S: Recode to fit shared libs.

12
libffi/configure vendored
View file

@ -633,16 +633,16 @@ fi
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_aux_dir=
for ac_dir in ${libffi_basedir}/.. $srcdir/${libffi_basedir}/..; do
for ac_dir in ${libffi_basedir}.. $srcdir/${libffi_basedir}..; do
if test -f $ac_dir/install-sh; then
ac_aux_dir=$ac_dir
ac_install_sh="$ac_aux_dir/install-sh -c"
@ -654,7 +654,7 @@ for ac_dir in ${libffi_basedir}/.. $srcdir/${libffi_basedir}/..; do
fi
done
if test -z "$ac_aux_dir"; then
{ echo "configure: error: can not find install-sh or install.sh in ${libffi_basedir}/.. $srcdir/${libffi_basedir}/.." 1>&2; exit 1; }
{ echo "configure: error: can not find install-sh or install.sh in ${libffi_basedir}.. $srcdir/${libffi_basedir}.." 1>&2; exit 1; }
fi
ac_config_guess=$ac_aux_dir/config.guess
ac_config_sub=$ac_aux_dir/config.sub
@ -4094,7 +4094,7 @@ test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h
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
exit 0

View file

@ -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
@ -186,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}