From 2d403eb3fdaeb0b5a15641b877d5ad87198e46d9 Mon Sep 17 00:00:00 2001
From: Karl Trygve Kalleberg <karltk@boblycat.org>
Date: Sat, 11 Jan 2014 01:34:03 +0100
Subject: [PATCH] Simplified Python build variables setup by using
 pythonX.Y-config directly, where possible

---
 configure.ac | 43 ++++++-------------------------------------
 1 file changed, 6 insertions(+), 37 deletions(-)

diff --git a/configure.ac b/configure.ac
index 6c3eba2..93fb3fe 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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)