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

[jelmer at samba.org]

Author: jelmer
Date: 2008-01-05 14:00:07 +0000 (Sat, 05 Jan 2008)
New Revision: 26666

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

Log:
python: Prefer newer Python versions as they use const properly.

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	2008-01-05 13:59:53 UTC (rev 26665)
+++ branches/SAMBA_4_0/source/scripting/python/config.m4	2008-01-05 14:00:07 UTC (rev 26666)
@@ -13,7 +13,12 @@
 	AC_MSG_WARN([No python found])
 fi
 
-AC_PATH_PROG([PYTHON_CONFIG],[python[$PYTHON_VERSION]-config])
+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
+
 if test -z "$PYTHON_CONFIG"; then
 	working_python=no
 	AC_MSG_WARN([No python-config found])