summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorpaul <paul>2004-08-19 04:41:21 +0000
committerpaul <paul>2004-08-19 04:41:21 +0000
commit0fc42949a4748f0ab8b5952bac15112762504fe0 (patch)
treed71eee190bc2ae41c100a39e5b24ecda4bb9fc43
parente0a29621d6ac1a944e2d8c23eaa8517aa96c8fc0 (diff)
2004-08-19 Paul Jakma <paul@dishone.st>
* Makefile.am: add m4 directory to EXTRA_DIST, and define ACLOCAL_AMFLAGS to have aclocal pull in m4/ * configure.ac: AM_PROG_LIBTOOL should be AC_PROG_LIBTOOL * update-autotools: print a warning that this script is deprecated
-rw-r--r--Makefile.am5
-rwxr-xr-xconfigure.ac4
-rwxr-xr-xupdate-autotools3
3 files changed, 9 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am
index 166c5b7e..91b29641 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,4 +9,7 @@ DIST_SUBDIRS = lib zebra bgpd ripd ripngd ospfd ospf6d \
EXTRA_DIST = aclocal.m4 SERVICES TODO REPORTING-BUGS vtysh/Makefile.in \
vtysh/Makefile.am update-autotools \
tools/mrlg.cgi tools/rrcheck.pl tools/rrlookup.pl tools/zc.pl \
- tools/zebra.el
+ tools/zebra.el m4
+
+
+ACLOCAL_AMFLAGS = -I m4
diff --git a/configure.ac b/configure.ac
index e7df8d06..648b5e32 100755
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@
## Copyright (c) 1996, 97, 98, 99, 2000 Kunihiro Ishiguro <kunihiro@zebra.org>
## Portions Copyright (c) 2003 Paul Jakma <paul@dishone.st>
##
-## $Id: configure.ac,v 1.58 2004/07/26 19:27:51 paul Exp $
+## $Id: configure.ac,v 1.59 2004/08/19 04:41:21 paul Exp $
AC_PREREQ(2.53)
AC_INIT(quagga, 0.96.5, [http://bugzilla.quagga.net])
@@ -70,7 +70,7 @@ AC_AIX
dnl -------
dnl libtool
dnl -------
-AM_PROG_LIBTOOL
+AC_PROG_LIBTOOL
dnl ----------------------
dnl Packages configuration
diff --git a/update-autotools b/update-autotools
index 5a4f6d25..4d7b6f73 100755
--- a/update-autotools
+++ b/update-autotools
@@ -7,6 +7,9 @@
rm -f config.cache Makefile.in aclocal.m4 config.h.in configure
rm -rf autom4te.cache
+echo "This $0 script is deprecated, and will be removed at some stage."
+echo "Please use the 'autoreconf' command included with autoconf."
+
echo "TOOLS VERIONS:"
for tool in autoheader autoconf libtool libtoolize aclocal automake; do
$tool --version | head -1