manoj 00/01/17 12:34:46
Modified: src configure.in
src/build buildcheck.sh
Log:
Remove vestiges of automake.
Revision Changes Path
1.21 +0 -4 apache-2.0/src/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apache-2.0/src/configure.in,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -u -r1.20 -r1.21
--- configure.in 2000/01/16 20:00:46 1.20
+++ configure.in 2000/01/17 20:34:41 1.21
@@ -16,10 +16,6 @@
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
1.3 +0 -26 apache-2.0/src/build/buildcheck.sh
Index: buildcheck.sh
===================================================================
RCS file: /home/cvs/apache-2.0/src/build/buildcheck.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -u -r1.2 -r1.3
--- buildcheck.sh 2000/01/15 15:37:52 1.2
+++ buildcheck.sh 2000/01/17 20:34:44 1.3
@@ -20,24 +20,6 @@
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
@@ -56,14 +38,6 @@
echo " You need libtool version 1.3.3 or newer installed"
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
