Ticket #39263: configure.ac.diff

configure.ac

@@ -436 +436 @@
         #verify the python installation
         AM_PATH_PYTHON(,[PYTHON_FOUND=true],[PYTHON_FOUND=false])
         if test "x$PYTHON_FOUND" = xtrue ; then
-                PYTHON_CPPFLAGS=
-                PYTHON_LDFLAGS=
-                AX_PYTHON_DEVEL
-                if test "x$PYTHON" = x ; then
+                AC_MSG_CHECKING([for Python include path])
+                PYTHON_CPPFLAGS="$CFLAGS `$PYTHON-config --cflags`"
+                AC_MSG_RESULT([$PYTHON_CPPFLAGS])
+                AC_MSG_CHECKING([for Python linker flags])
+                PYTHON_LDFLAGS="$LDFLAGS `$PYTHON-config --ldflags`"
+                AC_MSG_RESULT([$PYTHON_LDFLAGS])
+                if test "x$PYTHON_LDFLAGS" = x ; then
                         if test "x$enable_python" = xyes ; then
                                 AC_MSG_ERROR([Incomplete python development package])
                         else
@@ -448 +451 @@
                         VALID_PYTHON=no
                 else
                         VALID_PYTHON=yes
+                        AC_SUBST(PYTHON_LDFLAGS)
+                        AC_SUBST(PYTHON_CPPFLAGS)
                 fi
 
         fi
@@ -465 +470 @@
 #echo "PYTHON_LIBS_FIXED: $PYTHON_LIBS_FIXED"
 
 if test "x$enable_python_integration" = xyes ; then
-        pythondir=$PYTHON_SITE_PKG
-        pyexecdir=$PYTHON_SITE_PKG_EXEC
+        pythondir=`$PYTHON -c "import distutils.sysconfig; \
+                        print (distutils.sysconfig.get_python_lib(0,0));"`
+        pyexecdir=`$PYTHON -c "import distutils.sysconfig; \
+                        print (distutils.sysconfig.get_python_lib(1,0));"`
 fi
 
 AC_SUBST(PYTHON_INCLUDE_FIXED)