[cig-commits] r15431 - in cs/spatialdata-0.1/trunk: . modulesrc/geocoords modulesrc/spatialdb modulesrc/units

[brad at geodynamics.org]

Author: brad
Date: 2009-07-06 10:14:42 -0700 (Mon, 06 Jul 2009)
New Revision: 15431

Modified:
   cs/spatialdata-0.1/trunk/configure.ac
   cs/spatialdata-0.1/trunk/modulesrc/geocoords/Makefile.am
   cs/spatialdata-0.1/trunk/modulesrc/spatialdb/Makefile.am
   cs/spatialdata-0.1/trunk/modulesrc/units/Makefile.am
Log:
Use --enable-swig to conditionally use SWIG (source distribution contains SWIG generated files; SWIG is only needed when using the repository).

Modified: cs/spatialdata-0.1/trunk/configure.ac
===================================================================
--- cs/spatialdata-0.1/trunk/configure.ac	2009-07-06 17:08:57 UTC (rev 15430)
+++ cs/spatialdata-0.1/trunk/configure.ac	2009-07-06 17:14:42 UTC (rev 15431)
@@ -17,6 +17,14 @@
 AM_INIT_AUTOMAKE([foreign])
 
 # ----------------------------------------------------------------------
+# SWIG
+AC_ARG_ENABLE([swig],
+    [AC_HELP_STRING([--enable-swig],
+        [enable generating modules with SWIG) @<:@default=no@:>@])],
+	[enable_swig=yes],
+	[enable_swig=no])
+AM_CONDITIONAL([ENABLE_SWIG], [test "$enable_swig" = yes])
+
 # TESTING w/cppunit
 AC_ARG_ENABLE([testing],
 	[  --enable-testing        Enable unit testing with cppunit (requires cppunit) [[default=no]]],
@@ -117,7 +125,10 @@
   CIT_NUMPY_INCDIR
 
   # SWIG
-  AC_PROG_SWIG(1.3.33)
+  if test "$enable_swig" = "yes" ; then
+    AC_PROG_SWIG(1.3.33)
+  fi
+
 fi
 
 # DOXYGEN

Modified: cs/spatialdata-0.1/trunk/modulesrc/geocoords/Makefile.am
===================================================================
--- cs/spatialdata-0.1/trunk/modulesrc/geocoords/Makefile.am	2009-07-06 17:08:57 UTC (rev 15430)
+++ cs/spatialdata-0.1/trunk/modulesrc/geocoords/Makefile.am	2009-07-06 17:14:42 UTC (rev 15431)
@@ -44,8 +44,10 @@
 
 INCLUDES += -I$(NUMPY_INCDIR) -I$(PYTHON_INCDIR)
 
+if ENABLE_SWIG
 $(srcdir)/geocoords_wrap.cxx $(srcdir)/geocoords.py: $(swig_sources)
 	$(SWIG) -Wall -c++ -python $<
+endif
 
 
 MAINTAINERCLEANFILES = \

Modified: cs/spatialdata-0.1/trunk/modulesrc/spatialdb/Makefile.am
===================================================================
--- cs/spatialdata-0.1/trunk/modulesrc/spatialdb/Makefile.am	2009-07-06 17:08:57 UTC (rev 15430)
+++ cs/spatialdata-0.1/trunk/modulesrc/spatialdb/Makefile.am	2009-07-06 17:14:42 UTC (rev 15431)
@@ -53,8 +53,10 @@
 
 INCLUDES += -I$(NUMPY_INCDIR) -I$(PYTHON_INCDIR)
 
+if ENABLE_SWIG
 $(srcdir)/spatialdb_wrap.cxx $(srcdir)/spatialdb.py: $(swig_sources)
 	$(SWIG) -Wall -c++ -python $<
+endif
 
 
 MAINTAINERCLEANFILES = $(swig_generated)

Modified: cs/spatialdata-0.1/trunk/modulesrc/units/Makefile.am
===================================================================
--- cs/spatialdata-0.1/trunk/modulesrc/units/Makefile.am	2009-07-06 17:08:57 UTC (rev 15430)
+++ cs/spatialdata-0.1/trunk/modulesrc/units/Makefile.am	2009-07-06 17:14:42 UTC (rev 15431)
@@ -38,8 +38,10 @@
 
 INCLUDES += -I$(PYTHON_INCDIR)
 
+if ENABLE_SWIG
 $(srcdir)/units_wrap.cxx $(srcdir)/units.py: $(swig_sources)
 	$(SWIG) -Wall -c++ -python $<
+endif
 
 
 MAINTAINERCLEANFILES = \