2009-10-12 Jan Michael Alonzo <jmalonzo@webkit.org>
authorjmalonzo@webkit.org <jmalonzo@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 12 Oct 2009 11:56:15 +0000 (11:56 +0000)
committerjmalonzo@webkit.org <jmalonzo@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 12 Oct 2009 11:56:15 +0000 (11:56 +0000)
        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: https://svn.webkit.org/repository/webkit/trunk@49436 268f45cc-cd09-0410-ab3c-d52691b4dbfc

ChangeLog
autotools/webkit.m4

index 67180e2..d0512f6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 2009-10-12  Jan Michael Alonzo  <jmalonzo@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@webkit.org>
+
         Reviewed by Gustavo Noronha.
 
         [Gtk] Use the SQLite3 headers from WebKitLibraries if sqlite3 is undetected
index 5bb4f65..14dd0a5 100644 (file)
@@ -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