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

[tan2 at geodynamics.org]

Author: tan2
Date: 2012-01-16 18:41:15 -0800 (Mon, 16 Jan 2012)
New Revision: 19375

Modified:
   mc/3D/CitcomS/trunk/configure.ac
Log:
When python 2.7 is used, ask users to download pythia manually. See issue622 and issue606.

Modified: mc/3D/CitcomS/trunk/configure.ac
===================================================================
--- mc/3D/CitcomS/trunk/configure.ac	2012-01-16 22:34:14 UTC (rev 19374)
+++ mc/3D/CitcomS/trunk/configure.ac	2012-01-17 02:41:15 UTC (rev 19375)
@@ -83,6 +83,30 @@
 
     # Check for Python modules and packages.
     export want_exchanger
+
+    # merlin's install_deps command 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
+    else
+        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_FAILURE([building Python dependencies])])
+
     CIT_PYTHON_EGG_SETUP
 
     CIT_PROG_PYCONFIG