diff options
author | Björn Stenberg <bjorn@haxx.se> | 2009-12-08 10:24:59 +0000 |
---|---|---|
committer | Björn Stenberg <bjorn@haxx.se> | 2009-12-08 10:24:59 +0000 |
commit | f5ef0b9f1060e336495b71aa8f73cb15a6bb18d4 (patch) | |
tree | e75af55e66aebe74c514c82c96154d215346b21e | |
parent | 953f4d4accd4ee1ef1fab880a01fa65ec85614a5 (diff) | |
download | rockbox-f5ef0b9f1060e336495b71aa8f73cb15a6bb18d4.tar.gz rockbox-f5ef0b9f1060e336495b71aa8f73cb15a6bb18d4.zip |
Do not prompt for encoder and tts options. They are now command line only.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23895 a1c6a512-1295-4272-9138-f99709370657
-rwxr-xr-x | tools/configure | 29 |
1 files changed, 8 insertions, 21 deletions
diff --git a/tools/configure b/tools/configure index eeb13fa21f..fa7be456f6 100755 --- a/tools/configure +++ b/tools/configure | |||
@@ -628,19 +628,12 @@ voiceconfig () { | |||
628 | echo "(voice_$TTS_FESTIVAL_VOICE)" > festival-prolog.scm | 628 | echo "(voice_$TTS_FESTIVAL_VOICE)" > festival-prolog.scm |
629 | fi | 629 | fi |
630 | 630 | ||
631 | # Allow the user to input manual commandline options | 631 | # Read custom tts options from command line |
632 | if [ "$ARG_TTSOPTS" ]; then | 632 | if [ "$ARG_TTSOPTS" ]; then |
633 | USER_TTS_OPTS=$ARG_TTSOPTS | 633 | TTS_OPTS="$ARG_TTS_OPTS" |
634 | else | 634 | advopts="$advopts --ttsopts='$TTS_OPTS'" |
635 | printf "Enter $TTS_ENGINE options (enter for defaults \"$TTS_OPTS\"): " | 635 | echo "$TTS_ENGINE options set to $TTS_OPTS" |
636 | USER_TTS_OPTS=`input` | ||
637 | echo "" | ||
638 | fi | ||
639 | advopts="$advopts --ttsopts='$USER_TTS_OPTS'" | ||
640 | if [ -n "$USER_TTS_OPTS" ]; then | ||
641 | TTS_OPTS="$USER_TTS_OPTS" | ||
642 | fi | 636 | fi |
643 | echo "$TTS_ENGINE options set to $TTS_OPTS" | ||
644 | 637 | ||
645 | if [ "$swcodec" = "yes" ]; then | 638 | if [ "$swcodec" = "yes" ]; then |
646 | ENCODER="rbspeexenc" | 639 | ENCODER="rbspeexenc" |
@@ -660,18 +653,12 @@ voiceconfig () { | |||
660 | 653 | ||
661 | echo "Using $ENCODER for encoding voice clips" | 654 | echo "Using $ENCODER for encoding voice clips" |
662 | 655 | ||
663 | # Allow the user to input manual commandline options | 656 | # Read custom encoder options from command line |
664 | if [ "$ARG_ENCOPTS" ]; then | 657 | if [ "$ARG_ENCOPTS" ]; then |
665 | USER_ENC_OPTS=$ARG_ENCOPTS | 658 | ENC_OPTS="$ARG_ENCOPTS" |
666 | else | 659 | advopts="$advopts --encopts='$ENC_OPTS'" |
667 | printf "Enter $ENCODER options (enter for defaults \"$ENC_OPTS\"): " | 660 | echo "$ENCODER options set to $ENC_OPTS" |
668 | USER_ENC_OPTS=`input` | ||
669 | fi | ||
670 | advopts="$advopts --encopts='$USER_ENC_OPTS'" | ||
671 | if [ -n "$USER_ENC_OPTS" ]; then | ||
672 | ENC_OPTS=$USER_ENC_OPTS | ||
673 | fi | 661 | fi |
674 | echo "$ENCODER options set to $ENC_OPTS" | ||
675 | 662 | ||
676 | TEMPDIR="${pwd}" | 663 | TEMPDIR="${pwd}" |
677 | if [ -n "`findtool cygpath`" ]; then | 664 | if [ -n "`findtool cygpath`" ]; then |