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

[xan at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit ef9fcb9e5d64c4d34f7009575f7debdcc0fae705
Author: xan at webkit.org <xan at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 24 20:26:41 2010 +0000

    2010-08-24  Xan Lopez  <xlopez at igalia.com>
    
            Build fix, strike 2.
    
            The unit tests are C files, so put the flag in global_cflags.
    
            * GNUmakefile.am:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@65929 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index c2b0451..5f336ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2010-08-24  Xan Lopez  <xlopez at igalia.com>
 
+        Build fix, strike 2.
+
+        The unit tests are C files, so put the flag in global_cflags.
+
+        * GNUmakefile.am:
+
+2010-08-24  Xan Lopez  <xlopez at igalia.com>
+
         Try to fix GTK+ build.
 
         Move GTK_API_VERSION_2 define to here, since we want to use it
diff --git a/GNUmakefile.am b/GNUmakefile.am
index 4590e1c..4c09c92 100644
--- a/GNUmakefile.am
+++ b/GNUmakefile.am
@@ -275,14 +275,6 @@ global_cppflags += \
 	-DBUILDING_GTK__=1 \
 	-DWTF_CHANGES
 
-# ----
-# GTK+ 2.x/3.x support
-# ----
-if GTK_API_VERSION_2
-global_cppflags += \
-	-DGTK_API_VERSION_2=1
-endif
-
 if USE_ICU_UNICODE
 global_cppflags += \
 	-DWTF_USE_ICU_UNICODE=1
@@ -298,6 +290,14 @@ global_cppflags += \
 	-DUSE_SYSTEM_MALLOC
 endif
 
+# ----
+# GTK+ 2.x/3.x support
+# ----
+if GTK_API_VERSION_2
+global_cflags += \
+	-DGTK_API_VERSION_2=1
+endif
+
 if !ENABLE_DEBUG
 global_cppflags += -DNDEBUG
 global_cflags += $(SYMBOL_VISIBILITY)

-- 
WebKit Debian packaging