systemd-python: use python${PYTHON_VERSION}-config as python-config
This is the usual setup, where pythonX.Y and pythonX.Y-config go together. Using python-config with python3 will only lead to confusion. --libs is changed to --ldflags, since the latter also includes other required flags like -L<dir>. The tests for HAVE_PYTHON and HAVE_PYTHON_DEVEL are separated. It is possible to have python development libraries installed without the binary (or to want to build python modules without using python during the build). A line is added to the output, to show what flags will be used for python.
This commit is contained in:
parent
0c0271841a
commit
568c7e0237
27
configure.ac
27
configure.ac
|
@ -100,21 +100,20 @@ AC_ARG_WITH([python],
|
||||||
|
|
||||||
AS_IF([test "x$with_python" != "xno"], [
|
AS_IF([test "x$with_python" != "xno"], [
|
||||||
AM_PATH_PYTHON(,, [:])
|
AM_PATH_PYTHON(,, [:])
|
||||||
if test "$PYTHON" != : ; then
|
AS_IF([test "$PYTHON" != :], [have_python=yes])
|
||||||
have_python=yes
|
|
||||||
AC_PATH_PROG([PYTHON_CONFIG], python-config)
|
|
||||||
|
|
||||||
if test -n "$PYTHON_CONFIG" ; then
|
|
||||||
have_python_devel=yes
|
|
||||||
PYTHON_CFLAGS="`$PYTHON_CONFIG --cflags`"
|
|
||||||
PYTHON_LIBS="`$PYTHON_CONFIG --libs`"
|
|
||||||
AC_SUBST(PYTHON_CFLAGS)
|
|
||||||
AC_SUBST(PYTHON_LIBS)
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
])
|
])
|
||||||
|
|
||||||
AM_CONDITIONAL([HAVE_PYTHON], [test "$have_python" = "yes"])
|
AM_CONDITIONAL([HAVE_PYTHON], [test "$have_python" = "yes"])
|
||||||
|
|
||||||
|
AS_IF([test "x$with_python" != "xno"], [
|
||||||
|
AC_PATH_PROG(PYTHON_CONFIG, python${PYTHON_VERSION}-config)
|
||||||
|
AS_IF([test -n "$PYTHON_CONFIG"], [
|
||||||
|
have_python_devel=yes
|
||||||
|
PYTHON_CFLAGS="`$PYTHON_CONFIG --cflags`"
|
||||||
|
PYTHON_LIBS="`$PYTHON_CONFIG --ldflags`"
|
||||||
|
AC_SUBST(PYTHON_CFLAGS)
|
||||||
|
AC_SUBST(PYTHON_LIBS)
|
||||||
|
])
|
||||||
|
])
|
||||||
AM_CONDITIONAL([HAVE_PYTHON_DEVEL], [test "$have_python_devel" = "yes"])
|
AM_CONDITIONAL([HAVE_PYTHON_DEVEL], [test "$have_python_devel" = "yes"])
|
||||||
|
|
||||||
CC_CHECK_FLAGS_APPEND([with_cflags], [CFLAGS], [\
|
CC_CHECK_FLAGS_APPEND([with_cflags], [CFLAGS], [\
|
||||||
|
@ -877,4 +876,6 @@ AC_MSG_RESULT([
|
||||||
CFLAGS: ${OUR_CFLAGS} ${CFLAGS}
|
CFLAGS: ${OUR_CFLAGS} ${CFLAGS}
|
||||||
CPPLAGS: ${OUR_CPPFLAGS} ${CPPFLAGS}
|
CPPLAGS: ${OUR_CPPFLAGS} ${CPPFLAGS}
|
||||||
LDFLAGS: ${OUR_LDFLAGS} ${LDFLAGS}
|
LDFLAGS: ${OUR_LDFLAGS} ${LDFLAGS}
|
||||||
|
PYTHON_CFLAGS: ${PYTHON_CFLAGS}
|
||||||
|
PYTHON_LIBS: ${PYTHON_LIBS}
|
||||||
])
|
])
|
||||||
|
|
Loading…
Reference in New Issue