1
From: Francesco Paolo Lovergine <frankie@debian.org>
2
Subject: use system-wide libraries
7
libspatialite/Makefile.am | 14 ++++++--------
8
libspatialite/headers/Makefile.am | 2 --
9
spatialite-tools/Makefile.am | 14 +++++---------
10
spatialite-tools/exif_loader.c | 2 +-
11
spatialite-tools/shapefiles.c | 2 +-
12
spatialite-tools/shell.c | 2 +-
13
spatialite-tools/shp_doctor.c | 2 +-
14
spatialite-tools/spatialite_network.c | 2 +-
15
spatialite-tools/spatialite_osm.c | 2 +-
16
spatialite-tools/spatialite_tool.c | 2 +-
17
10 files changed, 18 insertions(+), 26 deletions(-)
19
--- spatialite.orig/libspatialite/headers/Makefile.am
20
+++ spatialite/libspatialite/headers/Makefile.am
21
@@ -4,6 +4,4 @@ nobase_include_HEADERS = \
22
spatialite/gaiaexif.h \
23
spatialite/gaiaaux.h \
24
spatialite/gaiageo.h \
25
- spatialite/sqlite3.h \
26
- spatialite/sqlite3ext.h \
27
spatialite/spatialite.h
28
--- spatialite.orig/libspatialite/Makefile.am
29
+++ spatialite/libspatialite/Makefile.am
30
@@ -7,8 +7,7 @@ INCLUDES += @PROJ_INCLUDE@ @GEOS_INCLUDE
32
lib_LTLIBRARIES = libspatialite.la
34
-libspatialite_la_SOURCES = spatialite.c \
36
+libspatialite_la_SOURCES = spatialite.c
39
libspatialite_la_LDFLAGS = -version-info 2:4:0 -no-undefined
40
@@ -26,16 +25,15 @@ libspatialite_la_LIBADD = \
42
-liconv -lm -lstdc++ -lpthread -ldl
44
-libspatialite_la_LDFLAGS = -version-info 2:4:0
45
-libspatialite_la_LIBADD = \
49
+# Fixed SONAME to avoid not proper bumping.
50
+libspatialite_la_LDFLAGS = -lsqlite3 -version-info 3:0:1
51
+libspatialite_la_LIBADD = -lsqlite3 \
52
+ -lgeos_c -lgeos -lproj \
53
-lm -lstdc++ -lpthread -ldl
57
-AUTOMAKE_OPTIONS = dist-zip
58
+AUTOMAKE_OPTIONS = dist-zip foreign
60
EXTRA_DIST = makefile.vc nmake.opt libspatialite.def
62
--- spatialite.orig/spatialite-tools/exif_loader.c
63
+++ spatialite/spatialite-tools/exif_loader.c
68
-#include <spatialite/sqlite3.h>
70
#include <spatialite/gaiaexif.h>
71
#include <spatialite/gaiageo.h>
72
#include <spatialite.h>
73
--- spatialite.orig/spatialite-tools/Makefile.am
74
+++ spatialite/spatialite-tools/Makefile.am
75
@@ -45,21 +45,17 @@ LDADD = @SPATIALITE_LIB@ \
77
-lm -liconv -lstdc++ -lpthread -ldl
79
-spatialite_LDADD = @SPATIALITE_LIB@ \
83
+spatialite_LDADD = @SPATIALITE_LIB@ -lsqlite3 \
84
+ -lgeos_c -lgeos -lproj \
85
-lm -lstdc++ -lpthread -ldl \
87
-LDADD = @SPATIALITE_LIB@ \
91
+LDADD = @SPATIALITE_LIB@ -lsqlite3 \
92
+ -lgeos_c -lgeos -lproj \
93
-lm -lstdc++ -lpthread -ldl
97
EXTRA_DIST = makefile.vc nmake.opt
99
-AUTOMAKE_OPTIONS = dist-zip
100
+AUTOMAKE_OPTIONS = dist-zip foreign
102
--- spatialite.orig/spatialite-tools/shapefiles.c
103
+++ spatialite/spatialite-tools/shapefiles.c
104
@@ -47,7 +47,7 @@ the terms of any one of the MPL, the GPL
108
-#include <spatialite/sqlite3.h>
109
+#include <sqlite3.h>
110
#include <spatialite/gaiaaux.h>
111
#include <spatialite/gaiageo.h>
112
#include <spatialite.h>
113
--- spatialite.orig/spatialite-tools/shell.c
114
+++ spatialite/spatialite-tools/shell.c
116
/* Sandro Furieri 30 May 2008
117
/ #include "sqlite3.h"
119
-#include <spatialite/sqlite3.h>
120
+#include <sqlite3.h>
121
#include <spatialite.h>
123
#define LIBICONV_STATIC
124
--- spatialite.orig/spatialite-tools/shp_doctor.c
125
+++ spatialite/spatialite-tools/shp_doctor.c
130
-#include <spatialite/sqlite3.h>
131
+#include <sqlite3.h>
132
#include <spatialite/gaiageo.h>
135
--- spatialite.orig/spatialite-tools/spatialite_network.c
136
+++ spatialite/spatialite-tools/spatialite_network.c
141
-#include <spatialite/sqlite3.h>
142
+#include <sqlite3.h>
143
#include <spatialite/gaiageo.h>
144
#include <spatialite.h>
146
--- spatialite.orig/spatialite-tools/spatialite_osm.c
147
+++ spatialite/spatialite-tools/spatialite_osm.c
152
-#include <spatialite/sqlite3.h>
153
+#include <sqlite3.h>
154
#include <spatialite/gaiageo.h>
155
#include <spatialite.h>
157
--- spatialite.orig/spatialite-tools/spatialite_tool.c
158
+++ spatialite/spatialite-tools/spatialite_tool.c
163
-#include <spatialite/sqlite3.h>
164
+#include <sqlite3.h>
165
#include <spatialite/gaiaaux.h>
166
#include <spatialite/gaiageo.h>
167
#include <spatialite.h>