[geos] 13/17: Add patches to modernize the build system to prevent autoreconf warnings.

Bas Couwenberg sebastic at xs4all.nl
Fri Mar 7 20:18:48 UTC 2014


This is an automated email from the git hooks/post-receive script.

sebastic-guest pushed a commit to branch master
in repository geos.

commit 6e99b0a5c62e325950ad6b20cdb6fb3682e9c0a4
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Feb 19 23:59:25 2014 +0100

    Add patches to modernize the build system to prevent autoreconf warnings.
---
 debian/changelog                       |    1 +
 debian/patches/automake-am-cppflags    |  550 ++++++++++++++++
 debian/patches/automake-subdir-objects |   49 ++
 debian/patches/configure.ac            | 1082 ++++++++++++++++++++++++++++++++
 debian/patches/series                  |    3 +
 debian/rules                           |    8 +-
 6 files changed, 1689 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 03fa47b..912c3bf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ geos (3.4.2-2) UNRELEASED; urgency=low
   * Update copyright file using copyright-format 1.0.
   * Add DEP3 patch headers.
   * Add doc-base registration for libgeos-doc.
+  * Add patches to modernize the build system to prevent autoreconf warnings.
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Sun, 16 Feb 2014 20:11:38 +0100
 
diff --git a/debian/patches/automake-am-cppflags b/debian/patches/automake-am-cppflags
new file mode 100644
index 0000000..f47b05a
--- /dev/null
+++ b/debian/patches/automake-am-cppflags
@@ -0,0 +1,550 @@
+Description: Rename INCLUDES to AM_CPPFLAGS.
+Author: Bas Couwenberg <sebastic at xs4all.nl>
+--- a/capi/Makefile.am
++++ b/capi/Makefile.am
+@@ -6,7 +6,7 @@ top_srcdir=@top_srcdir@
+ GEOS_CAPI_VERSION="@VERSION at -CAPI-@CAPI_VERSION@"
+ GEOS_JTS_PORT="@JTS_PORT@"
+ 
+-INCLUDES = -I$(top_srcdir)/include
++AM_CPPFLAGS = -I$(top_srcdir)/include
+ 
+ capidir = $(includedir)
+ 
+@@ -21,7 +21,7 @@ DIR_SOURCES = \
+     $(NULL)
+ 
+ libgeos_c_la_SOURCES = $(DIR_SOURCES)
+-libgeos_c_la_CPPFLAGS = -DGEOS_CAPI_VERSION='$(GEOS_CAPI_VERSION)' -DGEOS_JTS_PORT='$(GEOS_JTS_PORT)'
++libgeos_c_la_CPPFLAGS = $(AM_CPPFLAGS) -DGEOS_CAPI_VERSION='$(GEOS_CAPI_VERSION)' -DGEOS_JTS_PORT='$(GEOS_JTS_PORT)'
+ libgeos_c_la_LIBADD = $(top_builddir)/src/libgeos.la
+ libgeos_c_la_LDFLAGS = \
+     -version-info @CAPI_INTERFACE_CURRENT@:@CAPI_INTERFACE_REVISION@:@CAPI_INTERFACE_AGE@ \
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -12,7 +12,7 @@ LIBS = $(top_builddir)/src/libgeos.la
+ example_SOURCES = example.cpp 
+ example_LDADD = $(LIBS)
+ 
+-INCLUDES = -I$(top_srcdir)/include
++AM_CPPFLAGS = -I$(top_srcdir)/include
+ 
+ DOXYGEN = doxygen
+ 
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -18,7 +18,7 @@ SUBDIRS = \
+ 
+ EXTRA_DIST = Makefile.vc dirlist.mk CMakeLists.txt info.plist.in
+ 
+-INCLUDES = -I$(top_srcdir)/include
++AM_CPPFLAGS = -I$(top_srcdir)/include
+ 
+ lib_LTLIBRARIES = libgeos.la
+ 
+--- a/src/algorithm/Makefile.am
++++ b/src/algorithm/Makefile.am
+@@ -7,7 +7,7 @@ SUBDIRS = \
+ 
+ noinst_LTLIBRARIES = libalgorithm.la
+ 
+-INCLUDES = -I$(top_srcdir)/include 
++AM_CPPFLAGS = -I$(top_srcdir)/include 
+ 
+ libalgorithm_la_SOURCES = \
+     Angle.cpp \
+--- a/src/algorithm/distance/Makefile.am
++++ b/src/algorithm/distance/Makefile.am
+@@ -5,7 +5,7 @@ SUBDIRS =
+ 
+ noinst_LTLIBRARIES = libdistance.la
+ 
+-INCLUDES = -I$(top_srcdir)/include 
++AM_CPPFLAGS = -I$(top_srcdir)/include 
+ 
+ libdistance_la_SOURCES = \
+     DiscreteHausdorffDistance.cpp \
+--- a/src/algorithm/locate/Makefile.am
++++ b/src/algorithm/locate/Makefile.am
+@@ -5,7 +5,7 @@ SUBDIRS =
+ 
+ noinst_LTLIBRARIES = liblocation.la
+ 
+-INCLUDES = -I$(top_srcdir)/include 
++AM_CPPFLAGS = -I$(top_srcdir)/include 
+ 
+ liblocation_la_SOURCES = \
+ 	IndexedPointInAreaLocator.cpp \
+--- a/src/geom/Makefile.am
++++ b/src/geom/Makefile.am
+@@ -8,7 +8,7 @@ SUBDIRS=\
+ noinst_LTLIBRARIES = \
+     libgeom.la
+ 
+-INCLUDES = -I$(top_srcdir)/include 
++AM_CPPFLAGS = -I$(top_srcdir)/include 
+ 
+ libgeom_la_SOURCES = \
+     Coordinate.cpp \
+--- a/src/geom/prep/Makefile.am
++++ b/src/geom/prep/Makefile.am
+@@ -3,7 +3,7 @@
+ #
+ noinst_LTLIBRARIES = libgeomprep.la
+ 
+-INCLUDES = -I$(top_srcdir)/include 
++AM_CPPFLAGS = -I$(top_srcdir)/include 
+ 
+ ## these are full inlined
+ # PolygonExtracter.cpp 
+--- a/src/geom/util/Makefile.am
++++ b/src/geom/util/Makefile.am
+@@ -3,7 +3,7 @@
+ #
+ noinst_LTLIBRARIES = libgeomutil.la
+ 
+-INCLUDES = -I$(top_srcdir)/include 
++AM_CPPFLAGS = -I$(top_srcdir)/include 
+ 
+ libgeomutil_la_SOURCES = \
+     ComponentCoordinateExtracter.cpp \
+--- a/src/geomgraph/Makefile.am
++++ b/src/geomgraph/Makefile.am
+@@ -5,7 +5,7 @@ SUBDIRS = index
+ 
+ noinst_LTLIBRARIES = libgeomgraph.la
+ 
+-INCLUDES = -I$(top_srcdir)/include 
++AM_CPPFLAGS = -I$(top_srcdir)/include 
+ 
+ libgeomgraph_la_SOURCES = \
+ 	Depth.cpp \
+--- a/src/geomgraph/index/Makefile.am
++++ b/src/geomgraph/index/Makefile.am
+@@ -3,7 +3,7 @@
+ #
+ noinst_LTLIBRARIES = libgeomgraphindex.la
+ 
+-INCLUDES = -I$(top_srcdir)/include 
++AM_CPPFLAGS = -I$(top_srcdir)/include 
+ 
+ libgeomgraphindex_la_SOURCES = \
+     MonotoneChainEdge.cpp \
+--- a/src/index/bintree/Makefile.am
++++ b/src/index/bintree/Makefile.am
+@@ -3,7 +3,7 @@
+ #
+ noinst_LTLIBRARIES = libindexbintree.la
+ 
+-INCLUDES = -I$(top_srcdir)/include 
++AM_CPPFLAGS = -I$(top_srcdir)/include 
+ 
+ libindexbintree_la_SOURCES = \
+     Bintree.cpp \
+--- a/src/index/chain/Makefile.am
++++ b/src/index/chain/Makefile.am
+@@ -3,7 +3,7 @@
+ #
+ noinst_LTLIBRARIES = libindexchain.la
+ 
+-INCLUDES = -I$(top_srcdir)/include 
++AM_CPPFLAGS = -I$(top_srcdir)/include 
+ 
+ libindexchain_la_SOURCES = \
+ 	MonotoneChain.cpp \
+--- a/src/index/intervalrtree/Makefile.am
++++ b/src/index/intervalrtree/Makefile.am
+@@ -3,7 +3,7 @@
+ #
+ noinst_LTLIBRARIES = libintervalrtree.la
+ 
+-INCLUDES = -I$(top_srcdir)/include 
++AM_CPPFLAGS = -I$(top_srcdir)/include 
+ 
+ libintervalrtree_la_SOURCES = \
+ 	IntervalRTreeBranchNode.cpp \
+--- a/src/index/quadtree/Makefile.am
++++ b/src/index/quadtree/Makefile.am
+@@ -3,7 +3,7 @@
+ #
+ noinst_LTLIBRARIES = libindexquadtree.la
+ 
+-INCLUDES = -I$(top_srcdir)/include 
++AM_CPPFLAGS = -I$(top_srcdir)/include 
+ 
+ libindexquadtree_la_SOURCES = \
+     DoubleBits.cpp \
+--- a/src/index/strtree/Makefile.am
++++ b/src/index/strtree/Makefile.am
+@@ -3,7 +3,7 @@
+ #
+ noinst_LTLIBRARIES = libindexstrtree.la
+ 
+-INCLUDES = -I$(top_srcdir)/include 
++AM_CPPFLAGS = -I$(top_srcdir)/include 
+ 
+ libindexstrtree_la_SOURCES = \
+     AbstractNode.cpp \
+--- a/src/index/sweepline/Makefile.am
++++ b/src/index/sweepline/Makefile.am
+@@ -3,7 +3,7 @@
+ #
+ noinst_LTLIBRARIES = libindexsweepline.la
+ 
+-INCLUDES = -I$(top_srcdir)/include 
++AM_CPPFLAGS = -I$(top_srcdir)/include 
+ 
+ libindexsweepline_la_SOURCES = \
+     SweepLineEvent.cpp \
+--- a/src/io/Makefile.am
++++ b/src/io/Makefile.am
+@@ -5,7 +5,7 @@
+ 
+ noinst_LTLIBRARIES = libio.la
+ 
+-INCLUDES = -I$(top_srcdir)/include 
++AM_CPPFLAGS = -I$(top_srcdir)/include 
+ 
+ libio_la_SOURCES = \
+ 	ParseException.cpp \
+--- a/src/linearref/Makefile.am
++++ b/src/linearref/Makefile.am
+@@ -3,7 +3,7 @@
+ #
+ noinst_LTLIBRARIES = liblinearref.la
+ 
+-INCLUDES = -I$(top_srcdir)/include
++AM_CPPFLAGS = -I$(top_srcdir)/include
+ 
+ liblinearref_la_SOURCES = \
+     ExtractLineByLocation.cpp \
+--- a/src/noding/Makefile.am
++++ b/src/noding/Makefile.am
+@@ -5,7 +5,7 @@ SUBDIRS = snapround
+ 
+ noinst_LTLIBRARIES = libnoding.la
+ 
+-INCLUDES = -I$(top_srcdir)/include 
++AM_CPPFLAGS = -I$(top_srcdir)/include 
+ 
+ libnoding_la_SOURCES = \
+ 	BasicSegmentString.cpp \
+--- a/src/noding/snapround/Makefile.am
++++ b/src/noding/snapround/Makefile.am
+@@ -5,7 +5,7 @@ SUBDIRS =
+ 
+ noinst_LTLIBRARIES = libsnapround.la
+ 
+-INCLUDES = -I$(top_srcdir)/include 
++AM_CPPFLAGS = -I$(top_srcdir)/include 
+ 
+ libsnapround_la_SOURCES = \
+     HotPixel.cpp \
+--- a/src/operation/Makefile.am
++++ b/src/operation/Makefile.am
+@@ -15,7 +15,7 @@ SUBDIRS = \
+ 
+ noinst_LTLIBRARIES = liboperation.la
+ 
+-INCLUDES = -I$(top_srcdir)/include 
++AM_CPPFLAGS = -I$(top_srcdir)/include 
+ 
+ liboperation_la_SOURCES = \
+ 	GeometryGraphOperation.cpp \
+--- a/src/operation/buffer/Makefile.am
++++ b/src/operation/buffer/Makefile.am
+@@ -5,7 +5,7 @@ SUBDIRS =
+ 
+ noinst_LTLIBRARIES = libopbuffer.la
+ 
+-INCLUDES = -I$(top_srcdir)/include
++AM_CPPFLAGS = -I$(top_srcdir)/include
+ 
+ libopbuffer_la_SOURCES = \
+ 	BufferBuilder.cpp \
+--- a/src/operation/distance/Makefile.am
++++ b/src/operation/distance/Makefile.am
+@@ -5,7 +5,7 @@ SUBDIRS =
+ 
+ noinst_LTLIBRARIES = libopdistance.la
+ 
+-INCLUDES = -I$(top_srcdir)/include 
++AM_CPPFLAGS = -I$(top_srcdir)/include 
+ 
+ libopdistance_la_SOURCES = \
+     ConnectedElementLocationFilter.cpp \
+--- a/src/operation/linemerge/Makefile.am
++++ b/src/operation/linemerge/Makefile.am
+@@ -5,7 +5,7 @@ SUBDIRS =
+ 
+ noinst_LTLIBRARIES = liboplinemerge.la
+ 
+-INCLUDES = -I$(top_srcdir)/include 
++AM_CPPFLAGS = -I$(top_srcdir)/include 
+ 
+ liboplinemerge_la_SOURCES = \
+ 	EdgeString.cpp \
+--- a/src/operation/overlay/Makefile.am
++++ b/src/operation/overlay/Makefile.am
+@@ -8,7 +8,7 @@ SUBDIRS =
+ 
+ noinst_LTLIBRARIES = libopoverlay.la
+ 
+-INCLUDES = -I$(top_srcdir)/include 
++AM_CPPFLAGS = -I$(top_srcdir)/include 
+ 
+ libopoverlay_la_SOURCES = \
+     EdgeSetNoder.cpp \
+--- a/src/operation/polygonize/Makefile.am
++++ b/src/operation/polygonize/Makefile.am
+@@ -5,7 +5,7 @@ SUBDIRS =
+ 
+ noinst_LTLIBRARIES = liboppolygonize.la
+ 
+-INCLUDES = -I$(top_srcdir)/include 
++AM_CPPFLAGS = -I$(top_srcdir)/include 
+ 
+ liboppolygonize_la_SOURCES = \
+     PolygonizeDirectedEdge.cpp \
+--- a/src/operation/predicate/Makefile.am
++++ b/src/operation/predicate/Makefile.am
+@@ -6,7 +6,7 @@
+ 
+ noinst_LTLIBRARIES = liboppredicate.la
+ 
+-INCLUDES = -I$(top_srcdir)/include 
++AM_CPPFLAGS = -I$(top_srcdir)/include 
+ 
+ liboppredicate_la_SOURCES = \
+     RectangleIntersects.cpp \
+--- a/src/operation/relate/Makefile.am
++++ b/src/operation/relate/Makefile.am
+@@ -5,7 +5,7 @@ SUBDIRS =
+ 
+ noinst_LTLIBRARIES = liboprelate.la
+ 
+-INCLUDES = -I$(top_srcdir)/include 
++AM_CPPFLAGS = -I$(top_srcdir)/include 
+ 
+ liboprelate_la_SOURCES = \
+     EdgeEndBuilder.cpp \
+--- a/src/operation/sharedpaths/Makefile.am
++++ b/src/operation/sharedpaths/Makefile.am
+@@ -5,7 +5,7 @@ SUBDIRS =
+ 
+ noinst_LTLIBRARIES = libopsharedpaths.la
+ 
+-INCLUDES = -I$(top_srcdir)/include 
++AM_CPPFLAGS = -I$(top_srcdir)/include 
+ 
+ libopsharedpaths_la_SOURCES = \
+     SharedPathsOp.cpp 
+--- a/src/operation/union/Makefile.am
++++ b/src/operation/union/Makefile.am
+@@ -5,7 +5,7 @@ SUBDIRS =
+ 
+ noinst_LTLIBRARIES = libopunion.la
+ 
+-INCLUDES = -I$(top_srcdir)/include 
++AM_CPPFLAGS = -I$(top_srcdir)/include 
+ 
+ libopunion_la_SOURCES = \
+     CascadedPolygonUnion.cpp \
+--- a/src/operation/valid/Makefile.am
++++ b/src/operation/valid/Makefile.am
+@@ -5,7 +5,7 @@ SUBDIRS =
+ 
+ noinst_LTLIBRARIES = libopvalid.la
+ 
+-INCLUDES = -I$(top_srcdir)/include 
++AM_CPPFLAGS = -I$(top_srcdir)/include 
+ 
+ # NOTES:
+ # <incomplete>
+--- a/src/planargraph/Makefile.am
++++ b/src/planargraph/Makefile.am
+@@ -8,7 +8,7 @@ SUBDIRS =
+ 
+ noinst_LTLIBRARIES = libplanargraph.la
+ 
+-INCLUDES = -I$(top_srcdir)/include 
++AM_CPPFLAGS = -I$(top_srcdir)/include 
+ 
+ libplanargraph_la_SOURCES = \
+     DirectedEdge.cpp \
+--- a/src/precision/Makefile.am
++++ b/src/precision/Makefile.am
+@@ -5,7 +5,7 @@ SUBDIRS =
+ 
+ noinst_LTLIBRARIES = libprecision.la
+ 
+-INCLUDES = -I$(top_srcdir)/include 
++AM_CPPFLAGS = -I$(top_srcdir)/include 
+ 
+ libprecision_la_SOURCES = \
+ 	CommonBits.cpp \
+--- a/src/simplify/Makefile.am
++++ b/src/simplify/Makefile.am
+@@ -5,7 +5,7 @@ SUBDIRS =
+ 
+ noinst_LTLIBRARIES = libsimplify.la
+ 
+-INCLUDES = -I$(top_srcdir)/include 
++AM_CPPFLAGS = -I$(top_srcdir)/include 
+ 
+ libsimplify_la_SOURCES = \
+     DouglasPeuckerLineSimplifier.cpp \
+--- a/src/triangulate/Makefile.am
++++ b/src/triangulate/Makefile.am
+@@ -6,7 +6,7 @@ SUBDIRS = \
+ 
+ noinst_LTLIBRARIES = libtriangulate.la
+ 
+-INCLUDES = -I$(top_srcdir)/include 
++AM_CPPFLAGS = -I$(top_srcdir)/include 
+ 
+ libtriangulate_la_SOURCES = \
+ 	IncrementalDelaunayTriangulator.cpp \
+--- a/src/triangulate/quadedge/Makefile.am
++++ b/src/triangulate/quadedge/Makefile.am
+@@ -5,7 +5,7 @@ SUBDIRS =
+ 
+ noinst_LTLIBRARIES = libquadedge.la
+ 
+-INCLUDES = -I$(top_srcdir)/include 
++AM_CPPFLAGS = -I$(top_srcdir)/include 
+ 
+ libquadedge_la_SOURCES = \
+ 	QuadEdge.cpp \
+--- a/src/util/Makefile.am
++++ b/src/util/Makefile.am
+@@ -5,7 +5,7 @@ SUBDIRS =
+ 
+ noinst_LTLIBRARIES = libutil.la
+ 
+-INCLUDES = -I$(top_srcdir)/include 
++AM_CPPFLAGS = -I$(top_srcdir)/include 
+ 
+ libutil_la_SOURCES = \
+ 	Assert.cpp \
+--- a/swig/ruby/Makefile.am
++++ b/swig/ruby/Makefile.am
+@@ -17,7 +17,7 @@ BUILT_SOURCES = geos_wrap.cxx
+ rubyextensiondirdir = $(RUBY_EXTENSION_DIR)
+ 
+ # Setup includes
+-INCLUDES = -I$(RUBY_INCLUDE_DIR) -I$(RUBY_INCLUDE_DIR)/$(RUBY_SITE_ARCH)
++AM_CPPFLAGS = -I$(RUBY_INCLUDE_DIR) -I$(RUBY_INCLUDE_DIR)/$(RUBY_SITE_ARCH)
+ 
+ # Build Ruby module as shared library
+ rubyextensiondir_LTLIBRARIES = geos.la
+@@ -25,7 +25,7 @@ geos_la_SOURCES = geos_wrap.cxx
+ geos_la_LIBADD =  $(top_builddir)/capi/libgeos_c.la /usr/lib/$(RUBY_SO_NAME)
+ 
+ # Only need to grab the capi header files
+-geos_la_CPPFLAGS = -I$(top_builddir)/capi
++geos_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_builddir)/capi
+ 
+ # Specify -module and -avoid-version so we can create a file called geos.dll/so which is what Ruby wants
+ geos_la_LDFLAGS = -no-undefined  -module -avoid-version -L$(RUBY_LIB_DIR)
+--- a/tests/bigtest/Makefile.am
++++ b/tests/bigtest/Makefile.am
+@@ -17,8 +17,8 @@ TestSweepLineSpeed_LDADD = $(LIBS)
+ bug234_SOURCES = bug234.cpp
+ bug234_LDADD = $(LIBS)
+ 
+-INCLUDES = -I$(top_srcdir)/include
+-INCLUDES += -I$(top_srcdir)/src/io/markup
++AM_CPPFLAGS = -I$(top_srcdir)/include
++AM_CPPFLAGS += -I$(top_srcdir)/src/io/markup
+ 
+ EXTRA_DIST = CMakeLists.txt
+ 
+--- a/tests/geostest/Makefile.am
++++ b/tests/geostest/Makefile.am
+@@ -1,7 +1,7 @@
+ #
+ # This file is part of project GEOS (http://trac.osgeo.org/geos/) 
+ #
+-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/tests/unit/tut -I$(top_builddir)/capi
++AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/tests/unit/tut -I$(top_builddir)/capi
+ 
+ EXTRA_DIST = \
+ 	brokengrammar \
+--- a/tests/perf/Makefile.am
++++ b/tests/perf/Makefile.am
+@@ -5,7 +5,7 @@ SUBDIRS = \
+ 	operation \
+ 	capi
+ 
+-INCLUDES = -I$(top_srcdir)/include
++AM_CPPFLAGS = -I$(top_srcdir)/include
+ 
+ noinst_PROGRAMS = ClassSizes
+ 
+--- a/tests/perf/capi/Makefile.am
++++ b/tests/perf/capi/Makefile.am
+@@ -9,7 +9,7 @@ top_builddir=@top_builddir@
+ check_PROGRAMS = memleak_mp_prep
+ 
+ LIBS = $(top_builddir)/capi/libgeos_c.la
+-INCLUDES = -I$(top_builddir)/capi -I$(top_srcdir)/include
++AM_CPPFLAGS = -I$(top_builddir)/capi -I$(top_srcdir)/include
+ 
+ memleak_mp_prep_SOURCES = memleak_mp_prep.c
+ memleak_mp_prep_LDADD = $(LIBS)
+--- a/tests/perf/operation/buffer/Makefile.am
++++ b/tests/perf/operation/buffer/Makefile.am
+@@ -12,5 +12,5 @@ LIBS = $(top_builddir)/src/libgeos.la
+ IteratedBufferStressTest_SOURCES = IteratedBufferStressTest.cpp 
+ IteratedBufferStressTest_LDADD = $(LIBS)
+ 
+-INCLUDES = -I$(top_srcdir)/include
+-INCLUDES += -I$(top_srcdir)/src/io/markup
++AM_CPPFLAGS = -I$(top_srcdir)/include
++AM_CPPFLAGS += -I$(top_srcdir)/src/io/markup
+--- a/tests/perf/operation/predicate/Makefile.am
++++ b/tests/perf/operation/predicate/Makefile.am
+@@ -12,5 +12,5 @@ LIBS = $(top_builddir)/src/libgeos.la
+ RectangleIntersectsPerfTest_SOURCES = RectangleIntersectsPerfTest.cpp 
+ RectangleIntersectsPerfTest_LDADD = $(LIBS)
+ 
+-INCLUDES = -I$(top_srcdir)/include
+-INCLUDES += -I$(top_srcdir)/src/io/markup
++AM_CPPFLAGS = -I$(top_srcdir)/include
++AM_CPPFLAGS += -I$(top_srcdir)/src/io/markup
+--- a/tests/thread/Makefile.am
++++ b/tests/thread/Makefile.am
+@@ -1,7 +1,7 @@
+ #
+ # This file is part of project GEOS (http://trac.osgeo.org/geos/) 
+ #
+-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/tests/unit/tut -I$(top_builddir)/capi
++AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/tests/unit/tut -I$(top_builddir)/capi
+ 
+ # TODO: Enable if sample input WKT file is provided
+ #TESTS = threadtest badthreadtest
+--- a/tests/unit/Makefile.am
++++ b/tests/unit/Makefile.am
+@@ -4,7 +4,7 @@
+ 
+ AUTOMAKE_OPTIONS = subdir-objects
+ 
+-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/tests/unit/tut -I$(top_builddir)/capi
++AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/tests/unit/tut -I$(top_builddir)/capi
+ 
+ TESTS = geos_unit
+ 
+--- a/tests/xmltester/Makefile.am
++++ b/tests/xmltester/Makefile.am
+@@ -134,8 +134,8 @@ XMLTester_LDADD = $(LIBS)
+ # See http://trac.osgeo.org/geos/ticket/319
+ XMLTester_CXXFLAGS = $(INLINE_FLAGS)
+ 
+-INCLUDES = -I$(top_srcdir)/include
+-INCLUDES += -I$(top_srcdir)/src/io/tinyxml -DTIXML_USE_STL
++AM_CPPFLAGS = -I$(top_srcdir)/include
++AM_CPPFLAGS += -I$(top_srcdir)/src/io/tinyxml -DTIXML_USE_STL
+ 
+ static:
+ 	$(CXX) $(CXXFLAGS) -I../include -o staticXMLTester XMLTester.cpp MarkupSTL.o ../../src/geom/.libs/libgeos.a
diff --git a/debian/patches/automake-subdir-objects b/debian/patches/automake-subdir-objects
new file mode 100644
index 0000000..4a1a1eb
--- /dev/null
+++ b/debian/patches/automake-subdir-objects
@@ -0,0 +1,49 @@
+Description: Set automake option subdir-object to remain forward compatible.
+Author: Bas Couwenberg <sebastic at xs4all.nl>
+--- a/src/operation/overlay/Makefile.am
++++ b/src/operation/overlay/Makefile.am
+@@ -1,6 +1,9 @@
+ #
+ # This file is part of project GEOS (http://trac.osgeo.org/geos/) 
+ #
++
++AUTOMAKE_OPTIONS = subdir-objects
++
+ SUBDIRS = 
+ 
+ noinst_LTLIBRARIES = libopoverlay.la
+--- a/src/planargraph/Makefile.am
++++ b/src/planargraph/Makefile.am
+@@ -1,6 +1,9 @@
+ #
+ # This file is part of project GEOS (http://trac.osgeo.org/geos/) 
+ #
++
++AUTOMAKE_OPTIONS = subdir-objects
++
+ SUBDIRS = 
+ 
+ noinst_LTLIBRARIES = libplanargraph.la
+--- a/tests/unit/Makefile.am
++++ b/tests/unit/Makefile.am
+@@ -1,6 +1,9 @@
+ #
+ # This file is part of project GEOS (http://trac.osgeo.org/geos/) 
+ #
++
++AUTOMAKE_OPTIONS = subdir-objects
++
+ INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/tests/unit/tut -I$(top_builddir)/capi
+ 
+ TESTS = geos_unit
+--- a/tests/xmltester/Makefile.am
++++ b/tests/xmltester/Makefile.am
+@@ -5,6 +5,8 @@
+ #top_srcdir=@top_srcdir@
+ #top_builddir=@top_builddir@
+ 
++AUTOMAKE_OPTIONS = subdir-objects
++
+ TESTS = testrunner
+ 
+ CLEANFILES = testrunner 
diff --git a/debian/patches/configure.ac b/debian/patches/configure.ac
new file mode 100644
index 0000000..d758e02
--- /dev/null
+++ b/debian/patches/configure.ac
@@ -0,0 +1,1082 @@
+Description: Rename configure.in to configure.ac.
+Author: Bas Couwenberg <sebastic at xs4all.nl>
+--- /dev/null
++++ b/configure.ac
+@@ -0,0 +1,537 @@
++dnl
++dnl configure.in - autoconf input template to produce ./configure script
++dnl
++dnl version 2.52 is required for Cygwin libtool support
++AC_PREREQ([2.52])
++
++dnl local vars to hold user's preferences --------------------------------
++AC_INIT([include/geos.h])
++AC_CANONICAL_SYSTEM
++
++AC_CONFIG_MACRO_DIR([macros])
++
++dnl -- JTS_PORT: the version of JTS this release is bound to
++JTS_PORT=1.12.0
++
++dnl -- Version info for the CAPI
++CAPI_INTERFACE_CURRENT=9
++CAPI_INTERFACE_REVISION=2
++CAPI_INTERFACE_AGE=8
++
++dnl
++dnl -- Release versions / C++ library SONAME will use these
++dnl -- encoding ABI break at every release
++dnl
++VERSION_MAJOR=3
++VERSION_MINOR=4
++VERSION_PATCH=2
++VERSION="$VERSION_MAJOR.$VERSION_MINOR.$VERSION_PATCH"
++
++dnl CAPI_VERSION_MAJOR=$(($CAPI_INTERFACE_CURRENT-$CAPI_INTERFACE_AGE))
++dnl the following should be more portable
++CAPI_VERSION_MAJOR=`expr $CAPI_INTERFACE_CURRENT - $CAPI_INTERFACE_AGE`
++CAPI_VERSION_MINOR=$CAPI_INTERFACE_AGE
++CAPI_VERSION_PATCH=$CAPI_INTERFACE_REVISION
++CAPI_VERSION="$CAPI_VERSION_MAJOR.$CAPI_VERSION_MINOR.$CAPI_VERSION_PATCH"
++
++AM_INIT_AUTOMAKE([geos], [$VERSION], [no-define])
++AM_MAINTAINER_MODE
++AC_CONFIG_HEADERS([include/config.h] [include/geos/platform.h])
++AC_PROG_CC
++
++dnl use libtool ----------------------------------------------------------
++AC_LIBTOOL_DLOPEN
++AC_LIBTOOL_WIN32_DLL
++AC_PROG_LIBTOOL
++
++dnl check for programs ----------------------------------------------------
++AC_PROG_CXX
++AC_ISC_POSIX
++AC_PROG_INSTALL
++AC_PROG_MAKE_SET
++
++dnl function checks ------------------------------------------------------
++AC_FUNC_CLOSEDIR_VOID
++AC_FUNC_MEMCMP
++AC_FUNC_STRFTIME
++AC_FUNC_VPRINTF
++AC_FUNC_ALLOCA
++AC_HEADER_DIRENT
++AC_HEADER_STDC
++AC_CHECK_HEADERS([memory.h])
++AC_CHECK_HEADERS([unistd.h])
++AC_CHECK_HEADERS([ieeefp.h])
++AC_CHECK_HEADERS([sys/file.h])
++AC_CHECK_HEADERS([sys/time.h])
++AC_CHECK_FUNCS([strchr memcpy gettimeofday])
++AC_HEADER_STAT
++AC_STRUCT_TM
++AC_TYPE_SIZE_T
++AC_C_CONST
++
++dnl --------------------------------------------------------------------
++dnl - Check for inline and cassert settings
++dnl --------------------------------------------------------------------
++
++
++AC_ARG_ENABLE([inline], [  --disable-inline    Disable inlining],
++	[case "${enableval}" in
++		yes) enable_inline=true ;;
++		no)  enable_inline=false ;;
++		*) AC_MSG_ERROR(bad value ${enableval} for --enable-inline);;
++	esac],
++	[enable_inline=true]
++)
++
++AC_ARG_ENABLE([cassert], [  --disable-cassert   Disable assertion checking],
++	[case "${enableval}" in
++		yes) enable_cassert=true ;;
++		no)  enable_cassert=false ;;
++		*) AC_MSG_ERROR(bad value ${enableval} for --enable-cassert);;
++	esac],
++	[enable_cassert=true]
++)
++
++AC_ARG_ENABLE([glibcxx-debug], [  --enable-glibcxx-debug    Enable libstdc++ debug mode],
++	[case "${enableval}" in
++		yes) enable_glibcxx_debug=true ;;
++		no)  enable_glibcxx_debug=false ;;
++		*) AC_MSG_ERROR(bad value ${enableval} for --enable-glibcxx-debug);;
++	esac],
++	[enable_glibcxx_debug=false]
++)
++
++
++AC_MSG_CHECKING([if requested to force inline functions])
++INLINE_FLAGS=
++AC_SUBST(INLINE_FLAGS)
++if test x"$enable_inline" = xtrue; then
++	INLINE_FLAGS="-DGEOS_INLINE"
++	AM_CXXFLAGS="$AM_CXXFLAGS $INLINE_FLAGS"
++    AC_MSG_RESULT([yes])
++else
++    AC_MSG_RESULT([no])
++fi
++
++AC_MSG_CHECKING([if requested to enable assert macros])
++if test x"$enable_cassert" = xfalse; then
++	AM_CXXFLAGS="$AM_CXXFLAGS -DNDEBUG"
++    AC_MSG_RESULT([no])
++else
++    AC_MSG_RESULT([yes])
++fi
++
++AC_MSG_CHECKING([if requested libstdc++ debug mode])
++if test x"$enable_glibcxx_debug" = xtrue; then
++    AM_CXXFLAGS="$AM_CXXFLAGS -D_GLIBCXX_DEBUG=1 -D_GLIBCXX_DEBUG_PEDANTIC=1"
++    AC_MSG_RESULT([yes])
++else
++    AC_MSG_RESULT([no])
++fi
++
++dnl --------------------------------------------------------------------
++dnl - Append default C++ and C flags 
++dnl --------------------------------------------------------------------
++
++dnl In order for AC_LIBTOOL_COMPILER_OPTION to use
++dnl the C compiler we need the hack below.
++dnl It is likely a bug in the libtool macro file to
++dnl require AC_LIBTOOL_LANG_CXX_CONFIG in *addition*
++dnl to AC_LANG(CXX) or AC_LANG_PUSH(CXX)/AC_LANG_POP()
++dnl 
++AC_LIBTOOL_LANG_CXX_CONFIG
++
++# Set default AM_CXXFLAGS and AM_CFLAGS 
++# -pedantic: ISO does not support long long
++# we add -Wno-long-long to avoid those messages
++WARNFLAGS=""
++AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -pedantic], [dummy_cv_pedantic], [-pedantic], [], [WARNFLAGS="$WARNFLAGS -pedantic"], [])
++AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -Wall], [dummy_cv_wall], [-Wall], [], [WARNFLAGS="$WARNFLAGS -Wall"], [])
++AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -ansi], [dummy_cv_ansi], [-ansi], [], [WARNFLAGS="$WARNFLAGS -ansi"], [])
++AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -Wno-long-long], [dummy_cv_no_long_long], [-Wno-long-long], [], [WARNFLAGS="$WARNFLAGS -Wno-long-long"], [])
++
++# To make numerical computation more stable, we use --ffloat-store
++NUMERICFLAGS=""
++AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -ffloat-store], [dummy_cv_ffloat_store], [-ffloat-store], [], [NUMERICFLAGS="$NUMERICFLAGS -ffloat-store"], [])
++
++DEFAULTFLAGS="${WARNFLAGS} ${NUMERICFLAGS}"
++
++AM_CXXFLAGS="${AM_CXXFLAGS} ${DEFAULTFLAGS}"
++AM_CFLAGS="${AM_CFLAGS} ${DEFAULTFLAGS}"
++AC_SUBST(AM_CXXFLAGS)
++AC_SUBST(AM_CFLAGS)
++
++dnl --------------------------------------------------------------------
++dnl - Look for finite and/or isfinite macros/functions
++dnl --------------------------------------------------------------------
++
++dnl These two tests need the math library or they won't link
++dnl on OpenBSD, even if the functions exist.
++save_LIBS=$LIBS
++LIBS="$LIBS -lm"
++AC_CACHE_CHECK([for finite], ac_cv_finite,
++ [AC_TRY_LINK([#include <math.h>],
++ [double x; int y; y = finite(x);],
++ ac_cv_finite=yes,
++ ac_cv_finite=no
++)])
++if test x"$ac_cv_finite" = x"yes"; then
++  AC_DEFINE(HAVE_FINITE, [1], [Has finite])
++fi
++
++AC_CACHE_CHECK([for isfinite], ac_cv_isfinite,
++ [AC_TRY_LINK([#include <math.h>],
++ [double x; int y; y = isfinite(x);],
++ ac_cv_isfinite=yes,
++ ac_cv_isfinite=no
++)])
++if test x"$ac_cv_isfinite" = x"yes"; then
++  AC_DEFINE(HAVE_ISFINITE, [1], [Has isfinite])
++fi
++
++dnl --------------------------------------------------------------------
++dnl Test for presence of isnan function when using C++ and <cmath>
++dnl This is for a particular bug in OS/X where <cmath> drops the definition
++dnl of isnan().
++
++AC_LANG_PUSH([C++])
++AC_CACHE_CHECK([for isnan], ac_cv_isnan,
++ [AC_TRY_LINK([#include <cmath>],
++ [double x; int y; y = isnan(x);],
++ ac_cv_isnan=yes,
++ ac_cv_isnan=no
++)])
++if test x"$ac_cv_isnan" = x"yes"; then
++  AC_DEFINE(HAVE_ISNAN, [1], [Has isnan])
++fi
++AC_LANG_POP([C++])
++
++dnl --------------------------------------------------------------------
++
++LIBS=$save_LIBS
++
++dnl --------------------------------------------------------------------
++dnl - Look for a 64bit integer (do after CFLAGS is set)
++dnl --------------------------------------------------------------------
++
++dnl Find a working 64bit integer
++PGAC_TYPE_64BIT_INT([int64_t])
++if test x"$HAVE_INT64_T_64" = x"no" ; then
++  PGAC_TYPE_64BIT_INT([long int])
++  if test x"$HAVE_LONG_INT_64" = x"no" ; then
++    PGAC_TYPE_64BIT_INT([long long int])
++    if test x"$HAVE_LONG_LONG_INT_64" = x"no" ; then
++      AC_MSG_WARN([Could not find a working 64bit int type, you may experience weird bugs (undefined behaviour)]);
++    fi
++  fi
++fi
++
++
++
++dnl --------------------------------------------------------------------
++dnl - check whether python is required for the build
++dnl --------------------------------------------------------------------
++
++AC_ARG_ENABLE([python], [  --enable-python    Enable build of python module],
++	[case "${enableval}" in
++		yes) use_python=true ;;
++		no)  use_python=false ;;
++		*) AC_MSG_ERROR(bad value ${enableval} for --enable-python) ;;
++	esac],
++	[use_python=false]
++)
++
++
++dnl --------------------------------------------------------------------
++dnl - check whether ruby is required for the build
++dnl --------------------------------------------------------------------
++
++AC_ARG_ENABLE([ruby], [  --enable-ruby    Enable build of ruby module],
++	[case "${enableval}" in
++		yes) use_ruby=true ;;
++		no)  use_ruby=false ;;
++		*) AC_MSG_ERROR(bad value ${enableval} for --enable-ruby) ;;
++	esac],
++	[use_ruby=false]
++)
++
++dnl --------------------------------------------------------------------
++dnl - check whether php is required for the build
++dnl --------------------------------------------------------------------
++
++AC_ARG_ENABLE([php], [  --enable-php    Enable build of php module],
++	[case "${enableval}" in
++		yes) use_php=true ;;
++		no)  use_php=false ;;
++		*) AC_MSG_ERROR(bad value ${enableval} for --enable-php) ;;
++	esac],
++	[use_php=false]
++)
++
++
++dnl --------------------------------------------------------------------
++dnl - check for swig if python, ruby or php are enabled
++dnl --------------------------------------------------------------------
++
++use_swig=false
++if test x"$use_python" = xtrue ||
++   test x"$use_ruby" = xtrue; then
++	AC_PROG_SWIG(1.3.28)
++	if test x"$SWIG" != "x"; then
++	    SWIG_ENABLE_CXX	
++            AC_SUBST(SWIG)           
++ 
++            use_swig=true 
++	fi
++fi
++AM_CONDITIONAL(ENABLE_SWIG, [ test x"$use_swig" = xtrue ])
++
++
++dnl --------------------------------------------------------------------
++dnl - check for python if enabled
++dnl --------------------------------------------------------------------
++
++if test x"$use_python" = xtrue; then
++	dnl Check for Python 
++        AM_PATH_PYTHON	
++        SWIG_PYTHON
++
++	if test x"$PYTHON" = "x"; then
++		use_python=false
++	fi
++	
++	AC_SUBST(PYTHON)
++	AC_SUBST(SWIG_PYTHON_CPPFLAGS)
++	AC_SUBST(SWIG_PYTHON_OPT)
++fi
++AM_CONDITIONAL(ENABLE_PYTHON, [test x"$use_python" = xtrue])
++
++
++dnl --------------------------------------------------------------------
++dnl - check for ruby if enabled
++dnl --------------------------------------------------------------------
++
++if test x"$use_ruby" = xtrue; then
++	dnl Check for Ruby 
++	AC_RUBY_DEVEL
++
++	if test x"$RUBY" = x; then
++		use_ruby=false
++	fi
++
++fi
++AM_CONDITIONAL(ENABLE_RUBY, [ test x"$use_ruby" = xtrue ])
++
++dnl --------------------------------------------------------------------
++dnl - check for php if enabled
++dnl --------------------------------------------------------------------
++
++if test x"$use_php" = xtrue; then
++	dnl Check for PHP 
++	AC_PATH_PROG(PHP_CONFIG, php-config)
++
++	if test x"$PHP_CONFIG" = x; then
++		AC_MSG_WARN([php-config not found, php support disabled])
++		use_php=false
++	else
++
++		dnl TODO: check for version, we want PHP5 dev files
++
++		AC_PATH_PROG(PHP, php) dnl for unit testing
++		AC_PATH_PROG(PHPUNIT, phpunit) dnl for unit testing
++	fi
++
++
++fi
++AM_CONDITIONAL(ENABLE_PHP, [ test x"$use_php" = xtrue ])
++AM_CONDITIONAL(HAVE_PHP, [ test x"$PHP" != x ])
++AM_CONDITIONAL(HAVE_PHP_UNIT, [ test x"$PHPUNIT" != x ])
++
++
++dnl --------------------------------------------------------------------
++dnl - do operating-system specific things
++dnl --------------------------------------------------------------------
++
++AC_MSG_CHECKING([OS-specific settings])
++
++case "${host_os}" in
++	*darwin*)
++		AC_MSG_RESULT([${host_os}])
++		AC_MSG_CHECKING([for OS/X version])
++		kernel=`uname -r`
++
++		# "Darwin 9.6.0" is Mac OSX 10.5.6
++		# "Darwin 10.x" would presumably be Mac OS X 10.6.x
++		case "${kernel}" in
++			8.*)
++				AC_MSG_RESULT([Mac OS X 10.4 Tiger])
++				;;
++			9.*)
++				AC_MSG_RESULT([Mac OS X 10.5 Leopard])
++				;;
++			10.*)
++dnl				AM_CXXFLAGS="$AM_CXXFLAGS -Wnon-virtual-dtor -Woverloaded-virtual"
++				AC_MSG_RESULT([Mac OS X 10.6 Snow Leopard])
++				;;
++			*)
++				AC_MSG_RESULT([Mac OS X (Darwin ${kernel} kernel)])
++				;;
++		esac
++		;;
++esac
++
++dnl --------------------------------------------------------------------
++dnl - check for boost 
++dnl --------------------------------------------------------------------
++
++dnl -- AX_BOOST(1.32)
++dnl -- if test "x$ax_cv_boost_unit_test_framework" = "xyes"; then
++dnl -- 	use_boost_utf=yes
++dnl -- else
++dnl -- 	use_boost_utf=no
++dnl -- fi
++dnl -- AM_CONDITIONAL(ENABLE_BOOST_UTF, [test "x$use_boost_utf" = "xyes"])
++
++dnl things to substitute in output ----------------------------------------
++AC_SUBST(VERSION)
++AC_SUBST(VERSION_MAJOR)
++AC_SUBST(VERSION_MINOR)
++AC_SUBST(VERSION_PATCH)
++AC_SUBST(INTERFACE_CURRENT)
++AC_SUBST(INTERFACE_REVISION)
++AC_SUBST(INTERFACE_AGE)
++AC_SUBST(JTS_PORT)
++AC_SUBST(CAPI_VERSION)
++AC_SUBST(CAPI_VERSION_MAJOR)
++AC_SUBST(CAPI_VERSION_MINOR)
++AC_SUBST(CAPI_VERSION_PATCH)
++AC_SUBST(CAPI_INTERFACE_CURRENT)
++AC_SUBST(CAPI_INTERFACE_REVISION)
++AC_SUBST(CAPI_INTERFACE_AGE)
++
++dnl output stuff ----------------------------------------------------------
++
++AC_OUTPUT([
++	Makefile 
++	capi/Makefile
++	capi/geos_c.h
++	doc/Doxyfile
++	doc/Makefile
++	macros/Makefile
++	src/Makefile 
++	src/algorithm/Makefile
++	src/algorithm/locate/Makefile
++	src/algorithm/distance/Makefile
++	src/geom/Makefile
++	src/geom/prep/Makefile
++	src/geom/util/Makefile
++	src/geomgraph/Makefile
++	src/geomgraph/index/Makefile
++	include/Makefile
++	include/geos/Makefile
++	include/geos/algorithm/Makefile
++	include/geos/algorithm/locate/Makefile
++	include/geos/algorithm/distance/Makefile
++	include/geos/geom/Makefile
++	include/geos/geom/prep/Makefile
++	include/geos/geom/util/Makefile
++	include/geos/geomgraph/Makefile
++	include/geos/geomgraph/index/Makefile
++	include/geos/index/Makefile
++	include/geos/index/bintree/Makefile
++	include/geos/index/chain/Makefile
++	include/geos/index/intervalrtree/Makefile
++	include/geos/index/quadtree/Makefile
++	include/geos/index/strtree/Makefile
++	include/geos/index/sweepline/Makefile
++	include/geos/io/Makefile
++	include/geos/linearref/Makefile
++	include/geos/noding/Makefile
++	include/geos/noding/snapround/Makefile
++	include/geos/operation/Makefile
++	include/geos/operation/buffer/Makefile
++	include/geos/operation/distance/Makefile
++	include/geos/operation/linemerge/Makefile
++	include/geos/operation/overlay/Makefile
++	include/geos/operation/overlay/snap/Makefile
++	include/geos/operation/polygonize/Makefile
++	include/geos/operation/predicate/Makefile
++	include/geos/operation/relate/Makefile
++	include/geos/operation/sharedpaths/Makefile
++	include/geos/operation/union/Makefile
++	include/geos/operation/valid/Makefile
++	include/geos/planargraph/Makefile
++	include/geos/planargraph/algorithm/Makefile
++	include/geos/precision/Makefile
++	include/geos/simplify/Makefile
++	include/geos/triangulate/Makefile
++	include/geos/triangulate/quadedge/Makefile
++	include/geos/util/Makefile
++	include/geos/version.h
++	src/index/Makefile
++	src/index/bintree/Makefile
++	src/index/chain/Makefile
++	src/index/intervalrtree/Makefile
++	src/index/quadtree/Makefile
++	src/index/strtree/Makefile
++	src/index/sweepline/Makefile
++	src/io/Makefile
++	src/linearref/Makefile
++	src/noding/Makefile
++	src/noding/snapround/Makefile
++	src/operation/Makefile
++	src/operation/buffer/Makefile
++	src/operation/distance/Makefile
++	src/operation/linemerge/Makefile
++	src/operation/overlay/Makefile
++	src/operation/polygonize/Makefile
++	src/operation/predicate/Makefile
++	src/operation/relate/Makefile
++	src/operation/sharedpaths/Makefile
++	src/operation/union/Makefile
++	src/operation/valid/Makefile
++	src/planargraph/Makefile
++	src/precision/Makefile
++	src/simplify/Makefile
++	src/triangulate/Makefile
++	src/triangulate/quadedge/Makefile
++	src/util/Makefile
++	swig/geos.i
++	swig/Makefile
++	swig/python/Makefile
++	swig/python/tests/Makefile
++	swig/ruby/Makefile
++	swig/ruby/test/Makefile
++	php/Makefile
++	php/test/Makefile
++	tests/Makefile
++	tests/bigtest/Makefile
++	tests/unit/Makefile
++	tests/perf/Makefile
++	tests/perf/operation/Makefile
++	tests/perf/operation/buffer/Makefile
++	tests/perf/operation/predicate/Makefile
++	tests/perf/capi/Makefile
++	tests/xmltester/Makefile
++	tests/geostest/Makefile
++	tests/thread/Makefile
++	tools/Makefile
++	tools/geos-config
++	])
++
++dnl -- echo "---------------------------------------"
++dnl -- echo "Boost UTF: $use_boost_utf"
++echo "Swig: $use_swig"
++echo "Python bindings: $use_python"
++echo "Ruby bindings: $use_ruby"
++
++echo "PHP bindings: $use_php"
++if test x"$use_php" = xtrue; then
++ echo " PHP: $PHP"
++ echo " PHPUNIT: $PHPUNIT"
++ if test x"$PHP" = x -o x"$PHPUNIT" = x; then
++   AC_MSG_WARN([PHP Unit testing disabled (missing PHP or PHPUNIT)])
++ fi
++fi
++
++dnl -- echo "---------------------------------------"
+--- a/configure.in
++++ /dev/null
+@@ -1,537 +0,0 @@
+-dnl
+-dnl configure.in - autoconf input template to produce ./configure script
+-dnl
+-dnl version 2.52 is required for Cygwin libtool support
+-AC_PREREQ([2.52])
+-
+-dnl local vars to hold user's preferences --------------------------------
+-AC_INIT([include/geos.h])
+-AC_CANONICAL_SYSTEM
+-
+-AC_CONFIG_MACRO_DIR([macros])
+-
+-dnl -- JTS_PORT: the version of JTS this release is bound to
+-JTS_PORT=1.12.0
+-
+-dnl -- Version info for the CAPI
+-CAPI_INTERFACE_CURRENT=9
+-CAPI_INTERFACE_REVISION=2
+-CAPI_INTERFACE_AGE=8
+-
+-dnl
+-dnl -- Release versions / C++ library SONAME will use these
+-dnl -- encoding ABI break at every release
+-dnl
+-VERSION_MAJOR=3
+-VERSION_MINOR=4
+-VERSION_PATCH=2
+-VERSION="$VERSION_MAJOR.$VERSION_MINOR.$VERSION_PATCH"
+-
+-dnl CAPI_VERSION_MAJOR=$(($CAPI_INTERFACE_CURRENT-$CAPI_INTERFACE_AGE))
+-dnl the following should be more portable
+-CAPI_VERSION_MAJOR=`expr $CAPI_INTERFACE_CURRENT - $CAPI_INTERFACE_AGE`
+-CAPI_VERSION_MINOR=$CAPI_INTERFACE_AGE
+-CAPI_VERSION_PATCH=$CAPI_INTERFACE_REVISION
+-CAPI_VERSION="$CAPI_VERSION_MAJOR.$CAPI_VERSION_MINOR.$CAPI_VERSION_PATCH"
+-
+-AM_INIT_AUTOMAKE([geos], [$VERSION], [no-define])
+-AM_MAINTAINER_MODE
+-AC_CONFIG_HEADERS([include/config.h] [include/geos/platform.h])
+-AC_PROG_CC
+-
+-dnl use libtool ----------------------------------------------------------
+-AC_LIBTOOL_DLOPEN
+-AC_LIBTOOL_WIN32_DLL
+-AC_PROG_LIBTOOL
+-
+-dnl check for programs ----------------------------------------------------
+-AC_PROG_CXX
+-AC_ISC_POSIX
+-AC_PROG_INSTALL
+-AC_PROG_MAKE_SET
+-
+-dnl function checks ------------------------------------------------------
+-AC_FUNC_CLOSEDIR_VOID
+-AC_FUNC_MEMCMP
+-AC_FUNC_STRFTIME
+-AC_FUNC_VPRINTF
+-AC_FUNC_ALLOCA
+-AC_HEADER_DIRENT
+-AC_HEADER_STDC
+-AC_CHECK_HEADERS([memory.h])
+-AC_CHECK_HEADERS([unistd.h])
+-AC_CHECK_HEADERS([ieeefp.h])
+-AC_CHECK_HEADERS([sys/file.h])
+-AC_CHECK_HEADERS([sys/time.h])
+-AC_CHECK_FUNCS([strchr memcpy gettimeofday])
+-AC_HEADER_STAT
+-AC_STRUCT_TM
+-AC_TYPE_SIZE_T
+-AC_C_CONST
+-
+-dnl --------------------------------------------------------------------
+-dnl - Check for inline and cassert settings
+-dnl --------------------------------------------------------------------
+-
+-
+-AC_ARG_ENABLE([inline], [  --disable-inline    Disable inlining],
+-	[case "${enableval}" in
+-		yes) enable_inline=true ;;
+-		no)  enable_inline=false ;;
+-		*) AC_MSG_ERROR(bad value ${enableval} for --enable-inline);;
+-	esac],
+-	[enable_inline=true]
+-)
+-
+-AC_ARG_ENABLE([cassert], [  --disable-cassert   Disable assertion checking],
+-	[case "${enableval}" in
+-		yes) enable_cassert=true ;;
+-		no)  enable_cassert=false ;;
+-		*) AC_MSG_ERROR(bad value ${enableval} for --enable-cassert);;
+-	esac],
+-	[enable_cassert=true]
+-)
+-
+-AC_ARG_ENABLE([glibcxx-debug], [  --enable-glibcxx-debug    Enable libstdc++ debug mode],
+-	[case "${enableval}" in
+-		yes) enable_glibcxx_debug=true ;;
+-		no)  enable_glibcxx_debug=false ;;
+-		*) AC_MSG_ERROR(bad value ${enableval} for --enable-glibcxx-debug);;
+-	esac],
+-	[enable_glibcxx_debug=false]
+-)
+-
+-
+-AC_MSG_CHECKING([if requested to force inline functions])
+-INLINE_FLAGS=
+-AC_SUBST(INLINE_FLAGS)
+-if test x"$enable_inline" = xtrue; then
+-	INLINE_FLAGS="-DGEOS_INLINE"
+-	AM_CXXFLAGS="$AM_CXXFLAGS $INLINE_FLAGS"
+-    AC_MSG_RESULT([yes])
+-else
+-    AC_MSG_RESULT([no])
+-fi
+-
+-AC_MSG_CHECKING([if requested to enable assert macros])
+-if test x"$enable_cassert" = xfalse; then
+-	AM_CXXFLAGS="$AM_CXXFLAGS -DNDEBUG"
+-    AC_MSG_RESULT([no])
+-else
+-    AC_MSG_RESULT([yes])
+-fi
+-
+-AC_MSG_CHECKING([if requested libstdc++ debug mode])
+-if test x"$enable_glibcxx_debug" = xtrue; then
+-    AM_CXXFLAGS="$AM_CXXFLAGS -D_GLIBCXX_DEBUG=1 -D_GLIBCXX_DEBUG_PEDANTIC=1"
+-    AC_MSG_RESULT([yes])
+-else
+-    AC_MSG_RESULT([no])
+-fi
+-
+-dnl --------------------------------------------------------------------
+-dnl - Append default C++ and C flags 
+-dnl --------------------------------------------------------------------
+-
+-dnl In order for AC_LIBTOOL_COMPILER_OPTION to use
+-dnl the C compiler we need the hack below.
+-dnl It is likely a bug in the libtool macro file to
+-dnl require AC_LIBTOOL_LANG_CXX_CONFIG in *addition*
+-dnl to AC_LANG(CXX) or AC_LANG_PUSH(CXX)/AC_LANG_POP()
+-dnl 
+-AC_LIBTOOL_LANG_CXX_CONFIG
+-
+-# Set default AM_CXXFLAGS and AM_CFLAGS 
+-# -pedantic: ISO does not support long long
+-# we add -Wno-long-long to avoid those messages
+-WARNFLAGS=""
+-AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -pedantic], [dummy_cv_pedantic], [-pedantic], [], [WARNFLAGS="$WARNFLAGS -pedantic"], [])
+-AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -Wall], [dummy_cv_wall], [-Wall], [], [WARNFLAGS="$WARNFLAGS -Wall"], [])
+-AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -ansi], [dummy_cv_ansi], [-ansi], [], [WARNFLAGS="$WARNFLAGS -ansi"], [])
+-AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -Wno-long-long], [dummy_cv_no_long_long], [-Wno-long-long], [], [WARNFLAGS="$WARNFLAGS -Wno-long-long"], [])
+-
+-# To make numerical computation more stable, we use --ffloat-store
+-NUMERICFLAGS=""
+-AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -ffloat-store], [dummy_cv_ffloat_store], [-ffloat-store], [], [NUMERICFLAGS="$NUMERICFLAGS -ffloat-store"], [])
+-
+-DEFAULTFLAGS="${WARNFLAGS} ${NUMERICFLAGS}"
+-
+-AM_CXXFLAGS="${AM_CXXFLAGS} ${DEFAULTFLAGS}"
+-AM_CFLAGS="${AM_CFLAGS} ${DEFAULTFLAGS}"
+-AC_SUBST(AM_CXXFLAGS)
+-AC_SUBST(AM_CFLAGS)
+-
+-dnl --------------------------------------------------------------------
+-dnl - Look for finite and/or isfinite macros/functions
+-dnl --------------------------------------------------------------------
+-
+-dnl These two tests need the math library or they won't link
+-dnl on OpenBSD, even if the functions exist.
+-save_LIBS=$LIBS
+-LIBS="$LIBS -lm"
+-AC_CACHE_CHECK([for finite], ac_cv_finite,
+- [AC_TRY_LINK([#include <math.h>],
+- [double x; int y; y = finite(x);],
+- ac_cv_finite=yes,
+- ac_cv_finite=no
+-)])
+-if test x"$ac_cv_finite" = x"yes"; then
+-  AC_DEFINE(HAVE_FINITE, [1], [Has finite])
+-fi
+-
+-AC_CACHE_CHECK([for isfinite], ac_cv_isfinite,
+- [AC_TRY_LINK([#include <math.h>],
+- [double x; int y; y = isfinite(x);],
+- ac_cv_isfinite=yes,
+- ac_cv_isfinite=no
+-)])
+-if test x"$ac_cv_isfinite" = x"yes"; then
+-  AC_DEFINE(HAVE_ISFINITE, [1], [Has isfinite])
+-fi
+-
+-dnl --------------------------------------------------------------------
+-dnl Test for presence of isnan function when using C++ and <cmath>
+-dnl This is for a particular bug in OS/X where <cmath> drops the definition
+-dnl of isnan().
+-
+-AC_LANG_PUSH([C++])
+-AC_CACHE_CHECK([for isnan], ac_cv_isnan,
+- [AC_TRY_LINK([#include <cmath>],
+- [double x; int y; y = isnan(x);],
+- ac_cv_isnan=yes,
+- ac_cv_isnan=no
+-)])
+-if test x"$ac_cv_isnan" = x"yes"; then
+-  AC_DEFINE(HAVE_ISNAN, [1], [Has isnan])
+-fi
+-AC_LANG_POP([C++])
+-
+-dnl --------------------------------------------------------------------
+-
+-LIBS=$save_LIBS
+-
+-dnl --------------------------------------------------------------------
+-dnl - Look for a 64bit integer (do after CFLAGS is set)
+-dnl --------------------------------------------------------------------
+-
+-dnl Find a working 64bit integer
+-PGAC_TYPE_64BIT_INT([int64_t])
+-if test x"$HAVE_INT64_T_64" = x"no" ; then
+-  PGAC_TYPE_64BIT_INT([long int])
+-  if test x"$HAVE_LONG_INT_64" = x"no" ; then
+-    PGAC_TYPE_64BIT_INT([long long int])
+-    if test x"$HAVE_LONG_LONG_INT_64" = x"no" ; then
+-      AC_MSG_WARN([Could not find a working 64bit int type, you may experience weird bugs (undefined behaviour)]);
+-    fi
+-  fi
+-fi
+-
+-
+-
+-dnl --------------------------------------------------------------------
+-dnl - check whether python is required for the build
+-dnl --------------------------------------------------------------------
+-
+-AC_ARG_ENABLE([python], [  --enable-python    Enable build of python module],
+-	[case "${enableval}" in
+-		yes) use_python=true ;;
+-		no)  use_python=false ;;
+-		*) AC_MSG_ERROR(bad value ${enableval} for --enable-python) ;;
+-	esac],
+-	[use_python=false]
+-)
+-
+-
+-dnl --------------------------------------------------------------------
+-dnl - check whether ruby is required for the build
+-dnl --------------------------------------------------------------------
+-
+-AC_ARG_ENABLE([ruby], [  --enable-ruby    Enable build of ruby module],
+-	[case "${enableval}" in
+-		yes) use_ruby=true ;;
+-		no)  use_ruby=false ;;
+-		*) AC_MSG_ERROR(bad value ${enableval} for --enable-ruby) ;;
+-	esac],
+-	[use_ruby=false]
+-)
+-
+-dnl --------------------------------------------------------------------
+-dnl - check whether php is required for the build
+-dnl --------------------------------------------------------------------
+-
+-AC_ARG_ENABLE([php], [  --enable-php    Enable build of php module],
+-	[case "${enableval}" in
+-		yes) use_php=true ;;
+-		no)  use_php=false ;;
+-		*) AC_MSG_ERROR(bad value ${enableval} for --enable-php) ;;
+-	esac],
+-	[use_php=false]
+-)
+-
+-
+-dnl --------------------------------------------------------------------
+-dnl - check for swig if python, ruby or php are enabled
+-dnl --------------------------------------------------------------------
+-
+-use_swig=false
+-if test x"$use_python" = xtrue ||
+-   test x"$use_ruby" = xtrue; then
+-	AC_PROG_SWIG(1.3.28)
+-	if test x"$SWIG" != "x"; then
+-	    SWIG_ENABLE_CXX	
+-            AC_SUBST(SWIG)           
+- 
+-            use_swig=true 
+-	fi
+-fi
+-AM_CONDITIONAL(ENABLE_SWIG, [ test x"$use_swig" = xtrue ])
+-
+-
+-dnl --------------------------------------------------------------------
+-dnl - check for python if enabled
+-dnl --------------------------------------------------------------------
+-
+-if test x"$use_python" = xtrue; then
+-	dnl Check for Python 
+-        AM_PATH_PYTHON	
+-        SWIG_PYTHON
+-
+-	if test x"$PYTHON" = "x"; then
+-		use_python=false
+-	fi
+-	
+-	AC_SUBST(PYTHON)
+-	AC_SUBST(SWIG_PYTHON_CPPFLAGS)
+-	AC_SUBST(SWIG_PYTHON_OPT)
+-fi
+-AM_CONDITIONAL(ENABLE_PYTHON, [test x"$use_python" = xtrue])
+-
+-
+-dnl --------------------------------------------------------------------
+-dnl - check for ruby if enabled
+-dnl --------------------------------------------------------------------
+-
+-if test x"$use_ruby" = xtrue; then
+-	dnl Check for Ruby 
+-	AC_RUBY_DEVEL
+-
+-	if test x"$RUBY" = x; then
+-		use_ruby=false
+-	fi
+-
+-fi
+-AM_CONDITIONAL(ENABLE_RUBY, [ test x"$use_ruby" = xtrue ])
+-
+-dnl --------------------------------------------------------------------
+-dnl - check for php if enabled
+-dnl --------------------------------------------------------------------
+-
+-if test x"$use_php" = xtrue; then
+-	dnl Check for PHP 
+-	AC_PATH_PROG(PHP_CONFIG, php-config)
+-
+-	if test x"$PHP_CONFIG" = x; then
+-		AC_MSG_WARN([php-config not found, php support disabled])
+-		use_php=false
+-	else
+-
+-		dnl TODO: check for version, we want PHP5 dev files
+-
+-		AC_PATH_PROG(PHP, php) dnl for unit testing
+-		AC_PATH_PROG(PHPUNIT, phpunit) dnl for unit testing
+-	fi
+-
+-
+-fi
+-AM_CONDITIONAL(ENABLE_PHP, [ test x"$use_php" = xtrue ])
+-AM_CONDITIONAL(HAVE_PHP, [ test x"$PHP" != x ])
+-AM_CONDITIONAL(HAVE_PHP_UNIT, [ test x"$PHPUNIT" != x ])
+-
+-
+-dnl --------------------------------------------------------------------
+-dnl - do operating-system specific things
+-dnl --------------------------------------------------------------------
+-
+-AC_MSG_CHECKING([OS-specific settings])
+-
+-case "${host_os}" in
+-	*darwin*)
+-		AC_MSG_RESULT([${host_os}])
+-		AC_MSG_CHECKING([for OS/X version])
+-		kernel=`uname -r`
+-
+-		# "Darwin 9.6.0" is Mac OSX 10.5.6
+-		# "Darwin 10.x" would presumably be Mac OS X 10.6.x
+-		case "${kernel}" in
+-			8.*)
+-				AC_MSG_RESULT([Mac OS X 10.4 Tiger])
+-				;;
+-			9.*)
+-				AC_MSG_RESULT([Mac OS X 10.5 Leopard])
+-				;;
+-			10.*)
+-dnl				AM_CXXFLAGS="$AM_CXXFLAGS -Wnon-virtual-dtor -Woverloaded-virtual"
+-				AC_MSG_RESULT([Mac OS X 10.6 Snow Leopard])
+-				;;
+-			*)
+-				AC_MSG_RESULT([Mac OS X (Darwin ${kernel} kernel)])
+-				;;
+-		esac
+-		;;
+-esac
+-
+-dnl --------------------------------------------------------------------
+-dnl - check for boost 
+-dnl --------------------------------------------------------------------
+-
+-dnl -- AX_BOOST(1.32)
+-dnl -- if test "x$ax_cv_boost_unit_test_framework" = "xyes"; then
+-dnl -- 	use_boost_utf=yes
+-dnl -- else
+-dnl -- 	use_boost_utf=no
+-dnl -- fi
+-dnl -- AM_CONDITIONAL(ENABLE_BOOST_UTF, [test "x$use_boost_utf" = "xyes"])
+-
+-dnl things to substitute in output ----------------------------------------
+-AC_SUBST(VERSION)
+-AC_SUBST(VERSION_MAJOR)
+-AC_SUBST(VERSION_MINOR)
+-AC_SUBST(VERSION_PATCH)
+-AC_SUBST(INTERFACE_CURRENT)
+-AC_SUBST(INTERFACE_REVISION)
+-AC_SUBST(INTERFACE_AGE)
+-AC_SUBST(JTS_PORT)
+-AC_SUBST(CAPI_VERSION)
+-AC_SUBST(CAPI_VERSION_MAJOR)
+-AC_SUBST(CAPI_VERSION_MINOR)
+-AC_SUBST(CAPI_VERSION_PATCH)
+-AC_SUBST(CAPI_INTERFACE_CURRENT)
+-AC_SUBST(CAPI_INTERFACE_REVISION)
+-AC_SUBST(CAPI_INTERFACE_AGE)
+-
+-dnl output stuff ----------------------------------------------------------
+-
+-AC_OUTPUT([
+-	Makefile 
+-	capi/Makefile
+-	capi/geos_c.h
+-	doc/Doxyfile
+-	doc/Makefile
+-	macros/Makefile
+-	src/Makefile 
+-	src/algorithm/Makefile
+-	src/algorithm/locate/Makefile
+-	src/algorithm/distance/Makefile
+-	src/geom/Makefile
+-	src/geom/prep/Makefile
+-	src/geom/util/Makefile
+-	src/geomgraph/Makefile
+-	src/geomgraph/index/Makefile
+-	include/Makefile
+-	include/geos/Makefile
+-	include/geos/algorithm/Makefile
+-	include/geos/algorithm/locate/Makefile
+-	include/geos/algorithm/distance/Makefile
+-	include/geos/geom/Makefile
+-	include/geos/geom/prep/Makefile
+-	include/geos/geom/util/Makefile
+-	include/geos/geomgraph/Makefile
+-	include/geos/geomgraph/index/Makefile
+-	include/geos/index/Makefile
+-	include/geos/index/bintree/Makefile
+-	include/geos/index/chain/Makefile
+-	include/geos/index/intervalrtree/Makefile
+-	include/geos/index/quadtree/Makefile
+-	include/geos/index/strtree/Makefile
+-	include/geos/index/sweepline/Makefile
+-	include/geos/io/Makefile
+-	include/geos/linearref/Makefile
+-	include/geos/noding/Makefile
+-	include/geos/noding/snapround/Makefile
+-	include/geos/operation/Makefile
+-	include/geos/operation/buffer/Makefile
+-	include/geos/operation/distance/Makefile
+-	include/geos/operation/linemerge/Makefile
+-	include/geos/operation/overlay/Makefile
+-	include/geos/operation/overlay/snap/Makefile
+-	include/geos/operation/polygonize/Makefile
+-	include/geos/operation/predicate/Makefile
+-	include/geos/operation/relate/Makefile
+-	include/geos/operation/sharedpaths/Makefile
+-	include/geos/operation/union/Makefile
+-	include/geos/operation/valid/Makefile
+-	include/geos/planargraph/Makefile
+-	include/geos/planargraph/algorithm/Makefile
+-	include/geos/precision/Makefile
+-	include/geos/simplify/Makefile
+-	include/geos/triangulate/Makefile
+-	include/geos/triangulate/quadedge/Makefile
+-	include/geos/util/Makefile
+-	include/geos/version.h
+-	src/index/Makefile
+-	src/index/bintree/Makefile
+-	src/index/chain/Makefile
+-	src/index/intervalrtree/Makefile
+-	src/index/quadtree/Makefile
+-	src/index/strtree/Makefile
+-	src/index/sweepline/Makefile
+-	src/io/Makefile
+-	src/linearref/Makefile
+-	src/noding/Makefile
+-	src/noding/snapround/Makefile
+-	src/operation/Makefile
+-	src/operation/buffer/Makefile
+-	src/operation/distance/Makefile
+-	src/operation/linemerge/Makefile
+-	src/operation/overlay/Makefile
+-	src/operation/polygonize/Makefile
+-	src/operation/predicate/Makefile
+-	src/operation/relate/Makefile
+-	src/operation/sharedpaths/Makefile
+-	src/operation/union/Makefile
+-	src/operation/valid/Makefile
+-	src/planargraph/Makefile
+-	src/precision/Makefile
+-	src/simplify/Makefile
+-	src/triangulate/Makefile
+-	src/triangulate/quadedge/Makefile
+-	src/util/Makefile
+-	swig/geos.i
+-	swig/Makefile
+-	swig/python/Makefile
+-	swig/python/tests/Makefile
+-	swig/ruby/Makefile
+-	swig/ruby/test/Makefile
+-	php/Makefile
+-	php/test/Makefile
+-	tests/Makefile
+-	tests/bigtest/Makefile
+-	tests/unit/Makefile
+-	tests/perf/Makefile
+-	tests/perf/operation/Makefile
+-	tests/perf/operation/buffer/Makefile
+-	tests/perf/operation/predicate/Makefile
+-	tests/perf/capi/Makefile
+-	tests/xmltester/Makefile
+-	tests/geostest/Makefile
+-	tests/thread/Makefile
+-	tools/Makefile
+-	tools/geos-config
+-	])
+-
+-dnl -- echo "---------------------------------------"
+-dnl -- echo "Boost UTF: $use_boost_utf"
+-echo "Swig: $use_swig"
+-echo "Python bindings: $use_python"
+-echo "Ruby bindings: $use_ruby"
+-
+-echo "PHP bindings: $use_php"
+-if test x"$use_php" = xtrue; then
+- echo " PHP: $PHP"
+- echo " PHPUNIT: $PHPUNIT"
+- if test x"$PHP" = x -o x"$PHPUNIT" = x; then
+-   AC_MSG_WARN([PHP Unit testing disabled (missing PHP or PHPUNIT)])
+- fi
+-fi
+-
+-dnl -- echo "---------------------------------------"
diff --git a/debian/patches/series b/debian/patches/series
index 1286296..261339a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,6 @@ TaggedLineString.h
 TaggedLineStringSimplifier.h
 geos-config
 libruby
