[SCM] spatialite branch, master, updated. upstream/2.4.0_rc4-39-g8d7c38a
David Paleino
dapal at debian.org
Sat Oct 8 18:46:06 UTC 2011
The following commit has been merged in the master branch:
commit b23182d1e650fcda62572a37807373cedad30505
Author: David Paleino <dapal at debian.org>
Date: Sat Oct 8 18:55:34 2011 +0200
Reference local headers
diff --git a/debian/patches/01-fix_local_build.patch b/debian/patches/01-fix_local_build.patch
index a3824b2..75b6a28 100644
--- a/debian/patches/01-fix_local_build.patch
+++ b/debian/patches/01-fix_local_build.patch
@@ -4,25 +4,26 @@ Origin: vendor
Forwarded: not-needed
---
- spatialite-tools/Makefile.am | 6 ++-
- spatialite-tools/Makefile.in | 25 +++++++++-----
+ spatialite-tools/Makefile.am | 7 ++--
+ spatialite-tools/Makefile.in | 7 ++--
spatialite-tools/configure | 71 +-----------------------------------------
spatialite-tools/configure.ac | 3 +
- 4 files changed, 24 insertions(+), 81 deletions(-)
+ 4 files changed, 14 insertions(+), 74 deletions(-)
--- spatialite.orig/spatialite-tools/Makefile.am
+++ spatialite/spatialite-tools/Makefile.am
-@@ -1,7 +1,8 @@
+@@ -1,7 +1,9 @@
ACLOCAL_AMFLAGS = -I m4
AM_CFLAGS = -D_LARGE_FILE=1 -D_FILE_OFFSET_BITS=64 \
- -D_LARGEFILE_SOURCE=1 @LIBSPATIALITE_CFLAGS@
+ -D_LARGEFILE_SOURCE=1 @LIBSPATIALITE_CFLAGS@ \
-+ -L../libspatialite/src/.libs/
++ -L../libspatialite/src/.libs/ \
++ -I../libspatialite/src/headers/
bin_PROGRAMS = spatialite \
spatialite_tool \
-@@ -32,7 +33,8 @@ spatialite_osm_raw_LDADD = @LIBSPATIALIT
+@@ -32,7 +34,8 @@ spatialite_osm_raw_LDADD = @LIBSPATIALIT
spatialite_gml_LDADD = @LIBSPATIALITE_LIBS@ \
-lexpat
spatialite_LDADD = @LIBSPATIALITE_LIBS@ \
@@ -34,57 +35,18 @@ Forwarded: not-needed
EXTRA_DIST = makefile.vc nmake.opt \
--- spatialite.orig/spatialite-tools/Makefile.in
+++ spatialite/spatialite-tools/Makefile.in
-@@ -42,9 +42,13 @@ bin_PROGRAMS = spatialite$(EXEEXT) spati
- subdir = .
- DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
- $(srcdir)/Makefile.in $(top_srcdir)/configure AUTHORS COPYING \
-- config.guess config.sub depcomp install-sh ltmain.sh missing
-+ ChangeLog INSTALL NEWS config.guess config.sub depcomp \
-+ install-sh ltmain.sh missing
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-+am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
-+ $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
-+ $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
-+ $(top_srcdir)/configure.ac
- am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
- am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
-@@ -172,6 +176,7 @@ LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
- MAINT = @MAINT@
- MAKEINFO = @MAKEINFO@
-+MANIFEST_TOOL = @MANIFEST_TOOL@
- MKDIR_P = @MKDIR_P@
- NM = @NM@
- NMEDIT = @NMEDIT@
-@@ -201,6 +206,7 @@ abs_builddir = @abs_builddir@
- abs_srcdir = @abs_srcdir@
- abs_top_builddir = @abs_top_builddir@
- abs_top_srcdir = @abs_top_srcdir@
-+ac_ct_AR = @ac_ct_AR@
- ac_ct_CC = @ac_ct_CC@
- ac_ct_CXX = @ac_ct_CXX@
- ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
-@@ -234,7 +240,6 @@ libdir = @libdir@
- libexecdir = @libexecdir@
- localedir = @localedir@
- localstatedir = @localstatedir@
--lt_ECHO = @lt_ECHO@
- mandir = @mandir@
- mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
-@@ -252,7 +257,8 @@ top_builddir = @top_builddir@
+@@ -252,7 +252,9 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I m4
AM_CFLAGS = -D_LARGE_FILE=1 -D_FILE_OFFSET_BITS=64 \
- -D_LARGEFILE_SOURCE=1 @LIBSPATIALITE_CFLAGS@
+ -D_LARGEFILE_SOURCE=1 @LIBSPATIALITE_CFLAGS@ \
-+ -L../libspatialite/src/.libs/
++ -L../libspatialite/src/.libs/ \
++ -I../libspatialite/src/headers/
INCLUDES = @CFLAGS@
spatialite_SOURCES = shell.c shapefiles.c
-@@ -274,7 +280,8 @@ spatialite_gml_LDADD = @LIBSPATIALITE_LI
+@@ -274,7 +276,8 @@ spatialite_gml_LDADD = @LIBSPATIALITE_LI
-lexpat
spatialite_LDADD = @LIBSPATIALITE_LIBS@ \
@@ -94,26 +56,6 @@ Forwarded: not-needed
LDADD = @LIBSPATIALITE_LIBS@
EXTRA_DIST = makefile.vc nmake.opt \
-@@ -293,15 +300,15 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
-- echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \
-- $(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \
-+ echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \
-+ $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \
- && exit 0; \
- exit 1;; \
- esac; \
- done; \
-- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
-+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
- $(am__cd) $(top_srcdir) && \
-- $(AUTOMAKE) --foreign Makefile
-+ $(AUTOMAKE) --gnu Makefile
- .PRECIOUS: Makefile
- Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
--- spatialite.orig/spatialite-tools/configure
+++ spatialite/spatialite-tools/configure
@@ -16710,75 +16710,6 @@ $as_echo "no" >&6; }
--
geospatial extension for SQLite
More information about the Pkg-grass-devel
mailing list