[geos-commits] r3474 - in branches/3.3: . swig swig/python

[svn_geos at osgeo.org]

Author: strk
Date: 2011-09-21 01:06:05 -0700 (Wed, 21 Sep 2011)
New Revision: 3474

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


Modified: branches/3.3/NEWS
===================================================================
--- branches/3.3/NEWS	2011-09-21 07:37:26 UTC (rev 3473)
+++ branches/3.3/NEWS	2011-09-21 08:06:05 UTC (rev 3474)
@@ -11,6 +11,7 @@
   - Fix out of source builds
   - Fix Geometry::clone to copy SRID (#464)
   - Fix for clang builds (#463)
+  - Fix out-of-place build for python binding (#332)
 
 Changes in 3.3.0
 2011-05-30

Modified: branches/3.3/swig/geos.i.in
===================================================================
--- branches/3.3/swig/geos.i.in	2011-09-21 07:37:26 UTC (rev 3473)
+++ branches/3.3/swig/geos.i.in	2011-09-21 08:06:05 UTC (rev 3474)
@@ -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.3/swig/python/Makefile.am
===================================================================
--- branches/3.3/swig/python/Makefile.am	2011-09-21 07:37:26 UTC (rev 3473)
+++ branches/3.3/swig/python/Makefile.am	2011-09-21 08:06:05 UTC (rev 3474)
@@ -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)