[Crossfire-cvs] SF.net SVN: crossfire:[14033] server/trunk

[Crossfire C. r. messages. <cro...@li...>]

Revision: 14033
          http://crossfire.svn.sourceforge.net/crossfire/?rev=14033&view=rev
Author:   anmaster
Date:     2010-10-24 14:15:13 +0000 (Sun, 24 Oct 2010)

Log Message:
-----------
Enable Python 2.7 to be used. Prefer 3.1 over 3.0.

Modified Paths:
--------------
    server/trunk/ChangeLog
    server/trunk/macros/cf_python.m4

Modified: server/trunk/ChangeLog
===================================================================
--- server/trunk/ChangeLog	2010-10-24 14:06:28 UTC (rev 14032)
+++ server/trunk/ChangeLog	2010-10-24 14:15:13 UTC (rev 14033)
@@ -14,6 +14,9 @@
 else.  With this, include the file(s) that you changed.
 ------------------------------------------------------------------------------
 
+Enable Python 2.7 to be used. Prefer 3.1 over 3.0.
+Arvid Norlander 2010-10-24
+
 Remove 'Fontindex' type and use 'uint16', for coherence.
 Nicolas Weeger 2010-10-24
 

Modified: server/trunk/macros/cf_python.m4
===================================================================
--- server/trunk/macros/cf_python.m4	2010-10-24 14:06:28 UTC (rev 14032)
+++ server/trunk/macros/cf_python.m4	2010-10-24 14:15:13 UTC (rev 14033)
@@ -9,7 +9,7 @@
 	PY_INCLUDES=""
 	dir=""
 	if test "x$PYTHON_HOME" != "x"; then
-		for dir in $PYTHON_HOME/include/python{,2.6,2.5,2.4,3.0,3.1} ; do
+		for dir in $PYTHON_HOME/include/python{,2.7,2.6,2.5,2.4,3.1,3.0} ; do
 			AC_CHECK_HEADERS(["$dir/Python.h"],[cf_have_python_h=yes])
 			if test "x$cf_have_python_h" != "x" ; then
 				PY_INCLUDES="-I$dir"
@@ -20,7 +20,7 @@
 	else
 		AC_CHECK_HEADERS([Python.h],[cf_have_python_h=yes])
 		if test "x$cf_have_python_h" = "x"  ; then
-			for dir in  /usr{,/local}/include/python{,2.6,2.5,2.4,3.0,3.1} ; do
+			for dir in  /usr{,/local}/include/python{,2.7,2.6,2.5,2.4,3.1,3.0} ; do
 				AC_CHECK_HEADERS(["$dir/Python.h"],[cf_have_python_h=yes])
 				if test "x$cf_have_python_h" != "x" ; then
 					PY_INCLUDES="-I$dir"
@@ -64,7 +64,7 @@
 			fi
 
 		else
-			for lib in python{,2.6,2.5,2.4,3.0,3.1} ; do
+			for lib in python{,2.7,2.6,2.5,2.4,3.1,3.0} ; do
 				AC_CHECK_LIB($lib, PyArg_ParseTuple,[PYTHON_LIB="-l$lib"])
 				if test "x$PYTHON_LIB" != "x" ; then
 					break


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.