[cig-commits] r13590 - in cs/cigma/trunk: build build/tmp config

[luis at geodynamics.org]

Author: luis
Date: 2008-12-09 18:15:20 -0800 (Tue, 09 Dec 2008)
New Revision: 13590

Added:
   cs/cigma/trunk/build/tmp/
   cs/cigma/trunk/build/tmp/python_module.m4
Removed:
   cs/cigma/trunk/config/python_module.m4
Log:
Remove AC_CHECK_PYTHON_MODULE (incompatible with Autoconf 2.62)

Copied: cs/cigma/trunk/build/tmp/python_module.m4 (from rev 13589, cs/cigma/trunk/config/python_module.m4)
===================================================================
--- cs/cigma/trunk/build/tmp/python_module.m4	                        (rev 0)
+++ cs/cigma/trunk/build/tmp/python_module.m4	2008-12-10 02:15:20 UTC (rev 13590)
@@ -0,0 +1,62 @@
+# AC_CHECK_PYTHON_MODULE Autoconf macro, revision 0
+#
+# Copyright (C) 2008 Stephan Peijnik
+#
+# Copying and distribution of this file, with or without modification,         
+# are permitted in any medium without royalty provided the copyright notice    
+# and this notice are preserved.  
+#
+# Sources:
+#   http://www.sp.or.at/python_module.m4
+#   http://blog.sp.or.at/2008/08/31/autoconf-and-python-checking-for-modules/
+#
+AC_DEFUN([AC_CHECK_PYTHON_MODULE],[
+    # AC_CHECK_PYTHON_MODULE(MODULE_NAME [,VERSION_VARIABLE])
+
+    # the python module name
+    MODULE_NAME=$1
+    # the python variable that contains the module's version
+    # If this is not set the version will not be retrieved from the module.
+    # Example: __version__.
+    VERSION_VARIABLE=$1.$2
+
+    # check for the python binary defined in $PYTHON
+    # fall back to "python"
+    if test -z $PYTHON;
+    then
+        PYTHON="python"
+    fi
+
+    AC_MSG_CHECKING(for python module $MODULE_NAME)
+
+    if test -z "$2"
+    then
+      $PYTHON -c "import $MODULE_NAME" 2>/dev/null
+      if test $? -eq 0
+      then
+        eval PYTHON_${MODULE_NAME}=1
+        AC_MSG_RESULT(found)
+       else
+        eval PYTHON_${MODULE_NAME}=0
+        AC_MSG_RESULT(not found)
+      fi
+      AC_SUBST(PYTHON_${MODULE_NAME})
+    else
+      VERSION=`$PYTHON -c "import $MODULE_NAME; print $VERSION_VARIABLE" 2>/dev/null`
+      if test $? -eq 0
+      then
+        eval PYTHON_${MODULE_NAME}_VERSION=$VERSION
+        eval PYTHON_${MODULE_NAME}=1
+
+        AC_MSG_RESULT([found ($VERSION)])
+      else
+        eval PYTHON_${MODULE_NAME}=0
+        eval PYTHON_${MODULE_NAME}_VERSION=0
+
+        AC_MSG_RESULT(not found)
+      fi
+      AC_SUBST(PYTHON_${MODULE_NAME_VERSION})
+      AC_SUBST(PYTHON_${MODULE_NAME})
+    fi
+])
+# vim: syntax=config foldmethod=marker

Deleted: cs/cigma/trunk/config/python_module.m4
===================================================================
--- cs/cigma/trunk/config/python_module.m4	2008-12-10 02:15:18 UTC (rev 13589)
+++ cs/cigma/trunk/config/python_module.m4	2008-12-10 02:15:20 UTC (rev 13590)
@@ -1,62 +0,0 @@
-# AC_CHECK_PYTHON_MODULE Autoconf macro, revision 0
-#
-# Copyright (C) 2008 Stephan Peijnik
-#
-# Copying and distribution of this file, with or without modification,         
-# are permitted in any medium without royalty provided the copyright notice    
-# and this notice are preserved.  
-#
-# Sources:
-#   http://www.sp.or.at/python_module.m4
-#   http://blog.sp.or.at/2008/08/31/autoconf-and-python-checking-for-modules/
-#
-AC_DEFUN([AC_CHECK_PYTHON_MODULE],[
-    # AC_CHECK_PYTHON_MODULE(MODULE_NAME [,VERSION_VARIABLE])
-
-    # the python module name
-    MODULE_NAME=$1
-    # the python variable that contains the module's version
-    # If this is not set the version will not be retrieved from the module.
-    # Example: __version__.
-    VERSION_VARIABLE=$1.$2
-
-    # check for the python binary defined in $PYTHON
-    # fall back to "python"
-    if test -z $PYTHON;
-    then
-        PYTHON="python"
-    fi
-
-    AC_MSG_CHECKING(for python module $MODULE_NAME)
-
-    if test -z "$2"
-    then
-      $PYTHON -c "import $MODULE_NAME" 2>/dev/null
-      if test $? -eq 0
-      then
-        eval PYTHON_${MODULE_NAME}=1
-        AC_MSG_RESULT(found)
-       else
-        eval PYTHON_${MODULE_NAME}=0
-        AC_MSG_RESULT(not found)
-      fi
-      AC_SUBST(PYTHON_${MODULE_NAME})
-    else
-      VERSION=`$PYTHON -c "import $MODULE_NAME; print $VERSION_VARIABLE" 2>/dev/null`
-      if test $? -eq 0
-      then
-        eval PYTHON_${MODULE_NAME}_VERSION=$VERSION
-        eval PYTHON_${MODULE_NAME}=1
-
-        AC_MSG_RESULT([found ($VERSION)])
-      else
-        eval PYTHON_${MODULE_NAME}=0
-        eval PYTHON_${MODULE_NAME}_VERSION=0
-
-        AC_MSG_RESULT(not found)
-      fi
-      AC_SUBST(PYTHON_${MODULE_NAME_VERSION})
-      AC_SUBST(PYTHON_${MODULE_NAME})
-    fi
-])
-# vim: syntax=config foldmethod=marker