diff options
| author | Jacob Bachmeyer <jcb@gnu.org> | 2021-04-16 16:30:52 -0500 |
|---|---|---|
| committer | Jacob Bachmeyer <jcb@gnu.org> | 2021-04-16 16:30:52 -0500 |
| commit | 408cfae9ecf4ec3a586fc50a31a8f05a218b004d (patch) | |
| tree | e9a75093c4f931e9baaddb43334b5af14372a80f | |
| parent | e2fa0bcf54e2bb05106be1ce22a73de4f7381444 (diff) | |
| download | dejagnu-408cfae9ecf4ec3a586fc50a31a8f05a218b004d.zip dejagnu-408cfae9ecf4ec3a586fc50a31a8f05a218b004d.tar.gz dejagnu-408cfae9ecf4ec3a586fc50a31a8f05a218b004d.tar.bz2 | |
Remove experimental support for patching config.guess interpreter line
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | configure.ac | 20 |
2 files changed, 3 insertions, 20 deletions
@@ -12,6 +12,9 @@ that a file contains a help message. Also use Awk to extract help messages from files, instead of a complex dynamic sed(1) program. + * configure.ac: Remove experimental support for propagating + CONFIG_SHELL to scripts in the source directory. + 2021-04-15 Jacob Bachmeyer <jcb@gnu.org> PR47382 diff --git a/configure.ac b/configure.ac index 7c9a95e..c60f34f 100644 --- a/configure.ac +++ b/configure.ac @@ -42,25 +42,5 @@ fi AC_SUBST(DEJAGNU) # 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([scriptpatch],[ - 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 - AC_MSG_ERROR([patching script for local shell changed line count!]) - fi - mv -f ${f}.new $f - done -], [SHELL=$SHELL]) -fi - AC_CONFIG_FILES([Makefile]) AC_OUTPUT |