From 4fe829da39e35cf2a08b2581b3c9755ddc6a76a1 Mon Sep 17 00:00:00 2001 From: Jani Taskinen Date: Sat, 26 Jul 2008 23:45:54 +0000 Subject: [PATCH] - Fixed build with bundled library --- ext/sqlite3/config.m4 | 3 +-- ext/sqlite3/config0.m4 | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/ext/sqlite3/config.m4 b/ext/sqlite3/config.m4 index 0adb01b4e3..f13566d33b 100644 --- a/ext/sqlite3/config.m4 +++ b/ext/sqlite3/config.m4 @@ -72,7 +72,6 @@ if test $PHP_SQLITE3 != "no"; then 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 @@ -81,6 +80,6 @@ dnl fi sqlite3_sources="sqlite3.c $sqlite3_extra_sources" PHP_NEW_EXTENSION(sqlite3, $sqlite3_sources, $ext_shared,,$PHP_SQLITE3_CFLAGS) + PHP_ADD_BUILD_DIR([$ext_builddir/libsqlite]) PHP_SUBST(SQLITE3_SHARED_LIBADD) - fi diff --git a/ext/sqlite3/config0.m4 b/ext/sqlite3/config0.m4 index 0adb01b4e3..f13566d33b 100644 --- a/ext/sqlite3/config0.m4 +++ b/ext/sqlite3/config0.m4 @@ -72,7 +72,6 @@ if test $PHP_SQLITE3 != "no"; then 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 @@ -81,6 +80,6 @@ dnl fi sqlite3_sources="sqlite3.c $sqlite3_extra_sources" PHP_NEW_EXTENSION(sqlite3, $sqlite3_sources, $ext_shared,,$PHP_SQLITE3_CFLAGS) + PHP_ADD_BUILD_DIR([$ext_builddir/libsqlite]) PHP_SUBST(SQLITE3_SHARED_LIBADD) - fi -- 2.50.1