--- gpsbabel-1.5.3/Makefile.in.SHAPE 2016-04-17 20:04:08.078363232 +0300 +++ gpsbabel-1.5.3/Makefile.in 2016-04-17 20:05:42.776512046 +0300 @@ -100,7 +100,7 @@ # 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 +SHAPE=-lshp MINIZIP=zlib/contrib/minizip/zip.o \ zlib/contrib/minizip/ioapi.o @@ -888,11 +888,7 @@ session.o: session.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \ gbfile.h cet.h inifile.h session.h src/core/datetime.h shape.o: shape.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \ - gbfile.h cet.h inifile.h session.h src/core/datetime.h \ - shapelib/shapefil.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 + gbfile.h cet.h inifile.h session.h src/core/datetime.h skyforce.o: skyforce.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \ gbfile.h cet.h inifile.h session.h src/core/datetime.h skytraq.o: skytraq.cc defs.h config.h queue.h zlib/zlib.h zlib/zconf.h \ --- gpsbabel-1.5.3/configure.SHAPE 2016-01-03 04:09:17.000000000 +0200 +++ gpsbabel-1.5.3/configure 2016-04-17 20:04:08.078363232 +0300 @@ -5183,7 +5183,7 @@ -ac_config_files="$ac_config_files Makefile gbversion.h gui/setup.iss xmldoc/makedoc tools/mkcapabilities win32/gpsbabel.rc jeeps/Makefile shapelib/Makefile zlib/empty" +ac_config_files="$ac_config_files Makefile gbversion.h gui/setup.iss xmldoc/makedoc tools/mkcapabilities win32/gpsbabel.rc jeeps/Makefile zlib/empty" ac_config_files="$ac_config_files gui/makelinuxdist.sh" @@ -5886,7 +5886,6 @@ "tools/mkcapabilities") CONFIG_FILES="$CONFIG_FILES tools/mkcapabilities" ;; "win32/gpsbabel.rc") CONFIG_FILES="$CONFIG_FILES win32/gpsbabel.rc" ;; "jeeps/Makefile") CONFIG_FILES="$CONFIG_FILES jeeps/Makefile" ;; - "shapelib/Makefile") CONFIG_FILES="$CONFIG_FILES shapelib/Makefile" ;; "zlib/empty") CONFIG_FILES="$CONFIG_FILES zlib/empty" ;; "gui/makelinuxdist.sh") CONFIG_FILES="$CONFIG_FILES gui/makelinuxdist.sh" ;; --- gpsbabel-1.5.3/configure.in.SHAPE 2016-01-03 04:09:17.000000000 +0200 +++ gpsbabel-1.5.3/configure.in 2016-04-17 20:04:08.079363223 +0300 @@ -397,7 +397,7 @@ AC_SUBST(QT_SYSINC_OPT) AC_SUBST(QT_LIBS) -AC_CONFIG_FILES([Makefile gbversion.h gui/setup.iss xmldoc/makedoc tools/mkcapabilities win32/gpsbabel.rc jeeps/Makefile shapelib/Makefile zlib/empty]) +AC_CONFIG_FILES([Makefile gbversion.h gui/setup.iss xmldoc/makedoc tools/mkcapabilities win32/gpsbabel.rc jeeps/Makefile zlib/empty]) AC_CONFIG_FILES([gui/makelinuxdist.sh], [chmod +x gui/makelinuxdist.sh]) AC_OUTPUT --- gpsbabel-1.5.3/shape.cc.SHAPE 2016-04-17 20:04:08.079363223 +0300 +++ gpsbabel-1.5.3/shape.cc 2016-04-17 20:06:16.739206984 +0300 @@ -20,7 +20,7 @@ */ #include "defs.h" -#include "shapelib/shapefil.h" +#include <shapefil.h> #include <stdlib.h> #if SHAPELIB_ENABLED