summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ext/sqlite3/config.m48
-rw-r--r--ext/sqlite3/config0.m48
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