diff options
| author | Scott MacVicar <scottmac@php.net> | 2008-12-22 16:43:21 +0000 |
|---|---|---|
| committer | Scott MacVicar <scottmac@php.net> | 2008-12-22 16:43:21 +0000 |
| commit | 178e0c726ec914aee10aeab612c061d4d0706d7b (patch) | |
| tree | 10cc7af41ed7d003d1a9367332847672583d3622 | |
| parent | dbd703131dada883aeaceb731ab1b3739cf64f7a (diff) | |
| download | php-git-178e0c726ec914aee10aeab612c061d4d0706d7b.tar.gz | |
MFH Enable ICU support within bundled SQLite if intl is enabled but not shared.
| -rw-r--r-- | ext/sqlite3/config.m4 | 8 | ||||
| -rw-r--r-- | ext/sqlite3/config0.m4 | 8 |
2 files changed, 10 insertions, 6 deletions
diff --git a/ext/sqlite3/config.m4 b/ext/sqlite3/config.m4 index 4b080d2817..e71c17dd36 100644 --- a/ext/sqlite3/config.m4 +++ b/ext/sqlite3/config.m4 @@ -69,9 +69,11 @@ if test $PHP_SQLITE3 != "no"; then other_flags="-DSQLITE_ENABLE_FTS3=1 -DSQLITE_CORE=1" -dnl if test "$PHP_MAJOR_VERSION" -ge "6"; then -dnl other_flags="$other_flags -DSQLITE_ENABLE_ICU=1" -dnl fi + dnl As long as intl is not shared we can have ICU support + if test "$PHP_INTL" = "yes"; then + other_flags="$other_flags -DSQLITE_ENABLE_ICU=1" + fi + PHP_SQLITE3_CFLAGS="-I@ext_srcdir@/libsqlite $other_flags $threadsafe_flags $debug_flags" fi diff --git a/ext/sqlite3/config0.m4 b/ext/sqlite3/config0.m4 index 4b080d2817..e71c17dd36 100644 --- a/ext/sqlite3/config0.m4 +++ b/ext/sqlite3/config0.m4 @@ -69,9 +69,11 @@ if test $PHP_SQLITE3 != "no"; then other_flags="-DSQLITE_ENABLE_FTS3=1 -DSQLITE_CORE=1" -dnl if test "$PHP_MAJOR_VERSION" -ge "6"; then -dnl other_flags="$other_flags -DSQLITE_ENABLE_ICU=1" -dnl fi + dnl As long as intl is not shared we can have ICU support + if test "$PHP_INTL" = "yes"; then + other_flags="$other_flags -DSQLITE_ENABLE_ICU=1" + fi + PHP_SQLITE3_CFLAGS="-I@ext_srcdir@/libsqlite $other_flags $threadsafe_flags $debug_flags" fi |