diff options
author | Mike Frysinger <vapier@gentoo.org> | 2022-01-07 00:53:26 -0500 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2022-01-10 19:50:35 -0500 |
commit | 7f8fa1de4fd35c96b61d2f80155bc1aa09367e3d (patch) | |
tree | d8c8561110289afe1b5cc5b43de5d893874613f4 /libgloss/fr30 | |
parent | cf8aa432844d912d0a0d2d6bebe2c3de22be0914 (diff) | |
download | newlib-7f8fa1de4fd35c96b61d2f80155bc1aa09367e3d.zip newlib-7f8fa1de4fd35c96b61d2f80155bc1aa09367e3d.tar.gz newlib-7f8fa1de4fd35c96b61d2f80155bc1aa09367e3d.tar.bz2 |
libgloss: hardcode AC_CONFIG_AUX_DIR path
In order to transition to automake, we have to use hardcoded paths in
the AC_CONFIG_AUX_DIR macro call (since automake evaluates the path
itself, and doesn't expand vars), so simplify all the calls here.
Diffstat (limited to 'libgloss/fr30')
-rwxr-xr-x | libgloss/fr30/configure | 40 | ||||
-rw-r--r-- | libgloss/fr30/configure.ac | 8 |
2 files changed, 4 insertions, 44 deletions
diff --git a/libgloss/fr30/configure b/libgloss/fr30/configure index 7beda07..7f0e888 100755 --- a/libgloss/fr30/configure +++ b/libgloss/fr30/configure @@ -1913,41 +1913,8 @@ ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` -if test "$srcdir" = "." ; then - mdir=`echo "${with_multisubdir}/" \ - | sed -e 's,\([^/][^/]*\),..,g' -e 's,^/$,,'` - ac_aux_dir= -for ac_dir in ${mdir}../../.. "$srcdir"/${mdir}../../..; do - if test -f "$ac_dir/install-sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break - elif test -f "$ac_dir/install.sh"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break - elif test -f "$ac_dir/shtool"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" - break - fi -done -if test -z "$ac_aux_dir"; then - as_fn_error $? "cannot find install-sh, install.sh, or shtool in ${mdir}../../.. \"$srcdir\"/${mdir}../../.." "$LINENO" 5 -fi - -# These three variables are undocumented and unsupported, -# and are intended to be withdrawn in a future Autoconf release. -# They can cause serious problems if a builder's source tree is in a directory -# whose full name contains unusual characters. -ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. -ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. -ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. - - -else - ac_aux_dir= -for ac_dir in ${srcdir}/../.. "$srcdir"/${srcdir}/../..; do +ac_aux_dir= +for ac_dir in ../.. "$srcdir"/../..; do if test -f "$ac_dir/install-sh"; then ac_aux_dir=$ac_dir ac_install_sh="$ac_aux_dir/install-sh -c" @@ -1963,7 +1930,7 @@ for ac_dir in ${srcdir}/../.. "$srcdir"/${srcdir}/../..; do fi done if test -z "$ac_aux_dir"; then - as_fn_error $? "cannot find install-sh, install.sh, or shtool in ${srcdir}/../.. \"$srcdir\"/${srcdir}/../.." "$LINENO" 5 + as_fn_error $? "cannot find install-sh, install.sh, or shtool in ../.. \"$srcdir\"/../.." "$LINENO" 5 fi # These three variables are undocumented and unsupported, @@ -1975,7 +1942,6 @@ ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. -fi # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or diff --git a/libgloss/fr30/configure.ac b/libgloss/fr30/configure.ac index 8ac12e4..f76fc6e 100644 --- a/libgloss/fr30/configure.ac +++ b/libgloss/fr30/configure.ac @@ -5,13 +5,7 @@ AC_INIT(crt0.s) AC_CANONICAL_SYSTEM AC_ARG_PROGRAM -if test "$srcdir" = "." ; then - mdir=`echo "${with_multisubdir}/" \ - | sed -e 's,\([[^/]][[^/]]*\),..,g' -e 's,^/$,,'` - AC_CONFIG_AUX_DIR(${mdir}../../..) -else - AC_CONFIG_AUX_DIR(${srcdir}/../..) -fi +AC_CONFIG_AUX_DIR(../..) AC_PROG_INSTALL |