X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=configure.in;h=4d838368edb5420ebcbe7d43e4d25880a4a24b72;hb=efbfe5b8ea5aaec1ae08c922a996f844d8e16f14;hp=35d5a370be41a92f911f5cf121b36c1ab00f71bb;hpb=b9d529d2a6ae21bff31ccd76e621870ed1f57897;p=navit-package

diff --git a/configure.in b/configure.in
index 35d5a37..4d83836 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,5 @@
 AC_INIT(navit, 0.2.0)
+AC_CONFIG_MACRO_DIR([m4])
 SOURCE_MODE=svn
 
 AM_INIT_AUTOMAKE
@@ -48,20 +49,104 @@ graphics_qt_qpainter=yes; graphics_qt_qpainter_reason=default
 graphics_opengl=yes; graphics_opengl_reason=default
 graphics_sdl=yes; graphics_sdl_reason=default
 graphics_win32=no; graphics_win32_reason=default
+speech_android=no; speech_android_reason=default
 speech_cmdline=yes; speech_cmdline_reason=default
+speech_dbus=no; speech_dbus_reason=default
+speech_espeak=no; speech_espeak_reason=default
 speech_speech_dispatcher=yes; speech_speech_dispatcher_reason=default
 vehicle_demo=yes; vehicle_demo_reason=default
 vehicle_file=yes; vehicle_file_reason=default
 vehicle_gpsd=yes; vehicle_gpsd_reason=default
+vehicle_gpsd_dbus=no; vehicle_gpsd_dbus_reason=default
 vehicle_gypsy=yes; vehicle_gypsy_reason=default
+vehicle_null=no; vehicle_null_reason=default
 vehicle_wince=no; vehicle_wince_reason=default
+vehicle_iphone=no; vehicle_iphone_reason=default
+vehicle_android=no; vehicle_android_reason=default
+graphics_android=no; graphics_android_reason=default
+vehicle_maemo=no; vehicle_maemo_reason=default
+
+shared_libnavit=no
+bin_navit=yes
+
+AC_CANONICAL_HOST
+win32=no
+win32ce=no
+case $host_os in
+wince|mingw32ce|cegcc)
+	win32=yes
+	win32ce=yes
+	AC_DEFINE(HAVE_API_WIN32_BASE, 1, [Have Windows Base API])
+	AC_DEFINE(HAVE_API_WIN32_CE, 1, [Have Windows CE API])
+	gui_win32=yes; gui_win32_reason="host_os is wince"
+	graphics_win32=yes; graphics_win32_reason="host_os is wince"
+	vehicle_wince=yes; vehcile_wince_reason="host_os is wince"
+	speech_espeak=yes; speech_espeak_reason="host_os is wince"
+	support_libpng=yes
+	;;
+mingw32)
+	win32=yes
+	AC_DEFINE(HAVE_API_WIN32_BASE, 1, [Have Windows Base API])
+	AC_DEFINE(HAVE_API_WIN32, 1, [Have Windows API])
+	gui_win32=yes; gui_win32_reason="host_os is mingw32"
+	graphics_win32=yes; graphics_win32_reason="host_os is mingw32"
+	speech_espeak=yes; speech_espeak_reason="host_os is mingw32"
+	support_libpng=yes
+	;;
+linux*_android)
+	android=yes
+	shared_libnavit=yes
+	bin_navit=no
+	AC_DEFINE(HAVE_API_ANDROID, 1, [Have Android API])
+	echo "void dl_unwind_find_exidx(void) {}" >crt0.c
+	$CC -c crt0.c
+	$AR r libg.a crt0.o
+	vehicle_android=yes; vehicle_android_reason="host_os is android"
+	graphics_android=yes; graphics_android_reason="host_os is android"
+	speech_android=yes; speech_android_reason="host_os is android"
+	MODULE_LDFLAGS="-module -Xcompiler -nostdlib"
+	MODULE_LIBADD="-llog"
+	NAVIT_MODULE_LDFLAGS="$MODULE_LDFLAGS -L\$(top_builddir)/navit -lnavit"
+	;;
+esac
+if test "x$win32" = "xyes"
+then
+	NAVIT_CFLAGS="$NAVIT_CFLAGS -I\$(top_srcdir)/navit/support/win32"
+	NAVIT_LIBS="$NAVIT_LIBS -L\$(top_builddir)/navit/support/win32 -lsupport_win32"
+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"])
+
+if test "x$support_libpng" = "xyes"
+then
+	NAVIT_CFLAGS="$NAVIT_CFLAGS -I\$(top_srcdir)/navit/support/libpng"
+	NAVIT_LIBS="$NAVIT_LIBS -L\$(top_builddir)/navit/support/libpng -lsupport_libpng"
+fi
+AM_CONDITIONAL(SUPPORT_LIBPNG, [test "x$support_libpng" = "xyes"])
+
+AC_SUBST(MODULE_LDFLAGS)
+AC_SUBST(MODULE_LIBADD)
+AC_SUBST(NAVIT_MODULE_LDFLAGS)
+
+LIBS="$LIBS -lm"
+if test "$win32" == "no"; then
+	LIBS="$LIBS -rdynamic"
+fi
 
 m4_ifndef([AC_USE_SYSTEM_EXTENSIONS],
 	[AC_DEFUN([AC_USE_SYSTEM_EXTENSIONS], [AC_GNU_SOURCE])])
 
 AC_USE_SYSTEM_EXTENSIONS
 
