diff -Naur gpsbabel-1.4.3.orig/configure gpsbabel-1.4.3/configure --- gpsbabel-1.4.3.orig/configure 2012-01-30 04:37:29.000000000 +0100 +++ gpsbabel-1.4.3/configure 2012-08-24 08:45:58.684085341 +0200 @@ -4986,7 +4986,7 @@ { echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6; } fi -ac_config_files="$ac_config_files Makefile gbversion.h gui/setup.iss gui/makelinuxdist.sh 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 gui/makelinuxdist.sh xmldoc/makedoc tools/mkcapabilities win32/gpsbabel.rc jeeps/Makefile zlib/empty" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -5550,7 +5550,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" ;; *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 diff -Naur gpsbabel-1.4.3.orig/configure.in gpsbabel-1.4.3/configure.in --- gpsbabel-1.4.3.orig/configure.in 2012-01-28 22:59:29.000000000 +0100 +++ gpsbabel-1.4.3/configure.in 2012-08-24 08:45:58.685085358 +0200 @@ -430,6 +430,6 @@ else AC_MSG_RESULT(no) fi -AC_CONFIG_FILES([Makefile gbversion.h gui/setup.iss gui/makelinuxdist.sh xmldoc/makedoc tools/mkcapabilities win32/gpsbabel.rc jeeps/Makefile shapelib/Makefile zlib/empty]) +AC_CONFIG_FILES([Makefile gbversion.h gui/setup.iss gui/makelinuxdist.sh xmldoc/makedoc tools/mkcapabilities win32/gpsbabel.rc jeeps/Makefile zlib/empty]) AC_OUTPUT diff -Naur gpsbabel-1.4.3.orig/Makefile.in gpsbabel-1.4.3/Makefile.in --- gpsbabel-1.4.3.orig/Makefile.in 2012-01-28 22:59:29.000000000 +0100 +++ gpsbabel-1.4.3/Makefile.in 2012-08-24 08:45:58.686085375 +0200 @@ -87,7 +87,7 @@ @PALM_DB_CMT@PALM_DB=pdbfile.o -SHAPE=shapelib/shpopen.o shapelib/dbfopen.o +SHAPE=-lshp ZLIB=zlib/adler32.o zlib/compress.o zlib/crc32.o zlib/deflate.o zlib/inffast.o \ zlib/inflate.o zlib/infback.o zlib/inftrees.o zlib/trees.o \ @@ -825,8 +825,7 @@ session.o: session.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h shape.o: shape.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ - zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \ - shapelib/shapefil.h + zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h skyforce.o: skyforce.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h strptime.h skytraq.o: skytraq.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \ @@ -1099,8 +1098,6 @@ jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h \ jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h \ jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h -shapelib/dbfopen.o: shapelib/dbfopen.c shapelib/shapefil.h config.h -shapelib/shpopen.o: shapelib/shpopen.c shapelib/shapefil.h config.h zlib/adler32.o: zlib/adler32.c zlib/zlib.h zlib/zconf.h zlib/compress.o: zlib/compress.c zlib/zlib.h zlib/zconf.h zlib/crc32.o: zlib/crc32.c zlib/zutil.h zlib/zlib.h zlib/zconf.h \ diff -Naur gpsbabel-1.4.3.orig/shape.c gpsbabel-1.4.3/shape.c --- gpsbabel-1.4.3.orig/shape.c 2011-11-20 21:14:08.000000000 +0100 +++ gpsbabel-1.4.3/shape.c 2012-08-24 08:45:58.686085375 +0200 @@ -20,7 +20,7 @@ */ #include "defs.h" -#include "shapelib/shapefil.h" +#include #if SHAPELIB_ENABLED static SHPHandle ihandle;