pybind: Ensure correct python flags are passed

Cython should use the cflags and ldflags provided by
python-config; add checks, population and use of:

  PYTHON_CFLAGS
  PYTHON_LDFLAGS

resolving linker failures on Ubuntu and Debian.

Signed-off-by: James Page <james.page@ubuntu.com>

diff --git a/configure.ac b/configure.ac
index 09d9f64231cc56b9d9674bddd2414b47af672ec1..265843b9ac614555ce4e42b91c2f1c63270222f6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -213,6 +213,14 @@ if test x"$with_cython" = xyes; then
     if test x"$CYTHON_CHECK" != xyes; then
         AC_MSG_FAILURE([cython not found])
     fi
+    AC_CHECK_PROG(PYTHON_CONFIG_CHECK, python-config, yes)
+    if test x"$PYTHON_CONFIG_CHECK" != xyes; then
+        AC_MSG_FAILURE([python-config not found])
+    fi
+    PYTHON_CFLAGS=`python-config --cflags`
+    AC_SUBST(PYTHON_CFLAGS)
+    PYTHON_LDFLAGS=`python-config --ldflags`
+    AC_SUBST(PYTHON_LDFLAGS)
 fi
 
 # cond-check if snappy-devel is installed, needed by leveldb that is need by server parts of the project

diff --git a/src/pybind/Makefile.am b/src/pybind/Makefile.am
index fd23fcb52f48a3cf560374716510a2bbad5cb16f..f590138dfd2e60ac99598f2d5ebddf10c90347b2 100644 (file)
--- a/src/pybind/Makefile.am
+++ b/src/pybind/Makefile.am
@@ -7,8 +7,8 @@ if WITH_CYTHON
 
 PY_DISTUTILS = \
        CPPFLAGS="-iquote \${abs_srcdir}/include ${AM_CPPFLAGS} ${CPPFLAGS}" \
-       CFLAGS="-iquote \${abs_srcdir}/include ${AM_CFLAGS} ${CFLAGS}" \
-       LDFLAGS="-L\${abs_builddir}/.libs $(subst -pie,,${AM_LDFLAGS}) ${LDFLAGS}" \
+       CFLAGS="-iquote \${abs_srcdir}/include ${AM_CFLAGS} ${PYTHON_CFLAGS}" \
+       LDFLAGS="-L\${abs_builddir}/.libs $(subst -pie,,${AM_LDFLAGS}) ${PYTHON_LDFLAGS}" \
        CYTHON_BUILD_DIR="$(shell readlink -f $(builddir))/build" \
        ${PYTHON} ./setup.py