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 4964d517c294950701ffb4d52dad01475ba46226..c8b3800061a0d7c11f71cdad76e4129d20597fdd 100644 (file)
--- 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 5eb335e21aa50209d576baf52a66d37dd09ad9b5..79b3aecd11b4a9d2105291bd83dda87f21b94e33 100644 (file)
--- 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