Changeset 39313 in webkit


Ignore:
Timestamp:
Dec 15, 2008 2:18:40 PM (15 years ago)
Author:
eric@webkit.org
Message:

2008-12-15 Daniel Macks <dmacks@netspace.org>

Reviewed by Darin Adler.

Default to use external libicu-config if avail on all platforms.
https://bugs.webkit.org/show_bug.cgi?id=22713

  • configure.ac:
Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/ChangeLog

    r39241 r39313  
     12008-12-15  Daniel Macks  <dmacks@netspace.org>
     2
     3        Reviewed by Darin Adler.
     4
     5        Default to use external libicu-config if avail on all platforms.
     6        https://bugs.webkit.org/show_bug.cgi?id=22713
     7
     8        * configure.ac:
     9
    1102008-12-12  Holger Hans Peter Freyther  <zecke@selfish.org>
    211
  • trunk/configure.ac

    r39241 r39313  
    235235
    236236if test "$unicode_backend" = "icu"; then
    237         if test "$os_darwin" = "yes"; then
    238                 UNICODE_CFLAGS="-I\$(srcdir)/JavaScriptCore/icu -I\$(srcdir)/WebCore/icu"
    239                 UNICODE_LIBS="-licucore"
    240         elif test "$os_win32" = "yes"; then
    241                 UNICODE_CFLAGS=""
    242                 UNICODE_LIBS="-licuin -licuuc"
    243         else
    244                 AC_PATH_PROG(icu_config, icu-config, no)
    245                 if test "$icu_config" = "no"; then
     237        AC_PATH_PROG(icu_config, icu-config, no)
     238        if test "$icu_config" = "no"; then
     239                if test "$os_darwin" = "yes"; then
     240                        UNICODE_CFLAGS="-I\$(srcdir)/JavaScriptCore/icu -I\$(srcdir)/WebCore/icu"
     241                        UNICODE_LIBS="-licucore"
     242                elif test "$os_win32" = "yes"; then
     243                        UNICODE_CFLAGS=""
     244                        UNICODE_LIBS="-licuin -licuuc"
     245                else
    246246                        AC_MSG_ERROR([Cannot find icu-config. The ICU library is needed.])
    247247                fi
    248 
     248        else
    249249                # We don't use --cflags as this gives us a lot of things that we don't
    250250                # necessarily want, like debugging and optimization flags
Note: See TracChangeset for help on using the changeset viewer.