[cig-commits] r19388 - mc/3D/CitcomS/trunk

[tan2 at geodynamics.org]

Author: tan2
Date: 2012-01-19 11:24:59 -0800 (Thu, 19 Jan 2012)
New Revision: 19388

Modified:
   mc/3D/CitcomS/trunk/configure.ac
Log:
Stop configure if pyre is enabled and python 2.7 is used. See Issue622.


Modified: mc/3D/CitcomS/trunk/configure.ac
===================================================================
--- mc/3D/CitcomS/trunk/configure.ac	2012-01-19 17:07:17 UTC (rev 19387)
+++ mc/3D/CitcomS/trunk/configure.ac	2012-01-19 19:24:59 UTC (rev 19388)
@@ -84,31 +84,27 @@
     # Check for Python modules and packages.
     export want_exchanger
 
-    # merlin's install_deps command is incompatible with python 2.7
+    # merlin is incompatible with python 2.7
     if test "$PYTHON_VERSION" = 2.7; then
-        # Check for presence of pythia .egg or .tar.gz files
-	if ls $cit_builddir/deps/pythia-0.8.1.* 2>&1 > /dev/null; then
-	    echo -e "Found Pythia package."
-	else
-            echo -e "Please download pythia from:"
-	    echo -e "  http://www.geodynamics.org/cig/software/pythia"
-	    echo -e "and put it under deps/ directory."
-            AC_MSG_ERROR([Pythia package not found])
-	fi
+        echo -e "Pyre support is incompatible with python 2.7."
+        echo -e "Please either disable pyre or use python 2.4-python2.6."
+        AC_MSG_ERROR([Python 2.7 not supported])
     else
+        cit_builddir=`pwd`
         AC_MSG_NOTICE([downloading missing Python dependencies])
 	AS_IF([AC_TRY_COMMAND([$PYTHON setup.py install_deps -f $cit_builddir/deps -zmxd $cit_builddir/deps >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD])],
           [],
           [AC_MSG_FAILURE([cannot download missing Python dependencies])])
-    fi
 
-    AC_MSG_NOTICE([building Python dependencies])
-    AS_IF([AC_TRY_COMMAND([$PYTHON setup.py develop -H None -f $cit_builddir/deps -x -d $cit_builddir/python >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD])],
+        AC_MSG_NOTICE([building Python dependencies])
+        AS_IF([AC_TRY_COMMAND([$PYTHON setup.py develop -H None -f $cit_builddir/deps -x -d $cit_builddir/python >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD])],
           [],
           [AC_MSG_FAILURE([building Python dependencies])])
 
-    CIT_PYTHON_EGG_SETUP
+        CIT_PYTHON_EGG_SETUP
+    fi
 
+
     CIT_PROG_PYCONFIG
     AC_SUBST([pkgsysconfdir], [\${sysconfdir}/$PACKAGE])
     # Compile C as C++.