Merge branch 'v4-0-trivial' into v4-0-python
[ira/wip.git] / source / scripting / python / config.m4
index 8c4225175ef249a98f85e17d0191384f952ecaff..1f03ec8e345f09546d2a55f9ccc69725d7b2fef9 100644 (file)
@@ -13,137 +13,62 @@ if test -z "$PYTHON"; then
        AC_MSG_WARN([No python found])
 fi
 
-#
-# Check for a version of Python >= 2.1.0
-#
-AC_MSG_CHECKING([for a version of Python >= '2.1.0'])
-ac_supports_python_ver=`$PYTHON -c "import sys, string; \
-       ver = string.split(sys.version)[[0]]; \
-       print ver >= '2.1.0'"`
-if test "$ac_supports_python_ver" != "True"; then
-       working_python=no
-       AC_MSG_RESULT([no])
-else 
-       AC_MSG_RESULT([yes])
-fi
-
-#
-# Check if you have distutils, else fail
-#
-AC_MSG_CHECKING([for the distutils Python package])
-ac_distutils_result=`$PYTHON -c "import distutils" 2>&1`
-if test -z "$ac_distutils_result"; then
-       AC_MSG_RESULT([yes])
-       working_python=yes
-else
-       AC_MSG_RESULT([no])
-       working_python=no
-fi
-
-#
-# Check for Python include path
-#
-AC_MSG_CHECKING([for Python include path])
-if test -z "$PYTHON_CPPFLAGS"; then
-       python_path=`$PYTHON -c "import distutils.sysconfig; \
-                       print distutils.sysconfig.get_python_inc();"`
-       if test -n "${python_path}"; then
-               python_path="-I$python_path"
-       fi
-       PYTHON_CPPFLAGS=$python_path
-fi
-AC_MSG_RESULT([$PYTHON_CPPFLAGS])
-AC_SUBST([PYTHON_CPPFLAGS])
-
-#
-# Check for Python library path
-#
-AC_MSG_CHECKING([for Python library path])
-if test -z "$PYTHON_LDFLAGS"; then
-       # (makes two attempts to ensure we've got a version number
-       # from the interpreter)
-       py_version=`$PYTHON -c "from distutils.sysconfig import *; \
-               from string import join; \
-               print join(get_config_vars('VERSION'))"`
-       if test "$py_version" == "[None]"; then
-               if test -n "$PYTHON_VERSION"; then
-                       py_version=$PYTHON_VERSION
-               else
-                       py_version=`$PYTHON -c "import sys; \
-                               print sys.version[[:3]]"`
-               fi
+AC_DEFUN([TRY_LINK_PYTHON],
+[
+       if test $working_python = no; then
+               ac_save_LIBS="$LIBS"
+               ac_save_CFLAGS="$CFLAGS"
+               LIBS="$LIBS $1"
+               CFLAGS="$CFLAGS $2"
+
+               AC_TRY_LINK([
+                               #include <Python.h>
+                               #include <stdlib.h>
+                       ],[
+                               Py_InitModule(NULL, NULL);
+                       ],[
+                               PYTHON_LDFLAGS="$1"
+                               PYTHON_CFLAGS="$2"
+                               working_python=yes
+                       ])
+               LIBS="$ac_save_LIBS"
+               CFLAGS="$ac_save_CFLAGS"
        fi
+])
 
-       PYTHON_LDFLAGS=`$PYTHON -c "from distutils.sysconfig import *; \
-               from string import join; \
-               print '-L' + get_python_lib(0,1), \
-                       '-lpython';"`$py_version
-fi             
-AC_MSG_RESULT([$PYTHON_LDFLAGS])
-AC_SUBST([PYTHON_LDFLAGS])
+dnl assume no working python
+working_python=no
 
-#
-# Check for site packages
-#
-AC_MSG_CHECKING([for Python site-packages path])
-if test -z "$PYTHON_SITE_PKG"; then
-       PYTHON_SITE_PKG=`$PYTHON -c "import distutils.sysconfig; \
-                       print distutils.sysconfig.get_python_lib(0,0);"`
+if test -z "$PYTHON_VERSION"; then 
+       AC_PATH_PROGS([PYTHON_CONFIG], [python2.6-config python2.5-config python2.4-config python-config])
+else 
+       AC_PATH_PROG([PYTHON_CONFIG], [python[$PYTHON_VERSION]-config])
 fi
