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
diff --git a/Makefile.am b/Makefile.am
index 166c5b7..91b2964 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,4 +9,7 @@
 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