From: Sandro Santilli <strk@kbt.io>
Date: Tue, 16 Jan 2018 20:54:14 +0000 (+0000)
Subject: Use PKG_PROG_PKG_CONFIG macro from pkg.m4 to detect pkg-config
X-Git-Tag: 2.4.4~34
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=67f94d5ff769df4d6ad53a7b6a2d28470caca9fb;p=postgis

Use PKG_PROG_PKG_CONFIG macro from pkg.m4 to detect pkg-config

Patch by Bas Couwenberg
Closes #3992 in 2.4 branch (for 2.4.4)

git-svn-id: http://svn.osgeo.org/postgis/branches/2.4@16325 b70326c6-7e19-0410-871a-916f4a2858ee
---

diff --git a/NEWS b/NEWS
index 4964d517c..c8b380006 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,10 @@
+PostGIS 2.4.4
+2018/MM/DD
+
+ * Enhancements *
+    - #3992, Use PKG_PROG_PKG_CONFIG macro from pkg.m4 to detect pkg-config
+             (Bas Couwenberg)
+
 PostGIS 2.4.3
 2018/01/17
 
diff --git a/configure.ac b/configure.ac
index 5eb335e21..79b3aecd1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -907,13 +907,12 @@ AC_SUBST([HAVE_JSON])
 
 fi
 
-
 dnl ===========================================================================
 dnl Detect if pkg-config installed
 dnl ===========================================================================
 # check for pkg-config
-AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-if test "$PKG_CONFIG" = "no"; then
+PKG_PROG_PKG_CONFIG
+if test -z "$PKG_CONFIG"; then
    AC_MSG_WARN([Cannot find pkg-config, make sure it is installed in your PATH])
 fi
 
@@ -970,7 +969,7 @@ if test "$CHECK_PROTOBUF" != "no"; then
 
     dnl No user-specified protobuf dir, try to find one using pkg-config
     else
-        if test "$PKG_CONFIG" = "no"; then
+        if test -z "$PKG_CONFIG"; then
         	AC_MSG_WARN([Cannot find pkg-config, disabling protobuf support.])
         	HAVE_PROTOBUF=no
         else