From f6b08a278203875809f44a5ea3e506ad8d2ac386 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Manuel=20J=C3=A1quez=20Leal?= Date: Fri, 6 Aug 2010 00:58:57 +0200 Subject: autogen.sh: remove the ACLOCAL_FLAGS variable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The user can set the ACLOCAL environment variable to override the location of the /share/aclocal. But the assignation of the variable ACLOCAL_FLAGS prevents the override. This patch also pass the autogen.sh parameters to gnome-autogen.sh. Signed-off-by: Víctor Manuel Jáquez Leal --- autogen.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'autogen.sh') diff --git a/autogen.sh b/autogen.sh index 0f00aae..1bdfde4 100755 --- a/autogen.sh +++ b/autogen.sh @@ -4,8 +4,6 @@ srcdir=`dirname $0` test -z "$srcdir" && srcdir=. -REQUIRED_AUTOMAKE_VERSION=1.10 -ACLOCAL_FLAGS="-I m4" PKG_NAME="grilo" (test -f $srcdir/configure.ac) || { @@ -19,4 +17,7 @@ which gnome-autogen.sh || { exit 1 } -USE_GNOME2_MACROS=1 USE_COMMON_DOC_BUILD=yes . gnome-autogen.sh +REQUIRED_AUTOMAKE_VERSION=1.10 \ +USE_GNOME2_MACROS=1 \ +USE_COMMON_DOC_BUILD=yes \ +. gnome-autogen.sh $* -- cgit v1.2.1