Fix:Build:Add forgotten speech_android

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

diff --git a/configure.in b/configure.in
index 6f34f42..1f6f108 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -48,6 +48,7 @@ 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_speech_dispatcher=yes; speech_speech_dispatcher_reason=default
 vehicle_demo=yes; vehicle_demo_reason=default
@@ -86,6 +87,7 @@ linux*_android)
        $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="-Xcompiler -nostdlib"
        ;;
 esac
@@ -110,6 +112,7 @@ m4_ifndef([AC_USE_SYSTEM_EXTENSIONS],
 AC_USE_SYSTEM_EXTENSIONS
 
 AC_PROG_CC
+AC_PROG_OBJC
 if eval "test x`uname` = xDarwin"; then
        CFLAGS="$CFLAGS -I/opt/local/include -L/opt/local/lib"
 fi
@@ -704,6 +707,9 @@ 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")
@@ -790,6 +796,7 @@ navit/gui/win32/Makefile
 navit/osd/Makefile
 navit/osd/core/Makefile
 navit/speech/Makefile
+navit/speech/android/Makefile
 navit/speech/cmdline/Makefile
 navit/speech/speech_dispatcher/Makefile
 navit/support/Makefile
@@ -890,6 +897,7 @@ 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 "  speech_dispatcher: $speech_speech_dispatcher ($speech_speech_dispatcher_reason)"
 

diff --git a/navit/Makefile.am b/navit/Makefile.am
index a84e04e..dbdbb67 100644 (file)
--- a/navit/Makefile.am
+++ b/navit/Makefile.am
@@ -44,10 +44,9 @@ libnavit_la_SOURCES = announcement.c atom.c attr.c cache.c callback.c command.c
 comma=,
 XSLTS=@XSLTS@
 navit.xml: navit_shipped.xml  $(foreach xslt, $(subst $(comma), ,$(XSLTS)), $(addsuffix .xslt,$(addprefix xslt/,$(xslt))))
-       cp $< navit.xml.tmp
        cp $< navit.xml.new
        if [ "$(builddir)" != "$(srcdir)" ]; then cp $(srcdir)/navit.dtd $(builddir)/navit.dtd; fi
-       for i in $^; do if [ "$${i%.xslt}" != "$$i" ]; then echo "Applying $$i" ; saxon -snone navit.xml.tmp $$i >navit.xml.new || exit ; fi ; done
+       for i in $^; do if [ "$${i%.xslt}" != "$$i" ]; then echo "Applying $$i" ; saxon -snone navit.xml.new $$i >navit.xml.tmp || exit ; mv navit.xml.tmp navit.xml.new || exit ; fi ; done
        mv navit.xml.new navit.xml
        rm -f navit.xml.tmp
        

diff --git a/navit/speech/Makefile.am b/navit/speech/Makefile.am
index 03b17d8..1d40c8e 100644 (file)
--- a/navit/speech/Makefile.am
+++ b/navit/speech/Makefile.am
@@ -1,4 +1,7 @@
 SUBDIRS=
+if SPEECH_ANDROID
+  SUBDIRS += android
+endif
 if SPEECH_CMDLINE
   SUBDIRS += cmdline
 endif