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

jelmer at samba.org jelmer at samba.org
Tue Dec 25 16:36:50 GMT 2007


Author: jelmer
Date: 2007-12-25 16:36:50 +0000 (Tue, 25 Dec 2007)
New Revision: 26597

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

Log:
Attempt to provide alternative for hosts that don't have python-config.
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-25 16:36:44 UTC (rev 26596)
+++ branches/SAMBA_4_0/source/scripting/python/config.m4	2007-12-25 16:36:50 UTC (rev 26597)
@@ -19,10 +19,16 @@
 	AC_MSG_WARN([No python-config found])
 else
 	working_python=yes
+	PYTHON_LDFLAGS=`$PYTHON_CONFIG --ldflags`
+	PYTHON_CFLAGS=`$PYTHON_CONFIG --cflags`
 fi
 
-PYTHON_LDFLAGS=`$PYTHON_CONFIG --ldflags`
-PYTHON_CFLAGS=`$PYTHON_CONFIG --cflags`
+if test $working_python = no && 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
+fi
 
 SMB_EXT_LIB(EXT_LIB_PYTHON, [$PYTHON_LDFLAGS], [$PYTHON_CFLAGS])
 



More information about the samba-cvs mailing list