[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[jmalonzo at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit f34ecef6662740501123daa3c4a1395b99d7b4d7
Author: jmalonzo at webkit.org <jmalonzo at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 12 11:56:15 2009 +0000

    2009-10-12  Jan Michael Alonzo  <jmalonzo at webkit.org>
    
            Rubberstamped by Eric Seidel.
    
            [Gtk] Fix icu CFLAG for Darwin
            https://bugs.webkit.org/show_bug.cgi?id=29517
    
            Don't escape the srcdir variable. Also use $host instead of the
            os_foo variables.
    
            * autotools/webkit.m4:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49436 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index 67180e2..d0512f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 2009-10-12  Jan Michael Alonzo  <jmalonzo at webkit.org>
 
+        Rubberstamped by Eric Seidel.
+
+        [Gtk] Fix icu CFLAG for Darwin
+        https://bugs.webkit.org/show_bug.cgi?id=29517
+
+        Don't escape the srcdir variable. Also use $host instead of the
+        os_foo variables.
+
+        * autotools/webkit.m4:
+
+2009-10-12  Jan Michael Alonzo  <jmalonzo at webkit.org>
+
         Reviewed by Gustavo Noronha.
 
         [Gtk] Use the SQLite3 headers from WebKitLibraries if sqlite3 is undetected
diff --git a/autotools/webkit.m4 b/autotools/webkit.m4
index 5bb4f65..14dd0a5 100644
--- a/autotools/webkit.m4
+++ b/autotools/webkit.m4
@@ -144,13 +144,16 @@ AC_MSG_RESULT([$with_unicode_backend])
 # with the WTF Unicode backend being based on GLib while text codecs and TextBreakIterator
 # keep the ICU dependency. That's why we temporarily add icu headers and libs for glib config case as well.
 if test "$with_unicode_backend" = "icu" -o "$with_unicode_backend" = "glib"; then
-	if test "$os_darwin" = "yes"; then
-		UNICODE_CFLAGS="-I\$(srcdir)/JavaScriptCore/icu -I\$(srcdir)/WebCore/icu"
+        case "$host" in
+            *-*-darwin*)
+		UNICODE_CFLAGS="-I$srcdir/JavaScriptCore/icu -I$srcdir/WebCore/icu"
 		UNICODE_LIBS="-licucore"
-	elif test "$os_win32" = "yes"; then
+                ;;
+            *-*-mingw*)
 		UNICODE_CFLAGS=""
 		UNICODE_LIBS="-licuin -licuuc"
-	else
+                ;;
+            *)
 		AC_PATH_PROG(icu_config, icu-config, no)
 		if test "$icu_config" = "no"; then
 			AC_MSG_ERROR([Cannot find icu-config. The ICU library is needed.])
@@ -161,7 +164,8 @@ if test "$with_unicode_backend" = "icu" -o "$with_unicode_backend" = "glib"; the
 		# See man (1) icu-config for more info.
 		UNICODE_CFLAGS=`$icu_config --cppflags`
 		UNICODE_LIBS=`$icu_config --ldflags-libsonly`
-	fi
+                ;;
+        esac
 fi
 
 if test "$with_unicode_backend" = "glib"; then

-- 
WebKit Debian packaging