From: Scott MacVicar <scottmac@php.net>
Date: Mon, 22 Dec 2008 16:42:34 +0000 (+0000)
Subject: Enable ICU support within bundled SQLite
X-Git-Tag: php-5.4.0alpha1~191^2~4766
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=938bf96a110c7e64a57f4de0eca848e4afed42bc;p=php

Enable ICU support within bundled SQLite
---

diff --git a/ext/sqlite3/config.m4 b/ext/sqlite3/config.m4
index 2ca2656aa1..f9c9e54134 100644
--- 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 2ca2656aa1..f9c9e54134 100644
--- 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