[cig-commits] r18452 - cs/autoconf/trunk

[brad at geodynamics.org]

Author: brad
Date: 2011-05-24 14:49:26 -0700 (Tue, 24 May 2011)
New Revision: 18452

Modified:
   cs/autoconf/trunk/cit_python.m4
Log:
Limit egg stuff in setup per Leif's suggestions for compatibility with Python 2.7.

Modified: cs/autoconf/trunk/cit_python.m4
===================================================================
--- cs/autoconf/trunk/cit_python.m4	2011-05-24 21:30:49 UTC (rev 18451)
+++ cs/autoconf/trunk/cit_python.m4	2011-05-24 21:49:26 UTC (rev 18452)
@@ -308,16 +308,16 @@
 PYTHONPATH="$cit_builddir/python:$PYTHONPATH"; export PYTHONPATH
 cd $srcdir
 
-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])])
+#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])])
+#
+#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])])
 
-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])])
-
 AC_MSG_CHECKING([for egg-related flags])
 AS_IF([AC_TRY_COMMAND([$PYTHON setup.py egg_flags >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD])],
       [AC_MSG_RESULT(ok)