diff options
-rwxr-xr-x | tools/configure | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/tools/configure b/tools/configure index 2e2cf2cdb0..9e95cd0452 100755 --- a/tools/configure +++ b/tools/configure | |||
@@ -29,7 +29,16 @@ thread_support="ASSEMBLER_THREADS" | |||
29 | app_lcd_width= | 29 | app_lcd_width= |
30 | app_lcd_height= | 30 | app_lcd_height= |
31 | app_lcd_orientation= | 31 | app_lcd_orientation= |
32 | cmdline="$@" | 32 | |
33 | # Properly retain command line arguments containing spaces | ||
34 | cmdline= | ||
35 | for arg in "$@"; do | ||
36 | case "$arg" in | ||
37 | *\ *) cmdline="$cmdline \"$arg\"";; | ||
38 | *) cmdline="$cmdline $arg";; | ||
39 | esac | ||
40 | done | ||
41 | |||
33 | # | 42 | # |
34 | # Begin Function Definitions | 43 | # Begin Function Definitions |
35 | # | 44 | # |
@@ -878,7 +887,7 @@ voiceconfig () { | |||
878 | DEFAULT_TTS="flite" | 887 | DEFAULT_TTS="flite" |
879 | DEFAULT_TTS_OPTS=$FLITE_OPTS | 888 | DEFAULT_TTS_OPTS=$FLITE_OPTS |
880 | DEFAULT_NOISEFLOOR="500" | 889 | DEFAULT_NOISEFLOOR="500" |
881 | DEFAULT_CHOICE="L" | 890 | DEFAULT_CHOICE="l" |
882 | fi | 891 | fi |
883 | if [ -n "`findtool espeak`" ]; then | 892 | if [ -n "`findtool espeak`" ]; then |
884 | ESPEAK="(e)Speak " | 893 | ESPEAK="(e)Speak " |
@@ -910,7 +919,7 @@ voiceconfig () { | |||
910 | DEFAULT_TTS="festival" | 919 | DEFAULT_TTS="festival" |
911 | DEFAULT_TTS_OPTS=$FESTIVAL_OPTS | 920 | DEFAULT_TTS_OPTS=$FESTIVAL_OPTS |
912 | DEFAULT_NOISEFLOOR="500" | 921 | DEFAULT_NOISEFLOOR="500" |
913 | DEFAULT_CHOICE="F" | 922 | DEFAULT_CHOICE="f" |
914 | fi | 923 | fi |
915 | if [ -n "`findtool swift`" ]; then | 924 | if [ -n "`findtool swift`" ]; then |
916 | SWIFT="S(w)ift " | 925 | SWIFT="S(w)ift " |
@@ -927,7 +936,7 @@ voiceconfig () { | |||
927 | DEFAULT_TTS="sapi" | 936 | DEFAULT_TTS="sapi" |
928 | DEFAULT_TTS_OPTS=$SAPI_OPTS | 937 | DEFAULT_TTS_OPTS=$SAPI_OPTS |
929 | DEFAULT_NOISEFLOOR="500" | 938 | DEFAULT_NOISEFLOOR="500" |
930 | DEFAULT_CHOICE="S" | 939 | DEFAULT_CHOICE="s" |
931 | fi | 940 | fi |
932 | 941 | ||
933 | if [ "$FESTIVAL" = "$FLITE" ] && [ "$FLITE" = "$ESPEAK" ] && [ "$ESPEAK" = "$SAPI" ] && [ "$SAPI" = "$SWIFT" ]; then | 942 | if [ "$FESTIVAL" = "$FLITE" ] && [ "$FLITE" = "$ESPEAK" ] && [ "$ESPEAK" = "$SAPI" ] && [ "$SAPI" = "$SWIFT" ]; then |
@@ -940,8 +949,9 @@ voiceconfig () { | |||
940 | else | 949 | else |
941 | echo "TTS engine to use: ${FLITE}${FESTIVAL}${ESPEAK}${SAPI}${SWIFT}(${DEFAULT_CHOICE})?" | 950 | echo "TTS engine to use: ${FLITE}${FESTIVAL}${ESPEAK}${SAPI}${SWIFT}(${DEFAULT_CHOICE})?" |
942 | option=`input` | 951 | option=`input` |
952 | if [ -z "$option" ]; then option=${DEFAULT_CHOICE}; fi | ||
953 | advopts="$advopts --tts=$option" | ||
943 | fi | 954 | fi |
944 | advopts="$advopts --tts=$option" | ||
945 | case "$option" in | 955 | case "$option" in |
946 | [Ll]) | 956 | [Ll]) |
947 | TTS_ENGINE="flite" | 957 | TTS_ENGINE="flite" |
@@ -1008,7 +1018,6 @@ voiceconfig () { | |||
1008 | # Read custom tts options from command line | 1018 | # Read custom tts options from command line |
1009 | if [ "$ARG_TTSOPTS" ]; then | 1019 | if [ "$ARG_TTSOPTS" ]; then |
1010 | TTS_OPTS="$ARG_TTSOPTS" | 1020 | TTS_OPTS="$ARG_TTSOPTS" |
1011 | advopts="$advopts --ttsopts='$TTS_OPTS'" | ||
1012 | echo "$TTS_ENGINE options set to $TTS_OPTS" | 1021 | echo "$TTS_ENGINE options set to $TTS_OPTS" |
1013 | fi | 1022 | fi |
1014 | 1023 | ||
@@ -1031,7 +1040,6 @@ voiceconfig () { | |||
1031 | # Read custom encoder options from command line | 1040 | # Read custom encoder options from command line |
1032 | if [ "$ARG_ENCOPTS" ]; then | 1041 | if [ "$ARG_ENCOPTS" ]; then |
1033 | ENC_OPTS="$ARG_ENCOPTS" | 1042 | ENC_OPTS="$ARG_ENCOPTS" |
1034 | advopts="$advopts --encopts='$ENC_OPTS'" | ||
1035 | echo "$ENCODER options set to $ENC_OPTS" | 1043 | echo "$ENCODER options set to $ENC_OPTS" |
1036 | fi | 1044 | fi |
1037 | 1045 | ||
@@ -1061,8 +1069,8 @@ picklang() { | |||
1061 | num=`expr $num + 1` | 1069 | num=`expr $num + 1` |
1062 | done | 1070 | done |
1063 | pick=`input` | 1071 | pick=`input` |
1072 | advopts="$advopts --language=$pick" | ||
1064 | fi | 1073 | fi |
1065 | advopts="$advopts --language=$pick" | ||
1066 | } | 1074 | } |
1067 | 1075 | ||
1068 | whichlang() { | 1076 | whichlang() { |