[cig-commits] r5408 - in mc/3D/CitcomS/trunk: . bin

[leif at geodynamics.org]

Author: leif
Date: 2006-12-01 13:33:03 -0800 (Fri, 01 Dec 2006)
New Revision: 5408

Modified:
   mc/3D/CitcomS/trunk/bin/Makefile.am
   mc/3D/CitcomS/trunk/configure.ac
Log:
builddir != srcdir works again.

The use of setup.py/distutils/setuptools forces the
creation of files in srcdir.  This bugs me.


Modified: mc/3D/CitcomS/trunk/bin/Makefile.am
===================================================================
--- mc/3D/CitcomS/trunk/bin/Makefile.am	2006-12-01 20:15:13 UTC (rev 5407)
+++ mc/3D/CitcomS/trunk/bin/Makefile.am	2006-12-01 21:33:03 UTC (rev 5408)
@@ -58,7 +58,6 @@
 ######## pyrized driver ########
 
 
-abs_top_srcdir = @abs_top_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_builddir = @abs_builddir@
 
@@ -66,12 +65,12 @@
 if COND_EMBEDDING
     INTERPRETER = $(bindir)/pycitcoms
     noinstINTERPRETER = $(abs_builddir)/pycitcoms
-    noinstPYTHONPATH = $(abs_top_srcdir):$(abs_top_builddir)
+    noinstPYTHONPATH = $(abs_top_builddir)
     libCitcomS = $(top_builddir)/lib/libCitcomS.a
 else
     INTERPRETER = $(PYTHON)
     noinstINTERPRETER = $(PYTHON)
-    noinstPYTHONPATH = $(abs_top_srcdir):$(abs_top_builddir):$(abs_top_builddir)/module/.libs
+    noinstPYTHONPATH = $(abs_top_builddir):$(abs_top_builddir)/module/.libs
     libCitcomS = $(top_builddir)/lib/libCitcomS.la
 endif
 

Modified: mc/3D/CitcomS/trunk/configure.ac
===================================================================
--- mc/3D/CitcomS/trunk/configure.ac	2006-12-01 20:15:13 UTC (rev 5407)
+++ mc/3D/CitcomS/trunk/configure.ac	2006-12-01 21:33:03 UTC (rev 5408)
@@ -56,28 +56,31 @@
 
     # Checks for Python modules and packages.
 
+    builddir=`pwd`
     save_PYTHONPATH="$PYTHONPATH"
-    PYTHONPATH="`pwd`:$PYTHONPATH"; export PYTHONPATH
+    PYTHONPATH="$builddir:$PYTHONPATH"; export PYTHONPATH
+    cd $srcdir
 
     AC_MSG_NOTICE([downloading missing Python dependencies])
-    AS_IF([AC_TRY_COMMAND([$PYTHON $srcdir/setup.py install_deps -zmaxd deps >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD])],
+    AS_IF([AC_TRY_COMMAND([$PYTHON setup.py install_deps -zmaxd $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 $srcdir/setup.py install_deps -H None -f deps -x -d . >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD])],
+    AS_IF([AC_TRY_COMMAND([$PYTHON setup.py develop -H None -f $builddir/deps -x -d $builddir >&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 $srcdir/setup.py egg_flags >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD])],
+    AS_IF([AC_TRY_COMMAND([$PYTHON setup.py egg_flags >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD])],
           [AC_MSG_RESULT(ok)
-           eval `cat egg-flags.sh`
+           . egg-flags.sh
            rm -f egg-flags.sh
           ],
           [AC_MSG_RESULT(failed)
           AC_MSG_FAILURE([cannot scan Python eggs for flags])])
 
+    cd $builddir
     PYTHONPATH="$save_PYTHONPATH"
     PYTHONPATH="${pythondir}:${pyexecdir}${save_PYTHONPATH:+:${save_PYTHONPATH}}"