[cig-commits] r9096 - in cs/spatialdata-0.1/trunk: . tests

[brad at geodynamics.org]

Author: brad
Date: 2008-01-18 19:08:26 -0800 (Fri, 18 Jan 2008)
New Revision: 9096

Modified:
   cs/spatialdata-0.1/trunk/Makefile.am
   cs/spatialdata-0.1/trunk/configure.ac
   cs/spatialdata-0.1/trunk/tests/Makefile.am
Log:
Cleaned up install cases (with and without pythia).

Modified: cs/spatialdata-0.1/trunk/Makefile.am
===================================================================
--- cs/spatialdata-0.1/trunk/Makefile.am	2008-01-19 01:51:11 UTC (rev 9095)
+++ cs/spatialdata-0.1/trunk/Makefile.am	2008-01-19 03:08:26 UTC (rev 9096)
@@ -34,17 +34,16 @@
 	CPPFLAGS="-I${PROJ4_INCDIR} -I${CPPUNIT_INCDIR} -I${PYTHIA_INCDIR} -I${CIG_INCDIR}" \
 	LDFLAGS="-L${PROJ4_LIBDIR} -L${CPPUNIT_LIBDIR} -L${CIG_LIBDIR}"
 
-EXTRA_DIST = \
+if ENABLE_PYTHIA
+  EXTRA_DIST = \
 	setup.py \
 	archimedes/__init__.py
-
 install-data-hook:
 	top_builddir=`$(am__cd) $(top_builddir) && pwd` && \
 		cd $(top_srcdir) && \
 		$(PYTHON) setup.py install_deps -H None -f $$top_builddir/deps --prefix=$(prefix) && \
 		$(PYTHON) setup.py egg_info -e $(pythondir)
+endif
 
-# version
-# $Id$
 
 # End of file 

Modified: cs/spatialdata-0.1/trunk/configure.ac
===================================================================
--- cs/spatialdata-0.1/trunk/configure.ac	2008-01-19 01:51:11 UTC (rev 9095)
+++ cs/spatialdata-0.1/trunk/configure.ac	2008-01-19 03:08:26 UTC (rev 9096)
@@ -17,10 +17,6 @@
 AM_INIT_AUTOMAKE([foreign])
 
 # ----------------------------------------------------------------------
-# PYTHON
-AC_ARG_VAR(PYTHON, [Python interpreter])
-AC_ARG_VAR(PYTHONPATH, [Python module search path])
-
 # TESTING w/cppunit
 AC_ARG_ENABLE([testing],
 	[  --enable-testing        Enable unit testing with cppunit (requires cppunit) [[default=no]]],
@@ -46,7 +42,6 @@
 	[enable_scec_cvm_h=no])
 
 # ----------------------------------------------------------------------
-
 AC_PROG_CXX
 AC_PROG_CC
 
@@ -61,9 +56,6 @@
 AM_PATH_PYTHON([2.3])
 
 # ----------------------------------------------------------------------
-# PYTHON
-CIT_PYTHON_SYSCONFIG
-
 # PROJ4
 AC_CHECK_LIB(proj, pj_init_plus, [
   AC_CHECK_HEADER([proj_api.h], [], [
@@ -115,6 +107,9 @@
   AC_LANG(C++)
 
   # Check for Python modules and packages.
+  AC_ARG_VAR(PYTHON, [Python interpreter])
+  AC_ARG_VAR(PYTHONPATH, [Python module search path])
+  CIT_PYTHON_SYSCONFIG
   CIT_PYTHON_EGG_SETUP
 
   # PYREX/PYREXEMBED

Modified: cs/spatialdata-0.1/trunk/tests/Makefile.am
===================================================================
--- cs/spatialdata-0.1/trunk/tests/Makefile.am	2008-01-19 01:51:11 UTC (rev 9095)
+++ cs/spatialdata-0.1/trunk/tests/Makefile.am	2008-01-19 03:08:26 UTC (rev 9096)
@@ -11,10 +11,11 @@
 #
 
 SUBDIRS = \
-	libtests \
-	pytests
+	libtests
 
-# version
-# $Id$
+if ENABLE_PYTHIA
+  SUBDIRS += pytests
+endif
 
+
 # End of file