Regenerate build system files

3 files changed, 30 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index c093299..0948acb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2021-04-08  Jacob Bachmeyer  <jcb@gnu.org>
 
+	* configure: Regenerate.
+
 	* configure.ac: Change "dnl" comments that should appear in
 	configure to regular comments.
 	Add experimental support for propagating CONFIG_SHELL to the
diff --git a/configure b/configure
index 7b3c48d..a23f414 100755
--- a/configure
+++ b/configure
@@ -3977,11 +3977,23 @@ if test -z "$AWK"; then
   as_fn_error $? "AWK not installed" "$LINENO" 5
 fi
 
+# Provide an empty global site file (/dev/null) as default.
 if test x"$DEJAGNU" = x
 then
   DEJAGNU="/dev/null"
 fi
 
+# Makefile.am arranges for DEJAGNU to be exported in the environment.
+
+# Patch interpreter lines in config.* scripts to reference CONFIG_SHELL.
+# Normally configure ensures that these scripts are run using CONFIG_SHELL
+# and their interpreter lines are ignored, but DejaGnu also installs
+# config.guess and the framework invokes it at runtime.
+if test x"$SHELL" != x/bin/sh
+then
+  ac_config_commands="$ac_config_commands scriptpatch"
+
+fi
 
 ac_config_files="$ac_config_files Makefile"
 
@@ -4727,6 +4739,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 # INIT-COMMANDS
 #
 AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
+SHELL=$SHELL
 
 _ACEOF
 
@@ -4737,6 +4750,7 @@ for ac_config_target in $ac_config_targets
 do
   case $ac_config_target in
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+    "scriptpatch") CONFIG_COMMANDS="$CONFIG_COMMANDS scriptpatch" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
 
   *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
@@ -5260,6 +5274,18 @@ $as_echo X"$file" |
   done
 }
  ;;
+    "scriptpatch":C)
+    for file in config.guess config.sub
+    do
+      f=${ac_srcdir}/${file}
+      sed -e '1s,^#!.*$,#! '"${SHELL}", $f > ${f}.new
+      if test `awk 'END {print NR}' $f` != `awk 'END {print NR}' ${f}.new`
+      then
+	as_fn_error $? "patching script for local shell changed line count!" "$LINENO" 5
+      fi
+      mv -f ${f}.new $f
+    done
+ ;;
 
   esac
 done # for ac_tag
diff --git a/doc/version.texi b/doc/version.texi
index de57524..74dd1ef 100644
--- a/doc/version.texi
+++ b/doc/version.texi
@@ -1,4 +1,4 @@
-@set UPDATED 28 December 2020
-@set UPDATED-MONTH December 2020
+@set UPDATED 22 March 2021
+@set UPDATED-MONTH March 2021
 @set EDITION 1.6.3-rc2
 @set VERSION 1.6.3-rc2