From: Hilko Bengen <bengen@hilluzination.de>
Date: Sat, 10 Dec 2011 21:16:55 +0000 (+0100)
Subject: Fixed checks for libpython features
X-Git-Tag: 1.15.13~2
X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=commitdiff_plain;h=ad5b5f96da53a6f51424e22e26f2d8a325eec681

Fixed checks for libpython features

The python3.1 package shipped with Debian/squeeze does not have the
'mu' suffix that was assumed before.
---

diff --git a/configure.ac b/configure.ac
index 0374b66..40f67aa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -738,19 +738,20 @@ AS_IF([test "x$enable_python" != "xno"],
                 AC_MSG_RESULT([$PYTHON_INSTALLDIR])
             fi
 
-            dnl Look for libpython and some optional symbols in it.
+            dnl Look for some optional symbols in libpython.
             old_LIBS="$LIBS"
-            if test "x$PYTHON_VERSION_MAJOR" = "x3"; then
-                dnl libpython3 is called "libpython3.Xmu.so"
-                LIBPYTHON="python${PYTHON_VERSION}mu"
-            else
-                LIBPYTHON="python$PYTHON_VERSION"
-            fi
-            AC_CHECK_LIB([$LIBPYTHON], [PyList_Size], [],
-                         [AC_MSG_FAILURE([$LIBPYTHON is not installed])])
 
-            AC_CHECK_FUNCS([PyCapsule_New \
-                            PyString_AsString])
+            PYTHON_BLDLIBRARY=`$PYTHON -c "import distutils.sysconfig; \
+                                           print (distutils.sysconfig.get_config_var('BLDLIBRARY'))"`
+            AC_CHECK_LIB([c],[PyCapsule_New],
+                         [AC_DEFINE([HAVE_PYCAPSULE_NEW],1,
+                                    [Found PyCapsule_New in libpython])],
+                         [],[$PYTHON_BLDLIBRARY])
+            AC_CHECK_LIB([c],[PyString_AsString],
+                         [AC_DEFINE([HAVE_PYSTRING_ASSTRING],1,
+                                    [Found PyString_AsString in libpython])],
+                         [],[$PYTHON_BLDLIBRARY])
+
             LIBS="$old_LIBS"
         fi