+AC_PROG_OBJC
 AC_PROG_CC
+AC_PROG_OBJC
+if eval "test x`uname` = xDarwin"; then
+	CFLAGS="$CFLAGS -I/opt/local/include -L/opt/local/lib"
+fi
 if eval "test x$GCC = xyes"; then
         CFLAGS="$CFLAGS -Wall -Wcast-align -Wmissing-declarations -Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith -Wreturn-type -D_GNU_SOURCE"
 fi
@@ -87,6 +172,10 @@ AC_SUBST(cross_compiling)
 AC_SUBST(CC_FOR_BUILD)
 AC_SUBST(CCLD_FOR_BUILD)
 
+# Endianness
+# defines WORDS_BIGENDIAN for big-endian systems
+AC_C_BIGENDIAN
+
 AC_ARG_ENABLE(variant, [  --enable-variant=something          set variant], NAVIT_VARIANT=$enableval)
 AC_SUBST(NAVIT_VARIANT)
 
@@ -179,11 +268,17 @@ if test "x${plugins}" = "xyes"; then
 		[],
 		Define to 1 if you have plugins.
 	)
+	if test "x${win32}" = "xyes"; then
+		shared_libnavit=yes
+		NAVIT_MODULE_LDFLAGS="-no-undefined -L\$(top_builddir)/navit -lnavit -L\$(top_builddir)/intl -lintl"
+	fi
 else
 	AC_DISABLE_SHARED
 	AC_ENABLE_STATIC
 fi
 AM_CONDITIONAL(PLUGINS, [test "x$plugins" = "xyes"])
+AM_CONDITIONAL(SHARED_LIBNAVIT, [test "x$shared_libnavit" = "xyes"])
+AM_CONDITIONAL(BIN_NAVIT, [test "x$bin_navit" = "xyes"])
 AC_PROG_LIBTOOL
 
 AM_CONDITIONAL(EVENT_GLIB, [test "x$glib" = "xyes"])
