new program osm2navit capable of processing planet.osm, improvements to binfile driver

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@503 ffa7fe5e-494d-0410-b361-a75ebd5db220

diff --git a/navit/configure.in b/navit/configure.in
index b8e2c73..a9fb77d 100644 (file)
--- a/navit/configure.in
+++ b/navit/configure.in
@@ -40,6 +40,18 @@ PKG_CHECK_MODULES(NAVIT, [glib-2.0 gmodule-2.0])
 AC_SUBST(NAVIT_CFLAGS)
 AC_SUBST(NAVIT_LIBS)
 
+AC_CHECK_HEADER(
+       zlib.h,
+       AC_DEFINE(
+               [HAVE_ZLIB],
+               [],
+               Define to 1 if you have the <zlib.h> header file.
+               )
+               ZLIB_LIBS="-lz",
+       AC_MSG_WARN([*** no zlib.h\ -- reduced functionality of osm2navit])
+       )
+AC_SUBST(ZLIB_LIBS)
+
 AC_ARG_ENABLE(gui-gtk, [  --disable-gui-gtk             don't create gui gtk ], MODULE_GUI_GTK=$enableval, MODULE_GUI_GTK=yes)
 if test "x$MODULE_GUI_GTK" = "xyes"; then
        PKG_CHECK_MODULES(GTK2, [gtk+-2.0], [gtk2_pkgconfig=yes], [gtk2_pkgconfig=no])

diff --git a/navit/src/Makefile.am b/navit/src/Makefile.am
index 0384294..1736a98 100644 (file)
--- a/navit/src/Makefile.am
+++ b/navit/src/Makefile.am
@@ -5,7 +5,7 @@ SAMPLE_MAP=osm_bbox_11.3,47.9,11.7,48.2
 
 AM_CPPFLAGS = -I$(top_srcdir)/src/fib-1.1 @NAVIT_CFLAGS@ -DPREFIX=\"@prefix@\" -DMODULE=\"navit\"
 
-bin_PROGRAMS = navit
+bin_PROGRAMS = navit osm2navit
 
 pkgdata_DATA = navit.xml
 
@@ -22,8 +22,12 @@ navit_SOURCES = attr.c callback.c compass.c coord.c country.c cursor.c data_wind
        param.h phrase.h plugin.h point.h plugin_def.h projection.h popup.h route.h profile.h search.h speech.h statusbar.h \
        transform.h track.h util.h vehicle.h xmlconfig.h
 
+osm2navit_SOURCES = osm2navit.c item.c debug.c
+
 navit_LDADD = @NAVIT_LIBS@ @GPSD_LIBS@ -Lfib-1.1 -lfib
 
+osm2navit_LDADD = @NAVIT_LIBS@  @ZLIB_LIBS@
+
 samplemap: maps/$(SAMPLE_MAP).txt
 
 maps/$(SAMPLE_MAP).osm: