From: Hilko Bengen <bengen@debian.org>
Date: Fri, 10 Jan 2020 23:15:24 +0000 (+0100)
Subject: python: Recognize python-X.Y-embed flavor introduced with Python 3.8 in Debian
X-Git-Tag: archive/raspbian/1%1.44.0-1+rpi1~2^2~7
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=08cb5159cee22df462a0a5741565aa7c91fe508f;p=libguestfs.git

python: Recognize python-X.Y-embed flavor introduced with Python 3.8 in Debian

The non-"embed" .pc file does not include linker instructions. See
Debian bug #948017

Gbp-Pq: Name 0017-python-Recognize-python-X.Y-embed-flavor-introduced-.patch
---

diff --git a/m4/guestfs-python.m4 b/m4/guestfs-python.m4
index 3210c49b..227f31cd 100644
--- a/m4/guestfs-python.m4
+++ b/m4/guestfs-python.m4
@@ -38,23 +38,30 @@ AS_IF([test "x$enable_python" != "xno"],[
            AC_MSG_ERROR([found Python $PYTHON_VERSION, while Python $PYTHON_REQ_MAJOR.$PYTHON_REQ_MINOR is required])
         ])
 	AC_MSG_RESULT([$PYTHON_VERSION])
-
-        # Debian: python-2.7.pc, python-3.2.pc
-        PKG_CHECK_MODULES([PYTHON], [python-"$PYTHON_VERSION"],[
+        # Debian: python-2.7.pc, python-3.2.pc. But also: python-3.8-embed.pc
+        PKG_CHECK_MODULES([PYTHON], [python-"$PYTHON_VERSION"-embed],[
             have_python_module=1
             AC_SUBST([PYTHON_CFLAGS])
             AC_SUBST([PYTHON_LIBS])
             AC_SUBST([PYTHON_VERSION])
             AC_DEFINE([HAVE_PYTHON],[1],[Python library found at compile time])
         ],[
-            PKG_CHECK_MODULES([PYTHON], [python],[
+            PKG_CHECK_MODULES([PYTHON], [python-"$PYTHON_VERSION"],[
                 have_python_module=1
                 AC_SUBST([PYTHON_CFLAGS])
                 AC_SUBST([PYTHON_LIBS])
                 AC_SUBST([PYTHON_VERSION])
                 AC_DEFINE([HAVE_PYTHON],[1],[Python library found at compile time])
             ],[
-                AC_MSG_WARN([python $PYTHON_VERSION not found])
+                PKG_CHECK_MODULES([PYTHON], [python],[
+                    have_python_module=1
+                    AC_SUBST([PYTHON_CFLAGS])
+                    AC_SUBST([PYTHON_LIBS])
+                    AC_SUBST([PYTHON_VERSION])
+                    AC_DEFINE([HAVE_PYTHON],[1],[Python library found at compile time])
+                ],[
+                    AC_MSG_WARN([python $PYTHON_VERSION not found])
+                ])
             ])
         ])