diff options
author | Mike Frysinger <vapier@gentoo.org> | 2022-01-07 08:53:26 +0300 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2022-01-11 03:50:35 +0300 |
commit | 7f8fa1de4fd35c96b61d2f80155bc1aa09367e3d (patch) | |
tree | d8c8561110289afe1b5cc5b43de5d893874613f4 /libgloss/sparc | |
parent | cf8aa432844d912d0a0d2d6bebe2c3de22be0914 (diff) |
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/sparc')
-rwxr-xr-x | libgloss/sparc/configure | 17 | ||||
-rw-r--r-- | libgloss/sparc/configure.ac | 15 | ||||
-rwxr-xr-x | libgloss/sparc/libsys/configure | 40 | ||||
-rw-r--r-- | libgloss/sparc/libsys/configure.ac | 8 |
4 files changed, 9 insertions, 71 deletions
diff --git a/libgloss/sparc/configure b/libgloss/sparc/configure index 6fbfb76ae..19f26eff2 100755 --- a/libgloss/sparc/configure +++ b/libgloss/sparc/configure @@ -1767,18 +1767,8 @@ if test "${enable_shared}" = "yes" ; then echo "Shared libraries not supported for cross compiling, ignored" fi -if test "$srcdir" = "." ; then - if test "${with_target_subdir}" != "." ; then - libgloss_topdir="${with_multisrctop}../../.." - else - libgloss_topdir="${with_multisrctop}../.." - fi -else - libgloss_topdir="${srcdir}/../.." -fi - ac_aux_dir= -for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do +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" @@ -1794,7 +1784,7 @@ for ac_dir in $libgloss_topdir "$srcdir"/$libgloss_topdir; do fi done if test -z "$ac_aux_dir"; then - as_fn_error $? "cannot find install-sh, install.sh, or shtool in $libgloss_topdir \"$srcdir\"/$libgloss_topdir" "$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, @@ -3288,7 +3278,6 @@ target=${target} with_multisubdir=${with_multisubdir} ac_configure_args="${ac_configure_args} --enable-multilib" CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} -libgloss_topdir=${libgloss_topdir} _ACEOF @@ -3857,7 +3846,7 @@ $as_echo X"$file" | done } ;; - "default":C) . ${libgloss_topdir}/config-ml.in ;; + "default":C) . ${srcdir}/../../config-ml.in ;; esac done # for ac_tag diff --git a/libgloss/sparc/configure.ac b/libgloss/sparc/configure.ac index 4e2b177ab..32b0db821 100644 --- a/libgloss/sparc/configure.ac +++ b/libgloss/sparc/configure.ac @@ -17,17 +17,7 @@ if test "${enable_shared}" = "yes" ; then echo "Shared libraries not supported for cross compiling, ignored" fi -if test "$srcdir" = "." ; then - if test "${with_target_subdir}" != "." ; then - libgloss_topdir="${with_multisrctop}../../.." - else - libgloss_topdir="${with_multisrctop}../.." - fi -else - libgloss_topdir="${srcdir}/../.." -fi - -AC_CONFIG_AUX_DIR($libgloss_topdir) +AC_CONFIG_AUX_DIR(../..) AC_PROG_INSTALL @@ -74,12 +64,11 @@ AC_SUBST_FILE(target_makefile_frag) AC_SUBST(CYGMONLDSCRIPTTEMPL) AC_OUTPUT(Makefile, -. ${libgloss_topdir}/config-ml.in, +. ${srcdir}/../../config-ml.in, srcdir=${srcdir} target=${target} with_multisubdir=${with_multisubdir} ac_configure_args="${ac_configure_args} --enable-multilib" CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} -libgloss_topdir=${libgloss_topdir} ) diff --git a/libgloss/sparc/libsys/configure b/libgloss/sparc/libsys/configure index 377388a86..9ba58d6d5 100755 --- a/libgloss/sparc/libsys/configure +++ b/libgloss/sparc/libsys/configure @@ -1740,11 +1740,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -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 +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" @@ -1760,7 +1757,7 @@ for ac_dir in ${mdir}../../../.. "$srcdir"/${mdir}../../../..; do 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 + as_fn_error $? "cannot find install-sh, install.sh, or shtool in ../../.. \"$srcdir\"/../../.." "$LINENO" 5 fi # These three variables are undocumented and unsupported, @@ -1772,37 +1769,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. -else - ac_aux_dir= -for ac_dir in ${srcdir}/../../.. "$srcdir"/${srcdir}/../../..; 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 ${srcdir}/../../.. \"$srcdir\"/${srcdir}/../../.." "$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. - - -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/sparc/libsys/configure.ac b/libgloss/sparc/libsys/configure.ac index 2cbd75de0..0a0be9034 100644 --- a/libgloss/sparc/libsys/configure.ac +++ b/libgloss/sparc/libsys/configure.ac @@ -18,13 +18,7 @@ dnl Process this file with autoconf to produce a configure script. AC_PREREQ(2.69)dnl AC_INIT(libsys-crt0.S) -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 |