[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[alex at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit fe1703086b9d3f5809c90aab92d4680c86f27c03
Author: alex at webkit.org <alex at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Aug 13 16:51:10 2010 +0000

    2010-08-13  Alejandro G. Castro  <alex at 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: http://svn.webkit.org/repository/webkit/trunk@65328 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index 086a085..72d9107 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-08-13  Alejandro G. Castro  <alex at 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 at nokia.com>
 
         Reviewed by Ariya Hidayat.
diff --git a/autogen.sh b/autogen.sh
index 97beb20..60b163d 100755
--- 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

-- 
WebKit Debian packaging