[SCM] libspatialindex branch, master, updated. upstream/1.8.1-31-g821fcb8

Fri Jan 10 20:20:36 UTC 2014

The following commit has been merged in the master branch:
commit a71cc0f26beae8ba25a245bbcd43c550a14c3740
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Jan 10 21:03:43 2014 +0100

    Add patch to modernize the build system.

diff --git a/debian/changelog b/debian/changelog
index 03308d3..a9c5742 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,7 @@ spatialindex (1.8.1-1) unstable; urgency=low
   * Add symbols files using pkgkde-symbolshelper.
   * Bump Standards-Version to 3.9.5, changes: minimal dh rules, Multi-Arch,
     Vcs-* fields, shared library changes, copyright.
+  * Add patch to modernize the build system.
 
  -- Bas Couwenberg <sebastic at xs4all.nl>  Fri, 10 Jan 2014 20:30:00 +0100
 
diff --git a/debian/patches/buildsystem.patch b/debian/patches/buildsystem.patch
new file mode 100644
index 0000000..29dc705
--- /dev/null
+++ b/debian/patches/buildsystem.patch
@@ -0,0 +1,123 @@
+Description: Update buildsystem for clean autoreconf.
+Author: Bas Couwenberg <sebastic at xs4all.nl>
+Last-Update: 2013-01-10
+--- a/configure.ac
++++ b/configure.ac
+@@ -11,6 +11,7 @@ m4_define([sidx_version],
+ 
+ AC_INIT([spatialindex], [sidx_version], [mhadji at gmail.com], [spatialindex-src])
+ AC_CANONICAL_BUILD
++AC_CONFIG_MACRO_DIR([m4])
+ 
+ debug_default="no"
+ 
+--- a/src/capi/Makefile.am
++++ b/src/capi/Makefile.am
+@@ -1,6 +1,6 @@
+ ## Makefile.am -- Process this file with automake to produce Makefile.in
+ noinst_LTLIBRARIES = libsidxc.la
+-INCLUDES = -I../../include -I../../include/capi
++AM_CPPFLAGS = -I../../include -I../../include/capi
+ libsidxc_la_SOURCES =	BoundsQuery.cc \
+ 						CountVisitor.cc \
+ 						CustomStorage.cc \
+--- a/src/mvrtree/Makefile.am
++++ b/src/mvrtree/Makefile.am
+@@ -1,4 +1,4 @@
+ ## Makefile.am -- Process this file with automake to produce Makefile.in
+ noinst_LTLIBRARIES = libmvrtree.la
+-INCLUDES = -I../../include 
++AM_CPPFLAGS = -I../../include
+ libmvrtree_la_SOURCES = Index.cc Leaf.cc Node.cc MVRTree.cc Statistics.cc Index.h Leaf.h MVRTree.h Node.h PointerPoolNode.h Statistics.h
+--- a/src/rtree/Makefile.am
++++ b/src/rtree/Makefile.am
+@@ -1,4 +1,4 @@
+ ## Makefile.am -- Process this file with automake to produce Makefile.in
+ noinst_LTLIBRARIES = librtree.la
+-INCLUDES = -I../../include 
++AM_CPPFLAGS = -I../../include
+ librtree_la_SOURCES = BulkLoader.cc Index.cc Leaf.cc Node.cc RTree.cc Statistics.cc BulkLoader.h Index.h Leaf.h Node.h PointerPoolNode.h RTree.h Statistics.h
+--- a/src/spatialindex/Makefile.am
++++ b/src/spatialindex/Makefile.am
+@@ -1,4 +1,4 @@
+ ## Makefile.am -- Process this file with automake to produce Makefile.in
+ noinst_LTLIBRARIES = liblibrary.la
+-INCLUDES = -I../../include
++AM_CPPFLAGS = -I../../include
+ liblibrary_la_SOURCES = Point.cc Region.cc LineSegment.cc MovingPoint.cc MovingRegion.cc TimePoint.cc TimeRegion.cc SpatialIndexImpl.cc
+--- a/src/storagemanager/Makefile.am
++++ b/src/storagemanager/Makefile.am
+@@ -1,4 +1,4 @@
+ ## Makefile.am -- Process this file with automake to produce Makefile.in
+ noinst_LTLIBRARIES = libstoragemanager.la
+-INCLUDES = -I../../include 
++AM_CPPFLAGS = -I../../include
+ libstoragemanager_la_SOURCES = Buffer.h Buffer.cc DiskStorageManager.cc MemoryStorageManager.cc RandomEvictionsBuffer.cc DiskStorageManager.h MemoryStorageManager.h RandomEvictionsBuffer.h
+--- a/src/tools/Makefile.am
++++ b/src/tools/Makefile.am
+@@ -1,6 +1,6 @@
+ ## Makefile.am -- Process this file with automake to produce Makefile.in
+ noinst_LTLIBRARIES = libtools.la
+-INCLUDES = -I../../include
++AM_CPPFLAGS = -I../../include
+ libtools_la_SOURCES = Tools.cc 
+ 
+ if !RAND_IS_CONFIG
+--- a/src/tprtree/Makefile.am
++++ b/src/tprtree/Makefile.am
+@@ -1,4 +1,4 @@
+ ## Makefile.am -- Process this file with automake to produce Makefile.in
+ noinst_LTLIBRARIES = libtprtree.la
+-INCLUDES = -I../../include 
++AM_CPPFLAGS = -I../../include
+ libtprtree_la_SOURCES = Index.cc Leaf.cc Node.cc TPRTree.cc Statistics.cc Leaf.h Index.h Node.h PointerPoolNode.h Statistics.h TPRTree.h 
+--- a/test/geometry/Makefile.am
++++ b/test/geometry/Makefile.am
+@@ -1,5 +1,5 @@
+ ## Makefile.am -- Process this file with automake to produce Makefile.in
+ noinst_PROGRAMS = Intersection
+-INCLUDES = -I../../include
++AM_CPPFLAGS = -I../../include
+ Intersection_SOURCES = Intersection.cc
+ Intersection_LDADD = ../../libspatialindex.la
+--- a/test/mvrtree/Makefile.am
++++ b/test/mvrtree/Makefile.am
+@@ -1,6 +1,6 @@
+ ## Makefile.am -- Process this file with automake to produce Makefile.in
+ noinst_PROGRAMS = Generator Exhaustive MVRTreeLoad MVRTreeQuery
+-INCLUDES = -I../../include 
++AM_CPPFLAGS = -I../../include
+ Generator_SOURCES = Generator.cc 
+ Generator_LDADD = ../../libspatialindex.la
+ Exhaustive_SOURCES = Exhaustive.cc 
+--- a/test/rtree/Makefile.am
++++ b/test/rtree/Makefile.am
+@@ -1,6 +1,6 @@
+ ## Makefile.am -- Process this file with automake to produce Makefile.in
+ noinst_PROGRAMS = Generator Exhaustive RTreeLoad RTreeQuery RTreeBulkLoad
+-INCLUDES = -I../../include 
++AM_CPPFLAGS = -I../../include
+ Generator_SOURCES = Generator.cc 
+ Generator_LDADD = ../../libspatialindex.la
+ Exhaustive_SOURCES = Exhaustive.cc 
+--- a/test/tprtree/Makefile.am
++++ b/test/tprtree/Makefile.am
+@@ -1,6 +1,6 @@
+ ## Makefile.am -- Process this file with automake to produce Makefile.in
+ noinst_PROGRAMS = Generator Exhaustive TPRTreeLoad TPRTreeQuery
+-INCLUDES = -I../../include 
++AM_CPPFLAGS = -I../../include
+ Generator_SOURCES = RandomGenerator.cc Generator.cc RandomGenerator.h
+ Generator_LDADD = ../../libspatialindex.la
+ Exhaustive_SOURCES = Exhaustive.cc 
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,6 +1,8 @@
+ ## Makefile.am -- Process this file with automake to produce Makefile.in
+ SUBDIRS = src . test include
+ 
++ACLOCAL_AMFLAGS = -I m4
++
+ lib_LTLIBRARIES = libspatialindex.la libspatialindex_c.la
+ 
+ libspatialindex_la_SOURCES = 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..2af3136
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+buildsystem.patch

-- 
A general framework for developing spatial indices

