9 files changed, 55 insertions, 6 deletions
diff --git a/configure.in b/configure.in
index ca27d8d93..6f57adec7 100644
--- a/configure.in
+++ b/configure.in
@@ -96,7 +96,7 @@ then
 fi
 AM_CONDITIONAL(SUPPORT_WIN32, [test "x$win32" = "xyes"])
 AM_CONDITIONAL(SUPPORT_WIN32CE, [test "x$win32ce" = "xyes"])
-AM_CONDITIONAL(SUPPORT_ANDROID, [test "x$android" =" xyes"])
+AM_CONDITIONAL(SUPPORT_ANDROID, [test "x$android" = "xyes"])
 AC_SUBST(MODULE_LDFLAGS)
 
 LIBS="$LIBS -lm"
diff --git a/navit/Makefile.am b/navit/Makefile.am
index 2212de4fd..c0c9b7d3e 100644
--- a/navit/Makefile.am
+++ b/navit/Makefile.am
@@ -15,13 +15,19 @@ if BUILD_SAMPLEMAP
   BUILT_SOURCES += osm2navit$(EXEEXT)
 endif
 
-bin_PROGRAMS = navit osm2navit
+if SUPPORT_ANDROID
+  lib_LTLIBRARIES        = libnavit.la
+  libnavit_la_LDFLAGS = -module -avoid-version @MODULE_LDFLAGS@
+
+else
+  bin_PROGRAMS = navit osm2navit
+  noinst_LTLIBRARIES        = libnavit.la
+endif
 
 pkgdata_DATA = navit.xml
 
 EXTRA_DIST = navit.xml 
 
-noinst_LTLIBRARIES        = libnavit.la
 libnavit_la_SOURCES = announcement.c atom.c attr.c cache.c callback.c command.c compass.c coord.c country.c cursor.c data_window.c debug.c \
 	event.c event_glib.h file.c graphics.c gui.c item.c layout.c log.c main.c map.c \
 	linguistics.c mapset.c maptype.c menu.c messages.c navit.c navigation.c osd.c param.c phrase.c plugin.c popup.c \
@@ -34,12 +40,31 @@ libnavit_la_SOURCES = announcement.c atom.c attr.c cache.c callback.c command.c
 	transform.h track.h util.h vehicle.h vehicleprofile.h window.h xmlconfig.h zipfile.h \
 	navit_nls.h
 
+if SUPPORT_ANDROID
+  libnavit_la_SOURCES += android.c
+  navit_SOURCES =
+  navit_LDADD =
+  osm2navit_SOURCES =
+  osm2navit_LDADD =
+
+android/build.xml: android/AndroidManifest.xml
+	android update project -t 3 -p android
+
+apk: all-am android/build.xml
+	mkdir -p android/libs/armeabi
+	cp .libs/*.so */*/.libs/*.so android/libs/armeabi
+	for i in $(shell cd xpm && echo *.xpm); do convert xpm/$$i android/res/drawable/$${i%.xpm}.png; done 
+	cp xpm/*.png android/res/drawable
+	cd android && ant debug
+
+else
 navit_SOURCES = start.c
 navit_LDADD = libnavit.la @NAVIT_LIBS@ @ZLIB_LIBS@ @INTLLIBS@ -Lfib-1.1 -lfib
 
 osm2navit_CPPFLAGS = $(AM_CPPFLAGS) @ZLIB_CFLAGS@ @POSTGRESQL_CFLAGS@
 osm2navit_SOURCES = osm2navit.c
 osm2navit_LDADD = libnavit.la @NAVIT_LIBS@ @ZLIB_LIBS@ @POSTGRESQL_LIBS@ @INTLLIBS@
+endif
 
 if EVENT_GLIB
   libnavit_la_SOURCES += event_glib.c
diff --git a/navit/android/res/values/strings.xml b/navit/android/res/values/strings.xml
new file mode 100644
index 000000000..6a86ff0ff
--- /dev/null
+++ b/navit/android/res/values/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Navit</string>
+</resources>
+
diff --git a/navit/navit.c b/navit/navit.c
index 83a5b50f9..70fdd6e15 100644
--- a/navit/navit.c
+++ b/navit/navit.c
@@ -897,6 +897,7 @@ navit_get_center_file(gboolean create)
 static void
 navit_set_center_from_file(struct navit *this_, char *file)
 {
+#ifndef HAVE_API_ANDROID
 	FILE *f;
 	char *line = NULL;
 
@@ -916,6 +917,7 @@ navit_set_center_from_file(struct navit *this_, char *file)
 		free(line);
 	}
 	return;
+#endif
 }
  
 static void
diff --git a/navit/support/glib/gstrfuncs.c b/navit/support/glib/gstrfuncs.c
index 24be1f30b..f063c1f5e 100644
--- a/navit/support/glib/gstrfuncs.c
+++ b/navit/support/glib/gstrfuncs.c
@@ -374,9 +374,14 @@ g_ascii_strtod (const gchar *nptr,
 
   fail_pos = NULL;
 
+#ifdef HAVE_API_ANDROID
+  decimal_point = ".";
+  decimal_point_len = 1;
+#else
   locale_data = localeconv ();
   decimal_point = locale_data->decimal_point;
   decimal_point_len = strlen (decimal_point);
+#endif
 
 #if NOT_NEEDED_FOR_NAVIT
   g_assert (decimal_point_len != 0);
@@ -591,9 +596,14 @@ g_ascii_formatd (gchar       *buffer,
       
   _g_snprintf (buffer, buf_len, format, d);
 
+#ifdef HAVE_API_ANDROID
+  decimal_point = ".";
+  decimal_point_len = 1;
+#else
   locale_data = localeconv ();
   decimal_point = locale_data->decimal_point;
   decimal_point_len = strlen (decimal_point);
+#endif
 
 #if NOT_NEEDED_FOR_NAVIT
   g_assert (decimal_point_len != 0);
diff --git a/navit/support/wordexp/wordexp.c b/navit/support/wordexp/wordexp.c
index d4ad44a9f..bacaea57c 100644
--- a/navit/support/wordexp/wordexp.c
+++ b/navit/support/wordexp/wordexp.c
@@ -85,7 +85,9 @@ wordexp(const char *words, wordexp_t *we, int flags)
 	int     i;
 	int     error;	
 	char   *words_expanded;
+#ifdef HAVE_API_WIN32_BASE
 	glob_t  pglob;
+#endif
 
 	assert(we != NULL);
 	assert(words != NULL);
@@ -93,6 +95,7 @@ wordexp(const char *words, wordexp_t *we, int flags)
 	/* expansion of �$NAME� or �${NAME}� */
 	words_expanded=expand_variables(words);
 
