[Hamlib-commits] Hamlib -- Ham radio control libraries branch master updated. 709b89da5867cec689bf72b4742b8a25eb6adb17

[n0nb <n0...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Hamlib -- Ham radio control libraries".

The branch, master has been updated
       via  709b89da5867cec689bf72b4742b8a25eb6adb17 (commit)
      from  ee439484d4748b82e6a7fddbaf3ad3a584d4bd09 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 709b89da5867cec689bf72b4742b8a25eb6adb17
Author: Nate Bargmann <n0...@n0...>
Date:   Thu Sep 18 09:25:16 2025 -0500

    Test for the presence of pkg-config in bootstrap
    
    Test the version of pkg-config during autoreconf.
    
    Document the requirement for pkg-config for bootstrap.

diff --git a/README.developer b/README.developer
index 614dc4579..7910296d1 100644
--- a/README.developer
+++ b/README.developer
@@ -251,10 +251,16 @@ differ).
 * automake      1.16                        # automake --version
 * libtool       2.4.6                       # libtool --version
 * Git           2.30                        # git --version
+* pkg-config    0.29.2                      # pkg-config --version (libusb)
 
 As of Hamlib 4.7.0 (commit e09007a), POSIX thread support (pthreads) is
 required to compile or run Hamlib.
 
+As of Hamlib 4.7.0 (commit d04364e), pkg-config (replaced by pkgconf for the
+most part) is required for bootstrap to install the pkg.m4 file which enables
+the pkg-config facility (bootstrap will now fail if some version of pkg-config
+is not found; its version will be checked during the autoreconf stage).
+
 Optional, but highly recommended:
 * GNU C++                           # Build C++ binding and INDI backend
 * swig (for bindings)               # Generate wrappers for the bindings
@@ -269,7 +275,6 @@ Optional, but highly recommended:
 * libnova devel
 * libusb-1.0 devel                  # 1.0.24 or newer
 * libreadline devel                 # ver 5.2 or newer
-* pkg-config                        # pkg-config --version (libxml and USRP)
 * zlib1g devel                      # (rigmatrix)
 
 N.B.:  The libusb-1.0 package is required for building most of the 'kit'
diff --git a/bootstrap b/bootstrap
index db85b1e9d..15ced7cc1 100755
--- a/bootstrap
+++ b/bootstrap
@@ -8,6 +8,7 @@
 LIBTOOLIZE=libtoolize
 AUTORECONF=autoreconf
 AUTOMAKE=automake
+PKGCONFIG=pkg-config
 
 # Check if we compile on OSX and resolve the name conflict with
 # Apple's tool for creating Mach-O dynamic libraries.
@@ -48,6 +49,14 @@ DIE=0
         DIE=1
 }
 
+("$PKGCONFIG" --version) > /dev/null 2>&1 || {
+        echo
+        echo "You must have pkg-config 0.29.2 or newer (replaced by pkgconf"
+        echo "for the most part) installed to compile $PROJECT."
+        echo "Download the appropriate package for your distribution."
+        DIE=1
+}
+
 if test "$DIE" -eq 1; then
         exit 1
 fi
diff --git a/configure.ac b/configure.ac
index 327e3823f..5e55c1d0f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -447,6 +447,11 @@ dnl available.  At least pkg-config/pkgconf version 0.29.2 or newer is required
 dnl for support of these modules.  If pkg-config or pkgconf is not installed,
 dnl their support will be gracefully disabled.
 
+dnl Ensure that the PKG_PREREQ macro is defined:
+m4_ifndef([PKG_PREREQ],
+    [m4_fatal([must install pkg-config (or pkgconf) 0.29.2 or later before running bootstrap])])
+
+PKG_PREREQ([0.29.2])
 PKG_PROG_PKG_CONFIG([0.29.2])
 
 dnl Check for libusb, treat LIBUSB_LIBS and LIBUSB_CFLAGS as precious variables.

-----------------------------------------------------------------------

Summary of changes:
 README.developer | 7 ++++++-
 bootstrap        | 9 +++++++++
 configure.ac     | 5 +++++
 3 files changed, 20 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
Hamlib -- Ham radio control libraries