[Synce-cvslog] SF.net SVN: synce:[3631] trunk/librapi2

[<mar...@us...>]

Revision: 3631
          http://synce.svn.sourceforge.net/synce/?rev=3631&view=rev
Author:   mark_ellis
Date:     2008-12-18 10:27:57 +0000 (Thu, 18 Dec 2008)

Log Message:
-----------
require at least python 2.3, pyrex doesn't support 2.2; check pyrex version when python > 2.4

Modified Paths:
--------------
    trunk/librapi2/ChangeLog
    trunk/librapi2/configure.ac.in

Modified: trunk/librapi2/ChangeLog
===================================================================
--- trunk/librapi2/ChangeLog	2008-12-16 15:01:00 UTC (rev 3630)
+++ trunk/librapi2/ChangeLog	2008-12-18 10:27:57 UTC (rev 3631)
@@ -1,3 +1,8 @@
+2008-12-18  Mark Ellis  <ma...@mp...>
+
+	* configure.ac.in - require at least python 2.3, pyrex doesn't
+	  support 2.2; check pyrex version when python > 2.4
+
 2008-10-29  Mark Ellis  <ma...@mp...>
 
 	* python/pyrapi2.pyx - enhance RAPIError exception, add error

Modified: trunk/librapi2/configure.ac.in
===================================================================
--- trunk/librapi2/configure.ac.in	2008-12-16 15:01:00 UTC (rev 3630)
+++ trunk/librapi2/configure.ac.in	2008-12-18 10:27:57 UTC (rev 3631)
@@ -80,7 +80,7 @@
         minimum_version=$enable_python
 	enable_python=yes
     else
-        minimum_version=2.2
+        minimum_version=2.3
     fi
 	AM_PATH_PYTHON($minimum_version, [have_python_path=yes], [have_python_path=no] )
 	AC_CHECK_PROGS(PYREX, pyrexc)
@@ -102,7 +102,33 @@
 	    if test x$have_python = xno ; then
 	        if test x$enable_python = xyes ; then
 	            AC_MSG_ERROR([Building python explicitly requested, but can't build python bindings])
+		else
+		    AC_MSG_NOTICE([Not building Python bindings])
 	        fi
+	    else
+
+dnl # python 2.5 requires at least pyrex 0.9.6
+
+	    	`echo "$PYTHON_VERSION" | awk 'BEGIN { FS = "."; } { printf "export python_maj_ver=%s export python_min_ver=%s", $1, $2;}'`
+
+		if test "$python_maj_ver" -gt 2 || ( test "$python_maj_ver" -gt 1 && test "$python_min_ver" -gt 4 ); then
+		    AC_MSG_CHECKING([pyrex version])
+
+		    pyrex_ver=`$PYREX --version 2>&1 | sed -e 's/Pyrex version //'`
+	    	    `echo "$pyrex_ver" | awk 'BEGIN { FS = "."; } { printf "export pyrex_maj_ver=%s export pyrex_min_ver=%s export pyrex_sub_ver=%s", $1, $2, $3;}'`
+
+    		    if test "$pyrex_min_ver" -lt 9 || test "$pyrex_sub_ver" -lt 6 ; then
+		        AC_MSG_RESULT([$pyrex_ver])
+	        	if test x$enable_python = xyes ; then
+	            	   AC_MSG_ERROR([Building python explicitly requested, but can't build python bindings, need at least pyrex 0.9.6])
+			else
+			   AC_MSG_NOTICE([Not building Python bindings, need at least pyrex 0.9.6])
+			   have_python=no
+	        	fi
+    		    else
+			AC_MSG_RESULT([ok])
+    		    fi
+		fi
 	    fi
 	fi
 fi


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