[SCM] libspatialindex branch, master, updated. upstream/1.8.1-32-g6cefc58

Bas Couwenberg sebastic at xs4all.nl
Fri Jan 10 20:34:03 UTC 2014


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

    There is no m4 directory.

diff --git a/debian/patches/buildsystem.patch b/debian/patches/buildsystem.patch
index 29dc705..ac604b0 100644
--- a/debian/patches/buildsystem.patch
+++ b/debian/patches/buildsystem.patch
@@ -1,16 +1,6 @@
 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 @@
@@ -110,14 +100,3 @@ Last-Update: 2013-01-10
  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 = 

-- 
A general framework for developing spatial indices



More information about the Pkg-grass-devel mailing list