Patch:gui_gtk:Fix hildon support for OS2008

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

diff --git a/configure.in b/configure.in
index b7152d7..b82cddb 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -92,7 +92,7 @@ test x"${AVOID_FLOAT}" = xyes && AC_DEFINE(AVOID_FLOAT,[],Define to avoid floati
 
 AC_ARG_ENABLE(hildon, [  --enable-hildon              build with maemo/hildon support], enable_hildon=$enableval, enable_hildon=no)
 if test "x${enable_hildon}" = "xyes" ; then
-       PKG_CHECK_MODULES(enable_hildon, hildon-libs >= 0.12.24, , [
+       PKG_CHECK_MODULES(enable_hildon, hildon-1 >= 0.9.9, , [
                AC_MSG_RESULT(no)
                enable_hildon=no
        ])

diff --git a/navit/gui/gtk/Makefile.am b/navit/gui/gtk/Makefile.am
index 5d34b15..4b65eec 100644 (file)
--- a/navit/gui/gtk/Makefile.am
+++ b/navit/gui/gtk/Makefile.am
@@ -1,5 +1,5 @@
 include $(top_srcdir)/Makefile.inc
-AM_CPPFLAGS = -I$(top_srcdir)/navit @NAVIT_CFLAGS@ @GTK2_CFLAGS@ -DMODULE=gui_gtk
+AM_CPPFLAGS = -I$(top_srcdir)/navit @NAVIT_CFLAGS@ @HILDON_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@

diff --git a/navit/gui/gtk/gui_gtk_window.c b/navit/gui/gtk/gui_gtk_window.c
index ec151a7..782af3f 100644 (file)
--- a/navit/gui/gtk/gui_gtk_window.c
+++ b/navit/gui/gtk/gui_gtk_window.c
@@ -45,7 +45,7 @@
 #include "navit_nls.h"
 
 #ifdef USE_HILDON
-#include "hildon-widgets/hildon-defines.h"
+#include "hildon/hildon-defines.h
 #define KEY_ZOOM_IN HILDON_HARDKEY_INCREASE
 #define KEY_ZOOM_OUT HILDON_HARDKEY_DECREASE
 #define KEY_UP HILDON_HARDKEY_UP