diff options
Diffstat (limited to 'ext/pdo_sqlite/config.m4')
| -rw-r--r-- | ext/pdo_sqlite/config.m4 | 41 |
1 files changed, 3 insertions, 38 deletions
diff --git a/ext/pdo_sqlite/config.m4 b/ext/pdo_sqlite/config.m4 index f76aef24fa..7fb3e56ebf 100644 --- a/ext/pdo_sqlite/config.m4 +++ b/ext/pdo_sqlite/config.m4 @@ -71,20 +71,7 @@ if test "$PHP_PDO_SQLITE" != "no"; then PHP_NEW_EXTENSION(pdo_sqlite, $php_pdo_sqlite_sources_core, $ext_shared,,-I$pdo_inc_path) else # use bundled libs - pdo_sqlite_sources="sqlite/src/attach.c sqlite/src/auth.c sqlite/src/btree.c \ - sqlite/src/build.c sqlite/src/callback.c sqlite/src/date.c sqlite/src/delete.c sqlite/src/expr.c \ - sqlite/src/func.c sqlite/src/hash.c sqlite/src/insert.c sqlite/src/legacy.c \ - sqlite/src/main.c sqlite/src/os_unix.c sqlite/src/os_win.c sqlite/src/os.c \ - sqlite/src/pager.c sqlite/src/pragma.c sqlite/src/prepare.c \ - sqlite/src/printf.c sqlite/src/random.c sqlite/src/select.c \ - sqlite/src/table.c sqlite/src/tokenize.c sqlite/src/analyze.c sqlite/src/complete.c \ - sqlite/src/trigger.c sqlite/src/update.c sqlite/src/utf.c sqlite/src/util.c \ - sqlite/src/vacuum.c sqlite/src/vdbeapi.c sqlite/src/vdbeaux.c sqlite/src/vdbe.c \ - sqlite/src/vdbemem.c sqlite/src/where.c sqlite/src/parse.c sqlite/src/opcodes.c \ - sqlite/src/alter.c sqlite/src/vdbefifo.c sqlite/src/vtab.c sqlite/src/loadext.c \ - sqlite/src/btmutex.c sqlite/src/fault.c sqlite/src/journal.c \ - sqlite/src/malloc.c sqlite/src/mem1.c sqlite/src/mutex.c sqlite/src/mutex_unix.c \ - sqlite/src/mutex_w32.c sqlite/src/vdbeblob.c" + pdo_sqlite_sources="libsqlite/sqlite3.c" if test "$enable_maintainer_zts" = "yes"; then threadsafe_flag="-DTHREADSAFE=1" @@ -94,33 +81,11 @@ if test "$PHP_PDO_SQLITE" != "no"; then PHP_NEW_EXTENSION(pdo_sqlite, $php_pdo_sqlite_sources_core $pdo_sqlite_sources, - $ext_shared,,-I$ext_srcdir/sqlite/src -DPDO_SQLITE_BUNDLED=1 -DSQLITE_OMIT_CURSOR $threadsafe_flag -I$pdo_inc_path) + $ext_shared,,-I$ext_srcdir/libsqlite -DPDO_SQLITE_BUNDLED=1 -DSQLITE_OMIT_CURSOR $threadsafe_flag -I$pdo_inc_path) PHP_SUBST(PDO_SQLITE_SHARED_LIBADD) - PHP_ADD_BUILD_DIR($ext_builddir/sqlite/src, 1) - AC_CHECK_SIZEOF(char *,4) - AC_DEFINE(SQLITE_PTR_SZ, SIZEOF_CHAR_P, [Size of a pointer]) - PDO_SQLITE_VERSION=`cat $ext_srcdir/sqlite/VERSION | sed 's/[^0-9.]//g'` - PDO_SQLITE_VERSION_NUMBER=`echo $PDO_SQLITE_VERSION | $AWK -F. '{printf("%d%03d%03d", $1, $2, $3)}'` - sed -e s/--VERS--/$PDO_SQLITE_VERSION/ -e s/--VERSION-NUMBER--/$PDO_SQLITE_VERSION_NUMBER/ $ext_srcdir/sqlite/src/sqlite.h.in > $ext_srcdir/sqlite/src/sqlite3.h + PHP_ADD_BUILD_DIR($ext_builddir/libsqlite, 1) - touch $ext_srcdir/sqlite/src/parse.c $ext_srcdir/sqlite/src/parse.h - - if test "$ext_shared" = "no" || test "$ext_srcdir" != "$abs_srcdir"; then - echo '#include <php_config.h>' > $ext_srcdir/sqlite/src/config.h - else - echo "#include \"$abs_builddir/config.h\"" > $ext_srcdir/sqlite/src/config.h - fi - cat >> $ext_srcdir/sqlite/src/config.h <<EOF -#if ZTS -# define THREADSAFE 1 -#endif -#if !ZEND_DEBUG -# define NDEBUG -#endif -/* discourage foolishness */ -#define sqlite3_temp_directory sqlite3_temp_directory_unsafe_except_in_minit -EOF AC_CHECK_FUNCS(usleep nanosleep) AC_CHECK_HEADERS(time.h) fi |