diff options
-rwxr-xr-x | tools/configure | 2 | ||||
-rw-r--r-- | tools/voicecommon.sh | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/tools/configure b/tools/configure index 0bbb9584a7..03182cfde4 100755 --- a/tools/configure +++ b/tools/configure | |||
@@ -1865,7 +1865,7 @@ if [ "yes" = "$voice" ]; then | |||
1865 | cat >> Makefile <<EOF | 1865 | cat >> Makefile <<EOF |
1866 | 1866 | ||
1867 | voice: tools features | 1867 | voice: tools features |
1868 | \$(SILENT)for f in \`cat \$(BUILDDIR)/@APPS@/features\`; do feat="\$\$feat:\$\$f" ; done ; \\ | 1868 | \$(SILENT)for f in \`cat \$(BUILDDIR)/${apps}/features\`; do feat="\$\$feat:\$\$f" ; done ; \\ |
1869 | for lang in \`echo \$(VOICELANGUAGE) |sed "s/,/ /g"\`; do \$(TOOLSDIR)/genvoice.sh \$(ROOTDIR) \$\$lang \$(ARCHOS)\$\$feat \$(TARGET_ID) voicesettings-\$\$lang.sh ; done \\ | 1869 | for lang in \`echo \$(VOICELANGUAGE) |sed "s/,/ /g"\`; do \$(TOOLSDIR)/genvoice.sh \$(ROOTDIR) \$\$lang \$(ARCHOS)\$\$feat \$(TARGET_ID) voicesettings-\$\$lang.sh ; done \\ |
1870 | EOF | 1870 | EOF |
1871 | 1871 | ||
diff --git a/tools/voicecommon.sh b/tools/voicecommon.sh index 052e73b67a..458a7b2ec6 100644 --- a/tools/voicecommon.sh +++ b/tools/voicecommon.sh | |||
@@ -128,14 +128,14 @@ init_tts() { | |||
128 | case $TTS_ENGINE in | 128 | case $TTS_ENGINE in |
129 | festival) | 129 | festival) |
130 | # Check for festival_client | 130 | # Check for festival_client |
131 | if [ -f "`which $FESTIVAL_CLIENT`" ]; then | 131 | if [ ! -f "`which $FESTIVAL_CLIENT`" ]; then |
132 | echo "Error: $FESTIVAL_CLIENT not found" | 132 | echo "Error: $FESTIVAL_CLIENT not found" |
133 | exit 4 | 133 | exit 4 |
134 | fi | 134 | fi |
135 | 135 | ||
136 | # Check for, and start festival server if specified | 136 | # Check for, and start festival server if specified |
137 | if [ X$FESTIVAL_START = XY ]; then | 137 | if [ X$FESTIVAL_START = XY ]; then |
138 | if [ -f "`which $FESTIVAL_BIN`" ]; then | 138 | if [ ! -f "`which $FESTIVAL_BIN`" ]; then |
139 | echo "Error: $FESTIVAL_BIN not found" | 139 | echo "Error: $FESTIVAL_BIN not found" |
140 | exit 3 | 140 | exit 3 |
141 | fi | 141 | fi |
@@ -160,14 +160,14 @@ init_tts() { | |||
160 | ;; | 160 | ;; |
161 | flite) | 161 | flite) |
162 | # Check for flite | 162 | # Check for flite |
163 | if [ -f "`which $FLITE_BIN`" ]; then | 163 | if [ ! -f "`which $FLITE_BIN`" ]; then |
164 | echo "Error: $FLITE_BIN not found" | 164 | echo "Error: $FLITE_BIN not found" |
165 | exit 5 | 165 | exit 5 |
166 | fi | 166 | fi |
167 | ;; | 167 | ;; |
168 | espeak) | 168 | espeak) |
169 | # Check for espeak | 169 | # Check for espeak |
170 | if [ -f "`which $ESPEAK_BIN`" ]; then | 170 | if [ ! -f "`which $ESPEAK_BIN`" ]; then |
171 | echo "Error: $ESPEAK_BIN not found" | 171 | echo "Error: $ESPEAK_BIN not found" |
172 | exit 5 | 172 | exit 5 |
173 | fi | 173 | fi |
@@ -208,21 +208,21 @@ init_encoder() { | |||
208 | case $ENCODER in | 208 | case $ENCODER in |
209 | lame) | 209 | lame) |
210 | # Check for lame binary | 210 | # Check for lame binary |
211 | if [ -f "`which $LAME_BIN`" ]; then | 211 | if [ ! -f "`which $LAME_BIN`" ]; then |
212 | echo "Error: $LAME_BIN not found" | 212 | echo "Error: $LAME_BIN not found" |
213 | exit 6 | 213 | exit 6 |
214 | fi | 214 | fi |
215 | ;; | 215 | ;; |
216 | speex) | 216 | speex) |
217 | # Check for speexenc binary | 217 | # Check for speexenc binary |
218 | if [ -f "`which $SPEEX_BIN`" ]; then | 218 | if [ ! -f "`which $SPEEX_BIN`" ]; then |
219 | echo "Error: $SPEEX_BIN not found" | 219 | echo "Error: $SPEEX_BIN not found" |
220 | exit 7 | 220 | exit 7 |
221 | fi | 221 | fi |
222 | ;; | 222 | ;; |
223 | vorbis) | 223 | vorbis) |
224 | # Check for vorbis encoder binary | 224 | # Check for vorbis encoder binary |
225 | if [ -f "`which $VORBIS_BIN`" ]; then | 225 | if [ ! -f "`which $VORBIS_BIN`" ]; then |
226 | echo "Error: $VORBIS_BIN not found" | 226 | echo "Error: $VORBIS_BIN not found" |
227 | exit 10 | 227 | exit 10 |
228 | fi | 228 | fi |