summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-01-13 04:17:04 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-01-13 04:17:04 +0100
commitc264fb4bde955ede94b82b5e98308553ecab93f2 (patch)
tree18df1371f2cbe3a531e2a5315c36d3e15ec2bdf5
parent53c33aa2b42732304f247798a4dbe3bcae14e407 (diff)
downloadsamba-c264fb4bde955ede94b82b5e98308553ecab93f2.tar.gz
samba-c264fb4bde955ede94b82b5e98308553ecab93f2.tar.bz2
samba-c264fb4bde955ede94b82b5e98308553ecab93f2.zip
python: Try more possible flags.
The flags returned by python-config may be for gcc and may not work for other compilers. (This used to be commit 1fbc3a9f47a33f785d935e39345021d9ca455bb9)
-rw-r--r--source4/scripting/python/config.m465
1 files changed, 34 insertions, 31 deletions
diff --git a/source4/scripting/python/config.m4 b/source4/scripting/python/config.m4
index 326cef8440..6cf667a338 100644
--- a/source4/scripting/python/config.m4
+++ b/source4/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
+