Two oops commits for the price of one.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14312 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jonas Häggqvist 2007-08-13 12:44:45 +00:00
parent 8a6383884b
commit 41a5776539
2 changed files with 8 additions and 8 deletions

2
tools/configure vendored
View File

@ -1865,7 +1865,7 @@ if [ "yes" = "$voice" ]; then
cat >> Makefile <<EOF
voice: tools features
\$(SILENT)for f in \`cat \$(BUILDDIR)/@APPS@/features\`; do feat="\$\$feat:\$\$f" ; done ; \\
\$(SILENT)for f in \`cat \$(BUILDDIR)/${apps}/features\`; do feat="\$\$feat:\$\$f" ; done ; \\
for lang in \`echo \$(VOICELANGUAGE) |sed "s/,/ /g"\`; do \$(TOOLSDIR)/genvoice.sh \$(ROOTDIR) \$\$lang \$(ARCHOS)\$\$feat \$(TARGET_ID) voicesettings-\$\$lang.sh ; done \\
EOF

View File

@ -128,14 +128,14 @@ init_tts() {
case $TTS_ENGINE in
festival)
# Check for festival_client
if [ -f "`which $FESTIVAL_CLIENT`" ]; then
if [ ! -f "`which $FESTIVAL_CLIENT`" ]; then
echo "Error: $FESTIVAL_CLIENT not found"
exit 4
fi
# Check for, and start festival server if specified
if [ X$FESTIVAL_START = XY ]; then
if [ -f "`which $FESTIVAL_BIN`" ]; then
if [ ! -f "`which $FESTIVAL_BIN`" ]; then
echo "Error: $FESTIVAL_BIN not found"
exit 3
fi
@ -160,14 +160,14 @@ init_tts() {
;;
flite)
# Check for flite
if [ -f "`which $FLITE_BIN`" ]; then
if [ ! -f "`which $FLITE_BIN`" ]; then
echo "Error: $FLITE_BIN not found"
exit 5
fi
;;
espeak)
# Check for espeak
if [ -f "`which $ESPEAK_BIN`" ]; then
if [ ! -f "`which $ESPEAK_BIN`" ]; then
echo "Error: $ESPEAK_BIN not found"
exit 5
fi
@ -208,21 +208,21 @@ init_encoder() {
case $ENCODER in
lame)
# Check for lame binary
if [ -f "`which $LAME_BIN`" ]; then
if [ ! -f "`which $LAME_BIN`" ]; then
echo "Error: $LAME_BIN not found"
exit 6
fi
;;
speex)
# Check for speexenc binary
if [ -f "`which $SPEEX_BIN`" ]; then
if [ ! -f "`which $SPEEX_BIN`" ]; then
echo "Error: $SPEEX_BIN not found"
exit 7
fi
;;
vorbis)
# Check for vorbis encoder binary
if [ -f "`which $VORBIS_BIN`" ]; then
if [ ! -f "`which $VORBIS_BIN`" ]; then
echo "Error: $VORBIS_BIN not found"
exit 10
fi