Fix bug #54318 (Non-portable grep option used in PDO pgsql configurat…

…ion). Patch by Ben Walton <bwalton at artsci dot utoronto dot ca>.
c77cc · Mar 22, 2011 · c5c87c5 · c5c87c5
1 parent 334d2df
commit c5c87c5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/NEWS b/NEWS
@@ -29,6 +29,10 @@ PHP                                                                        NEWS
   . 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)
 

diff --git a/ext/pdo_pgsql/config.m4 b/ext/pdo_pgsql/config.m4
@@ -69,7 +69,8 @@ if test "$PHP_PDO_PGSQL" != "no"; then
   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)