-AC_MSG_RESULT([$PYTHON_SITE_PKG])
-AC_SUBST([PYTHON_SITE_PKG])
 
-#
-# libraries which must be linked in when embedding
-#
-AC_MSG_CHECKING(python extra libraries)
-if test -z "$PYTHON_EXTRA_LIBS"; then
-   PYTHON_EXTRA_LIBS=`$PYTHON -c "import distutils.sysconfig; \
-                       conf = distutils.sysconfig.get_config_var; \
-                       print conf('LOCALMODLIBS'), conf('LIBS')"`
+if test -z "$PYTHON_CONFIG"; then
+       AC_MSG_WARN([No python-config found])
+else
+       TRY_LINK_PYTHON([`$PYTHON_CONFIG --ldflags`], [`$PYTHON_CONFIG --includes`])
+       TRY_LINK_PYTHON([`$PYTHON_CONFIG --ldflags`], [`$PYTHON_CONFIG --cflags`])
 fi
-AC_MSG_RESULT([$PYTHON_EXTRA_LIBS])
-AC_SUBST(PYTHON_EXTRA_LIBS)
 
-#
-# linking flags needed when embedding
-#
-AC_MSG_CHECKING(python extra linking flags)
-if test -z "$PYTHON_EXTRA_LDFLAGS"; then
-       PYTHON_EXTRA_LDFLAGS=`$PYTHON -c "import distutils.sysconfig; \
-               conf = distutils.sysconfig.get_config_var; \
-               print conf('LINKFORSHARED')"`
+if test x$PYTHON != x
+then
+       DISTUTILS_CFLAGS=`$PYTHON -c "from distutils import sysconfig; print '-I%s -I%s %s' % (sysconfig.get_python_inc(), sysconfig.get_python_inc(plat_specific=True), sysconfig.get_config_var('CFLAGS'))"`
+       DISTUTILS_LDFLAGS=`$PYTHON -c "from distutils import sysconfig; print '%s %s -lpython%s -L%s' % (sysconfig.get_config_var('LIBS'), sysconfig.get_config_var('SYSLIBS'), sysconfig.get_config_var('VERSION'), sysconfig.get_config_var('LIBPL'))"`
+       TRY_LINK_PYTHON($DISTUTILS_LDFLAGS, $DISTUTILS_CFLAGS)
 fi
-AC_MSG_RESULT([$PYTHON_EXTRA_LDFLAGS])
-AC_SUBST(PYTHON_EXTRA_LDFLAGS)
-
-SMB_EXT_LIB(LIBPYTHON, [$PYTHON_LDFLAGS], [$PYTHON_CPPFLAGS])
 
+SMB_EXT_LIB(EXT_LIB_PYTHON, [$PYTHON_LDFLAGS], [$PYTHON_CFLAGS])
 
 AC_MSG_CHECKING(working python module support)
-if test x$working_python = xyes
-then
-       ac_save_LIBS="$LIBS"
-       ac_save_CFLAGS="$CFLAGS"
-       LIBS="$LIBS $PYTHON_LDFLAGS"
-       CFLAGS="$CFLAGS $PYTHON_CPPFLAGS"
-
-       AC_TRY_LINK([
-                       #include <Python.h>
-                       #include <stdlib.h>
-               ],[
-                       Py_InitModule(NULL, NULL);
-               ],[
-                       SMB_ENABLE(LIBPYTHON,YES)
-                       AC_MSG_RESULT([yes])
-               ],[
-                       SMB_ENABLE(LIBPYTHON,NO)
-                       AC_MSG_RESULT([no])
-               ])
-
-       LIBS="$ac_save_LIBS"
-       CFLAGS="$ac_save_CFLAGS"
+if test $working_python = yes; then
+       SMB_ENABLE(EXT_LIB_PYTHON,YES)
+       SMB_ENABLE(smbpython,YES)
+       SMB_ENABLE(LIBPYTHON,YES)
+       AC_DEFINE(HAVE_WORKING_PYTHON, 1, [Whether we have working python support])
+       AC_MSG_RESULT([yes])
 else
-       SMB_ENABLE(LIBPYTHON,NO)
-       AC_MSG_RESULT([no])
+       AC_MSG_ERROR([Python not found. Please install Python 2.x and its development headers/libraries.])
 fi
+