aboutsummaryrefslogtreecommitdiff
path: root/libgloss/m32r
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2022-01-07 00:53:26 -0500
committerMike Frysinger <vapier@gentoo.org>2022-01-10 19:50:35 -0500
commit7f8fa1de4fd35c96b61d2f80155bc1aa09367e3d (patch)
treed8c8561110289afe1b5cc5b43de5d893874613f4 /libgloss/m32r
parentcf8aa432844d912d0a0d2d6bebe2c3de22be0914 (diff)
downloadnewlib-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/m32r')
-rwxr-xr-xlibgloss/m32r/configure41
-rw-r--r--libgloss/m32r/configure.ac9
2 files changed, 4 insertions, 46 deletions
diff --git a/libgloss/m32r/configure b/libgloss/m32r/configure
index 4c57f7a..01e3010 100755
--- a/libgloss/m32r/configure
+++ b/libgloss/m32r/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
@@ -3321,7 +3287,6 @@ target=${target}
with_multisubdir=${with_multisubdir}
ac_configure_args="${ac_configure_args} --enable-multilib"
CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${srcdir}/../..
_ACEOF
diff --git a/libgloss/m32r/configure.ac b/libgloss/m32r/configure.ac
index f4ab6dc..c5fd568 100644
--- a/libgloss/m32r/configure.ac
+++ b/libgloss/m32r/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
@@ -42,6 +36,5 @@ target=${target}
with_multisubdir=${with_multisubdir}
ac_configure_args="${ac_configure_args} --enable-multilib"
CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-libgloss_topdir=${srcdir}/../..
)
AC_OUTPUT