summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.am5
-rwxr-xr-xconfigure.ac2
-rwxr-xr-xupdate-autotools3
3 files changed, 8 insertions, 2 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 01ad7694..22ffaf1b 100755
--- a/configure.ac
+++ b/configure.ac
@@ -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