[Webkit-unassigned] [Bug 29517] [Gtk] Fix icu CFLAG for Darwin
bugzilla-daemon at webkit.org
bugzilla-daemon at webkit.org
Mon Sep 21 22:37:09 PDT 2009
https://bugs.webkit.org/show_bug.cgi?id=29517
--- Comment #2 from Xan Lopez <xan.lopez at gmail.com> 2009-09-21 22:37:09 PDT ---
(From update of attachment 39815)
>diff --git a/ChangeLog b/ChangeLog
>index ea1f82c..dff1c2b 100644
>--- a/ChangeLog
>+++ b/ChangeLog
>@@ -1,3 +1,15 @@
>+2009-09-19 Jan Michael Alonzo <jmalonzo at webkit.org>
>+
>+ Reviewed by NOBODY (OOPS!).
>+
>+ [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:
>+
Can you explain why are you doing instead of just saying what are you doing? :)
I suppose it fails in interesting ways in OSX, but it would be good to put it
in the ChangeLog for reference.
> 2009-09-18 Xan Lopez <xlopez at igalia.com>
>
> Reviewed by Gustavo Noronha and Jan Alonzo.
>diff --git a/autotools/webkit.m4 b/autotools/webkit.m4
>index 92fe5db..4698fe6 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"
I think the common practice is not to leave a space between -I and the path?
> 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`
>- fi
>+ ;;
>+ esac
> fi
>
> if test "$with_unicode_backend" = "glib"; then
--
Configure bugmail: https://bugs.webkit.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.
More information about the webkit-unassigned
mailing list