autogen.sh: Enforce serial test harness on automake >=1.13

(cherry picked from commit 0703fcd71983bd04f70101fd0143660174d22f84)

diff --git a/autogen.sh b/autogen.sh
index 6c2a8dd16b2c94fa7caced4af559bb1e1f76a315..d480252683a0fc43f6f2d9133666787b2c140434 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -172,11 +172,21 @@ else
        DEANSI_START="#"
        DEANSI_END="    # disabled by ./autogen.sh script"
 fi
-sed -e "s|^__ng_Makefile_am_template__|${DEANSI_START}AUTOMAKE_OPTIONS = ansi2knr${DEANSI_END}|g" \
+# Serial test harness?
+if [ "$AM_MAJOR" -eq "1" -a "$AM_MINOR" -ge "13" ]; then
+       # automake >= 1.13 => enforce "serial test harness"
+       echo " - Enforcing serial test harness."
+       SERIAL_TESTS="serial-tests"
+else
+       # automake < 1.13 => no new test harness, nothing to do
+       SERIAL_TEST=""
+fi
+
+sed -e "s|^__ng_Makefile_am_template__|AUTOMAKE_OPTIONS = ${SERIAL_TESTS} ${DEANSI_START}ansi2knr${DEANSI_END}|g" \
        src/portab/Makefile.ng >src/portab/Makefile.am
 for makefile_ng in $AM_MAKEFILES; do
        makefile_am=`echo "$makefile_ng" | sed -e "s|\.ng\$|\.am|g"`
-       sed -e "s|^__ng_Makefile_am_template__|${DEANSI_START}AUTOMAKE_OPTIONS = ../portab/ansi2knr${DEANSI_END}|g" \
+       sed -e "s|^__ng_Makefile_am_template__|AUTOMAKE_OPTIONS = ${SERIAL_TESTS} ${DEANSI_START}../portab/ansi2knr${DEANSI_END}|g" \
                $makefile_ng >$makefile_am
 done
 

diff --git a/configure.ng b/configure.ng
index 84e27508c793721cade924c8ee25f743affbddcd..01da7f6cf8d853056c13ac43a445c093a48bfcbc 100644 (file)
--- a/configure.ng
+++ b/configure.ng
@@ -711,7 +711,8 @@ echo $ECHO_N "   libiconv support: $ECHO_C"
 
 echo
 
-if ! grep "^AUTOMAKE_OPTIONS = ../portab/ansi2knr" src/ngircd/Makefile.am >/dev/null 2>&1; then
+define(_automake_regex_,[[^AUTOMAKE_OPTIONS = [a-z .\-]*/portab/ansi2knr]])
+if ! grep "_automake_regex_" src/ngircd/Makefile.am >/dev/null 2>&1; then
        echo "WARNING:"
        echo "This GNU automake generated build system does not support \"de-ANSI-fication\","
        echo "therefore don't use it to generate \"official\" distribution archives!"