From: Jani Taskinen <jani@php.net>
Date: Mon, 9 Jul 2007 12:53:52 +0000 (+0000)
Subject: - Fixed bug #35981 (pdo-pgsql should not use pkg-config when not present)
X-Git-Tag: BEFORE_IMPORT_OF_MYSQLND~294
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=eb45a0f7d7fb1b5420e7bbcd7b30e8a1506dd09d;p=php

- Fixed bug #35981 (pdo-pgsql should not use pkg-config when not present)
---

diff --git a/ext/pdo_pgsql/config.m4 b/ext/pdo_pgsql/config.m4
index 61169d491b..e0111df4d7 100644
--- a/ext/pdo_pgsql/config.m4
+++ b/ext/pdo_pgsql/config.m4
@@ -71,8 +71,10 @@ if test "$PHP_PDO_PGSQL" != "no"; then
   AC_MSG_CHECKING([for openssl dependencies])
   if grep -q openssl $PGSQL_INCLUDE/libpq-fe.h ; then
     AC_MSG_RESULT([yes])
-    if pkg-config openssl ; then
-      PDO_PGSQL_CFLAGS="`pkg-config openssl --cflags`"
+    dnl First try to find pkg-config
+    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+    if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists openssl; then
+      PDO_PGSQL_CFLAGS=`$PKG_CONFIG openssl --cflags`
     fi
   else
     AC_MSG_RESULT([no])