diff options
author | Jonas Häggqvist <rasher@rasher.dk> | 2007-08-13 12:31:18 +0000 |
---|---|---|
committer | Jonas Häggqvist <rasher@rasher.dk> | 2007-08-13 12:31:18 +0000 |
commit | 8a6383884bb3ff25edffe1853deedec6094a8811 (patch) | |
tree | 65b4584022fd538f60d7dbbd007706c5ee2294fa /tools/configure | |
parent | 45ffc87030f1fa3d49b10cc61c1d2d748ffd3e3f (diff) | |
download | rockbox-8a6383884bb3ff25edffe1853deedec6094a8811.tar.gz rockbox-8a6383884bb3ff25edffe1853deedec6094a8811.zip |
More elegant (and robust) check for program availability.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14311 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 041c7d3f8d..0bbb9584a7 100755 --- a/tools/configure +++ b/tools/configure | |||
@@ -327,7 +327,7 @@ voiceconfig () { | |||
327 | echo "Building $thislang voice for $archos. Select options" | 327 | echo "Building $thislang voice for $archos. Select options" |
328 | echo "" | 328 | echo "" |
329 | 329 | ||
330 | if [ "`which flite`" != "" ]; then | 330 | if [ -f "`which flite`" ]; then |
331 | FLITE="F(l)ite " | 331 | FLITE="F(l)ite " |
332 | FLITE_OPTS="FLITE_OPTS=\"\"" | 332 | FLITE_OPTS="FLITE_OPTS=\"\"" |
333 | DEFAULT_TTS="flite" | 333 | DEFAULT_TTS="flite" |
@@ -335,7 +335,7 @@ voiceconfig () { | |||
335 | DEFAULT_NOISEFLOOR="500" | 335 | DEFAULT_NOISEFLOOR="500" |
336 | DEFAULT_CHOICE="L" | 336 | DEFAULT_CHOICE="L" |
337 | fi | 337 | fi |
338 | if [ "`which espeak`" != "" ]; then | 338 | if [ -f "`which espeak`" ]; then |
339 | ESPEAK="(e)Speak " | 339 | ESPEAK="(e)Speak " |
340 | ESPEAK_OPTS="ESPEAK_OPTS=\"\"" | 340 | ESPEAK_OPTS="ESPEAK_OPTS=\"\"" |
341 | DEFAULT_TTS="espeak" | 341 | DEFAULT_TTS="espeak" |
@@ -343,7 +343,7 @@ voiceconfig () { | |||
343 | DEFAULT_NOISEFLOOR="500" | 343 | DEFAULT_NOISEFLOOR="500" |
344 | DEFAULT_CHOICE="e" | 344 | DEFAULT_CHOICE="e" |
345 | fi | 345 | fi |
346 | if [ "`which festival`" != "" ]; then | 346 | if [ -f "`which festival`" ]; then |
347 | FESTIVAL="(F)estival " | 347 | FESTIVAL="(F)estival " |
348 | FESTIVAL_OPTS="FESTIVAL_OPTS=\"\"" | 348 | FESTIVAL_OPTS="FESTIVAL_OPTS=\"\"" |
349 | DEFAULT_TTS="festival" | 349 | DEFAULT_TTS="festival" |
@@ -352,7 +352,7 @@ voiceconfig () { | |||
352 | DEFAULT_CHOICE="F" | 352 | DEFAULT_CHOICE="F" |
353 | fi | 353 | fi |
354 | # Allow SAPI if Windows is in use | 354 | # Allow SAPI if Windows is in use |
355 | if [ "`which winver`" != "" ]; then | 355 | if [ -f "`which winver`" ]; then |
356 | SAPI5="(S)API5 " | 356 | SAPI5="(S)API5 " |
357 | SAPI5_OPTS="SAPI5_OPTS=\"\"" | 357 | SAPI5_OPTS="SAPI5_OPTS=\"\"" |
358 | DEFAULT_TTS="sapi5" | 358 | DEFAULT_TTS="sapi5" |
@@ -405,21 +405,21 @@ voiceconfig () { | |||
405 | 405 | ||
406 | echo "" | 406 | echo "" |
407 | 407 | ||
408 | if [ "`which oggenc`" != "" ]; then | 408 | if [ -f "`which oggenc`" ]; then |
409 | OGGENC="(O)ggenc " | 409 | OGGENC="(O)ggenc " |
410 | DEFAULT_ENC="oggenc" | 410 | DEFAULT_ENC="oggenc" |
411 | VORBIS_OPTS="VORBIS_OPTS=\"-q0 --downmix\"" | 411 | VORBIS_OPTS="VORBIS_OPTS=\"-q0 --downmix\"" |
412 | DEFAULT_ENC_OPTS=$VORBIS_OPTS | 412 | DEFAULT_ENC_OPTS=$VORBIS_OPTS |
413 | DEFAULT_CHOICE="O" | 413 | DEFAULT_CHOICE="O" |
414 | fi | 414 | fi |
415 | if [ "`which speexenc`" != "" ]; then | 415 | if [ -f "`which speexenc`" ]; then |
416 | SPEEXENC="(S)peexenc " | 416 | SPEEXENC="(S)peexenc " |
417 | DEFAULT_ENC="speexenc" | 417 | DEFAULT_ENC="speexenc" |
418 | SPEEX_OPTS="" # TODO: find appropriate options for speex | 418 | SPEEX_OPTS="" # TODO: find appropriate options for speex |
419 | DEFAULT_ENC_OPTS=$SPEEX_OPTS | 419 | DEFAULT_ENC_OPTS=$SPEEX_OPTS |
420 | DEFAULT_CHOICE="S" | 420 | DEFAULT_CHOICE="S" |
421 | fi | 421 | fi |
422 | if [ "`which lame`" != "" ]; then | 422 | if [ -f "`which lame`" ]; then |
423 | LAME="(L)ame " | 423 | LAME="(L)ame " |
424 | DEFAULT_ENC="lame" | 424 | DEFAULT_ENC="lame" |
425 | LAME_OPTS="LAME_OPTS=\"--resample 12 -t -m m -h -V 9 -S\"" | 425 | LAME_OPTS="LAME_OPTS=\"--resample 12 -t -m m -h -V 9 -S\"" |
@@ -463,7 +463,7 @@ voiceconfig () { | |||
463 | fi | 463 | fi |
464 | 464 | ||
465 | TEMPDIR="${pwd}" | 465 | TEMPDIR="${pwd}" |
466 | if [ "`which cygpath`" != "" ]; then | 466 | if [ -f "`which cygpath`" ]; then |
467 | TEMPDIR=`cygpath . -a -w` | 467 | TEMPDIR=`cygpath . -a -w` |
468 | fi | 468 | fi |
469 | 469 | ||