X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=configure.ac;fp=configure.ac;h=40f67aad11fa8e4a65ff27114ce5c34ab06e16d2;hp=0374b66ea9bc6ba30444f66932c73990f7964319;hb=ad5b5f96da53a6f51424e22e26f2d8a325eec681;hpb=be1419a442d9936e737fb2ca6f0fdba36a048964;ds=sidebyside 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