Merge branch 'gawk-5.1-stable'

1 files changed, 7 insertions, 6 deletions

diff --git a/configure b/configure
index 31f67174..ed525950 100755
--- a/configure
+++ b/configure
@@ -2609,15 +2609,15 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 if test "$INSTALL" = ""
 then
-	INSTALL="$srcdir/install-sh -c"
+	INSTALL="$srcdir/build-aux/install-sh -c"
 	export INSTALL
 fi
 
 
-am__api_version='1.16'
+
 
 ac_aux_dir=
-for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
+for ac_dir in build-aux "$srcdir"/build-aux; do
   if test -f "$ac_dir/install-sh"; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
@@ -2633,7 +2633,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 build-aux \"$srcdir\"/build-aux" "$LINENO" 5
 fi
 
 # These three variables are undocumented and unsupported,
@@ -2645,6 +2645,9 @@ 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.
 
 
+
+am__api_version='1.16'
+
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -3223,8 +3226,6 @@ END
 fi
 
 
-
-
 # Check whether --enable-lint was given.
 if test "${enable_lint+set}" = set; then :
   enableval=$enable_lint; if test "$enableval" = no