use-system-shapelib.patch

   1 Use system shapelib - not suitable for upstream in this form.
   2
   3 --- gpsbabel-1.4.2/configure.in 2010-10-10 21:04:52.000000000 +0200
   4 +++ gpsbabel-1.4.2-shapelib/configure.in        2011-01-11 17:22:01.785437703 +0100
   5 @@ -421,6 +421,6 @@
   6  else
   7         AC_MSG_RESULT(no)
   8  fi
   9 -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])
  10 +AC_CONFIG_FILES([Makefile gbversion.h gui/setup.iss gui/makelinuxdist.sh xmldoc/makedoc tools/mkcapabilities win32/gpsbabel.rc jeeps/Makefile zlib/empty])
  11  AC_OUTPUT
  12
  13 --- gpsbabel-1.4.2/Makefile.in  2011-01-11 17:27:22.684760413 +0100
  14 +++ gpsbabel-1.4.2-shapelib/Makefile.in 2011-01-11 17:24:31.275511027 +0100
  15 @@ -87,7 +87,7 @@
  16
  17  @PALM_DB_CMT@PALM_DB=pdbfile.o
  18
  19 -SHAPE=shapelib/shpopen.o shapelib/dbfopen.o
  20 +SHAPE=-lshp
  21
  22  ZLIB=zlib/adler32.o zlib/compress.o zlib/crc32.o zlib/deflate.o zlib/inffast.o \
  23         zlib/inflate.o zlib/infback.o zlib/inftrees.o zlib/trees.o \
  24 @@ -818,8 +818,7 @@
  25  session.o: session.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \
  26    zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h
  27  shape.o: shape.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \
  28 -  zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h \
  29 -  shapelib/shapefil.h
  30 +  zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h
  31  skyforce.o: skyforce.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \
  32    zlib/zconf.h gbfile.h cet.h cet_util.h inifile.h session.h strptime.h
  33  skytraq.o: skytraq.c defs.h config.h queue.h gbtypes.h zlib/zlib.h \
  34 @@ -1092,8 +1091,6 @@
  35    jeeps/gpsread.h jeeps/gpsutil.h jeeps/gpsapp.h jeeps/gpsprot.h \
  36    jeeps/gpscom.h jeeps/gpsfmt.h jeeps/gpsmath.h jeeps/gpsmem.h \
  37    jeeps/gpsrqst.h jeeps/gpsinput.h jeeps/gpsproj.h
  38 -shapelib/dbfopen.o: shapelib/dbfopen.c shapelib/shapefil.h config.h
  39 -shapelib/shpopen.o: shapelib/shpopen.c shapelib/shapefil.h config.h
  40  zlib/adler32.o: zlib/adler32.c zlib/zlib.h zlib/zconf.h
  41  zlib/compress.o: zlib/compress.c zlib/zlib.h zlib/zconf.h
  42  zlib/crc32.o: zlib/crc32.c zlib/zutil.h zlib/zlib.h zlib/zconf.h \
  43 --- gpsbabel-1.4.2/shape.c      2010-05-31 23:15:10.000000000 +0200
  44 +++ gpsbabel-1.4.2-shapelib/shape.c     2011-01-11 17:26:19.521297747 +0100
  45 @@ -20,7 +20,7 @@
  46
  47   */
  48  #include "defs.h"
  49 -#include "shapelib/shapefil.h"
  50 +#include <libshp/shapefil.h>
  51
  52  #if SHAPELIB_ENABLED
  53  static SHPHandle ihandle;