MFH Enable ICU support within bundled SQLite if intl is enabled but not shared.

diff --git a/ext/sqlite3/config.m4 b/ext/sqlite3/config.m4
index 4b080d28172c4875712a594033b602a970f257fe..e71c17dd36a09592219c3b4684f51b6490d87b26 100644 (file)
--- 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 4b080d28172c4875712a594033b602a970f257fe..e71c17dd36a09592219c3b4684f51b6490d87b26 100644 (file)
--- 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