diff options
| author | dj <dj@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-11-12 04:45:57 +0000 |
|---|---|---|
| committer | dj <dj@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-11-12 04:45:57 +0000 |
| commit | be36f77d9690b4d9a8096a69275e462167b80d54 (patch) | |
| tree | d049825871ccf560608d6de241ef9a72df5ce4a1 /libffi | |
| parent | 2a3edec56bee49d4a83483777cee1f99d73112f2 (diff) | |
| download | gcc-be36f77d9690b4d9a8096a69275e462167b80d54.tar.gz | |
* configure.in: Look for common files in the right place.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@59039 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libffi')
| -rw-r--r-- | libffi/ChangeLog | 4 | ||||
| -rwxr-xr-x | libffi/configure | 6 | ||||
| -rw-r--r-- | libffi/configure.in | 1 |
3 files changed, 8 insertions, 3 deletions
diff --git a/libffi/ChangeLog b/libffi/ChangeLog index adfa3885e7d..40ba2a57824 100644 --- a/libffi/ChangeLog +++ b/libffi/ChangeLog @@ -1,3 +1,7 @@ +2002-11-11 DJ Delorie <dj@redhat.com> + + * configure.in: Look for common files in the right place. + 2002-10-08 Ulrich Weigand <uweigand@de.ibm.com> * src/java_raw_api.c (ffi_java_raw_to_ptrarray): Interpret diff --git a/libffi/configure b/libffi/configure index 37ea9b48dd0..13a6187c2b4 100755 --- a/libffi/configure +++ b/libffi/configure @@ -652,9 +652,8 @@ else libffi_basedir="${srcdir}" fi - ac_aux_dir= -for ac_dir in $srcdir $srcdir/.. $srcdir/../..; 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" @@ -666,13 +665,14 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do fi done if test -z "$ac_aux_dir"; then - { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 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 ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. + # Make sure we can run config.sub. if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then : else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; } diff --git a/libffi/configure.in b/libffi/configure.in index 9062dca9e7e..3dccbeb85b3 100644 --- a/libffi/configure.in +++ b/libffi/configure.in @@ -30,6 +30,7 @@ else libffi_basedir="${srcdir}" fi AC_SUBST(libffi_basedir) +AC_CONFIG_AUX_DIR(${libffi_basedir}/..) AC_CANONICAL_HOST |