2010-08-13 Alejandro G. Castro <alex@igalia.com>

        Reviewed by Xan Lopez.

        We have to add the ACLOCAL_FLAGS in the env to the autogen.sh
        ACLOCAL_FLAGS variable in order to honor the value already
        defined, jhbuild uses it to pass parameters.

        * autogen.sh:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@65328 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index 086a08561b7b2b930d59b89fa2e1fe9938bcf94e..72d910740a6340dac283190acb5fa19b0b951e40 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-08-13  Alejandro G. Castro  <alex@igalia.com>
+
+        Reviewed by Xan Lopez.
+
+        We have to add the ACLOCAL_FLAGS in the env to the autogen.sh
+        ACLOCAL_FLAGS variable in order to honor the value already
+        defined, jhbuild uses it to pass parameters.
+
+        * autogen.sh:
+
 2010-08-13  Simon Hausmann  <simon.hausmann@nokia.com>
 
         Reviewed by Ariya Hidayat.

diff --git a/autogen.sh b/autogen.sh
index 97beb209d2f755a70523b1774dc2f8512ed8dd63..60b163d5503dc4e677b0c26b7e97dc039cf398ed 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -10,7 +10,7 @@ cd $srcdir
 
 GTKDOCIZE_FLAGS="--copy"
 LIBTOOLIZE_FLAGS="--force --automake"
-ACLOCAL_FLAGS="-I autotools"
+ACLOCAL_FLAGS="-I autotools $ACLOCAL_FLAGS"
 AUTOMAKE_FLAGS="--foreign --add-missing"
 
 DIE=0