diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2017-09-05 12:00:30 +0300 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2017-09-05 12:00:30 +0300 |
| commit | 80b5c12eaaa51efca64780eb1d917d2f67c73013 (patch) | |
| tree | 78a34272949b7f51636e5569fa8dc9fd530acce5 /configure.ac | |
| parent | 6d610e9b9a906548ce44265d7f36199441ea8bca (diff) | |
| download | rpm-80b5c12eaaa51efca64780eb1d917d2f67c73013.tar.gz | |
Use pkg-config for figuring python cflags and libs
Simplifies things a bit and also makes "PYTHON=python3 ./configure" work,
whereas it previously barfed on figuring the library names like
"libpython3.6m"
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 25 |
1 files changed, 4 insertions, 21 deletions
diff --git a/configure.ac b/configure.ac index 2090b8f54..913921a21 100644 --- a/configure.ac +++ b/configure.ac @@ -794,32 +794,15 @@ yes|no) ;; esac], [enable_python=no]) +WITH_PYTHON_SUBPACKAGE=0 AS_IF([test "$enable_python" = yes],[ AM_PATH_PYTHON([2.6],[ - WITH_PYTHON_INCLUDE=`${PYTHON} -c 'from distutils.sysconfig import *; import sys; sys.stdout.write(get_python_inc())'` - WITH_PYTHON_SUBPACKAGE=1 - save_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS -I$WITH_PYTHON_INCLUDE" - AC_CHECK_HEADER([Python.h],[], - [AC_MSG_ERROR([missing Python.h]) - ]) - CPPFLAGS="$save_CPPFLAGS" - save_LIBS="$LIBS" - AC_SEARCH_LIBS([Py_Main],[python${PYTHON_VERSION} python],[ - WITH_PYTHON_LIB="$ac_res" - ],[AC_MSG_ERROR([missing python library]) - ]) - LIBS="$save_LIBS" + PKG_CHECK_MODULES([PYTHON], [python-${PYTHON_VERSION}], [WITH_PYTHON_SUBPACKAGE=1]) + AC_SUBST(PYTHON_CFLAGS) + AC_SUBST(PYTHON_LIB) ]) -],[ - WITH_PYTHON_INCLUDE= - WITH_PYTHON_LIB= - WITH_PYTHON_SUBPACKAGE=0 ]) -AC_SUBST(WITH_PYTHON_INCLUDE) -AC_SUBST(WITH_PYTHON_LIB) - AM_CONDITIONAL(ENABLE_PYTHON,[test "$WITH_PYTHON_SUBPACKAGE" = 1]) AC_PATH_PROG(DOXYGEN, doxygen, no) |