+automake-subdir-objects
+automake-am-cppflags
+configure.ac
diff --git a/debian/rules b/debian/rules
index 8aafc0d..360d211 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,13 +10,13 @@ DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 # Guessing geos version, which is required for C++ binding support
-VER_MAJOR=$(shell grep ^VERSION_MAJOR configure.in|cut -d= -f2)
-VER_MINOR=$(shell grep ^VERSION_MINOR configure.in|cut -d= -f2)
-VER_PATCH=$(shell grep ^VERSION_PATCH configure.in|cut -d= -f2|cut -dr -f1)
+VER_MAJOR=$(shell grep ^VERSION_MAJOR configure.*|cut -d= -f2)
+VER_MINOR=$(shell grep ^VERSION_MINOR configure.*|cut -d= -f2)
+VER_PATCH=$(shell grep ^VERSION_PATCH configure.*|cut -d= -f2|cut -dr -f1)
 VER=$(VER_MAJOR).$(VER_MINOR).$(VER_PATCH)
 
 ifeq (..,$(VER))
-$(error configure.in not found or version cannot be guessed)
+$(error configure.ac/configure.in not found or version cannot be guessed)
 else
 $(info Guessed geos version is $(VER))
 endif

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/geos.git



More information about the Pkg-grass-devel mailing list