add aclocal include in makefile

When auto-regen is done at the make time, eg. when the configure.in
script has been modified, the configure is not correctly generated
because the 'config' directory is missing for aclocal, and that makes
the generation to fail due to the missing macros defined in config
directory.

Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>

diff --git a/Makefile.am b/Makefile.am
index ede235d4931872e441c148ba4965761786446a1d..e3e1978b437f4cf25a30948b0a073413687e2fd8 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,7 @@
 # Makefile.am
 
+ACLOCAL_AMFLAGS = -I config
+
 SUBDIRS = src test etc scripts doc
 DIST_SUBDIRS = config src test etc scripts doc
 EXTRA_DIST = autogen.sh lxc.spec CONTRIBUTING MAINTAINERS ChangeLog

diff --git a/autogen.sh b/autogen.sh
index 0e0595c87ec5bbb4036e2be9ed72463490b75320..e2e473b639b6648ec93812a9a365017c153e0269 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,9 +4,8 @@ set -x
 
 test -d autom4te.cache && rm -rf autom4te.cache
 test -d m4 || mkdir m4
-ACLOCAL_AMFLAGS="-I m4 -I config $ACLOCAL_AMFLAGS"
 libtoolize --force --copy
-aclocal $ACLOCAL_AMFLAGS || exit 1
+aclocal -I m4 -I config || exit 1
 autoheader || exit 1
 autoconf || exit 1
 automake --add-missing --copy || exit 1