[geos-commits] r3476 - in branches/3.2: . swig swig/python

[svn_geos at osgeo.org]

Author: strk
Date: 2011-09-21 01:39:40 -0700 (Wed, 21 Sep 2011)
New Revision: 3476

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


Modified: branches/3.2/NEWS
===================================================================
--- branches/3.2/NEWS	2011-09-21 08:11:08 UTC (rev 3475)
+++ branches/3.2/NEWS	2011-09-21 08:39:40 UTC (rev 3476)
@@ -5,6 +5,7 @@
   - ValidOp abort in presence of 2 touching holes forming an island (#449)
   - DistanceOp segfaults on MULTIPOLYGON with EMPTY elements (#367)
   - RobustDeterminant is not robust (#450)
+  - Fix out-of-place build for python binding (#332)
 
 Changes in 3.2.2
  

Modified: branches/3.2/swig/geos.i.in
===================================================================
--- branches/3.2/swig/geos.i.in	2011-09-21 08:11:08 UTC (rev 3475)
+++ branches/3.2/swig/geos.i.in	2011-09-21 08:39:40 UTC (rev 3476)
@@ -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: branches/3.2/swig/python/Makefile.am
===================================================================
--- branches/3.2/swig/python/Makefile.am	2011-09-21 08:11:08 UTC (rev 3475)
+++ branches/3.2/swig/python/Makefile.am	2011-09-21 08:39:40 UTC (rev 3476)
@@ -18,7 +18,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)/source/headers
 # 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)