summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xtools/configure29
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