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.52.0-6.1+rpi1^2~12
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=870a1a4583ac7a4828f1662a5140b2d51e7beb31;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 python-Recognize-python-X.Y-embed-flavor-introduced-with-.patch
---

diff --git a/m4/guestfs-python.m4 b/m4/guestfs-python.m4
index ccb15d0c..c4bc7a3c 100644
--- a/m4/guestfs-python.m4
+++ b/m4/guestfs-python.m4
@@ -52,22 +52,30 @@ supports it.
 If you want to use Python 2, you will need to use libguestfs 1.40 or 1.42.0.])
         ])
 
-        # Debian: python-3.2.pc
-        PKG_CHECK_MODULES([PYTHON], [python-"$PYTHON_VERSION"],[
+        # Debian: 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])
+                ])
             ])
         ])