Some minor fixes

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

diff --git a/navit/autogen.sh b/navit/autogen.sh
index fd0be89..b483139 100755 (executable)
--- a/navit/autogen.sh
+++ b/navit/autogen.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-autoreconf --force --install -I config -I m4
+autoreconf --force --install -I m4

diff --git a/navit/src/data/mg/town.c b/navit/src/data/mg/town.c
index df880b7..fbcfcff 100644 (file)
--- a/navit/src/data/mg/town.c
+++ b/navit/src/data/mg/town.c
@@ -102,7 +102,7 @@ town_get_data(struct town_priv *twn, unsigned char **p)
        twn->district=get_string(p);
        twn->postal_code1=get_string(p);
        twn->order=get_u8(p);                   /* 1-15 (19) */
-       twn->country=get_u16(p);
+       twn->country=get_u16_unal(p);
        twn->type=get_u8(p);
        twn->unknown2=get_u32_unal(p);
        twn->size=get_u8(p);

diff --git a/navit/src/gui/gtk/Makefile.am b/navit/src/gui/gtk/Makefile.am
index 2aa3d88..84a39c4 100644 (file)
--- a/navit/src/gui/gtk/Makefile.am
+++ b/navit/src/gui/gtk/Makefile.am
@@ -1,5 +1,5 @@
 include $(top_srcdir)/Makefile.inc
-AM_CPPFLAGS = @NAVIT_CFLAGS@ @GTK2_CFLAGS@ -I$(top_srcdir)/src -DMODULE=\"gui_gtk\"
+AM_CPPFLAGS = -I$(top_srcdir)/src @NAVIT_CFLAGS@ @GTK2_CFLAGS@ -DMODULE=\"gui_gtk\"
 modulegui_LTLIBRARIES = libgui_gtk.la
 libgui_gtk_la_SOURCES = datawindow.c destination.c gui_gtk_statusbar.c gui_gtk_action.c gui_gtk_window.c gui_gtk.h
 libgui_gtk_la_LIBADD = @GTK2_LIBS@