]> granicus.if.org Git - php/commitdiff
- Fixed build with bundled library
authorJani Taskinen <jani@php.net>
Sat, 26 Jul 2008 23:45:54 +0000 (23:45 +0000)
committerJani Taskinen <jani@php.net>
Sat, 26 Jul 2008 23:45:54 +0000 (23:45 +0000)
ext/sqlite3/config.m4
ext/sqlite3/config0.m4

index 0adb01b4e3531ea19dce4b0895ae6f8511a57aa3..f13566d33b9ac6c3052c989e7baca620a9397089 100644 (file)
@@ -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
index 0adb01b4e3531ea19dce4b0895ae6f8511a57aa3..f13566d33b9ac6c3052c989e7baca620a9397089 100644 (file)
@@ -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