[master] Added check for pkg-config to configure.ac

    Manual merge of rt40371.

diff --git a/RELNOTES b/RELNOTES
index 2c98ea01891d5aedd5108ea113f8e7694121da65..8183585fe33e81a5cb4e0f7bee5e7df96354c7d4 100644 (file)
--- a/RELNOTES
+++ b/RELNOTES
@@ -126,6 +126,12 @@ by Eric Young (eay@cryptsoft.com).
   to the usage string.  This may be disabled by editing includes/site.h.
   [ISC-Bugs #40321]
 
+- The configure script will now exit with an error message if it cannot find
+  pkg-config (needed to locate ATF used for building unit tests). Prior to
+  this the script would exit indicating success causing subsequent attempts
+  to build the software to fail.
+  [ISC-Bugs #40371]
+
                        Changes since 4.1-ESV-R12b1
 
 - None

diff --git a/configure.ac b/configure.ac
index 6f3fa08029c10e565f6607dea62d75c393145291..c6748eb967f4198fea88e8329684ba4715d56f29 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -232,6 +232,10 @@ if test "$atf_path" != "no" ; then
     if test "$atf_pcp" = "" ; then
         AC_MSG_ERROR([Unable to find atf files in location specified])
     else
+        AC_CHECK_PROG([pkgcfg_found],[pkg-config],[pkg-config],[])
+        if test "$pkgcfg_found" = ""; then
+            AC_MSG_ERROR([Could not locate ATF, pkg-config not installed])
+        fi
         ATF_CFLAGS="`PKG_CONFIG_PATH=$atf_pcp pkg-config --cflags atf-c` -DUNIT_TEST"
         ATF_LDFLAGS="`PKG_CONFIG_PATH=$atf_pcp pkg-config --libs atf-c`"
         if  test -f $atf_pcp/atf-sh.pc ; then