[cig-commits] r15244 - in cs/spatialdata-0.1/trunk: modulesrc/spatialdb templates/spatialdb

[brad at geodynamics.org]

Author: brad
Date: 2009-06-14 17:11:44 -0700 (Sun, 14 Jun 2009)
New Revision: 15244

Modified:
   cs/spatialdata-0.1/trunk/modulesrc/spatialdb/Makefile.am
   cs/spatialdata-0.1/trunk/templates/spatialdb/Makefile.am
   cs/spatialdata-0.1/trunk/templates/spatialdb/configure.ac
Log:
Install SWIG files to share directory and explicitly check for existence of file in configuration of user extension module.

Modified: cs/spatialdata-0.1/trunk/modulesrc/spatialdb/Makefile.am
===================================================================
--- cs/spatialdata-0.1/trunk/modulesrc/spatialdb/Makefile.am	2009-06-14 23:27:57 UTC (rev 15243)
+++ cs/spatialdata-0.1/trunk/modulesrc/spatialdb/Makefile.am	2009-06-15 00:11:44 UTC (rev 15244)
@@ -13,8 +13,6 @@
 subpackage = spatialdb
 include $(top_srcdir)/subpackage.am
 
-swigincludedir = $(pkgincludedir)/$(subpackage)/swig
-
 subpkgpyexec_LTLIBRARIES = _spatialdbmodule.la
 
 subpkgpyexec_PYTHON = spatialdb.py
@@ -33,6 +31,7 @@
 	TimeHistory.i \
 	TimeHistoryIO.i
 
+swigincludedir = $(pkgdatadir)/swig/$(subpackage)
 swiginclude_HEADERS = \
 	SpatialDBObj.i
 

Modified: cs/spatialdata-0.1/trunk/templates/spatialdb/Makefile.am
===================================================================
--- cs/spatialdata-0.1/trunk/templates/spatialdb/Makefile.am	2009-06-14 23:27:57 UTC (rev 15243)
+++ cs/spatialdata-0.1/trunk/templates/spatialdb/Makefile.am	2009-06-15 00:11:44 UTC (rev 15244)
@@ -71,7 +71,7 @@
 INCLUDES += -I$(NUMPY_INCDIR) -I$(PYTHON_INCDIR)
 
 $(srcdir)/spatialdbcontrib_wrap.cxx $(srcdir)/spatialdbcontrib.py: $(swig_sources)
-	$(SWIG) -Wall -c++ -python $(CPPFLAGS) $<
+	$(SWIG) -Wall -c++ -python $(SWIG_FLAGS) $<
 
 
 MAINTAINERCLEANFILES = $(swig_generated)

Modified: cs/spatialdata-0.1/trunk/templates/spatialdb/configure.ac
===================================================================
--- cs/spatialdata-0.1/trunk/templates/spatialdb/configure.ac	2009-06-14 23:27:57 UTC (rev 15243)
+++ cs/spatialdata-0.1/trunk/templates/spatialdb/configure.ac	2009-06-15 00:11:44 UTC (rev 15244)
@@ -64,9 +64,14 @@
   [AC_MSG_RESULT(no)
    AC_MSG_ERROR([Spatialdata library not found; try LDFLAGS="-L<Spatialdata lib dir>"])
 ])
-AC_CHECK_HEADER([spatialdata/spatialdb/swig/SpatialDBObj.i], [], [
-  AC_MSG_ERROR([SpatialDB SWIG interface file not found; try CPPFLAGS="-I<Spatialdata include dir>"])
-])
+if test "x$SPATIALDATA_SWIG_DIR" != "x" ; then
+  AC_CHECK_FILE([$SPATIALDATA_SWIG_DIR/spatialdb/SpatialDBObj.i], [], [
+    AC_MSG_ERROR([Spatialdata SpatialDBObj.i SWIG interface file not found])])
+  AC_SUBST([SWIG_FLAGS], ["-I$SPATIALDATA_SWIG_DIR $SWIG_FLAGS"])
+else
+  AC_CHECK_FILE([spatialdata/SpatialDBObj.i], [], [
+    AC_MSG_ERROR([Spatialdata SpatialDBObj.i SWIG interface file not found; Try setting SPATIALDATA_SWIG_DIR=<directory containing spatialdb/SpatialDBObj.i>])])
+fi
 
 
 # ENDIANNESS