ID: 35032 User updated by: [EMAIL PROTECTED] Reported By: [EMAIL PROTECTED] -Status: Feedback +Status: Open Bug Type: PDO related Operating System: Mac OS X PHP Version: 5CVS-2005-10-28 (CVS) Assigned To: Wez New Comment:
Yeah, I was afraid this would happen. The patch can be downloaded at http://eloris.spheroid.info/~henkka/tmp/pdo_dblib-config.m4.patch Previous Comments: ------------------------------------------------------------------------ [2005-11-01 02:43:28] [EMAIL PROTECTED] Provide a link to a downloadable patch against PHP_5_1 branch; your patch would not apply. ------------------------------------------------------------------------ [2005-10-31 11:15:08] [EMAIL PROTECTED] Description: ------------ On some systems FreeTDS include files are being installed on $prefix/include/freetds instead of $prefix/include where configure is trying to find them. I have modified the ext/pdo_dblib/config.m4 to also search that directory with the following patch: --- config.m4 2005-10-31 10:08:18.000000000 +0200 +++ config.m4.new 2005-10-31 10:17:30.000000000 +0200 @@ -10,13 +10,17 @@ if test "$PHP_PDO_DBLIB" != "no"; then - PDO_FREETDS_INSTALLATION_DIR="" if test "$PHP_PDO_DBLIB" = "yes"; then for i in /usr/local /usr; do if test -f $i/include/tds.h; then PDO_FREETDS_INSTALLATION_DIR=$i + PDO_FREETDS_INCLUDE_DIR=$i/include break + elif test -f $i/include/freetds/tds.h; then + PDO_FREETDS_INSTALLATION_DIR=$i + PDO_FREETDS_INCLUDE_DIR=$i/include/freetds + break; fi done @@ -28,6 +32,10 @@ if test -f $PHP_PDO_DBLIB/include/tds.h; then PDO_FREETDS_INSTALLATION_DIR=$PHP_PDO_DBLIB + PDO_FREETDS_INCLUDE_DIR=$PHP_PDO_DBLIB/include + elif test -f $PHP_PDO_DBLIB/include/freetds/tds.h; then + PDO_FREETDS_INSTALLATION_DIR=$PHP_PDO_DBLIB + PDO_FREETDS_INCLUDE_DIR=$PHP_PDO_DBLIB/include/freetds else AC_MSG_ERROR(Directory $PHP_PDO_DBLIB is not a FreeTDS installation directory) fi @@ -41,11 +49,9 @@ AC_MSG_ERROR(Could not find $PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR/libtds.[a|so]) fi - PDO_DBLIB_INCDIR=$PDO_FREETDS_INSTALLATION_DIR/include - PDO_DBLIB_LIBDIR=$PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR + PHP_ADD_INCLUDE($PDO_FREETDS_INCLUDE_DIR) + PHP_ADD_LIBRARY_WITH_PATH(sybdb, $PDO_FREETDS_INSTALLATION_DIR/$PHP_LIBDIR, PDO_DBLIB_SHARED_LIBADD) - PHP_ADD_INCLUDE($PDO_DBLIB_INCDIR) - PHP_ADD_LIBRARY_WITH_PATH(sybdb, $PDO_DBLIB_LIBDIR, PDO_DBLIB_SHARED_LIBADD) ifdef([PHP_CHECK_PDO_INCLUDES], [ PHP_CHECK_PDO_INCLUDES ------------------------------------------------------------------------ -- Edit this bug report at http://bugs.php.net/?id=35032&edit=1
