Simplified Python build variables setup by using pythonX.Y-config directly, where possible

This commit is contained in:
Karl Trygve Kalleberg
2014-01-11 01:34:03 +01:00
parent 5979ac5836
commit 2d403eb3fd
+6 -37
View File
@@ -21,44 +21,13 @@ if echo $CC | grep -q "gcc"; then
fi
AM_PATH_PYTHON([2.6],, [AC_ERROR([Python is required])])
PYTHON_PREFIX=$($PYTHON -c 'import sys; print(sys.prefix)')
PYTHON_EXEC_PREFIX=$($PYTHON -c 'import sys; print(sys.exec_prefix)')
PYTHON_CONFIG=${PYTHON}-config
PYTHON_PREFIX=$($PYTHON_CONFIG --prefix)
PYTHON_EXEC_PREFIX=$($PYTHON_CONFIG --exec-prefix)
PYTHON_ABIFLAGS=$($PYTHON -c 'import sys; print(getattr(sys, "abiflags", ""))')
PYTHON_CFLAGS=""
PYTHON_LDFLAGS=""
PYTHON_LIBS=""
AC_DEFUN([ADD_PYTHON_INCDIR], [
if [[ -d "$1" ]]; then
PYTHON_CFLAGS="-I\"$1\" $PYTHON_CFLAGS"
fi
])
AC_DEFUN([ADD_PYTHON_LIBDIR], [
if [[ -d "$1" ]]; then
PYTHON_LIBS="-L\"$1\" $PYTHON_LIBS"
fi
])
ADD_PYTHON_INCDIR([${PYTHON_PREFIX}/include/python${PYTHON_VERSION}${PYTHON_ABIFLAGS}/])
ADD_PYTHON_LIBDIR([${PYTHON_PREFIX}/lib/])
ADD_PYTHON_LIBDIR([${PYTHON_PREFIX}/lib/python${PYTHON_VERSION}/config/])
ADD_PYTHON_LIBDIR([${PYTHON_PREFIX}/lib/python${PYTHON_VERSION}/config-${PYTHON_VERSION}${PYTHON_ABIFLAGS}/])
if [[ "$PYTHON_EXEC_PREFIX" != "$PYTHON_PREFIX" ]]; then
ADD_PYTHON_INCDIR([${PYTHON_EXEC_PREFIX}/include/python${PYTHON_VERSION}${PYTHON_ABIFLAGS}/])
ADD_PYTHON_LIBDIR([${PYTHON_EXEC_PREFIX}/lib/])
ADD_PYTHON_LIBDIR([${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/config/])
ADD_PYTHON_LIBDIR([${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/config-${PYTHON_VERSION}${PYTHON_ABIFLAGS}/])
fi
PYTHON_LIBS="$PYTHON_LIBS $($PYTHON -c ["result = None
try:
import sysconfig
lib = sysconfig.get_config_var('PY3LIBRARY')
if lib is not None and len(lib) > 0:
result = '-lpython3'
except:
pass
if result is None:
result = '-lpython${PYTHON_VERSION}${PYTHON_ABIFLAGS}'
print(result)
"])"
PYTHON_CFLAGS=$($PYTHON_CONFIG --cflags)
PYTHON_LDFLAGS=$($PYTHON_CONFIG --ldflags)
PYTHON_LIBS=$($PYTHON_CONFIG --libs)
AC_SUBST(PYTHON_CFLAGS)
AC_SUBST(PYTHON_LDFLAGS)