diff --git a/macros/ac_python_devel.m4 b/macros/ac_python_devel.m4 index d3cc13f..2589ecd 100644 --- a/macros/ac_python_devel.m4 +++ b/macros/ac_python_devel.m4 @@ -18,47 +18,22 @@ AC_DEFUN([AC_PYTHON_DEVEL],[ # AC_REQUIRE([AM_PATH_PYTHON]) - # Check for Python include path - AC_MSG_CHECKING([for Python include path]) - python_path=`echo $PYTHON | sed "s,/bin.*$,,"` - for i in "$python_path/include/python$PYTHON_VERSION/" "$python_path/include/python/" "$python_path/" ; do - python_path=`find $i -type f -name Python.h -print | sed "1q"` - if test -n "$python_path" ; then - break - fi - done - python_path=`echo $python_path | sed "s,/Python.h$,,"` - AC_MSG_RESULT([$python_path]) - if test -z "$python_path" ; then - AC_MSG_ERROR([cannot find Python include path]) + AC_MSG_CHECKING([for python-$PYTHON_VERSION.pc]) + if ! pkg-config --exists python-$PYTHON_VERSION; then + AC_MSG_ERROR([Can't find python-$PYTHON_VERSION.pc]) fi - AC_SUBST([PYTHON_CPPFLAGS],[-I$python_path]) + AC_MSG_RESULT([found]) - # Check for Python library path - AC_MSG_CHECKING([for Python library path]) - python_path=`echo $PYTHON | sed "s,/bin.*$,,"` - for i in "$python_path/lib/python$PYTHON_VERSION/config/" "$python_path/lib/python$PYTHON_VERSION/" "$python_path/lib/python/config/" "$python_path/lib/python/" "$python_path/" ; do - python_path=`find $i -type f -name libpython$PYTHON_VERSION.* -print | sed "1q"` - if test -n "$python_path" ; then - break - fi - done - python_path=`echo $python_path | sed "s,/libpython.*$,,"` - AC_MSG_RESULT([$python_path]) - if test -z "$python_path" ; then - AC_MSG_ERROR([cannot find Python library path]) - fi - AC_SUBST([PYTHON_LDFLAGS],["-L$python_path -lpython$PYTHON_VERSION"]) - # - python_site=`echo $python_path | sed "s/config/site-packages/"` + python_cflags=`pkg-config --cflags python-$PYTHON_VERSION` + AC_SUBST([PYTHON_CPPFLAGS],["$python_cflags"]) + + python_ldflags=`pkg-config --libs python-$PYTHON_VERSION` + AC_SUBST([PYTHON_LDFLAGS],["$python_ldflags"]) + + python_site=`$PYTHON -c 'import distutils.sysconfig; \ + print(distutils.sysconfig.get_python_lib(standard_lib=False))'` AC_SUBST([PYTHON_SITE_PKG],[$python_site]) - # - # libraries which must be linked in when embedding - # - AC_MSG_CHECKING(python extra libraries) - PYTHON_EXTRA_LIBS=`$PYTHON -c "import distutils.sysconfig; \ - conf = distutils.sysconfig.get_config_var; \ - print conf('LOCALMODLIBS')+' '+conf('LIBS')" - AC_MSG_RESULT($PYTHON_EXTRA_LIBS)` + + PYTHON_EXTRA_LIBS="" AC_SUBST(PYTHON_EXTRA_LIBS) ])