svn commit: samba r26411 - in branches/SAMBA_4_0: . source/scripting/python

[jelmer at samba.org]

Author: jelmer
Date: 2007-12-12 03:02:18 +0000 (Wed, 12 Dec 2007)
New Revision: 26411

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26411

Log:
Double check Python installation - make sure we can compile and link using it.
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/scripting/python/config.m4


Changeset:

Property changes on: branches/SAMBA_4_0
___________________________________________________________________
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...

Modified: branches/SAMBA_4_0/source/scripting/python/config.m4
===================================================================
--- branches/SAMBA_4_0/source/scripting/python/config.m4	2007-12-12 02:15:42 UTC (rev 26410)
+++ branches/SAMBA_4_0/source/scripting/python/config.m4	2007-12-12 03:02:18 UTC (rev 26411)
@@ -119,9 +119,23 @@
 
 SMB_EXT_LIB(LIBPYTHON, [$PYTHON_LDFLAGS], [$PYTHON_CPPFLAGS])
 
+
 if test x$working_python = xyes
 then
-	SMB_ENABLE(LIBPYTHON,YES)
+	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)],
+		[SMB_ENABLE(LIBPYTHON,NO)])
+
+	LIBS="$ac_save_LIBS"
+	CFLAGS="$ac_save_CFLAGS"
 else
 	SMB_ENABLE(LIBPYTHON,NO)
 fi