com php-src: use AC_DEFINE + win32: ext/sqlite3 /config.w32 ext/sqlite3/config0.m4
| From: | Remi Collet | Date: | Fri, 04 Aug 2017 11:21:28 +0000 |
| Subject: | com php-src: use AC_DEFINE + win32: ext/sqlite3 /config.w32 ext/sqlite3/config0.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-98944@lists.php.net to get a copy of this message | ||
Commit: 159e5c1048340fc4eecd231dff0903b59729ca3a
Author: Remi Collet <remi@php.net> Fri, 4 Aug 2017 13:21:28 +0200
Parents: 9689796c10b83febf5c08f411ac44232844ff53d
Branches: PHP-7.0 PHP-7.1 PHP-7.2 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=159e5c1048340fc4eecd231dff0903b59729ca3a
Log:
use AC_DEFINE + win32
Changed paths:
M ext/sqlite3/config.w32
M ext/sqlite3/config0.m4
Diff:
diff --git a/ext/sqlite3/config.w32 b/ext/sqlite3/config.w32
index 29a2832..f3c2f64 100644
--- a/ext/sqlite3/config.w32
+++ b/ext/sqlite3/config.w32
@@ -10,5 +10,6 @@ if (PHP_SQLITE3 != "no") {
ADD_SOURCES(configure_module_dirname + "/libsqlite", "sqlite3.c",
"sqlite3");
AC_DEFINE("HAVE_SQLITE3", 1, "SQLite support");
+ AC_DEFINE("HAVE_SQLITE3_ERRSTR", 1, "have sqlite3_errstr function")
PHP_INSTALL_HEADERS("ext/sqlite3", "libsqlite/sqlite3.h");
}
diff --git a/ext/sqlite3/config0.m4 b/ext/sqlite3/config0.m4
index ba760e1..0e5fbc5 100644
--- a/ext/sqlite3/config0.m4
+++ b/ext/sqlite3/config0.m4
@@ -78,7 +78,7 @@ if test $PHP_SQLITE3 != "no"; then
debug_flags="-DSQLITE_DEBUG=1"
fi
- other_flags="-DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_FTS4=1 -DSQLITE_ENABLE_FTS5=1
-DSQLITE_CORE=1 -DSQLITE_ENABLE_COLUMN_METADATA=1 -DHAVE_SQLITE3_ERRSTR=1"
+ other_flags="-DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_FTS4=1 -DSQLITE_ENABLE_FTS5=1
-DSQLITE_CORE=1 -DSQLITE_ENABLE_COLUMN_METADATA=1"
dnl As long as intl is not shared we can have ICU support
if test "$PHP_INTL" = "yes" && test "$PHP_INTL_SHARED" !=
"yes"; then
@@ -89,6 +89,7 @@ if test $PHP_SQLITE3 != "no"; then
PHP_INSTALL_HEADERS([ext/sqlite3/libsqlite/sqlite3.h])
fi
+ AC_DEFINE(HAVE_SQLITE3_ERRSTR, 1, [have sqlite3_errstr function])
AC_DEFINE(HAVE_SQLITE3,1,[ ])
sqlite3_sources="sqlite3.c $sqlite3_extra_sources"