aharvey Tue, 22 Mar 2011 09:12:01 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=309545
Log: Fix bug #54318 (Non-portable grep option used in PDO pgsql configuration). Patch by Ben Walton <bwalton at artsci dot utoronto dot ca>. Bug: http://bugs.php.net/54318 (Assigned) Non-portable grep option used in PDO pgsql configuration Changed paths: U php/php-src/branches/PHP_5_3/NEWS U php/php-src/branches/PHP_5_3/ext/pdo_pgsql/config.m4 U php/php-src/trunk/ext/pdo_pgsql/config.m4 Modified: php/php-src/branches/PHP_5_3/NEWS =================================================================== --- php/php-src/branches/PHP_5_3/NEWS 2011-03-22 09:08:00 UTC (rev 309544) +++ php/php-src/branches/PHP_5_3/NEWS 2011-03-22 09:12:01 UTC (rev 309545) @@ -29,6 +29,10 @@ . Fixed bug #54167 (PDO_DBLIB returns null on SQLUNIQUE field). (mjh at hodginsmedia dot com, Felipe) +- PDO PostgreSQL driver: + . Fixed bug #54318 (Non-portable grep option used in PDO pgsql + configuration). (bwalton at artsci dot utoronto dot ca) + - SOAP extension: . Fixed bug #54312 (soap_version logic bug). (tom at samplonius dot org) Modified: php/php-src/branches/PHP_5_3/ext/pdo_pgsql/config.m4 =================================================================== --- php/php-src/branches/PHP_5_3/ext/pdo_pgsql/config.m4 2011-03-22 09:08:00 UTC (rev 309544) +++ php/php-src/branches/PHP_5_3/ext/pdo_pgsql/config.m4 2011-03-22 09:12:01 UTC (rev 309545) @@ -69,7 +69,8 @@ AC_DEFINE(HAVE_PDO_PGSQL,1,[Whether to build PostgreSQL for PDO support or not]) AC_MSG_CHECKING([for openssl dependencies]) - if grep -q openssl $PGSQL_INCLUDE/libpq-fe.h ; then + grep openssl $PGSQL_INCLUDE/libpq-fe.h >/dev/null 2>&1 + if test $? -eq 0 ; then AC_MSG_RESULT([yes]) dnl First try to find pkg-config AC_PATH_PROG(PKG_CONFIG, pkg-config, no) Modified: php/php-src/trunk/ext/pdo_pgsql/config.m4 =================================================================== --- php/php-src/trunk/ext/pdo_pgsql/config.m4 2011-03-22 09:08:00 UTC (rev 309544) +++ php/php-src/trunk/ext/pdo_pgsql/config.m4 2011-03-22 09:12:01 UTC (rev 309545) @@ -69,7 +69,8 @@ AC_DEFINE(HAVE_PDO_PGSQL,1,[Whether to build PostgreSQL for PDO support or not]) AC_MSG_CHECKING([for openssl dependencies]) - if grep -q openssl $PGSQL_INCLUDE/libpq-fe.h ; then + grep openssl $PGSQL_INCLUDE/libpq-fe.h >/dev/null 2>&1 + if test $? -eq 0 ; then AC_MSG_RESULT([yes]) dnl First try to find pkg-config AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
