wez Wed Feb 16 23:23:15 2005 EDT
Added files:
/php-src/ext/pdo_sqlite/sqlite/src .cvsignore
Modified files:
/php-src/ext/pdo Makefile.frag config.m4
/php-src/ext/pdo_firebird config.m4
/php-src/ext/pdo_mysql config.m4
/php-src/ext/pdo_oci config.m4
/php-src/ext/pdo_odbc config.m4
/php-src/ext/pdo_pgsql config.m4
/php-src/ext/pdo_sqlite .cvsignore config.m4
Log:
symlinked pdo drivers under ext.
Enabled PDO and PDO_SQLITE by default.
Fixup PDO header detection so that it searches in the correct order, and
correctly picks up the headers when building from outside of the source
tree.
TODO: make pdo_XXX auto-enable when XXX is enabled. Volunteers welcome.
http://cvs.php.net/diff.php/php-src/ext/pdo/Makefile.frag?r1=1.7&r2=1.8&ty=u
Index: php-src/ext/pdo/Makefile.frag
diff -u php-src/ext/pdo/Makefile.frag:1.7 php-src/ext/pdo/Makefile.frag:1.8
--- php-src/ext/pdo/Makefile.frag:1.7 Sat Feb 12 22:27:48 2005
+++ php-src/ext/pdo/Makefile.frag Wed Feb 16 23:23:14 2005
@@ -32,8 +32,9 @@
# mini hack
install: $(all_targets) $(install_targets) install-pdo-headers
-$(top_srcdir)/ext/pdo/pdo_sql_parser.c: $(top_srcdir)/ext/pdo/pdo_sql_parser.re
- exit 0; re2c -b $(top_srcdir)/ext/pdo/pdo_sql_parser.re > $@
+#$(top_srcdir)/ext/pdo/pdo_sql_parser.c:
$(top_srcdir)/ext/pdo/pdo_sql_parser.re
+# exit 0; re2c -b $(top_srcdir)/ext/pdo/pdo_sql_parser.re > $@
+
+#$(srcdir)/pdo_sql_parser.c: $(srcdir)/pdo_sql_parser.re
+# exit 0; re2c -b $(srcdir)/pdo_sql_parser.re > $@
-$(srcdir)/pdo_sql_parser.c: $(srcdir)/pdo_sql_parser.re
- exit 0; re2c -b $(srcdir)/pdo_sql_parser.re > $@
http://cvs.php.net/diff.php/php-src/ext/pdo/config.m4?r1=1.8&r2=1.9&ty=u
Index: php-src/ext/pdo/config.m4
diff -u php-src/ext/pdo/config.m4:1.8 php-src/ext/pdo/config.m4:1.9
--- php-src/ext/pdo/config.m4:1.8 Sat Feb 12 20:54:59 2005
+++ php-src/ext/pdo/config.m4 Wed Feb 16 23:23:14 2005
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.8 2005/02/13 01:54:59 wez Exp $
+dnl $Id: config.m4,v 1.9 2005/02/17 04:23:14 wez Exp $
dnl config.m4 for extension pdo
dnl vim:se ts=2 sw=2 et:
@@ -51,8 +51,8 @@
fi
])
-PHP_ARG_ENABLE(pdo, whether to disable PDO support,
-[ --disable-pdo Disable PHP Data Objects support], yes)
+PHP_ARG_ENABLE(pdo, whether to enable PDO support,
+[ --enable-pdo=yes Enable PHP Data Objects support (recommended)],
yes)
if test "$PHP_PDO" != "no"; then
if test "$ext_shared" = "yes" ; then
http://cvs.php.net/diff.php/php-src/ext/pdo_firebird/config.m4?r1=1.3&r2=1.4&ty=u
Index: php-src/ext/pdo_firebird/config.m4
diff -u php-src/ext/pdo_firebird/config.m4:1.3
php-src/ext/pdo_firebird/config.m4:1.4
--- php-src/ext/pdo_firebird/config.m4:1.3 Wed Jun 23 09:26:08 2004
+++ php-src/ext/pdo_firebird/config.m4 Wed Feb 16 23:23:14 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.3 2004/06/23 13:26:08 abies Exp $
+dnl $Id: config.m4,v 1.4 2005/02/17 04:23:14 wez Exp $
dnl
PHP_ARG_WITH(pdo-firebird,for Firebird support for PDO,
@@ -30,20 +30,23 @@
], [
-L$FIREBIRD_LIBDIR
])
-
- if test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
- pdo_inc_path=$prefix/include/php/ext
- elif test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
+
+ AC_MSG_CHECKING([for PDO includes])
+ if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
+ pdo_inc_path=$abs_srcdir/ext
+ elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
pdo_inc_path=$abs_srcdir/ext
- elif test -f ext/pdo/php_pdo_driver.h; then
- pdo_inc_path=ext
+ elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
+ pdo_inc_path=$prefix/include/php/ext
else
- AC_MSG_ERROR([Cannot find php_pdo_driver.h.])
+ AC_MSG_ERROR([Cannot find php_pdo_driver.h.])
fi
+ AC_MSG_RESULT($pdo_inc_path)
PHP_ADD_LIBRARY_WITH_PATH($FIREBIRD_LIBNAME, $FIREBIRD_LIBDIR,
PDO_FIREBIRD_SHARED_LIBADD)
PHP_ADD_INCLUDE($FIREBIRD_INCDIR)
AC_DEFINE(HAVE_PDO_FIREBIRD,1,[ ])
PHP_NEW_EXTENSION(pdo_firebird, pdo_firebird.c firebird_driver.c
firebird_statement.c, $ext_shared,,-I$pdo_inc_path)
PHP_SUBST(PDO_FIREBIRD_SHARED_LIBADD)
+ PHP_ADD_EXTENSION_DEP(pdo_firebird, pdo)
fi
http://cvs.php.net/diff.php/php-src/ext/pdo_mysql/config.m4?r1=1.17&r2=1.18&ty=u
Index: php-src/ext/pdo_mysql/config.m4
diff -u php-src/ext/pdo_mysql/config.m4:1.17
php-src/ext/pdo_mysql/config.m4:1.18
--- php-src/ext/pdo_mysql/config.m4:1.17 Sun Feb 13 09:42:46 2005
+++ php-src/ext/pdo_mysql/config.m4 Wed Feb 16 23:23:14 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.17 2005/02/13 14:42:46 hholzgra Exp $
+dnl $Id: config.m4,v 1.18 2005/02/17 04:23:14 wez Exp $
dnl
AC_DEFUN([PDO_MYSQL_LIB_CHK], [
@@ -59,18 +59,20 @@
AC_CHECK_FUNCS([mysql_commit mysql_stmt_prepare])
LDFLAGS=$_SAVE_LDFLAGS
- if test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
- pdo_inc_path=$prefix/include/php/ext
- elif test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
- pdo_inc_path=$abs_srcdir/ext
- elif test -f ext/pdo/php_pdo_driver.h; then
- pdo_inc_path=ext
+ AC_MSG_CHECKING([for PDO includes])
+ if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
+ pdo_inc_path=$abs_srcdir/ext
+ elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
+ pdo_inc_path=$abs_srcdir/ext
+ elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
+ pdo_inc_path=$prefix/include/php/ext
else
- AC_MSG_ERROR([Cannot find php_pdo_driver.h.])
+ AC_MSG_ERROR([Cannot find php_pdo_driver.h.])
fi
+ AC_MSG_RESULT($pdo_inc_path)
PHP_NEW_EXTENSION(pdo_mysql, pdo_mysql.c mysql_driver.c mysql_statement.c,
$ext_shared,,-I$pdo_inc_path)
-dnl PHP_ADD_EXTENSION_DEP(pdo_mysql, pdo)
+ PHP_ADD_EXTENSION_DEP(pdo_mysql, pdo)
PDO_MYSQL_MODULE_TYPE=external
PDO_MYSQL_INCLUDE=-I$PDO_MYSQL_INC_DIR
http://cvs.php.net/diff.php/php-src/ext/pdo_oci/config.m4?r1=1.9&r2=1.10&ty=u
Index: php-src/ext/pdo_oci/config.m4
diff -u php-src/ext/pdo_oci/config.m4:1.9 php-src/ext/pdo_oci/config.m4:1.10
--- php-src/ext/pdo_oci/config.m4:1.9 Mon Feb 14 07:52:34 2005
+++ php-src/ext/pdo_oci/config.m4 Wed Feb 16 23:23:14 2005
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.9 2005/02/14 12:52:34 tony2001 Exp $
+dnl $Id: config.m4,v 1.10 2005/02/17 04:23:14 wez Exp $
AC_DEFUN([AC_PDO_OCI_VERSION],[
AC_MSG_CHECKING([Oracle version])
@@ -160,20 +160,23 @@
-L$PDO_OCI_LIB_DIR $PDO_OCI_SHARED_LIBADD
])
- if test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
- pdo_inc_path=$prefix/include/php/ext
- elif test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
+ AC_MSG_CHECKING([for PDO includes])
+ if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
+ pdo_inc_path=$abs_srcdir/ext
+ elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
pdo_inc_path=$abs_srcdir/ext
- elif test -f ext/pdo/php_pdo_driver.h; then
- pdo_inc_path=ext
+ elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
+ pdo_inc_path=$prefix/include/php/ext
else
- AC_MSG_ERROR([Cannot find php_pdo_driver.h.])
+ AC_MSG_ERROR([Cannot find php_pdo_driver.h.])
fi
+ AC_MSG_RESULT($pdo_inc_path)
PHP_NEW_EXTENSION(pdo_oci, pdo_oci.c oci_driver.c oci_statement.c,
$ext_shared,,-I$pdo_inc_path)
PHP_SUBST_OLD(PDO_OCI_SHARED_LIBADD)
PHP_SUBST_OLD(PDO_OCI_DIR)
PHP_SUBST_OLD(PDO_OCI_VERSION)
+ PHP_ADD_EXTENSION_DEP(pdo_oci, pdo)
fi
http://cvs.php.net/diff.php/php-src/ext/pdo_odbc/config.m4?r1=1.13&r2=1.14&ty=u
Index: php-src/ext/pdo_odbc/config.m4
diff -u php-src/ext/pdo_odbc/config.m4:1.13 php-src/ext/pdo_odbc/config.m4:1.14
--- php-src/ext/pdo_odbc/config.m4:1.13 Sun Feb 13 02:30:55 2005
+++ php-src/ext/pdo_odbc/config.m4 Wed Feb 16 23:23:14 2005
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.13 2005/02/13 07:30:55 hholzgra Exp $
+dnl $Id: config.m4,v 1.14 2005/02/17 04:23:14 wez Exp $
dnl config.m4 for extension pdo_odbc
dnl vim:et:sw=2:ts=2:
@@ -134,8 +134,8 @@
AC_MSG_CHECKING([for PDO includes])
if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
pdo_inc_path=$abs_srcdir/ext
- elif test -f ext/pdo/php_pdo_driver.h; then
- pdo_inc_path=ext
+ elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
+ pdo_inc_path=$abs_srcdir/ext
elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
pdo_inc_path=$prefix/include/php/ext
else
@@ -144,6 +144,6 @@
AC_MSG_RESULT($pdo_inc_path)
PHP_NEW_EXTENSION(pdo_odbc, pdo_odbc.c odbc_driver.c odbc_stmt.c,
$ext_shared,,-I$pdo_inc_path $PDO_ODBC_INCLUDE)
-dnl PHP_ADD_EXTENSION_DEP(pdo_odbc, pdo)
+ PHP_ADD_EXTENSION_DEP(pdo_odbc, pdo)
fi
http://cvs.php.net/diff.php/php-src/ext/pdo_pgsql/config.m4?r1=1.5&r2=1.6&ty=u
Index: php-src/ext/pdo_pgsql/config.m4
diff -u php-src/ext/pdo_pgsql/config.m4:1.5 php-src/ext/pdo_pgsql/config.m4:1.6
--- php-src/ext/pdo_pgsql/config.m4:1.5 Sun Feb 13 02:30:55 2005
+++ php-src/ext/pdo_pgsql/config.m4 Wed Feb 16 23:23:14 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.5 2005/02/13 07:30:55 hholzgra Exp $
+dnl $Id: config.m4,v 1.6 2005/02/17 04:23:14 wez Exp $
dnl
AC_DEFUN([PHP_PGSQL_CHECK_FUNCTIONS],[
@@ -97,17 +97,18 @@
PHP_ADD_INCLUDE($PGSQL_INCLUDE)
-dnl find PDO sources
- if test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
- pdo_inc_path=$prefix/include/php/ext
+ AC_MSG_CHECKING([for PDO includes])
+ if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
+ pdo_inc_path=$abs_srcdir/ext
elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
- pdo_inc_path=$abs_srcdir/ext
- elif test -f ext/pdo/php_pdo_driver.h; then
- pdo_inc_path=ext
+ pdo_inc_path=$abs_srcdir/ext
+ elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
+ pdo_inc_path=$prefix/include/php/ext
else
- AC_MSG_ERROR([Cannot find php_pdo_driver.h.])
+ AC_MSG_ERROR([Cannot find php_pdo_driver.h.])
fi
+ AC_MSG_RESULT($pdo_inc_path)
PHP_NEW_EXTENSION(pdo_pgsql, pdo_pgsql.c pgsql_driver.c pgsql_statement.c,
$ext_shared,,-I$pdo_inc_path $PDO_PGSQL_CFLAGS)
-dnl PHP_ADD_EXTENSION_DEP(pdo_pgsql, pdo)
+ PHP_ADD_EXTENSION_DEP(pdo_pgsql, pdo)
fi
http://cvs.php.net/diff.php/php-src/ext/pdo_sqlite/.cvsignore?r1=1.1&r2=1.2&ty=u
Index: php-src/ext/pdo_sqlite/.cvsignore
diff -u php-src/ext/pdo_sqlite/.cvsignore:1.1
php-src/ext/pdo_sqlite/.cvsignore:1.2
--- php-src/ext/pdo_sqlite/.cvsignore:1.1 Sun Sep 19 06:55:41 2004
+++ php-src/ext/pdo_sqlite/.cvsignore Wed Feb 16 23:23:14 2005
@@ -26,3 +26,4 @@
missing
mkinstalldirs
modules
+sqlite3.h
http://cvs.php.net/diff.php/php-src/ext/pdo_sqlite/config.m4?r1=1.8&r2=1.9&ty=u
Index: php-src/ext/pdo_sqlite/config.m4
diff -u php-src/ext/pdo_sqlite/config.m4:1.8
php-src/ext/pdo_sqlite/config.m4:1.9
--- php-src/ext/pdo_sqlite/config.m4:1.8 Sat Feb 12 22:01:38 2005
+++ php-src/ext/pdo_sqlite/config.m4 Wed Feb 16 23:23:14 2005
@@ -1,19 +1,19 @@
-dnl $Id: config.m4,v 1.8 2005/02/13 03:01:38 wez Exp $
+dnl $Id: config.m4,v 1.9 2005/02/17 04:23:14 wez Exp $
dnl config.m4 for extension pdo_sqlite
dnl vim:et:sw=2:ts=2:
PHP_ARG_WITH(pdo-sqlite, for sqlite 3 driver for PDO,
-[ --with-pdo-sqlite Include PDO sqlite 3 support])
+[ --with-pdo-sqlite Include PDO sqlite 3 support],yes)
if test "$PHP_PDO_SQLITE" != "no"; then
AC_MSG_CHECKING([for PDO includes])
- if test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
- pdo_inc_path=$prefix/include/php/ext
- elif test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
- pdo_inc_path=$abs_srcdir/ext
- elif test -f ext/pdo/php_pdo_driver.h; then
- pdo_inc_path=ext
+ if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then
+ pdo_inc_path=$abs_srcdir/ext
+ elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then
+ pdo_inc_path=$abs_srcdir/ext
+ elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then
+ pdo_inc_path=$prefix/include/php/ext
else
AC_MSG_ERROR([Cannot find php_pdo_driver.h.])
fi
@@ -110,5 +110,5 @@
AC_CHECK_HEADERS(time.h)
fi
-dnl PHP_ADD_EXTENSION_DEP(pdo_sqlite, pdo)
+ PHP_ADD_EXTENSION_DEP(pdo_sqlite, pdo)
fi
http://cvs.php.net/co.php/php-src/ext/pdo_sqlite/sqlite/src/.cvsignore?r=1.1&p=1
Index: php-src/ext/pdo_sqlite/sqlite/src/.cvsignore
+++ php-src/ext/pdo_sqlite/sqlite/src/.cvsignore
config.h
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
