Remove vestiges of automake.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84484 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/build/buildcheck.sh b/build/buildcheck.sh
index b13d1c6bf16d243cd1695276e73c8c86d9e9beca..091a17be33588f5bcefe6f504753654b247b369e 100755 (executable)
--- a/build/buildcheck.sh
+++ b/build/buildcheck.sh
@@ -20,24 +20,6 @@ else
 echo "buildconf: autoconf version $ac_version (ok)"
 fi
 
-# automake 1.4 or newer
-am_version=`automake --version 2>/dev/null|head -1|sed -e 's/^[^0-9]*//' -e 's/[a-z]* *$//'`
-if test "$am_version" = ""; then
-echo "buildconf: automake not found."
-echo "           You need automake version 1.4 or newer installed"
-echo "           to build Apache from CVS."
-exit 1
-fi
-IFS=.; set $am_version; IFS=' '
-if test "$1" = "1" -a "$2" -lt "4" || test "$1" -lt "1"; then
-echo "buildconf: automake version $am_version found."
-echo "           You need automake version 1.4 or newer installed"
-echo "           to build Apache from CVS."
-exit 1
-else
-echo "buildconf: automake version $am_version (ok)"
-fi
-
 # libtool 1.3.3 or newer
 lt_pversion=`libtool --version 2>/dev/null|sed -e 's/^[^0-9]*//' -e 's/[- ].*//'`
 if test "$lt_pversion" = ""; then
@@ -58,12 +40,4 @@ echo "           to build Apache from CVS."
 exit 1
 fi
 
-am_prefix=`which automake | sed -e 's#/[^/]*/[^/]*$##'`
-lt_prefix=`which libtool | sed -e 's#/[^/]*/[^/]*$##'`
-if test "$am_prefix" != "$lt_prefix"; then
-    echo "WARNING: automake and libtool are installed in different"
-    echo "         directories.  This may cause aclocal to fail."
-    echo "         continuing anyway"
-fi
-
 exit 0

diff --git a/configure.in b/configure.in
index d0cbda7b865ac9152b77c86565649b572410dfc9..47b6dc4d25cdfbf19e05c57edf59a36fdfc0a7bb 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -16,10 +16,6 @@ APACHE_SUBST(APACHE_VERSION)
 test "$exec_prefix" = "NONE" && exec_prefix='${prefix}'
 test "$prefix" = "NONE" && prefix='/usr/local'
 
-dnl XXX - make will sometimes die as annoyingly as automake with this option.
-dnl just remake and continue
-dnl AM_MAINTAINER_MODE
-
 dnl We want this one before the checks, so the checks can modify CFLAGS
 test -z "$CFLAGS" && auto_cflags=1