autoreconf doesnt like top_srcdir var. update-autotools needs to -I m4 too

to ensure it's pulled in. (snapshot host depends on that script).

diff --git a/Makefile.am b/Makefile.am
index dbfecc9322fda385728743da88696ec0e2167d59..dbc08075b6650dc631ceaa063d8f05e114fb6f65 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,4 +11,4 @@ EXTRA_DIST = aclocal.m4 SERVICES TODO REPORTING-BUGS vtysh/Makefile.in \
        tools/mrlg.cgi tools/rrcheck.pl tools/rrlookup.pl tools/zc.pl \
        tools/zebra.el
 
-ACLOCAL_AMFLAGS = -I $(top_srcdir)/m4
+ACLOCAL_AMFLAGS = -I m4

diff --git a/update-autotools b/update-autotools
index 4d7b6f731617e9d727a61d3455e13ead122b0cfc..4e68476630f88f87f0425519c551c49ce835f1ec 100755 (executable)
--- a/update-autotools
+++ b/update-autotools
@@ -16,7 +16,7 @@ for tool in autoheader autoconf libtool libtoolize aclocal automake; do
 done
 
 echo "UPDATING:"
-aclocal
+aclocal -I m4
 autoheader
 autoconf
 libtoolize