X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=autogen.sh;h=6c2a8dd16b2c94fa7caced4af559bb1e1f76a315;hp=d47d7504b68268ab3de7bf49b73a8b716307b8b5;hb=808c291c76b7ecb4ae13b6ee12e8afe658b627c1;hpb=192e304b94f239de13b0f10ca01f6694fe6eea40 diff --git a/autogen.sh b/autogen.sh index d47d7504..6c2a8dd1 100755 --- 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 | egrep -o "([0-9]+\.[0-9]+\.[0-9]+)"` +AM_VERSION=`$AUTOMAKE --version|head -n 1|egrep -o "([1-9]\.[0-9]+(\.[0-9]+)*)"` ifs=$IFS; IFS="."; set $AM_VERSION; IFS=$ifs AM_MAJOR="$1"; AM_MINOR="$2"; AM_PATCHLEVEL="$3" @@ -162,13 +162,13 @@ 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