From 09f16e5a8944ec0f741cecac37ff75b9067827ea Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Fri, 10 Nov 2023 09:16:03 +0100
Subject: simplify config using PKG_CHECK_MODULES

---
 config.m4 | 29 +++++++++--------------------
 1 file changed, 9 insertions(+), 20 deletions(-)

diff --git a/config.m4 b/config.m4
index fa16010..d0e2565 100644
--- a/config.m4
+++ b/config.m4
@@ -4,30 +4,19 @@ PHP_ARG_ENABLE(rpminfo, whether to enable rpminfo support,
    [  --enable-rpminfo        Enable rpminfo support])
 
 if test "$PHP_RPMINFO" != "no"; then
-  dnl Write more examples of tests here...
 
-  AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+  PKG_CHECK_MODULES([LIBRPM], [rpm >= 4.11.3])
 
-  AC_MSG_CHECKING(for librpm)
-  if test -x "$PKG_CONFIG" && $PKG_CONFIG --exists rpm; then
-    if $PKG_CONFIG rpm --atleast-version 4.11.3; then
-      LIBRPM_CFLAGS=`$PKG_CONFIG rpm --cflags`
-      LIBRPM_LIBDIR=`$PKG_CONFIG rpm --libs`
-      LIBRPM_VERSON=`$PKG_CONFIG rpm --modversion`
-      AC_MSG_RESULT(from pkgconfig: version $LIBRPM_VERSON)
-      if $PKG_CONFIG rpm --atleast-version 4.13; then
-        AC_DEFINE(HAVE_ARCHIVE, 1, [ Archive reader since RPM 4.13 ])
-        AC_DEFINE(HAVE_WEAKDEP, 1, [ Indexes on weak dependency field since RPM 4.13 ])
-      fi
-    else
-      AC_MSG_ERROR(system librpm is too old: version 4.11.3 required)
-    fi
-  else
-    AC_MSG_ERROR(pkg-config not found)
-  fi
-  PHP_EVAL_LIBLINE($LIBRPM_LIBDIR, RPMINFO_SHARED_LIBADD)
+  PHP_EVAL_LIBLINE($LIBRPM_LIBS, RPMINFO_SHARED_LIBADD)
   PHP_EVAL_INCLINE($LIBRPM_CFLAGS)
 
+  AC_MSG_CHECKING(for rpm >= 4.13)
+  PKG_CHECK_EXISTS([rpm >= 4.13],
+    AC_DEFINE(HAVE_ARCHIVE, 1, [ Archive reader since RPM 4.13 ])
+    AC_DEFINE(HAVE_WEAKDEP, 1, [ Indexes on weak dependency field since RPM 4.13 ])
+    AC_MSG_RESULT([yes]), AC_MSG_RESULT([no])
+  )
+
   PHP_SUBST(RPMINFO_SHARED_LIBADD)
 
   PHP_NEW_EXTENSION(rpminfo, rpminfo.c, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
-- 
cgit