+#ifdef HAVE_API_WIN32_BASE
 	/* expansion of �*�, �?� */
 	error=glob(words_expanded, 0, NULL, &pglob);
 	if (!error)
@@ -110,10 +113,13 @@ wordexp(const char *words, wordexp_t *we, int flags)
 	}
 	else
 	{
+#endif
 		we->we_wordc = 1;		
 		we->we_wordv = malloc(sizeof(char*));	
 		we->we_wordv[0] = words_expanded;
+#ifdef HAVE_API_WIN32_BASE
 	}
+#endif
 
 
 	return error;	
diff --git a/navit/util.c b/navit/util.c
index 7116d61cd..3f1fdd6e8 100644
--- a/navit/util.c
+++ b/navit/util.c
@@ -21,6 +21,7 @@
 #include <ctype.h>
 #include <stdlib.h>
 #include <stdarg.h>
+#include <time.h>
 #include "util.h"
 
 void
diff --git a/navit/vehicle/demo/Makefile.am b/navit/vehicle/demo/Makefile.am
index 608e9d0b5..61a265c53 100644
--- a/navit/vehicle/demo/Makefile.am
+++ b/navit/vehicle/demo/Makefile.am
@@ -2,4 +2,4 @@ include $(top_srcdir)/Makefile.inc
 AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/navit -DMODULE=vehicle_demo
 modulevehicle_LTLIBRARIES = libvehicle_demo.la
 libvehicle_demo_la_SOURCES = vehicle_demo.c
-libvehicle_demo_la_LDFLAGS = -module -avoid-version
+libvehicle_demo_la_LDFLAGS = -module -avoid-version @MODULE_LDFLAGS@
diff --git a/navit/vehicle/file/Makefile.am b/navit/vehicle/file/Makefile.am
index a5518696d..64a9c462f 100644
--- a/navit/vehicle/file/Makefile.am
+++ b/navit/vehicle/file/Makefile.am
@@ -3,7 +3,7 @@ AM_CPPFLAGS = @NAVIT_CFLAGS@ -I$(top_srcdir)/navit
 modulevehicle_LTLIBRARIES = libvehicle_file.la libvehicle_pipe.la
 libvehicle_file_la_CFLAGS=-DMODULE=vehicle_file
 libvehicle_file_la_SOURCES = vehicle_file.c
-libvehicle_file_la_LDFLAGS = -module -avoid-version
+libvehicle_file_la_LDFLAGS = -module -avoid-version @MODULE_LDFLAGS@
 libvehicle_pipe_la_CFLAGS=-DMODULE=vehicle_pipe
 libvehicle_pipe_la_SOURCES = vehicle_pipe.c
-libvehicle_pipe_la_LDFLAGS = -module -avoid-version
+libvehicle_pipe_la_LDFLAGS = -module -avoid-version @MODULE_LDFLAGS@