Changeset 30913 in webkit

Timestamp:

Mar 9, 2008 5:49:15 PM (16 years ago)

Author:

alp@webkit.org

Message:

2008-03-09 J?rg Billeter <​j@bitron.ch>

Reviewed by Alp Toker.

Conditionalise ICU for Unicode in the GTK+ port.

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• GNUmakefile.am (modified) (6 diffs)
• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/wtf/Platform.h (modified) (1 diff)
• configure.ac (modified) (2 diffs)

trunk/ChangeLog

@@ +1 @@
+2008-03-09  Jürg Billeter  <j@bitron.ch>
+
+        Reviewed by Alp Toker.
+
+        Conditionalise ICU for Unicode in the GTK+ port.
+
+        * GNUmakefile.am:
+        * configure.ac:
+
 2008-03-03  Brent Fulgham  <bfulgham@gmail.com>
 

trunk/GNUmakefile.am

@@ -59 +59 @@
         -I$(top_builddir)/DerivedSources
 
+global_cppflags += \
+        -DWTF_USE_ICU_UNICODE=1
+
 # Default compiler flags
 global_cflags := \
@@ -105 +108 @@
 
 libJavaScriptCore_la_LIBADD = \
-        $(ICU_LIBS) \
+        $(UNICODE_LIBS) \
         $(GLOBALDEPS_LIBS) \
         -lpthread
@@ -118 +121 @@
         $(global_cflags) \
         $(GLOBALDEPS_CFLAGS) \
+        $(UNICODE_CFLAGS) \
         -fstrict-aliasing
 
 libJavaScriptCore_la_CPPFLAGS = \
         $(global_cppflags) \
-        $(javascriptcore_cppflags) \
-        $(ICU_CPPFLAGS)
+        $(javascriptcore_cppflags)
 
 #
@@ -166 +169 @@
         -fno-strict-aliasing \
         $(global_cflags) \
+        $(UNICODE_CFLAGS) \
         $(GLOBALDEPS_CFLAGS) \
         $(WEBKITDEPS_CFLAGS) \
@@ -176 +180 @@
 
 libWebCore_la_CPPFLAGS = \
-        $(ICU_CPPFLAGS) \
         $(global_cppflags) \
         $(webcore_cppflags) \
@@ -187 +190 @@
         $(WEBKITDEPS_LIBS) \
         $(LIBCURL_LIBS) \
-        $(ICU_LIBS) \
+        $(UNICODE_LIBS) \
         $(SQLITE3_LIBS) \
         $(GSTREAMER_LIBS) \

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-03-09  Jürg Billeter  <j@bitron.ch>
+
+        Reviewed by Alp Toker.
+
+        Conditionalise ICU for Unicode in the GTK+ port.
+
+        * wtf/Platform.h:
+
 2008-03-07  David D. Kilzer  <ddkilzer@apple.com>
 

trunk/JavaScriptCore/wtf/Platform.h

@@ -204 +204 @@
 #endif
 
-/* for Unicode, KDE uses Qt, everything else uses ICU */
+/* for Unicode, KDE uses Qt */
 #if PLATFORM(KDE) || PLATFORM(QT)
 #define WTF_USE_QT4_UNICODE 1
 #elif PLATFORM(SYMBIAN)
 #define WTF_USE_SYMBIAN_UNICODE 1
+#elif PLATFORM(GTK)
+/* The GTK+ Unicode backend is configurable */
 #else
 #define WTF_USE_ICU_UNICODE 1

trunk/configure.ac

@@ -130 +130 @@
 fi
 
-# check for icu-config
-if test "$os_darwin" = "yes"; then
-ICU_CPPFLAGS="-I\$(srcdir)/JavaScriptCore/icu -I\$(srcdir)/WebCore/icu"
-ICU_LIBS="-licucore"
-else
-AC_PATH_PROG(icu_config, icu-config, no)
-if test "$icu_config" = "no"; then
-   AC_MSG_ERROR([Cannot find icu-config. ICU library is needed.])
-fi
-
-# We don't use --cflags as this gives us a lot of things that we don't
-# necessarily want, like debugging and optimization flags
-# See man (1) icu-config for more info.
-ICU_CPPFLAGS=`$icu_config --cppflags`
-ICU_LIBS=`$icu_config --ldflags`
-AC_SUBST([ICU_CPPFLAGS])
-AC_SUBST([ICU_LIBS])
-fi
+# determine the Unicode backend
+AC_MSG_CHECKING([the Unicode backend to use])
+AC_ARG_WITH(unicode_backend,
+            AC_HELP_STRING([--with-unicode-backend=@<:@icu@:>@],
+                           [Select Unicode backend [default=icu]]),
+            [],[unicode_backend="icu"])
+
+case "$unicode_backend" in
+     icu) ;;
+     *) AC_MSG_ERROR([Invalid Unicode backend: must be icu.]) ;;
+esac
+
+AC_MSG_RESULT([$unicode_backend])
+
+if test "$unicode_backend" = "icu"; then
+        # check for icu-config
+        if test "$os_darwin" = "yes"; then
+                UNICODE_CFLAGS="-I\$(srcdir)/JavaScriptCore/icu -I\$(srcdir)/WebCore/icu"
+                UNICODE_LIBS="-licucore"
+        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.])
+                fi
+
+                # We don't use --cflags as this gives us a lot of things that we don't
+                # necessarily want, like debugging and optimization flags
+                # See man (1) icu-config for more info.
+                UNICODE_CFLAGS=`$icu_config --cppflags`
+                UNICODE_LIBS=`$icu_config --ldflags`
+        fi
+fi
+
+AC_SUBST([UNICODE_CFLAGS])
+AC_SUBST([UNICODE_LIBS])
 
 # determine the GDK/GTK+ target
@@ -486 +503 @@
  Enable debugging (slow)           : $enable_debug
  Code coverage support             : $enable_coverage
+ Unicode backend                   : $unicode_backend
  HTTP backend                      : $http_backend
  Optimized memory allocator        : $enable_fast_malloc