--- embedaddon/php/ext/pdo_odbc/config.m4 2012/02/21 23:47:59 1.1.1.1 +++ embedaddon/php/ext/pdo_odbc/config.m4 2012/05/29 12:34:41 1.1.1.2 @@ -1,4 +1,4 @@ -dnl $Id: config.m4,v 1.1.1.1 2012/02/21 23:47:59 misho Exp $ +dnl $Id: config.m4,v 1.1.1.2 2012/05/29 12:34:41 misho Exp $ dnl config.m4 for extension pdo_odbc dnl vim:et:sw=2:ts=2: @@ -47,15 +47,15 @@ if test "$PHP_PDO_ODBC" != "no"; 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 + pdo_cv_inc_path=$abs_srcdir/ext elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then - pdo_inc_path=$abs_srcdir/ext + pdo_cv_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 + pdo_cv_inc_path=$prefix/include/php/ext else AC_MSG_ERROR([Cannot find php_pdo_driver.h.]) fi - AC_MSG_RESULT($pdo_inc_path) + AC_MSG_RESULT($pdo_cv_inc_path) ]) AC_MSG_CHECKING([for selected PDO ODBC flavour]) @@ -165,7 +165,7 @@ functions required for PDO support. AC_MSG_ERROR([Your ODBC library does not exist or there was an error. Check config.log for more information]) ], $PDO_ODBC_LDFLAGS) - PHP_NEW_EXTENSION(pdo_odbc, pdo_odbc.c odbc_driver.c odbc_stmt.c, $ext_shared,,-I$pdo_inc_path $PDO_ODBC_INCLUDE) + PHP_NEW_EXTENSION(pdo_odbc, pdo_odbc.c odbc_driver.c odbc_stmt.c, $ext_shared,,-I$pdo_cv_inc_path $PDO_ODBC_INCLUDE) PHP_SUBST(PDO_ODBC_SHARED_LIBADD) ifdef([PHP_ADD_EXTENSION_DEP], [