ngIRCd Release 20.3

[ngircd.git] / autogen.sh

diff --git a/autogen.sh b/autogen.sh
index 47c476c79632ef5a3d02b6181b78b8a7905f40de..c624eeb71d7876e780b3750df0344303ae4f9c1c 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -153,7 +153,7 @@ echo "Searching for required tools ..."
 [ -z "$AUTOMAKE" ] && Notfound automake
 [ -z "$AUTOCONF" ] && Notfound autoconf
 
-AM_VERSION=`$AUTOMAKE --version|head -n 1|egrep -o "([1-9]\.[0-9]+(\.[0-9]+)*)"`
+AM_VERSION=`$AUTOMAKE --version | head -n 1 | sed -e 's/.* //g'`
 ifs=$IFS; IFS="."; set $AM_VERSION; IFS=$ifs
 AM_MAJOR="$1"; AM_MINOR="$2"; AM_PATCHLEVEL="$3"
 
@@ -162,21 +162,31 @@ AM_MAKEFILES="src/ipaddr/Makefile.ng src/ngircd/Makefile.ng src/testsuite/Makefi
 if [ "$AM_MAJOR" -eq "1" -a "$AM_MINOR" -lt "12" ]; then
        # automake < 1.12 => automatic de-ANSI-fication support available
        echo "Enabling de-ANSI-fication support (automake $AM_VERSION) ..."
-       sed -e "s|^__ng_PROTOTYPES__|AM_C_PROTOTYPES|g" configure.ng >configure.in
+       sed -e "s|^__ng_PROTOTYPES__|AM_C_PROTOTYPES|g" configure.ng >configure.ac
        DEANSI_START=""
        DEANSI_END=""
 else
        # automake >= 1.12 => no de-ANSI-fication support available
        echo "Disabling de-ANSI-fication support (automake $AM_VERSION) ..."
-       sed -e "s|^__ng_PROTOTYPES__|AC_C_PROTOTYPES|g" configure.ng >configure.in
+       sed -e "s|^__ng_PROTOTYPES__|AC_C_PROTOTYPES|g" configure.ng >configure.ac
        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