From: fanquake <fanquake@gmail.com>
Date: Tue, 15 Jun 2021 07:49:38 +0000 (+0800)
Subject: build: replace ntp_pkg_config macro with a call to PKG_PROG_PKG_CONFIG()
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=12996ba9bf1e943e5c334fdbe8293db1ccc4a07a;p=libevent

build: replace ntp_pkg_config macro with a call to PKG_PROG_PKG_CONFIG()

Note that 0.15.0 is quite an old version to be testing for, however I've left
this as-is for now.
---

diff --git a/m4/libevent_openssl.m4 b/m4/libevent_openssl.m4
index b95d2449..178cf387 100644
--- a/m4/libevent_openssl.m4
+++ b/m4/libevent_openssl.m4
@@ -1,7 +1,7 @@
 dnl ######################################################################
 dnl OpenSSL support
 AC_DEFUN([LIBEVENT_OPENSSL], [
-AC_REQUIRE([NTP_PKG_CONFIG])dnl
+PKG_PROG_PKG_CONFIG([0.15.0])
 
 case "$host_os" in
     darwin*)
diff --git a/m4/ntp_pkg_config.m4 b/m4/ntp_pkg_config.m4
deleted file mode 100644
index 1bce8a6e..00000000
--- a/m4/ntp_pkg_config.m4
+++ /dev/null
@@ -1,27 +0,0 @@
-dnl NTP_PKG_CONFIG					-*- Autoconf -*-
-dnl
-dnl Look for pkg-config, which must be at least
-dnl $ntp_pkgconfig_min_version.
-dnl
-AC_DEFUN([NTP_PKG_CONFIG], [
-
-dnl lower the minimum version if you find an earlier one works
-ntp_pkgconfig_min_version='0.15.0'
-AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
-AS_UNSET([ac_cv_path_PKG_CONFIG])
-AS_UNSET([ac_cv_path_ac_pt_PKG_CONFIG])
-
-case "$PKG_CONFIG" in
- /*)
-    AC_MSG_CHECKING([if pkg-config is at least version $ntp_pkgconfig_min_version])
-    if $PKG_CONFIG --atleast-pkgconfig-version $ntp_pkgconfig_min_version; then
-	AC_MSG_RESULT([yes])
-    else
-	AC_MSG_RESULT([no])
-	PKG_CONFIG=""
-    fi
-    ;;
-esac
-
-]) dnl NTP_PKG_CONFIG
-