Minor updates on man pages

[navit-package] / configure.in

diff --git a/configure.in b/configure.in
index 70c2ec6..1aa9638 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -64,6 +64,7 @@ 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
@@ -91,7 +92,6 @@ mingw32)
        graphics_win32=yes; graphics_win32_reason="host_os is mingw32"
        speech_espeak=yes; speech_espeak_reason="host_os is mingw32"
        support_libpng=yes
-       MODULE_LIBADD="-Wl,-lwinmm"
        ;;
 linux*_android)
        android=yes
@@ -106,7 +106,7 @@ linux*_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"
+       NAVIT_MODULE_LDFLAGS="$MODULE_LDFLAGS"
        ;;
 esac
 if test "x$win32" = "xyes"
@@ -650,7 +650,7 @@ AC_SUBST(MOFILES)
 AC_SUBST(POFILES)
 AC_SUBST(POIFILES)
 AM_GNU_GETTEXT_VERSION
-AM_GNU_GETTEXT(use-libtool, need-ngettext, \$(top_builddir)/intl/)
+AM_GNU_GETTEXT(no-libtool, need-ngettext, \$(top_builddir)/intl/)
 AC_SUBST(LIBINTL)
 AC_SUBST(LTLIBINTL)
 if test x"$LIBINTL" != "x" ;then
@@ -785,7 +785,16 @@ AM_CONDITIONAL(VEHICLE_FILE, test "x${vehicle_file}" = "xyes")
 AC_ARG_ENABLE(vehicle-gpsd, [  --disable-vehicle-gpsd              disable vehicle type gpsd], vehicle_gpsd=$enableval;vehicle_gpsd_reason="configure parameter")
 if test "x${vehicle_gpsd}" = xyes
 then
-       AC_CHECK_HEADER(gps.h, AC_DEFINE([HAVE_LIBGPS],[],Define to 1 if you have the <gps.h> header file.) GPSD_LIBS="-lgps", vehicle_gpsd=no; vehicle_gpsd_reason="no gps.h" )
+       PKG_CHECK_MODULES([GPSD], [libgps], have_libgps="yes", have_libgps="no")
+       if test "x$have_libgps" = "xyes"; then
+               AC_DEFINE([HAVE_LIBGPS],[],Define to 1 if you have libgps.)
+               PKG_CHECK_MODULES([LIBGPS19], [libgps >= 2.90], have_libgps19="yes", have_libgps19="no")
+               if test "x$have_libgps19" = "xyes"; then
+                       AC_DEFINE([HAVE_LIBGPS19],[],Define to 1 if you have libgps19.)
+               fi
+       else
+               AC_CHECK_HEADER(gps.h, AC_DEFINE([HAVE_LIBGPS],[],Define to 1 if you have the <gps.h> header file.) GPSD_LIBS="-lgps", vehicle_gpsd=no; vehicle_gpsd_reason="no gps.h and no gpsd pkgconfig" )
+       fi
 fi
 AC_SUBST(GPSD_CFLAGS)
 AC_SUBST(GPSD_LIBS)
@@ -799,6 +808,19 @@ 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")
@@ -879,6 +901,7 @@ 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
@@ -980,6 +1003,7 @@ 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)"