The branch, v4-0-test has been updated
via 1fbc3a9f47a33f785d935e39345021d9ca455bb9 (commit)
from dec3f421be5d7fd4ead3b71f8b69921c41bad39a (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v4-0-test
- Log -----------------------------------------------------------------
commit 1fbc3a9f47a33f785d935e39345021d9ca455bb9
Author: Jelmer Vernooij <[EMAIL PROTECTED]>
Date: Sun Jan 13 04:17:04 2008 +0100
python: Try more possible flags.
The flags returned by python-config may be for gcc and may not work for
other compilers.
-----------------------------------------------------------------------
Summary of changes:
source/scripting/python/config.m4 | 65 +++++++++++++++++++-----------------
1 files changed, 34 insertions(+), 31 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source/scripting/python/config.m4
b/source/scripting/python/config.m4
index 326cef8..6cf667a 100644
--- a/source/scripting/python/config.m4
+++ b/source/scripting/python/config.m4
@@ -13,6 +13,30 @@ if test -z "$PYTHON"; then
AC_MSG_WARN([No python found])
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
+])
+
+
if test -z "$PYTHON_VERSION"; then
AC_PATH_PROGS([PYTHON_CONFIG], [python2.6-config python2.5-config
python2.4-config python-config])
else
@@ -23,50 +47,29 @@ if test -z "$PYTHON_CONFIG"; then
working_python=no
AC_MSG_WARN([No python-config found])
else
- working_python=yes
- PYTHON_LDFLAGS=`$PYTHON_CONFIG --ldflags`
- PYTHON_CFLAGS=`$PYTHON_CONFIG --cflags`
+ TRY_LINK_PYTHON([`$PYTHON_CONFIG --ldflags`], [`$PYTHON_CONFIG
--includes`])
+ TRY_LINK_PYTHON([`$PYTHON_CONFIG --ldflags`], [`$PYTHON_CONFIG
--cflags`])
fi
-if test $working_python = no && test x$PYTHON != x
+if test x$PYTHON != x
then
PYTHON_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'))"`
PYTHON_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'))"`
- working_python=yes
+ TRY_LINK_PYTHON($PYTHON_LDFLAGS, $PYTHON_CFLAGS)
fi
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_CFLAGS"
-
- AC_TRY_LINK([
- #include <Python.h>
- #include <stdlib.h>
- ],[
- Py_InitModule(NULL, NULL);
- ],[
- SMB_ENABLE(EXT_LIB_PYTHON,YES)
- SMB_ENABLE(smbpython,YES)
- SMB_ENABLE(LIBPYTHON,YES)
- AC_MSG_RESULT([yes])
- ],[
- SMB_ENABLE(EXT_LIB_PYTHON,NO)
- SMB_ENABLE(LIBPYTHON,NO)
- SMB_ENABLE(smbpython,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_MSG_RESULT([yes])
else
SMB_ENABLE(EXT_LIB_PYTHON,NO)
SMB_ENABLE(LIBPYTHONyy,NO)
SMB_ENABLE(smbpython,NO)
AC_MSG_RESULT([no])
fi
+
--
Samba Shared Repository
