summaryrefslogtreecommitdiff
path: root/autogen.sh
diff options
context:
space:
mode:
authorVíctor Manuel Jáquez Leal <vjaquez@igalia.com>2010-08-06 00:58:57 +0200
committerVíctor Manuel Jáquez Leal <vjaquez@igalia.com>2010-08-06 13:19:07 +0200
commitf6b08a278203875809f44a5ea3e506ad8d2ac386 (patch)
treee089eb48e3356a4def5ec8497b73324587555d6f /autogen.sh
parent55613ba239d6571cba100bd1d3af56a63674357b (diff)
downloadgrilo-f6b08a278203875809f44a5ea3e506ad8d2ac386.tar.gz
autogen.sh: remove the ACLOCAL_FLAGS variable
The user can set the ACLOCAL environment variable to override the location of the <prefix>/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 <vjaquez@igalia.com>
Diffstat (limited to 'autogen.sh')
-rwxr-xr-xautogen.sh7
1 files changed, 4 insertions, 3 deletions
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 $*