From: <mar...@us...> - 2009-08-24 04:33:17
|
Revision: 2519 http://navit.svn.sourceforge.net/navit/?rev=2519&view=rev Author: martin-s Date: 2009-08-24 04:33:09 +0000 (Mon, 24 Aug 2009) Log Message: ----------- Fix:Build:Add forgotten speech_android Modified Paths: -------------- trunk/navit/configure.in trunk/navit/navit/Makefile.am trunk/navit/navit/speech/Makefile.am Modified: trunk/navit/configure.in =================================================================== --- trunk/navit/configure.in 2009-08-23 21:23:49 UTC (rev 2518) +++ trunk/navit/configure.in 2009-08-24 04:33:09 UTC (rev 2519) @@ -48,6 +48,7 @@ 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 @@ $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 @@ 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 @@ 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/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 " 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)" Modified: trunk/navit/navit/Makefile.am =================================================================== --- trunk/navit/navit/Makefile.am 2009-08-23 21:23:49 UTC (rev 2518) +++ trunk/navit/navit/Makefile.am 2009-08-24 04:33:09 UTC (rev 2519) @@ -44,10 +44,9 @@ 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 Modified: trunk/navit/navit/speech/Makefile.am =================================================================== --- trunk/navit/navit/speech/Makefile.am 2009-08-23 21:23:49 UTC (rev 2518) +++ trunk/navit/navit/speech/Makefile.am 2009-08-24 04:33:09 UTC (rev 2519) @@ -1,4 +1,7 @@ SUBDIRS= +if SPEECH_ANDROID + SUBDIRS += android +endif if SPEECH_CMDLINE SUBDIRS += cmdline endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |