From: Adam Harvey <aharvey@php.net>
Date: Tue, 22 Mar 2011 09:12:01 +0000 (+0000)
Subject: Fix bug #54318 (Non-portable grep option used in PDO pgsql configuration).
X-Git-Tag: php-5.4.0alpha1~191^2~128
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9de1ad4cd2b622d3250a6b5e7cd60fa3fc9d52c7;p=php

Fix bug #54318 (Non-portable grep option used in PDO pgsql configuration).
Patch by Ben Walton <bwalton at artsci dot utoronto dot ca>.
---

diff --git a/ext/pdo_pgsql/config.m4 b/ext/pdo_pgsql/config.m4
index 4a118ca810..95d59a1b4a 100644
--- 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)