From ccf1319832ffeb8e07fcef9bfe67e96e283fead7 Mon Sep 17 00:00:00 2001 From: Daniel Lezcano Date: Sun, 26 Apr 2009 11:43:41 +0200 Subject: [PATCH] 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 --- Makefile.am | 2 ++ autogen.sh | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index ede235d49..e3e1978b4 100644 --- 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 0e0595c87..e2e473b63 100755 --- 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