configure: require at least pkg-config 0.17.0 by default.

We use the --static flag, and that wasn't available until 0.17.0.

(cherry picked from commit 9deff431fd6a315ae27650bb155e9f26a5ca5114)

3 files changed, 6 insertions, 5 deletions

diff --git a/CHANGES b/CHANGES
index d92c1e8c..c762aaf8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,7 @@
 DayOfTheWeek, Month DD, YYYY / The Tcpdump Group
   Summary for 1.10.4 libpcap release (so far!)
+    Building and testing:
+      Require at least pkg-config 0.17.0, as we use --static.
 
 Thursday, January 12, 2023 / The Tcpdump Group
   Summary for 1.10.3 libpcap release
diff --git a/aclocal.m4 b/aclocal.m4
index 502a3711..4ba8671e 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1103,9 +1103,8 @@ dnl Since: 0.16
 dnl
 dnl Search for the pkg-config tool and set the PKG_CONFIG variable to
 dnl first found in the path. Checks that the version of pkg-config found
-dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is
-dnl used since that's the first version where most current features of
-dnl pkg-config existed.
+dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.17.0 is
+dnl used since that's the first version where --static was supported.
 AC_DEFUN([PKG_PROG_PKG_CONFIG],
 [m4_pattern_forbid([^_?PKG_[A-Z_]+$])
 m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
@@ -1118,7 +1117,7 @@ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
 	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
 fi
 if test -n "$PKG_CONFIG"; then
-	_pkg_min_version=m4_default([$1], [0.9.0])
+	_pkg_min_version=m4_default([$1], [0.17.0])
 	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
 	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
 		AC_MSG_RESULT([yes])
diff --git a/configure b/configure
index e6b5372d..cc06bbea 100755
--- a/configure
+++ b/configure
@@ -7505,7 +7505,7 @@ fi
 
 fi
 if test -n "$PKG_CONFIG"; then
-	_pkg_min_version=0.9.0
+	_pkg_min_version=0.17.0
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
 $as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
 	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then