@@ -228,28 +323,21 @@ AC_MSG_CHECKING(for CreateProcess)
 AC_TRY_LINK([#include <windows.h>], [CreateProcess(NULL,NULL,NULL,NULL,0,0,NULL,NULL,NULL,NULL);],AC_MSG_RESULT(yes);AC_DEFINE(HAVE_CREATEPROCESS, 1, [Define to 1 if you have the `CreateProcess' function.]) speech_cmdline=yes; speech_cmdline_reason="CreateProcess exists", AC_MSG_RESULT(no))
 
 AC_ARG_ENABLE(graphics-sdl, [  --disable-graphics-sdl             don't create graphics sdl], graphics_sdl=$enableval;graphics_sdl_reason="configure parameter")
+
 if test "x${graphics_sdl}" = "xyes" ; then
-	if test -z "$SDL_CONFIG"; then
-            AC_PATH_PROG([SDL_CONFIG], [sdl-config], [])
-        fi
-fi
-if test "x${graphics_sdl}" = "xyes" ; then
-        AC_MSG_CHECKING([for SDL libraries with $SDL_CONFIG])
-	if test ! -x "$SDL_CONFIG"; then
-	    graphics_sdl = "no"
-	    graphics_sdl_reason = "sdl-config not available"
-            AC_MSG_RESULT([no])
-	else
-	    SDL_CFLAGS="`$SDL_CONFIG --cflags`"
-	    SDL_LIBS="`$SDL_CONFIG --libs`"
-	    AC_SUBST(SDL_CFLAGS)
-	    AC_SUBST(SDL_LIBS)
-            AC_MSG_RESULT([yes])
-       	fi 
+        PKG_CHECK_MODULES(SDL, 
+                          [sdl], 
+                          [graphics_sdl="yes"
+                           graphics_sdl_reason="sdl present"] , 
+                          [graphics_sdl="no"
+                           graphics_sdl_reason="sdl not available"]
+                         )
+        AC_SUBST(SDL_CFLAGS)
+        AC_SUBST(SDL_LIBS)
 fi
 if test "x${graphics_sdl}" = "xyes" ; then
 	save_CPPFLAGS=$CPPFLAGS
-	CPPFLAGS="$($SDL_CONFIG --cflags) $CPPFLAGS"
+	CPPFLAGS="$SDL_CFLAGS $CPPFLAGS"
 	AC_CHECK_HEADER(SDL_image.h,SDL_IMAGE_LIBS=-lSDL_image,graphics_sdl="no";graphics_sdl_reason="SDL_image.h missing")
 	AC_SUBST(SDL_IMAGE_LIBS)
 	CPPFLAGS=$save_CPPFLAGS
@@ -450,17 +538,25 @@ if test "x${binding_dbus}" = "xyes" ; then
 fi
 if test "x${binding_dbus}" = "xyes" ; then
 	AC_DEFINE(USE_BINDING_DBUS, 1, [Build with binding dbus])
+	vehicle_gpsd_dbus="yes"
+	vehicle_gpsd_dbus_reason="dbus binding present"
+	speech_dbus="yes"
+	speech_dbus_reason="dbus binding present"
 fi
 AC_SUBST(DBUS_CFLAGS)
 AC_SUBST(DBUS_LIBS)
 AM_CONDITIONAL(BINDING_DBUS, test "x${binding_dbus}" = "xyes")
+AM_CONDITIONAL(VEHICLE_GPSD_DBUS, test "x${vehicle_gpsd_dbus}" = "xyes")
+AM_CONDITIONAL(SPEECH_DBUS, test "x${speech_dbus}" = "xyes")
+AC_ARG_WITH(dbus-service-dir, [ --with-dbus-service-dir   specify where the dbus service dir resides], DBUS_SERVICE_DIR=$withval, DBUS_SERVICE_DIR="$datarootdir/dbus-1/services")
+AC_SUBST(DBUS_SERVICE_DIR)
 
 # svg
 AC_ARG_ENABLE(svg, [  --disable-svg        disable Scalable Vector Graphics], enable_svg=$enableval, enable_svg=yes)
 AC_ARG_ENABLE(svg2png, [  --disable-svg2png        disable conversion of svgs to pngs], enable_svg2png=$enableval, enable_svg2png=yes)
 AC_ARG_ENABLE(svg2png-scaling, [  --enable-svg2png-scaling   enable conversion of svgs to pngs with specified sizes], SVG2PNG_SCALES=$enableval, SVG2PNG_SCALES="8 16 32 48 96")
-AC_ARG_ENABLE(svg2png-scaling-flag, [  --enable-svg2png-scaling-flag   enable conversion of flag svgs to pngs with specified sizes], SVG2PNG_SCALES_FLAG=$enableval, SVG2PNG_SCALES_FLAG="")
-AC_ARG_ENABLE(svg2png-scaling-nav, [  --enable-svg2png-scaling-nav   enable conversion of nav svgs to pngs with specified sizes], SVG2PNG_SCALES_NAV=$enableval, SVG2PNG_SCALES_NAV="")
+AC_ARG_ENABLE(svg2png-scaling-flag, [  --enable-svg2png-scaling-flag   enable conversion of flag svgs to pngs with specified sizes], SVG2PNG_SCALES_FLAG=$enableval, SVG2PNG_SCALES_FLAG="8 16 32 48 96")
+AC_ARG_ENABLE(svg2png-scaling-nav, [  --enable-svg2png-scaling-nav   enable conversion of nav svgs to pngs with specified sizes], SVG2PNG_SCALES_NAV=$enableval, SVG2PNG_SCALES_NAV="8 16 32 48 96")
 AC_ARG_WITH(svg2png-use-convert, [  --with-svg2png-use-convert   use imagemagick's convert for png creation], SVG2PNG_CONVERTER="convert")
 AC_ARG_WITH(svg2png-use-rsvg-convert, [  --with-svg2png-use-rsvg-convert   use librsvg's rsvg-convert for png creation], SVG2PNG_CONVERTER="rsvg-convert")
 AC_ARG_WITH(svg2png-use-inkscape, [  --with-svg2png-use-inkscape   use inkscapes internal convert routines for png creation], SVG2PNG_CONVERTER="inkscape")
@@ -468,7 +564,7 @@ AC_ARG_WITH(svg2png-use-ksvgtopng4, [  --with-svg2png-use-ksvgtopng4   use kde4'
 AC_ARG_WITH(svg2png-use-ksvgtopng, [  --with-svg2png-use-ksvgtopng   use kde3's convert for png creation], SVG2PNG_CONVERTER="ksvgtopng")
 if test "x${enable_svg2png}" = "xyes" ; then
     if test "x${SVG2PNG_CONVERTER}" = "x"; then
-        SVG2PNG_CONVERTER="ksvgtopng ksvgtopng4 rsvg-convert inkscape convert"
+        SVG2PNG_CONVERTER="rsvg-convert ksvgtopng ksvgtopng4 inkscape convert"
     fi
     AC_PATH_PROGS([SVG2PNG], ${SVG2PNG_CONVERTER}, [none])
     if test "x${SVG2PNG}" = "xnone"; then
@@ -485,6 +581,16 @@ AM_CONDITIONAL(USE_SVG2PNG_SCALES_NAV, test "x${SVG2PNG_SCALES_NAV}" != "xyes" -
 AM_CONDITIONAL(USE_SVG2PNG, test "x${enable_svg2png}" = "xyes")
 AM_CONDITIONAL(USE_SVG, test "x${enable_svg}" = "xyes")
 
+# XSLTS
+AC_ARG_WITH(xslts, [  --with-xslts   enable processing of navit.xml with given xslt scripts], XSLTS=$withval, XSLTS="")
+AC_SUBST(XSLTS)
+AC_ARG_WITH(saxon, [ --with-saxon   specify the saxon xslt processor], SAXON=$withval, SAXON="saxon")
+AC_SUBST(SAXON)
+
+# Android Permissions
+AC_ARG_WITH(android-permissions, [  --with-android-permissions   Set additional android permissions], ANDROID_PERMISSIONS=$withval, ANDROID_PERMISSIONS="")
+AC_SUBST(ANDROID_PERMISSIONS)
+
 # NLS
 
 AC_ARG_ENABLE(nls,
@@ -500,10 +606,7 @@ LINGUAS=""
 
 if test "x$enable_nls" = "xyes"; then
 
-  AC_CHECK_FUNC(gettext, [HAVEGETTEXT="yes"] 
-	     AC_CHECK_LIB(intl, gettext, [INTLIBS="-lintl" HAVEGETTEXT="yes"],
-		  	 INTLIBS="" ))
-
+  AC_CHECK_FUNC(gettext, [HAVEGETTEXT="yes"],[INTLIBS="-lintl" HAVEGETTEXT="yes"])
   AC_CHECK_PROG(XGETTEXT, xgettext, xgettext)
   AC_CHECK_PROG(MSGMERGE, msgmerge, msgmerge)
   AC_CHECK_PROG(MSGFMT, msgfmt, msgfmt)
@@ -515,7 +618,7 @@ if test "x$enable_nls" = "xyes"; then
     fi
   fi
 
-  if test "$XGETTEXT" != "" -a "$HAVEGETTEXT" != ""; then
+  if test "$XGETTEXT" != "" ; then
      PO=""
      if test "$LINGUAS" = ""; then
            ling=` (cd $srcdir/po; /bin/ls *.po.in) `
@@ -529,8 +632,8 @@ if test "x$enable_nls" = "xyes"; then
   else
    LINGUAS=""
    PO=""
-   echo "xgettext and libintl.a don't both exist; will not build i18n support"
-   enable_nls = no
+   echo "xgettext doesn't exist; will not build i18n support"
+   enable_nls=no
  fi
  for lang in $LINGUAS; do
     MOFILES="$MOFILES $lang.mo"
@@ -547,7 +650,7 @@ AC_SUBST(MOFILES)
 AC_SUBST(POFILES)
 AC_SUBST(POIFILES)
 AM_GNU_GETTEXT_VERSION
-AM_GNU_GETTEXT(no-libtool, need-ngettext, \$(top_builddir)/intl/)
+AM_GNU_GETTEXT(use-libtool, need-ngettext, \$(top_builddir)/intl/)
 AC_SUBST(LIBINTL)
 AC_SUBST(LTLIBINTL)
 if test x"$LIBINTL" != "x" ;then
@@ -572,50 +675,21 @@ AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
 AC_SUBST(PACKAGE)
 AC_SUBST(VERSION)
 
-AC_CHECK_HEADER(wordexp.h,wordexp_h=yes,wordexp_h=no;NAVIT_CFLAGS="$NAVIT_CFLAGS -I\$(top_srcdir)/navit/support/wordexp";NAVIT_LIBS="$NAVIT_LIBS -L\$(top_builddir)/navit/support/wordexp -lsupport_wordexp")
+AC_CHECK_HEADER(wordexp.h,wordexp_h=yes,wordexp_h=no;NAVIT_CFLAGS="$NAVIT_CFLAGS -I\$(top_srcdir)/navit/support/wordexp";WORDEXP_LIBS="-L\$(top_builddir)/navit/support/wordexp -lsupport_wordexp")
 AM_CONDITIONAL(SUPPORT_WORDEXP, [test "x$wordexp_h" = "xno"])
 
-AC_CANONICAL_HOST
-win32=no
-win32ce=no
-case $host_os in
-wince)
-	win32=yes
-	win32ce=yes
-	AC_DEFINE(HAVE_API_WIN32_BASE, 1, [Have Windows Base API])
-	AC_DEFINE(HAVE_API_WIN32_CE, 1, [Have Windows CE API])
-	gui_win32=yes; gui_win32_reason="host_os is wince"
-	graphics_win32=yes; graphics_win32_reason="host_os is wince"
-	vehicle_wince=yes; vehcile_wince_reason="host_os is wince"
-	;;
-mingw32)
-	win32=yes
-	AC_DEFINE(HAVE_API_WIN32_BASE, 1, [Have Windows Base API])
-	AC_DEFINE(HAVE_API_WIN32, 1, [Have Windows API])
-	gui_win32=yes; gui_win32_reason="host_os is mingw32"
-	graphics_win32=yes; graphics_win32_reason="host_os is mingw32"
-esac
-if test "x$win32" = "xyes"
-then
-	NAVIT_CFLAGS="$NAVIT_CFLAGS -I\$(top_srcdir)/navit/support/win32"
-	NAVIT_LIBS="$NAVIT_LIBS -L\$(top_builddir)/navit/support/win32 -lsupport_win32"
-fi
-AM_CONDITIONAL(SUPPORT_WIN32, [test "x$win32" = "xyes"])
-AM_CONDITIONAL(SUPPORT_WIN32CE, [test "x$win32ce" = "xyes"])
-
-LIBS="$LIBS -lm"
-if test "$win32" == "no"; then
-	LIBS="$LIBS -rdynamic"
-fi
-
 support_libc=no
 AC_ARG_ENABLE(support_libc, [  --enable-support-libc enable builtin mini libc ], support_libc=$enableval)
 AM_CONDITIONAL(SUPPORT_LIBC, [test "x$support_libc" = "xyes"])
 if test "x$support_libc" = "xyes"; then
 	CFLAGS="$CFLAGS -I\$(top_srcdir)/navit/support/libc"
+	LIBC_LIBS="-L\$(top_builddir)/navit/support/libc -lsupport_libc"
 fi
 
 ## graphics
+# android
+AC_ARG_ENABLE(graphics-android, [  --disable-graphics-android            disable graphics type android], graphics_android=$enableval;graphics_android_reason="configure parameter")
+AM_CONDITIONAL(GRAPHICS_ANDROID, test "x${graphics_android}" = "xyes")
 # gd
 AC_ARG_ENABLE(graphics-gd, [  --enable-graphics-gd                enable graphics type gd], graphics_gd=$enableval;graphics_gd_reason="configure parameter")
 if test "x${graphics_gd}" = "xyes" ; then
@@ -650,11 +724,14 @@ AM_CONDITIONAL(GRAPHICS_WIN32, test "x${graphics_win32}" = "xyes")
 AC_ARG_ENABLE(graphics-qt-qpainter, [  --disable-graphics-qt-qpainter      disable graphics type qt-qpainter], graphics_qt_qpainter=$enableval;graphics_qt_qpainter_reason="configure parameter")
 if test "x${graphics_qt_qpainter}" = "xyes" -a "x${QT_GUI_CFLAGS}" = "x" -a "x${QT_GUI_LIBS}" = "x"; then
 	PKG_CHECK_MODULES(QT_GUI, [QtGui QtCore], ,graphics_qt_qpainter=no,graphics_qt_qpainter_reason="Packages QtGui and/or QtCore missing")
+	if test "x${graphics_qt_qpainter}" = "xno"; then
+		PKG_CHECK_MODULES(QT_GUI, [qt-mt],graphics_qt_qpainter=yes,graphics_qt_qpainter_reason="Package qt-mt present")
+	fi
 fi
 if test "x${graphics_qt_qpainter}" = "xyes" ; then
 	AC_DEFINE(USE_GRAPICS_QT_QPAINTER, 1, [Build with graphics qt_qpainter])
-	MOC=`pkg-config QtGui --variable=moc_location`
-	if test -z "$MOC" ; then
+	MOC=`$PKG_CONFIG QtGui --variable=moc_location`
+	if test "x${MOC}" = "x"; then
 		AC_CHECK_PROG(MOC, moc, moc)
 	fi
 	AC_SUBST(MOC)
@@ -675,19 +752,29 @@ AC_ARG_ENABLE(gui-win32, [  --disable-gui-win32                 disable gui type
 AM_CONDITIONAL(GUI_WIN32, test "x${gui_win32}" = "xyes")
 
 ## speech
+# android
+AC_ARG_ENABLE(speech-android, [  --disable-speech-android            disable speech type android], speech_android=$enableval;speech_android_reason="configure parameter")
+AM_CONDITIONAL(SPEECH_ANDROID, test "x${speech_android}" = "xyes")
 # cmdline
 AC_ARG_ENABLE(speech-cmdline, [  --disable-speech-cmdline            disable speech type cmdline], speech_cmdline=$enableval;speech_cmdline_reason="configure parameter")
 AM_CONDITIONAL(SPEECH_CMDLINE, test "x${speech_cmdline}" = "xyes")
-# cmdline
-AC_ARG_ENABLE(speech-speechd, [  --disable-speech-speech-dispatcher  disable speech type speech-dispatcher], speech_speech_dispatcher=$enableval;speech_speech_dispatcher_reason="configure parameter")
+# espeak
+AC_ARG_ENABLE(speech-espeak, [  --disable-speech-espeak            disable speech type espeak], speech_espeak=$enableval;speech_espeak_reason="configure parameter")
+AM_CONDITIONAL(SPEECH_ESPEAK, test "x${speech_espeak}" = "xyes")
+# speech-dispatcher
+AC_ARG_ENABLE(speech-speech-dispatcher, [  --disable-speech-speech-dispatcher  disable speech type speech-dispatcher], speech_speech_dispatcher=$enableval;speech_speech_dispatcher_reason="configure parameter")
 if test "x$speech_speech_dispatcher" = "xyes"; then
 	AC_CHECK_HEADER(libspeechd.h, AC_DEFINE([HAVE_LIBSPEECHD],[],Define to 1 if you have the <libspeechd.h> header file.) SPEECHD_LIBS="-lspeechd",  speech_speech_dispatcher=no; speech_speech_dispatcher_reason="libspeechd.h missing")
 fi
 AC_SUBST(SPEECHD_CFLAGS)
 AC_SUBST(SPEECHD_LIBS)
 AM_CONDITIONAL(SPEECH_SPEECH_DISPATCHER, test "x${speech_speech_dispatcher}" = "xyes")
+AM_CONDITIONAL(SUPPORT_ESPEAK, test "x${support_espeak}" = "xyes")
 
 ## vehicle
+# android
+AC_ARG_ENABLE(vehicle-android, [  --disable-vehicle-android             disable vehicle type android], vehicle_android=$enableval;vehicle_android_reason="configure parameter")
+AM_CONDITIONAL(VEHICLE_ANDROID, test "x${vehicle_android}" = "xyes")
 # demo
 AC_ARG_ENABLE(vehicle-demo, [  --disable-vehicle-demo              disable vehicle type demo], vehicle_demo=$enableval;vehicle_demo_reason="configure parameter")
 AM_CONDITIONAL(VEHICLE_DEMO, test "x${vehicle_demo}" = "xyes")
@@ -712,14 +799,40 @@ fi
 AC_SUBST(GYPSY_CFLAGS)
 AC_SUBST(GYPSY_LIBS)
 AM_CONDITIONAL(VEHICLE_GYPSY, test "x${vehicle_gypsy}" = "xyes")
+# maemo
+AC_ARG_ENABLE(vehicle-maemo, [  --disable-vehicle-maemo             disable vehicle type maemo], vehicle_maemo=$enableval;vehicle_maemo_reason="configure parameter")
+if test "x${vehicle_maemo}" = "xyes" ; then
+	PKG_CHECK_MODULES(LIBLOCATION, liblocation, [
+		AC_SUBST(LIBLOCATION_CFLAGS)
+		AC_SUBST(LIBLOCATION_LIBS)
+		], [
+		AC_MSG_RESULT(no)
+		vehicle_maemo=no
+		vehicle_maemo_reason="no maemo location library found"
+	])
+fi
+AM_CONDITIONAL(VEHICLE_MAEMO, test "x${vehicle_maemo}" = "xyes")
+# null
+AC_ARG_ENABLE(vehicle-null, [  --enable-vehicle-null             enable vehicle type null], vehicle_null=$enableval;vehicle_null_reason="configure parameter")
+AM_CONDITIONAL(VEHICLE_NULL, test "x${vehicle_null}" = "xyes")
 # wince
 AC_ARG_ENABLE(vehicle-wince, [  --disable-vehicle-wince             disable vehicle type wince], vehicle_wince=$enableval;vehicle_wince_reason="configure parameter")
 AM_CONDITIONAL(VEHICLE_WINCE, test "x${vehicle_wince}" = "xyes")
-
+# iphone
+AC_ARG_ENABLE(vehicle-iphone, [  --disable-vehicle-iphone              disable vehicle type iphone], vehicle_iphone=$enableval;vehicle_iphone_reason="configure parameter")
+AM_CONDITIONAL(VEHICLE_IPHONE, test "x${vehicle_iphone}" = "xyes")
+if test "x${vehicle_iphone}" = "xyes"
+then
+	IPHONE_LIBS=-Wl,-framework,CoreLocation
+fi
+AC_SUBST(IPHONE_CFLAGS)
+AC_SUBST(IPHONE_LIBS)
 NAVIT_CFLAGS="$NAVIT_CFLAGS $GLIB_CFLAGS $GMODULE_CFLAGS"
 NAVIT_LIBS="$NAVIT_LIBS $GLIB_LIBS $GMODULE_LIBS $LIBINTL"
 AC_SUBST(NAVIT_CFLAGS)
 AC_SUBST(NAVIT_LIBS)
+AC_SUBST(WORDEXP_LIBS)
+AC_SUBST(LIBC_LIBS)
 AC_SUBST(WINDRES)
 
 AC_CONFIG_FILES([
@@ -732,16 +845,19 @@ navit/map/Makefile
 navit/map/mg/Makefile
 navit/map/textfile/Makefile
 navit/map/shapefile/Makefile
+navit/map/filter/Makefile
 navit/map/binfile/Makefile
 navit/map/garmin/Makefile
 navit/map/poi_geodownload/Makefile
 navit/map/poi_geodownload/libmdb/Makefile
 navit/map/poi_geodownload/libmdb/include/Makefile
+navit/maptool/Makefile
 navit/fib-1.1/Makefile
 navit/font/Makefile
 navit/font/freetype/Makefile
 navit/fonts/Makefile
 navit/graphics/Makefile
+navit/graphics/android/Makefile
 navit/graphics/gd/Makefile
 navit/graphics/gtk_drawing_area/Makefile
 navit/graphics/opengl/Makefile
@@ -756,21 +872,31 @@ navit/gui/win32/Makefile
 navit/osd/Makefile
 navit/osd/core/Makefile
 navit/speech/Makefile
+navit/speech/android/Makefile
 navit/speech/cmdline/Makefile
+navit/speech/dbus/Makefile
+navit/speech/espeak/Makefile
 navit/speech/speech_dispatcher/Makefile
 navit/support/Makefile
+navit/support/espeak/Makefile
 navit/support/ezxml/Makefile
 navit/support/glib/Makefile
 navit/support/libc/Makefile
+navit/support/libpng/Makefile
 navit/support/win32/Makefile
 navit/support/wordexp/Makefile
 navit/support/zlib/Makefile
 navit/vehicle/Makefile
+navit/vehicle/android/Makefile
 navit/vehicle/file/Makefile
 navit/vehicle/gpsd/Makefile
+navit/vehicle/gpsd_dbus/Makefile
 navit/vehicle/gypsy/Makefile
+navit/vehicle/maemo/Makefile
+navit/vehicle/null/Makefile
 navit/vehicle/demo/Makefile
 navit/vehicle/wince/Makefile
+navit/vehicle/iphone/Makefile
 navit/xpm/Makefile
 navit/maps/Makefile
 intl/Makefile
@@ -837,6 +963,7 @@ echo "NLS Support:         $enable_nls ($nls_libs)"
 echo "Font renderers:"
 echo "  freetype:          $font_freetype ($font_freetype_reason)"
 echo "Graphics types:"
+echo "  android:  $graphics_android ($graphics_android_reason)"
 echo "  gtk_drawing_area:  $graphics_gtk_drawing_area ($graphics_gtk_drawing_area_reason)"
 echo "  qt_qpainter:       $graphics_qt_qpainter ($graphics_qt_qpainter_reason)"
 echo "  win32:             $graphics_win32 ($graphics_win32_reason)"
@@ -854,15 +981,23 @@ echo "  dbus:              $binding_dbus ($binding_dbus_reason)"
 echo "  python:            $binding_python ($binding_python_reason)"
 
 echo "Speech types:"
+echo "  android:           $speech_android ($speech_android_reason)"
 echo "  cmdline:           $speech_cmdline ($speech_cmdline_reason)"
+echo "  dbus:              $speech_dbus ($speech_dbus_reason)"
+echo "  espeak:            $speech_espeak ($speech_espeak_reason)"
 echo "  speech_dispatcher: $speech_speech_dispatcher ($speech_speech_dispatcher_reason)"
 
 echo "Vehicle types:"
+echo "  android:           $vehicle_android ($vehicle_android_reason)"
 echo "  demo:              $vehicle_demo ($vehicle_demo_reason)"
 echo "  file:              $vehicle_file ($vehicle_file_reason)"
 echo "  gpsd:              $vehicle_gpsd ($vehicle_gpsd_reason)"
+echo "  gpsd_dbus:         $vehicle_gpsd_dbus ($vehicle_gpsd_dbus_reason)"
 echo "  gypsy:             $vehicle_gypsy ($vehicle_gypsy_reason)"
+echo "  maemo:             $vehicle_maemo ($vehicle_maemo_reason)"
+echo "  null:              $vehicle_null ($vehicle_null_reason)"
 echo "  wince:             $vehicle_wince ($vehicle_wince_reason)"
+echo "  iphone:            $vehicle_iphone ($vehicle_iphone_reason)"
 
 if  test "x${gtk2_pkgconfig}" != "xyes" -a "x${gui_win32}" != "xyes" -a "x${gui_internal}" != "xyes"
 then