From f5ef0b9f1060e336495b71aa8f73cb15a6bb18d4 Mon Sep 17 00:00:00 2001
From: Björn Stenberg <bjorn@haxx.se>
Date: Tue, 8 Dec 2009 10:24:59 +0000
Subject: 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
---
 tools/configure | 29 ++++++++---------------------
 1 file changed, 8 insertions(+), 21 deletions(-)

(limited to 'tools')

diff --git a/tools/configure b/tools/configure
index eeb13fa21f..fa7be456f6 100755
--- a/tools/configure
+++ b/tools/configure
@@ -628,19 +628,12 @@ voiceconfig () {
         echo "(voice_$TTS_FESTIVAL_VOICE)" > festival-prolog.scm
     fi
 
-    # Allow the user to input manual commandline options
+    # Read custom tts options from command line
     if [ "$ARG_TTSOPTS" ]; then
-        USER_TTS_OPTS=$ARG_TTSOPTS
-    else
-        printf "Enter $TTS_ENGINE options (enter for defaults \"$TTS_OPTS\"): "
-        USER_TTS_OPTS=`input`
-        echo ""
-    fi
-    advopts="$advopts --ttsopts='$USER_TTS_OPTS'"
-    if [ -n "$USER_TTS_OPTS" ]; then
-        TTS_OPTS="$USER_TTS_OPTS"
+        TTS_OPTS="$ARG_TTS_OPTS"
+        advopts="$advopts --ttsopts='$TTS_OPTS'"
+        echo "$TTS_ENGINE options set to $TTS_OPTS"
     fi
-    echo "$TTS_ENGINE options set to $TTS_OPTS"
 
     if [ "$swcodec" = "yes" ]; then
         ENCODER="rbspeexenc"
@@ -660,18 +653,12 @@ voiceconfig () {
  
     echo "Using $ENCODER for encoding voice clips"
 
-    # Allow the user to input manual commandline options
+    # Read custom encoder options from command line
     if [ "$ARG_ENCOPTS" ]; then
-        USER_ENC_OPTS=$ARG_ENCOPTS
-    else
-        printf "Enter $ENCODER options (enter for defaults \"$ENC_OPTS\"): "
-        USER_ENC_OPTS=`input`
-    fi
-    advopts="$advopts --encopts='$USER_ENC_OPTS'"
-    if [ -n "$USER_ENC_OPTS" ]; then
-        ENC_OPTS=$USER_ENC_OPTS
+        ENC_OPTS="$ARG_ENCOPTS"
+        advopts="$advopts --encopts='$ENC_OPTS'"
+        echo "$ENCODER options set to $ENC_OPTS"
     fi
-    echo "$ENCODER options set to $ENC_OPTS"
 
     TEMPDIR="${pwd}"
     if [ -n "`findtool cygpath`" ]; then
-- 
cgit v1.2.3