[cig-commits] r17971 - cs/autoconf/trunk

[brad at geodynamics.org]

Author: brad
Date: 2011-02-24 09:22:51 -0800 (Thu, 24 Feb 2011)
New Revision: 17971

Modified:
   cs/autoconf/trunk/cit_python.m4
Log:
Improved version check for python module.

Modified: cs/autoconf/trunk/cit_python.m4
===================================================================
--- cs/autoconf/trunk/cit_python.m4	2011-02-24 16:51:14 UTC (rev 17970)
+++ cs/autoconf/trunk/cit_python.m4	2011-02-24 17:22:51 UTC (rev 17971)
@@ -442,14 +442,18 @@
   AC_MSG_CHECKING([for $1 version])
   [eval `$PYTHON -c "import $1; print $1.__version__" | sed 's/\([0-9]\{1,\}\)\.\([0-9]\{1,\}\)\.\([0-9]\{1,\}\)/avail_major=\1; avail_minor=\2; avail_patch=\3/'`]
   [eval `echo $2 | sed 's/\([0-9]\{1,\}\)\.\([0-9]\{1,\}\)\.\([0-9]\{1,\}\)/req_major=\1; req_minor=\2; req_patch=\3/' 2>/dev/null`]
-  if test $avail_major -lt $req_major ; then
-    AC_MSG_FAILURE([$1 version >= $2 is required. You have $avail_major.$avail_minor.$avail_patch.])
-  elif test $avail_major -eq $req_major -a $avail_minor -lt $req_minor; then
-    AC_MSG_FAILURE([$1 version >= $2 is required. You have $avail_major.$avail_minor.$avail_patch.])
-  elif test $avail_major -eq $req_major -a $avail_minor -eq $req_minor -a $avail_patch -lt $req_patch; then
-    AC_MSG_FAILURE([$1 version >= $2 is required. You have $avail_major.$avail_minor.$avail_patch.])
+  if test -n "$avail_major" -a -n "$avail_minor" -a -n "$avail_patch"; then
+    if test $avail_major -lt $req_major ; then
+      AC_MSG_FAILURE([$1 version >= $2 is required. You have $avail_major.$avail_minor.$avail_patch.])
+    elif test $avail_major -eq $req_major -a $avail_minor -lt $req_minor; then
+      AC_MSG_FAILURE([$1 version >= $2 is required. You have $avail_major.$avail_minor.$avail_patch.])
+    elif test $avail_major -eq $req_major -a $avail_minor -eq $req_minor -a $avail_patch -lt $req_patch; then
+      AC_MSG_FAILURE([$1 version >= $2 is required. You have $avail_major.$avail_minor.$avail_patch.])
+    else
+      AC_MSG_RESULT([$avail_major.$avail_minor.$avail_patch])
+    fi
   else
-    AC_MSG_RESULT([$avail_major.$avail_minor.$avail_patch])
+      AC_MSG_FAILURE([Could not determine version of module $1. Version >= $2 is required.])
   fi
 fi