From: Edin Kadribasic <edink@php.net>
Date: Sun, 20 Apr 2003 01:22:08 +0000 (+0000)
Subject: Set appropriate flags when compiling bundled lib in thread-safe
X-Git-Tag: SPL_ALPHA~144
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3f95e99afc5351e38c0cc480da4acd6853a4ad9b;p=php

Set appropriate flags when compiling bundled lib in thread-safe
and debug modes.
---

diff --git a/ext/sqlite/TODO b/ext/sqlite/TODO
index 24940a9b3b..a9c57b95dc 100644
--- a/ext/sqlite/TODO
+++ b/ext/sqlite/TODO
@@ -8,9 +8,4 @@
 
 - Test-suite
 
-- If building a ZTS build, -DTHREADSAFE while compiling libsqlite
-
-- If building a non-debug build, -DNDEBUG will disable the expensive
-  asserts in the inner loop. (and double performance)
-
 vim:tw=78
diff --git a/ext/sqlite/config.m4 b/ext/sqlite/config.m4
index 4f362ed0e9..cc472bd3fa 100644
--- a/ext/sqlite/config.m4
+++ b/ext/sqlite/config.m4
@@ -45,6 +45,15 @@ if test "$PHP_SQLITE" != "no"; then
 	PHP_NEW_EXTENSION(sqlite, sqlite.c libsqlite/src/encode.c, $ext_shared)
   else
 	# use bundled library
+
+	PHP_SQLITE_CFLAGS="-I@ext_srcdir@/libsqlite/src"
+	if test "$PHP_DEBUG" = "1"; then
+		PHP_SQLITE_CFLAGS="$PHP_SQLITE_CFLAGS -DNDEBUG"
+	fi
+	if test "$enable_experimental_zts" = "yes"; then
+		PHP_SQLITE_CFLAGS="$PHP_SQLITE_CFLAGS -DTHREADSAFE"
+	fi
+
 	sources="libsqlite/src/opcodes.c
 		libsqlite/src/parse.c libsqlite/src/encode.c \
 		libsqlite/src/auth.c libsqlite/src/btree.c libsqlite/src/build.c \
@@ -56,7 +65,7 @@ if test "$PHP_SQLITE" != "no"; then
 		libsqlite/src/update.c libsqlite/src/util.c libsqlite/src/vdbe.c \
 		libsqlite/src/where.c libsqlite/src/trigger.c"
 	
-  	PHP_NEW_EXTENSION(sqlite, sqlite.c $sources, $ext_shared,,-I@ext_srcdir@/libsqlite/src)
+  	PHP_NEW_EXTENSION(sqlite, sqlite.c $sources, $ext_shared,,$PHP_SQLITE_CFLAGS)
 	PHP_ADD_BUILD_DIR($ext_builddir/libsqlite)
 	PHP_ADD_BUILD_DIR($ext_builddir/libsqlite/src)
 	AC_CHECK_SIZEOF(char *,4)