projects / packages / gpsbabel.git / blame
| Commit | Line | Data |
|---|---|---|
| db464ee9 ER |
1 | Use system shapelib - not suitable for upstream in this form. |
| 2 | ||
| cddd20fd BS |
3 | --- gpsbabel-1.5.1/configure.in.orig 2014-11-23 10:08:03.673956695 +0100 |
| 4 | +++ gpsbabel-1.5.1/configure.in 2014-11-23 10:36:15.211127830 +0100 | |
| 5 | @@ -340,7 +340,7 @@ | |
| 6 | AC_SUBST(QT_SYSINC_OPT) | |
| 7 | AC_SUBST(QT_LIBS) | |
| db464ee9 | 8 | |
| cddd20fd BS |
9 | -AC_CONFIG_FILES([Makefile gbversion.h gui/setup.iss xmldoc/makedoc tools/mkcapabilities win32/gpsbabel.rc jeeps/Makefile shapelib/Makefile zlib/empty]) |
| 10 | +AC_CONFIG_FILES([Makefile gbversion.h gui/setup.iss xmldoc/makedoc tools/mkcapabilities win32/gpsbabel.rc jeeps/Makefile zlib/empty]) | |
| 11 | AC_CONFIG_FILES([gui/makelinuxdist.sh], [chmod +x gui/makelinuxdist.sh]) | |
| 12 | AC_OUTPUT | |
| db464ee9 | 13 | |
| cddd20fd BS |
14 | --- gpsbabel-1.5.1/Makefile.in.orig 2014-11-23 10:08:03.677290002 +0100 |
| 15 | +++ gpsbabel-1.5.1/Makefile.in 2014-11-23 10:40:46.535655647 +0100 | |
| 16 | @@ -99,7 +99,7 @@ | |
| 17 | # Extra modules in Jeeps that we don't use | |
| 18 | # jeeps/gpsfmt.o jeeps/gpsinput.o jeeps/gpsproj.o | |
| db464ee9 | 19 | |
| cddd20fd | 20 | -SHAPE=shapelib/shpopen.o shapelib/dbfopen.o shapelib/safileio.o |
| db464ee9 ER |
21 | +SHAPE=-lshp |
| 22 | ||
| 23 | ZLIB=zlib/adler32.o zlib/compress.o zlib/crc32.o zlib/deflate.o zlib/inffast.o \ | |
| 24 | zlib/inflate.o zlib/infback.o zlib/inftrees.o zlib/trees.o \ | |
| cddd20fd BS |
25 | @@ -906,11 +906,7 @@ |
| 26 | session.o: session.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \ | |
| 27 | gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h | |
| 28 | shape.o: shape.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \ | |
| 29 | - gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h \ | |
| db464ee9 | 30 | - shapelib/shapefil.h |
| cddd20fd BS |
31 | -shapelib/dbfopen.o: shapelib/dbfopen.c shapelib/shapefil.h |
| 32 | -shapelib/safileio.o: shapelib/safileio.c shapelib/shapefil.h | |
| 33 | -shapelib/shpopen.o: shapelib/shpopen.c shapelib/shapefil.h | |
| 34 | + gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h | |
| 35 | skyforce.o: skyforce.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \ | |
| 36 | gbfile.h cet.h cet_util.h inifile.h session.h src/core/datetime.h | |
| 37 | skytraq.o: skytraq.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \ | |
| 38 | --- gpsbabel-1.5.1/shape.cc.orig 2014-04-10 04:43:08.000000000 +0200 | |
| 39 | +++ gpsbabel-1.5.1/shape.cc 2014-11-23 10:42:23.854932957 +0100 | |
| db464ee9 ER |
40 | @@ -20,7 +20,7 @@ |
| 41 | ||
| 42 | */ | |
| 43 | #include "defs.h" | |
| 44 | -#include "shapelib/shapefil.h" | |
| 45 | +#include <libshp/shapefil.h> | |
| 46 | ||
| 47 | #if SHAPELIB_ENABLED | |
| 48 | static SHPHandle ihandle; |