diff options
author | Jonas Häggqvist <rasher@rasher.dk> | 2007-08-09 22:16:10 +0000 |
---|---|---|
committer | Jonas Häggqvist <rasher@rasher.dk> | 2007-08-09 22:16:10 +0000 |
commit | 2f6f52d7e424d0aaef2774437aca9474c33a88bc (patch) | |
tree | 4a0ad269707b9bde31937fbd199a668d34faaa2b /tools/configure | |
parent | edf54496ad7a9a5730d99f0d6ce9edc8347e1763 (diff) | |
download | rockbox-2f6f52d7e424d0aaef2774437aca9474c33a88bc.tar.gz rockbox-2f6f52d7e424d0aaef2774437aca9474c33a88bc.zip |
Don't break if the program paths looked for contain spaces.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14261 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'tools/configure')
-rwxr-xr-x | tools/configure | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tools/configure b/tools/configure index e01230c390..5601a9aae7 100755 --- a/tools/configure +++ b/tools/configure | |||
@@ -308,7 +308,7 @@ voiceconfig () { | |||
308 | echo "Building voice for $archos" | 308 | echo "Building voice for $archos" |
309 | echo "" | 309 | echo "" |
310 | 310 | ||
311 | if [ `which flite` ]; then | 311 | if [ "`which flite`" != "" ]; then |
312 | FLITE="F(l)ite " | 312 | FLITE="F(l)ite " |
313 | FLITE_OPTS="FLITE_OPTS=\"\"" | 313 | FLITE_OPTS="FLITE_OPTS=\"\"" |
314 | DEFAULT_TTS="flite" | 314 | DEFAULT_TTS="flite" |
@@ -316,7 +316,7 @@ voiceconfig () { | |||
316 | DEFAULT_NOISEFLOOR="500" | 316 | DEFAULT_NOISEFLOOR="500" |
317 | DEFAULT_CHOICE="L" | 317 | DEFAULT_CHOICE="L" |
318 | fi | 318 | fi |
319 | if [ `which espeak` ]; then | 319 | if [ "`which espeak`" != "" ]; then |
320 | ESPEAK="(e)Speak " | 320 | ESPEAK="(e)Speak " |
321 | ESPEAK_OPTS="ESPEAK_OPTS=\"\"" | 321 | ESPEAK_OPTS="ESPEAK_OPTS=\"\"" |
322 | DEFAULT_TTS="espeak" | 322 | DEFAULT_TTS="espeak" |
@@ -324,7 +324,7 @@ voiceconfig () { | |||
324 | DEFAULT_NOISEFLOOR="500" | 324 | DEFAULT_NOISEFLOOR="500" |
325 | DEFAULT_CHOICE="e" | 325 | DEFAULT_CHOICE="e" |
326 | fi | 326 | fi |
327 | if [ `which festival` ]; then | 327 | if [ "`which festival`" != "" ]; then |
328 | FESTIVAL="(F)estival " | 328 | FESTIVAL="(F)estival " |
329 | FESTIVAL_OPTS="FESTIVAL_OPTS=\"\"" | 329 | FESTIVAL_OPTS="FESTIVAL_OPTS=\"\"" |
330 | DEFAULT_TTS="festival" | 330 | DEFAULT_TTS="festival" |
@@ -333,7 +333,7 @@ voiceconfig () { | |||
333 | DEFAULT_CHOICE="F" | 333 | DEFAULT_CHOICE="F" |
334 | fi | 334 | fi |
335 | # Allow SAPI if Windows is in use | 335 | # Allow SAPI if Windows is in use |
336 | if [ `which winver` ]; then | 336 | if [ "`which winver`" != "" ]; then |
337 | SAPI5="(S)API5 " | 337 | SAPI5="(S)API5 " |
338 | SAPI5_OPTS="SAPI5_OPTS=\"\"" | 338 | SAPI5_OPTS="SAPI5_OPTS=\"\"" |
339 | DEFAULT_TTS="sapi5" | 339 | DEFAULT_TTS="sapi5" |
@@ -379,21 +379,21 @@ voiceconfig () { | |||
379 | 379 | ||
380 | echo "" | 380 | echo "" |
381 | 381 | ||
382 | if [ `which oggenc` ]; then | 382 | if [ "`which oggenc`" != "" ]; then |
383 | OGGENC="(O)ggenc " | 383 | OGGENC="(O)ggenc " |
384 | DEFAULT_ENC="oggenc" | 384 | DEFAULT_ENC="oggenc" |
385 | VORBIS_OPTS="VORBIS_OPTS=\"-q0 --downmix\"" | 385 | VORBIS_OPTS="VORBIS_OPTS=\"-q0 --downmix\"" |
386 | DEFAULT_ENC_OPTS=$VORBIS_OPTS | 386 | DEFAULT_ENC_OPTS=$VORBIS_OPTS |
387 | DEFAULT_CHOICE="O" | 387 | DEFAULT_CHOICE="O" |
388 | fi | 388 | fi |
389 | if [ `which speexenc` ]; then | 389 | if [ "`which speexenc`" != "" ]; then |
390 | SPEEXENC="(S)peexenc " | 390 | SPEEXENC="(S)peexenc " |
391 | DEFAULT_ENC="speexenc" | 391 | DEFAULT_ENC="speexenc" |
392 | SPEEX_OPTS="" # TODO: find appropriate options for speex | 392 | SPEEX_OPTS="" # TODO: find appropriate options for speex |
393 | DEFAULT_ENC_OPTS=$SPEEX_OPTS | 393 | DEFAULT_ENC_OPTS=$SPEEX_OPTS |
394 | DEFAULT_CHOICE="S" | 394 | DEFAULT_CHOICE="S" |
395 | fi | 395 | fi |
396 | if [ `which lame` ]; then | 396 | if [ "`which lame`" != "" ]; then |
397 | LAME="(L)ame " | 397 | LAME="(L)ame " |
398 | DEFAULT_ENC="lame" | 398 | DEFAULT_ENC="lame" |
399 | LAME_OPTS="LAME_OPTS=\"--resample 12 -t -m m -h -V 9 -S\"" | 399 | LAME_OPTS="LAME_OPTS=\"--resample 12 -t -m m -h -V 9 -S\"" |
@@ -428,7 +428,7 @@ voiceconfig () { | |||
428 | # esac | 428 | # esac |
429 | echo "Using $ENCODER for encoding voice clips" | 429 | echo "Using $ENCODER for encoding voice clips" |
430 | TEMPDIR="${pwd}" | 430 | TEMPDIR="${pwd}" |
431 | if [ `which cygpath` ]; then | 431 | if [ "`which cygpath`" != "" ]; then |
432 | TEMPDIR=`cygpath . -a -w` | 432 | TEMPDIR=`cygpath . -a -w` |
433 | fi | 433 | fi |
434 | 434 | ||