From: Wez Furlong <wez@php.net>
Date: Sat, 25 Dec 2004 04:01:30 +0000 (+0000)
Subject: fix build issues
X-Git-Tag: RELEASE_0_2~469
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c8b2f43005c977fa52e889e835dfcde445751a1a;p=php

fix build issues
---

diff --git a/ext/pdo_sqlite/config.m4 b/ext/pdo_sqlite/config.m4
index ce723c0e3e..fe5ef497b9 100644
--- a/ext/pdo_sqlite/config.m4
+++ b/ext/pdo_sqlite/config.m4
@@ -5,7 +5,7 @@ PHP_ARG_WITH(pdo-sqlite, for sqlite 3 driver for PDO,
 [  --with-pdo-sqlite             Include PDO sqlite 3 support])
 
 if test "$PHP_PDO_SQLITE" != "no"; then
-  SEARCH_PATH="/usr/local /usr"     # you might want to change this
+  SEARCH_PATH="$PHP_PDO_SQLITE /usr/local /usr"     # you might want to change this
   SEARCH_FOR="/include/sqlite3.h"  # you most likely want to change this
   if test -r $PHP_PDO_SQLITE/$SEARCH_FOR; then # path given as parameter
     PDO_SQLITE_DIR=$PHP_PDO_SQLITE
@@ -35,7 +35,7 @@ if test "$PHP_PDO_SQLITE" != "no"; then
   ],[
     AC_MSG_ERROR([wrong sqlite lib version or lib not found])
   ],[
-    -L$PDO_SQLITE_DIR/lib -lm -ldl
+    -L$PDO_SQLITE_DIR/lib -lm
   ])
   PHP_SUBST(PDO_SQLITE_SHARED_LIBADD)
 
diff --git a/ext/pdo_sqlite/sqlite_driver.c b/ext/pdo_sqlite/sqlite_driver.c
index ca73ac8b54..7be1dab798 100644
--- a/ext/pdo_sqlite/sqlite_driver.c
+++ b/ext/pdo_sqlite/sqlite_driver.c
@@ -327,7 +327,7 @@ static int pdo_sqlite_handle_factory(pdo_dbh_t *dbh, zval *driver_options TSRMLS
 	if (driver_options) {
 		timeout = pdo_attr_lval(driver_options, PDO_ATTR_TIMEOUT, timeout TSRMLS_CC);
 	}
-	sqlite_busy_timeout(H->db, timeout * 1000);
+	sqlite3_busy_timeout(H->db, timeout * 1000);
 
 	dbh->alloc_own_columns = 1;
 	dbh->supports_placeholders = PDO_PLACEHOLDER_POSITIONAL;