From cb4d76b505a4d189be0ac3eb8d50a97241dde205 Mon Sep 17 00:00:00 2001 From: Scott MacVicar Date: Sat, 10 Jan 2009 01:46:55 +0000 Subject: [PATCH] Fix bug #47055 - When intl is shared dont enable icu support in SQLite3 --- ext/sqlite3/config.m4 | 2 +- ext/sqlite3/config0.m4 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ext/sqlite3/config.m4 b/ext/sqlite3/config.m4 index e71c17dd36a..60d96b4af59 100644 --- a/ext/sqlite3/config.m4 +++ b/ext/sqlite3/config.m4 @@ -70,7 +70,7 @@ if test $PHP_SQLITE3 != "no"; then other_flags="-DSQLITE_ENABLE_FTS3=1 -DSQLITE_CORE=1" dnl As long as intl is not shared we can have ICU support - if test "$PHP_INTL" = "yes"; then + if test "$PHP_INTL" = "yes" && test "$PHP_INTL_SHARED" != "yes"; then other_flags="$other_flags -DSQLITE_ENABLE_ICU=1" fi diff --git a/ext/sqlite3/config0.m4 b/ext/sqlite3/config0.m4 index e71c17dd36a..60d96b4af59 100644 --- a/ext/sqlite3/config0.m4 +++ b/ext/sqlite3/config0.m4 @@ -70,7 +70,7 @@ if test $PHP_SQLITE3 != "no"; then other_flags="-DSQLITE_ENABLE_FTS3=1 -DSQLITE_CORE=1" dnl As long as intl is not shared we can have ICU support - if test "$PHP_INTL" = "yes"; then + if test "$PHP_INTL" = "yes" && test "$PHP_INTL_SHARED" != "yes"; then other_flags="$other_flags -DSQLITE_ENABLE_ICU=1" fi