diff options
| author | Wez Furlong <wez@php.net> | 2005-02-17 04:23:15 +0000 |
|---|---|---|
| committer | Wez Furlong <wez@php.net> | 2005-02-17 04:23:15 +0000 |
| commit | 55f53a5a963da2788840995bc33752c10d4c166a (patch) | |
| tree | cbae417e3efbd324679051a467398c9b5939e749 /ext/pdo_mysql | |
| parent | 4585c15cb04ac0f7da95ed04ecc808bfd1681417 (diff) | |
| download | php-git-55f53a5a963da2788840995bc33752c10d4c166a.tar.gz | |
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.
Diffstat (limited to 'ext/pdo_mysql')
| -rwxr-xr-x | ext/pdo_mysql/config.m4 | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/ext/pdo_mysql/config.m4 b/ext/pdo_mysql/config.m4 index d9de612ba1..860f10db0e 100755 --- a/ext/pdo_mysql/config.m4 +++ b/ext/pdo_mysql/config.m4 @@ -59,18 +59,20 @@ Note that the MySQL client library is not bundled anymore.]) 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 |