From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 11 Jun 2021 11:02:08 +0000 (+0000)
Subject: configure: Try to embed Python, but fall back to old behaviour
X-Git-Tag: 0.9.28~1277
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a5180a26b0ff5b48385ed4699e9eddf35f27c9ca;p=pakfire.git

configure: Try to embed Python, but fall back to old behaviour

Python has introduced a new way to embed the library into a module which
is incompatible with older ways. Hence we check for -embed first and
fall back to the "regular" library if the new one could not be found.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/configure.ac b/configure.ac
index 612575958..ab0987076 100644
--- a/configure.ac
+++ b/configure.ac
@@ -173,7 +173,8 @@ LIBS="$save_LIBS"
 
 PKG_CHECK_MODULES([ARCHIVE], [libarchive >= 3.3.3])
 PKG_CHECK_MODULES([CURL], [libcurl])
-PKG_CHECK_MODULES([PYTHON_DEVEL], [python-${PYTHON_VERSION}-embed python-${PYTHON_VERSION}])
+PKG_CHECK_MODULES([PYTHON_DEVEL], [python-${PYTHON_VERSION}-embed],
+	[], [PKG_CHECK_MODULES([PYTHON_DEVEL], [python-${PYTHON_VERSION}])])
 PKG_CHECK_MODULES([JSON_C], [json-c])
 PKG_CHECK_MODULES([LZMA], [liblzma])
 PKG_CHECK_MODULES([OPENSSL], [openssl >= 1.1.1])