Fix:Core:Revert wrong part of #2893

[navit-package] / configure.in

diff --git a/configure.in b/configure.in
index 81eeb4a..4d83836 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -64,6 +64,10 @@ 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
@@ -88,10 +92,11 @@ mingw32)
        graphics_win32=yes; graphics_win32_reason="host_os is mingw32"
        speech_espeak=yes; speech_espeak_reason="host_os is mingw32"
        support_libpng=yes
-       LIBS="$LIBS -lwinmm"
        ;;
 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
@@ -99,7 +104,8 @@ linux*_android)
        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="-Xcompiler -nostdlib"
+       MODULE_LDFLAGS="-module -Xcompiler -nostdlib"
+       MODULE_LIBADD="-llog"
        NAVIT_MODULE_LDFLAGS="$MODULE_LDFLAGS -L\$(top_builddir)/navit -lnavit"
        ;;
 esac
@@ -122,6 +128,7 @@ 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"
@@ -261,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"])
@@ -637,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
@@ -786,6 +799,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")
@@ -866,6 +892,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
@@ -967,6 +994,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)"