[postgis-tickets] r16325 - Use PKG_PROG_PKG_CONFIG macro from pkg.m4 to detect pkg-config

[Sandro Santilli]

Author: strk
Date: 2018-01-16 12:54:14 -0800 (Tue, 16 Jan 2018)
New Revision: 16325

Modified:
   branches/2.4/NEWS
   branches/2.4/configure.ac
Log:
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)

Modified: branches/2.4/NEWS
===================================================================
--- branches/2.4/NEWS	2018-01-16 20:47:02 UTC (rev 16324)
+++ branches/2.4/NEWS	2018-01-16 20:54:14 UTC (rev 16325)
@@ -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
 

Modified: branches/2.4/configure.ac
===================================================================
--- branches/2.4/configure.ac	2018-01-16 20:47:02 UTC (rev 16324)
+++ branches/2.4/configure.ac	2018-01-16 20:54:14 UTC (rev 16325)
@@ -907,13 +907,12 @@
 
 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 @@
 
     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