Enable ICU support within bundled SQLite

diff --git a/ext/sqlite3/config.m4 b/ext/sqlite3/config.m4
index 2ca2656aa119353acbe13eccb1f1086ebbb1f210..f9c9e5413404bb9c6c3d5c00045fa4137d89d778 100644 (file)
--- a/ext/sqlite3/config.m4
+++ b/ext/sqlite3/config.m4
@@ -67,11 +67,8 @@ if test $PHP_SQLITE3 != "no"; then
       debug_flags="-DSQLITE_DEBUG=1"
     fi
 
-    other_flags="-DSQLITE_ENABLE_FTS3=1 -DSQLITE_CORE=1"
+    other_flags="-DSQLITE_ENABLE_FTS3=1 -DSQLITE_CORE=1 -DSQLITE_ENABLE_ICU=1"
 
-dnl    if test "$PHP_MAJOR_VERSION" -ge "6"; then
-dnl      other_flags="$other_flags -DSQLITE_ENABLE_ICU=1"
-dnl    fi
     PHP_SQLITE3_CFLAGS="-I@ext_srcdir@/libsqlite -I@ext_builddir@/libsqlite $other_flags $threadsafe_flags $debug_flags"
   fi
 

diff --git a/ext/sqlite3/config0.m4 b/ext/sqlite3/config0.m4
index 2ca2656aa119353acbe13eccb1f1086ebbb1f210..f9c9e5413404bb9c6c3d5c00045fa4137d89d778 100644 (file)
--- a/ext/sqlite3/config0.m4
+++ b/ext/sqlite3/config0.m4
@@ -67,11 +67,8 @@ if test $PHP_SQLITE3 != "no"; then
       debug_flags="-DSQLITE_DEBUG=1"
     fi
 
-    other_flags="-DSQLITE_ENABLE_FTS3=1 -DSQLITE_CORE=1"
+    other_flags="-DSQLITE_ENABLE_FTS3=1 -DSQLITE_CORE=1 -DSQLITE_ENABLE_ICU=1"
 
-dnl    if test "$PHP_MAJOR_VERSION" -ge "6"; then
-dnl      other_flags="$other_flags -DSQLITE_ENABLE_ICU=1"
-dnl    fi
     PHP_SQLITE3_CFLAGS="-I@ext_srcdir@/libsqlite -I@ext_builddir@/libsqlite $other_flags $threadsafe_flags $debug_flags"
   fi