[cig-commits] r14180 - cs/cigma/trunk

[luis at geodynamics.org]

Author: luis
Date: 2009-03-02 08:31:58 -0800 (Mon, 02 Mar 2009)
New Revision: 14180

Modified:
   cs/cigma/trunk/configure.ac
Log:
Comment out checks for python (re-enable after release)

Modified: cs/cigma/trunk/configure.ac
===================================================================
--- cs/cigma/trunk/configure.ac	2009-03-02 16:31:56 UTC (rev 14179)
+++ cs/cigma/trunk/configure.ac	2009-03-02 16:31:58 UTC (rev 14180)
@@ -29,28 +29,28 @@
 
 
 dnl Check for Python
-AC_ARG_VAR(PYTHON, [Python interpreter])
-AC_ARG_VAR(PYTHONPATH, [Python module search path])
-AM_PATH_PYTHON(2.4, :)
-CIGMA_PYTHON_SYSCONFIG
-with_python="no"
-if test "$PYTHON" != ":"; then
-    with_python="yes"
-fi
-AM_CONDITIONAL([COND_PYTHON], [ test "$PYTHON" != : ])
+#AC_ARG_VAR(PYTHON, [Python interpreter])
+#AC_ARG_VAR(PYTHONPATH, [Python module search path])
+#AM_PATH_PYTHON(2.4, :)
+#CIGMA_PYTHON_SYSCONFIG
+#with_python="no"
+#if test "$PYTHON" != ":"; then
+#    with_python="yes"
+#fi
+#AM_CONDITIONAL([COND_PYTHON], [ test "$PYTHON" != : ])
 
 
 dnl Check for numpy
-if test "x${with_python}" = xyes; then
-    CIGMA_CHECK_NUMPY
-    if [ test "$PYTHON_NUMPY" != "1" ]; then
-        AC_MSG_ERROR([[Could not import the numpy python module. Please ensure it is installed correctly and is available in your PYTHONPATH]])
-    fi
-    CIGMA_PATH_NUMPY
-    if [ test -z "$PYTHON_INCDIR" ]; then
-        AC_MSG_ERROR([Could not find numpy include directory. Required for build.])
-    fi
-fi
+#if test "x${with_python}" = xyes; then
+#    CIGMA_CHECK_NUMPY
+#    if [ test "$PYTHON_NUMPY" != "1" ]; then
+#        AC_MSG_ERROR([[Could not import the numpy python module. Please ensure it is installed correctly and is available in your PYTHONPATH]])
+#    fi
+#    CIGMA_PATH_NUMPY
+#    if [ test -z "$PYTHON_INCDIR" ]; then
+#        AC_MSG_ERROR([Could not find numpy include directory. Required for build.])
+#    fi
+#fi
 
 
 dnl Configure Boost
@@ -62,13 +62,13 @@
 
 
 dnl Configure Boost.Python
-#if test "x${with_python}" = xyes; then
-#    CIGMA_BOOST_PYTHON
-#    if test -z "$BOOST_PYTHON_LIB"; then
-#        AC_MSG_ERROR([[boost::python could not be found. Please ensure that LDFLAGS is configured properly, or specify --with-boost]])
-#    fi
-#fi
-AM_CONDITIONAL([COND_BOOST_PYTHON], [test -n "$BOOST_PYTHON_LIB"])
+##if test "x${with_python}" = xyes; then
+##    CIGMA_BOOST_PYTHON
+##    if test -z "$BOOST_PYTHON_LIB"; then
+##        AC_MSG_ERROR([[boost::python could not be found. Please ensure that LDFLAGS is configured properly, or specify --with-boost]])
+##    fi
+##fi
+#AM_CONDITIONAL([COND_BOOST_PYTHON], [test -n "$BOOST_PYTHON_LIB"])
 
 dnl Check whether to use distutils (XXX: change default to yes)
 AC_ARG_WITH([distutils],
@@ -118,7 +118,7 @@
     [enable_testing="$enableval"],
     [enable_testing="yes"]
 )
-AM_CONDITIONAL([ENABLE_TESTING], [test "$enable_testing" = yes]) # XXX: not really needed?
+AM_CONDITIONAL([ENABLE_TESTING], [test "$enable_testing" = yes]) # XXX: do we need this automake conditional?
 
 
 dnl Configure CppUnit
@@ -159,16 +159,16 @@
 echo "- BOOST_SYSTEM_LIB          : $BOOST_SYSTEM_LIB"
 echo "- BOOST_FILESYSTEM_LIB      : $BOOST_FILESYSTEM_LIB"
 echo "- BOOST_PROGRAM_OPTIONS_LIB : $BOOST_PROGRAM_OPTIONS_LIB"
-echo "- BOOST_PYTHON_LIB          : $BOOST_PYTHON_LIB"
+#echo "- BOOST_PYTHON_LIB          : $BOOST_PYTHON_LIB"
 
 # Python flags
-echo "-"
-echo "- PYTHON               : $PYTHON"
-echo "- PYTHON_INCLUDES      : $PYTHON_INCLUDES"
-echo "- PYTHON_LIBS          : $PYTHON_LIBS"
-echo "- PYTHON_NUMPY         : $PYTHON_NUMPY"
-echo "- PYTHON_NUMPY_VERSION : $PYTHON_NUMPY_VERSION"
-echo "- NUMPY_INCLUDES       : $NUMPY_INCLUDES"
+#echo "-"
+#echo "- PYTHON               : $PYTHON"
+#echo "- PYTHON_INCLUDES      : $PYTHON_INCLUDES"
+#echo "- PYTHON_LIBS          : $PYTHON_LIBS"
+#echo "- PYTHON_NUMPY         : $PYTHON_NUMPY"
+#echo "- PYTHON_NUMPY_VERSION : $PYTHON_NUMPY_VERSION"
+#echo "- NUMPY_INCLUDES       : $NUMPY_INCLUDES"
 
 # HDF5 flags
 echo "-"