[cig-commits] r13595 - cs/cigma/trunk/config

[luis at geodynamics.org]

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

Removed:
   cs/cigma/trunk/config/check_numpy.m4
Modified:
   cs/cigma/trunk/config/cigma_python.m4
Log:
Configure python & numpy

Deleted: cs/cigma/trunk/config/check_numpy.m4
===================================================================
--- cs/cigma/trunk/config/check_numpy.m4	2008-12-10 02:15:26 UTC (rev 13594)
+++ cs/cigma/trunk/config/check_numpy.m4	2008-12-10 02:15:27 UTC (rev 13595)
@@ -1,43 +0,0 @@
-# AC_CHECK_PYTHON_NUMPY
-#
-# Based on http://www.sp.or.at/python_module.m4
-
-#
-# AC_CHECK_PYTHON_NUMPY([VERSION_VARIABLE])
-#
-AC_DEFUN([AC_CHECK_PYTHON_NUMPY],[
-    # 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 numpy)
-
-    if test -z "$1"; then
-        $PYTHON -c "import numpy" 2>/dev/null
-        if test $? -eq 0; then
-            PYTHON_NUMPY=1
-            AC_MSG_RESULT(found)
-        else
-            PYTHON_NUMPY=0
-            AC_MSG_RESULT(not found)
-        fi
-        AC_SUBST(PYTHON_NUMPY)
-    else
-        VERSION=`$PYTHON -c "import numpy; print numpy.__version__" 2>/dev/null`
-        if test $? -eq 0; then
-            PYTHON_NUMPY=1
-            PYTHON_NUMPY_VERSION=$VERSION
-            AC_MSG_RESULT([found ($VERSION)])
-        else
-            PYTHON_NUMPY=0
-            PYTHON_NUMPY_VERSION=0
-            AC_MSG_RESULT(not found)
-        fi
-        AC_SUBST(PYTHON_NUMPY)
-        AC_SUBST(PYTHON_NUMPY_VERSION)
-    fi
-])
-
-# vim: syntax=config foldmethod=marker

Modified: cs/cigma/trunk/config/cigma_python.m4
===================================================================
--- cs/cigma/trunk/config/cigma_python.m4	2008-12-10 02:15:26 UTC (rev 13594)
+++ cs/cigma/trunk/config/cigma_python.m4	2008-12-10 02:15:27 UTC (rev 13595)
@@ -3,8 +3,57 @@
 #
 #
 
+
 ##############################################################################
 #
+# CIGMA_PYTHON_INCDIR
+#
+# Determine the directory containing <Python.h> using distutils.
+AC_DEFUN([CIGMA_PYTHON_INCDIR],[
+
+    AC_REQUIRE([AM_PATH_PYTHON])
+
+    AC_CACHE_CHECK(
+        [for $am_display_PYTHON include directory],
+        [PYTHON_INCDIR],
+        [PYTHON_INCDIR=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_inc()" 2>/dev/null ||
+         echo "$PYTHON_PREFIX/include/python$PYTHON_VERSION"`])
+
+    AC_SUBST([PYTHON_INCDIR])
+])
+
+##############################################################################
+#
+# CIGMA_CHECK_NUMPY
+#
+AC_DEFUN([CIGMA_CHECK_NUMPY],[
+
+    AC_REQUIRE([AM_PATH_PYTHON])
+
+    # 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 numpy)
+
+    VERSION=`$PYTHON -c "import numpy; print numpy.__version__" 2>/dev/null`
+    if test $? -eq 0; then
+        PYTHON_NUMPY=1
+        PYTHON_NUMPY_VERSION=$VERSION
+        AC_MSG_RESULT([found ($VERSION)])
+    else
+        PYTHON_NUMPY=0
+        PYTHON_NUMPY_VERSION=0
+        AC_MSG_RESULT(not found)
+    fi
+    AC_SUBST([PYTHON_NUMPY])
+    AC_SUBST([PYTHON_NUMPY_VERSION])
+])
+
+##############################################################################
+#
 # CIGMA_PATH_NUMPY
 #
 # Determine the directory containing <numpy/arrayobject.h>
@@ -13,24 +62,23 @@
 
     AC_REQUIRE([AM_PATH_PYTHON])
 
-    #AC_MSG_CHECKING([for $am_display_PYTHON numpy include directory])
+    AC_MSG_CHECKING([for $am_display_PYTHON numpy include directory])
 
     NUMPY_INCDIR=`$PYTHON -c "import numpy; print numpy.get_include()" 2>/dev/null`
     if [[ -n "$NUMPY_INCDIR" ]]; then
-        AC_CHECK_FILE([$NUMPY_INCDIR/numpy/arrayobject.h])
-        #AC_CHECK_FILE([$NUMPY_INCDIR/numpy/arrayobject.h], [numpyFound="OK"])
-        #if [[ -n "$numpyFound" ]]; then
-        #    AC_MSG_RESULT([yes])
-        #else
-        #    AC_MSG_RESULT([no])
-        #fi
-    #else
-    #    AC_MSG_RESULT([no])
+        #AC_CHECK_FILE([$NUMPY_INCDIR/numpy/arrayobject.h])
+        AC_CHECK_FILE([$NUMPY_INCDIR/numpy/arrayobject.h], [numpyFound="OK"])
+        if [[ -n "$numpyFound" ]]; then
+            AC_MSG_RESULT([yes])
+        else
+            AC_MSG_RESULT([no])
+        fi
+    else
+        AC_MSG_RESULT([no])
     fi
 
     NUMPY_INCLUDES="-I${NUMPY_INCDIR}"
-    AC_SUBST([NUMPY_INCLUDES], [$NUMPY_INCLUDES])
-
+    AC_SUBST([NUMPY_INCLUDES])
 ])