Use system shapelib

Gbp-Pq: Name 0007-Use-system-shapelib.patch

diff --git a/Makefile.in b/Makefile.in
index eb0f12067b85f9cb65371f2b5da7fb344a860b29..a1bec30b32132b207b95e131febff041a7849de0 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -105,8 +105,6 @@ JEEPS=jeeps/gpsapp.o jeeps/gpscom.o \
 # Extra modules in Jeeps that we don't use
 #      jeeps/gpsfmt.o jeeps/gpsinput.o jeeps/gpsproj.o
 
-SHAPE=shapelib/shpopen.o shapelib/dbfopen.o shapelib/safileio.o
-
 LIBOBJS = route.o waypt.o filter_vecs.o util.o vecs.o mkshort.o \
           csv_util.o strptime.o grtcirc.o util_crc.o xmlgeneric.o \
           formspec.o xmltag.o cet.o cet_util.o fatal.o rgbcolors.o \
@@ -115,7 +113,7 @@ LIBOBJS = route.o waypt.o filter_vecs.o util.o vecs.o mkshort.o \
     src/core/textstream.o \
          src/core/usasciicodec.o \
          src/core/xmlstreamwriter.o \
-         $(GARMIN) $(JEEPS) $(SHAPE) $(FMTS) $(FILTERS)
+         $(GARMIN) $(JEEPS) $(FMTS) $(FILTERS)
 OBJS = main.o globals.o $(LIBOBJS) @FILEINFO@
 
 DEPFILES = $(OBJS:.o=.d)
@@ -903,8 +901,7 @@ sbp.o: sbp.cc defs.h config.h  cet.h inifile.h \
 session.o: session.cc defs.h config.h  cet.h \
   inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h
 shape.o: shape.cc defs.h config.h  cet.h \
-  inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \
-  shapelib/shapefil.h
+  inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h
 shapelib/dbfopen.o: shapelib/dbfopen.c shapelib/shapefil.h
 shapelib/safileio.o: shapelib/safileio.c shapelib/shapefil.h
 shapelib/shpopen.o: shapelib/shpopen.c shapelib/shapefil.h

diff --git a/configure.ac b/configure.ac
index ceaefd37859521df728955ec565c3850dd5e14e6..1fb4a91891a0e27d81eb46afb2785ff4a1ea3435 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -67,6 +67,9 @@ AC_ARG_ENABLE([shapefile],
        [AS_VAR_SET([enable_shapefile], [yes])])
 AS_IF([test "$enable_shapefile" = "yes"], [
        AC_DEFINE(SHAPELIB_ENABLED, 1, [1 to enable shapefile support])
+       PKG_CHECK_MODULES(SHAPELIB, shapelib)
+       CPPFLAGS="$CPPFLAGS $SHAPELIB_CFLAGS"
+       LIBS="$LIBS $SHAPELIB_LIBS"
 ])
 AC_MSG_RESULT([$enable_shapefile])
 

diff --git a/shape.cc b/shape.cc
index bdc2961dc143aaf6f1b2b98ba9e0b1fab1895f1b..fce500bf613747bc4f3accb603b1389ecdce9c1c 100644 (file)
--- a/shape.cc
+++ b/shape.cc
@@ -25,7 +25,7 @@
 #include <QtCore/QVector>
 
 #include "defs.h"
-#include "shapelib/shapefil.h"
+#include <shapefil.h>
 #include <cstdlib>
 
 #if SHAPELIB_ENABLED