]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
bpo-45723: Detect missing pkg-config (GH-29442)
authorChristian Heimes <christian@python.org>
Sun, 7 Nov 2021 10:18:45 +0000 (12:18 +0200)
committerGitHub <noreply@github.com>
Sun, 7 Nov 2021 10:18:45 +0000 (11:18 +0100)
Misc/NEWS.d/next/Build/2021-11-07-10-36-12.bpo-45723.JNwKSG.rst [new file with mode: 0644]
configure
configure.ac

diff --git a/Misc/NEWS.d/next/Build/2021-11-07-10-36-12.bpo-45723.JNwKSG.rst b/Misc/NEWS.d/next/Build/2021-11-07-10-36-12.bpo-45723.JNwKSG.rst
new file mode 100644 (file)
index 0000000..0e06560
--- /dev/null
@@ -0,0 +1 @@
+``configure`` now prints a warning when pkg-config is missing.
index 1eea2d13205789dc020a54f47bd5041cd60c848a..7c34a60763d6b22bda054ad8c69af13b18339e03 100755 (executable)
--- a/configure
+++ b/configure
@@ -2777,7 +2777,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-
 if test "$srcdir" != . -a "$srcdir" != "$(pwd)"; then
     # If we're building out-of-tree, we need to make sure the following
     # resources get picked up before their $srcdir counterparts.
@@ -19574,6 +19573,11 @@ $SHELL $srcdir/Modules/makesetup -c $srcdir/Modules/config.c.in \
                        Modules/Setup.local $srcdir/Modules/Setup
 mv config.c Modules
 
+if test -z "$PKG_CONFIG"; then
+  echo "" >&6
+  echo "pkg-config is missing. Some dependencies may not be detected correctly." >&6
+fi
+
 if test "$Py_OPT" = 'false' -a "$Py_DEBUG" != 'true'; then
     echo "" >&6
     echo "" >&6
index 8895818d19da6c6a221331d1678cafd28c1950d2..d7699dc4ea90d8ef6c5893174c19a1b5ffb58c97 100644 (file)
@@ -16,7 +16,12 @@ m4_ifdef(
     [AX_C_FLOAT_WORDS_BIGENDIAN],
     [],
     [AC_MSG_ERROR([Please install autoconf-archive package and re-run autoreconf])]
-)
+)dnl
+m4_ifdef(
+    [PKG_PROG_PKG_CONFIG],
+    [],
+    [AC_MSG_ERROR([Please install pkgconf's m4 macro package and re-run autoreconf])]
+)dnl
 
 AC_SUBST(BASECPPFLAGS)
 if test "$srcdir" != . -a "$srcdir" != "$(pwd)"; then
@@ -6114,6 +6119,11 @@ $SHELL $srcdir/Modules/makesetup -c $srcdir/Modules/config.c.in \
                        Modules/Setup.local $srcdir/Modules/Setup
 mv config.c Modules
 
+if test -z "$PKG_CONFIG"; then
+  echo "" >&AS_MESSAGE_FD
+  echo "pkg-config is missing. Some dependencies may not be detected correctly." >&AS_MESSAGE_FD
+fi
+
 if test "$Py_OPT" = 'false' -a "$Py_DEBUG" != 'true'; then
     echo "" >&AS_MESSAGE_FD
     echo "" >&AS_MESSAGE_FD