[geos-commits] r3475 - in trunk/swig: . python

[svn_geos at osgeo.org]

Author: strk
Date: 2011-09-21 01:11:08 -0700 (Wed, 21 Sep 2011)
New Revision: 3475

Modified:
   trunk/swig/geos.i.in
   trunk/swig/python/Makefile.am
Log:
Fix out-of-place build for python binding (#332)

Modified: trunk/swig/geos.i.in
===================================================================
--- trunk/swig/geos.i.in	2011-09-21 08:06:05 UTC (rev 3474)
+++ trunk/swig/geos.i.in	2011-09-21 08:11:08 UTC (rev 3475)
@@ -123,11 +123,11 @@
 
 
 #ifdef SWIGPYTHON
-	%include ../python/python.i
+	%include @top_srcdir@/swig/python/python.i
 #endif
 
 #ifdef SWIGRUBY
-	%include ../ruby/ruby.i
+	%include @top_srcdir@/swig/ruby/ruby.i
 #endif
 
 

Modified: trunk/swig/python/Makefile.am
===================================================================
--- trunk/swig/python/Makefile.am	2011-09-21 08:06:05 UTC (rev 3474)
+++ trunk/swig/python/Makefile.am	2011-09-21 08:11:08 UTC (rev 3475)
@@ -22,7 +22,7 @@
 _geos_la_SOURCES = geos_wrap.cxx 
 
 # Only need to grab the capi header files
-_geos_la_CPPFLAGS = $(SWIG_PYTHON_CPPFLAGS) -I$(top_builddir)/capi
+_geos_la_CPPFLAGS = $(SWIG_PYTHON_CPPFLAGS) -I$(top_builddir)/capi -I$(top_srcdir)/include
 # Specify -module and -avoid-version so we can create a file called geos.dll/so which is what Python wants
 _geos_la_LDFLAGS = -no-undefined -module -avoid-version
 _geos_la_LIBADD = $(top_builddir)/capi/libgeos_c.la $(PYTHON_LDFLAGS)