From 7c133c2f554d64eac709e934838deb0261106b85 Mon Sep 17 00:00:00 2001 From: Jacob Bachmeyer Date: Mon, 22 Mar 2021 16:40:31 -0500 Subject: Update version numbers for 1.6.3 release branch --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index af23f6f..72ac862 100644 --- a/configure.ac +++ b/configure.ac @@ -19,7 +19,7 @@ dnl along with DejaGnu; if not, write to the Free Software Foundation, dnl Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. AC_PREREQ([2.69]) -AC_INIT([GNU DejaGnu],[1.6.3-git],[bug-dejagnu@gnu.org]) +AC_INIT([GNU DejaGnu],[1.6.3-rc1],[bug-dejagnu@gnu.org]) AM_INIT_AUTOMAKE([1.14 subdir-objects]) AM_MAINTAINER_MODE AC_PROG_MAKE_SET -- cgit v1.1 From 4c4aa8332143d65efb42aee40b2d52c48e887069 Mon Sep 17 00:00:00 2001 From: Jacob Bachmeyer Date: Tue, 30 Mar 2021 17:36:21 -0500 Subject: Update version numbers for 1.6.3 release candidate 2 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 72ac862..a1cfb5b 100644 --- a/configure.ac +++ b/configure.ac @@ -19,7 +19,7 @@ dnl along with DejaGnu; if not, write to the Free Software Foundation, dnl Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. AC_PREREQ([2.69]) -AC_INIT([GNU DejaGnu],[1.6.3-rc1],[bug-dejagnu@gnu.org]) +AC_INIT([GNU DejaGnu],[1.6.3-rc2],[bug-dejagnu@gnu.org]) AM_INIT_AUTOMAKE([1.14 subdir-objects]) AM_MAINTAINER_MODE AC_PROG_MAKE_SET -- cgit v1.1 From 3c804107f4a5ad6928585aaba94f8c27e6b1af56 Mon Sep 17 00:00:00 2001 From: Jacob Bachmeyer Date: Thu, 8 Apr 2021 21:01:31 -0500 Subject: Change comments that should appear in the configure script accordingly --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index a1cfb5b..b44f006 100644 --- a/configure.ac +++ b/configure.ac @@ -34,13 +34,13 @@ if test -z "$AWK"; then AC_MSG_ERROR([AWK not installed]) fi -dnl Provide an empty global site file (/dev/null) as default. +# Provide an empty global site file (/dev/null) as default. if test x"$DEJAGNU" = x then DEJAGNU="/dev/null" fi AC_SUBST(DEJAGNU) -dnl Makefile.am arranges for DEJAGNU to be exported in the environment. +# Makefile.am arranges for DEJAGNU to be exported in the environment. AC_CONFIG_FILES([Makefile]) AC_OUTPUT -- cgit v1.1 From c6d9e1e2b1a5abaa88a6ec46bc76ea7e752a1b36 Mon Sep 17 00:00:00 2001 From: Jacob Bachmeyer Date: Thu, 8 Apr 2021 21:31:21 -0500 Subject: Add support for patching config.guess interpreter line with CONFIG_SHELL --- configure.ac | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index b44f006..a6e980c 100644 --- a/configure.ac +++ b/configure.ac @@ -42,5 +42,25 @@ 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 -- cgit v1.1 From 016bb73c96591a7bdee5c6298832dede7f055caf Mon Sep 17 00:00:00 2001 From: Jacob Bachmeyer Date: Thu, 8 Apr 2021 22:09:45 -0500 Subject: Update version numbers for 1.6.3 release candidate 3 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index a6e980c..7c9a95e 100644 --- a/configure.ac +++ b/configure.ac @@ -19,7 +19,7 @@ dnl along with DejaGnu; if not, write to the Free Software Foundation, dnl Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. AC_PREREQ([2.69]) -AC_INIT([GNU DejaGnu],[1.6.3-rc2],[bug-dejagnu@gnu.org]) +AC_INIT([GNU DejaGnu],[1.6.3-rc3],[bug-dejagnu@gnu.org]) AM_INIT_AUTOMAKE([1.14 subdir-objects]) AM_MAINTAINER_MODE AC_PROG_MAKE_SET -- cgit v1.1 From 408cfae9ecf4ec3a586fc50a31a8f05a218b004d Mon Sep 17 00:00:00 2001 From: Jacob Bachmeyer Date: Fri, 16 Apr 2021 16:30:52 -0500 Subject: Remove experimental support for patching config.guess interpreter line --- configure.ac | 20 -------------------- 1 file changed, 20 deletions(-) (limited to 'configure.ac') 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 -- cgit v1.1 From e3e1e07e96f4ff99a0465164ddd4b1c9eadd88c6 Mon Sep 17 00:00:00 2001 From: Jacob Bachmeyer Date: Tue, 20 Apr 2021 22:24:48 -0500 Subject: Adjust Automake options to build maximally portable tarballs --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index c60f34f..aa7b6f8 100644 --- a/configure.ac +++ b/configure.ac @@ -20,7 +20,7 @@ dnl Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. AC_PREREQ([2.69]) AC_INIT([GNU DejaGnu],[1.6.3-rc3],[bug-dejagnu@gnu.org]) -AM_INIT_AUTOMAKE([1.14 subdir-objects]) +AM_INIT_AUTOMAKE([1.14 subdir-objects tar-v7 filename-length-max=99]) AM_MAINTAINER_MODE AC_PROG_MAKE_SET -- cgit v1.1 From 9434672603a6022f3ec4cbd4b5d6e37f7c149bd0 Mon Sep 17 00:00:00 2001 From: Jacob Bachmeyer Date: Wed, 28 Apr 2021 21:49:06 -0500 Subject: Update version numbers for 1.6.3 release candidate 4 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index aa7b6f8..cf4c482 100644 --- a/configure.ac +++ b/configure.ac @@ -19,7 +19,7 @@ dnl along with DejaGnu; if not, write to the Free Software Foundation, dnl Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. AC_PREREQ([2.69]) -AC_INIT([GNU DejaGnu],[1.6.3-rc3],[bug-dejagnu@gnu.org]) +AC_INIT([GNU DejaGnu],[1.6.3-rc4],[bug-dejagnu@gnu.org]) AM_INIT_AUTOMAKE([1.14 subdir-objects tar-v7 filename-length-max=99]) AM_MAINTAINER_MODE AC_PROG_MAKE_SET -- cgit v1.1 From 19ffb41e4158f0818149871c0ce7617ed7dc3617 Mon Sep 17 00:00:00 2001 From: Jacob Bachmeyer Date: Sat, 22 May 2021 22:27:23 -0500 Subject: Update version numbers for 1.6.3 release candidate 5 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index cf4c482..5745f75 100644 --- a/configure.ac +++ b/configure.ac @@ -19,7 +19,7 @@ dnl along with DejaGnu; if not, write to the Free Software Foundation, dnl Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. AC_PREREQ([2.69]) -AC_INIT([GNU DejaGnu],[1.6.3-rc4],[bug-dejagnu@gnu.org]) +AC_INIT([GNU DejaGnu],[1.6.3-rc5],[bug-dejagnu@gnu.org]) AM_INIT_AUTOMAKE([1.14 subdir-objects tar-v7 filename-length-max=99]) AM_MAINTAINER_MODE AC_PROG_MAKE_SET -- cgit v1.1