vcs.maemo.org Git - navit-package/blob - debian/patches/remove-libmdb.diff

   1 iHandles the removal of embedded mdbtools from upstream-svn.
   2 Index: navit/navit/map/poi_geodownload/Makefile.am
   3 ===================================================================
   4 --- navit.orig/navit/map/poi_geodownload/Makefile.am    2010-01-28 11:24:05.161223044 +0100
   5 +++ navit/navit/map/poi_geodownload/Makefile.am 2010-01-28 11:24:23.667887733 +0100
   6 @@ -1,7 +1,6 @@
   7 -SUBDIRS=libmdb
   8  include $(top_srcdir)/Makefile.inc
   9 -AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/navit -I$(srcdir)/libmdb/include -DMODULE=map_poi_geodownload
  10 +AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=map_poi_geodownload
  11  modulemap_LTLIBRARIES = libmap_poi_geodownload.la
  12  libmap_poi_geodownload_la_SOURCES = poi_geodownload.c
  13 -libmap_poi_geodownload_la_LIBADD = -Llibmdb -lmdb
  14 +libmap_poi_geodownload_la_LIBADD = -lmdb
  15  libmap_poi_geodownload_la_LDFLAGS = -module -avoid-version
  16 Index: navit/configure.in
  17 ===================================================================
  18 --- navit.orig/configure.in     2010-01-28 11:24:20.940395365 +0100
  19 +++ navit/configure.in  2010-01-28 11:24:23.667887733 +0100
  20 @@ -858,8 +858,6 @@
  21  navit/map/binfile/Makefile
  22  navit/map/garmin/Makefile
  23  navit/map/poi_geodownload/Makefile
  24 -navit/map/poi_geodownload/libmdb/Makefile
  25 -navit/map/poi_geodownload/libmdb/include/Makefile
  26  navit/maptool/Makefile
  27  navit/fib-1.1/Makefile
  28  navit/font/Makefile