Index: configure =================================================================== RCS file: /cvsroot/mplayer/main/configure,v retrieving revision 1.888 diff -u -r1.888 configure --- configure 31 Jul 2004 22:17:23 -0000 1.888 +++ configure 31 Jul 2004 23:40:58 -0000 @@ -125,7 +125,7 @@ *) _echo_n='-n ' _echo_c= ;; # BSD echo esac -LANGUAGES=`echo help/help_mp-??.h help/help_mp-??_??.h | sed "s/help\/help_mp-\(..\).h/\1/g" |sed "s/help\/help_mp-\(.....\).h/\1/g"` +LANGUAGES=`echo help/help_mp-??.h help/help_mp-??_??.h | sed "s:help/help_mp-\(..\).h:\1:g" | sed "s:help/help_mp-\(.....\).h:\1:g"` for parm in "$@" ; do if test "$parm" = "--help" || test "$parm" = "-help" || test "$parm" = "-h" ; then @@ -2072,29 +2072,28 @@ test -z "$_language" && _language=$LINGUAS _language=`echo $_language | sed 's/,/ /g'` echo $_language | grep all > /dev/null || LANGUAGES="$_language en" -for i in $_language ; do - test "$i" = all && i=en - if test -f "help/help_mp-${i}.h" ; then - _language=$i +for lang in $_language ; do + test "$lang" = all && lang=en + if test -f "help/help_mp-${lang}.h" ; then + _language=$lang break else - echo -n "$i not found, " - _language=`echo $_language | sed "s/$i *//"` + echo -n "$lang not found, " + _language=`echo $_language | sed "s/$lang *//"` fi done test -z "$_language" && _language=en -for i in $LANGUAGES ; do - if test -f "DOCS/man/$i/mplayer.1" ; then - LANGUAGES=`echo $LANGUAGES | sed "s/$i *//2" | sed 's/ *$//'` - else - LANGUAGES=`echo $LANGUAGES | sed "s/$i *//" | sed 's/ *$//'` +for lang in $LANGUAGES ; do + if test -f "DOCS/man/$lang/mplayer.1" ; then + MAN_LANG="$MAN_LANG $lang" fi done -echores "using $_language (man pages: $LANGUAGES)" _mp_help="help/help_mp-${_language}.h" test -f $_mp_help || die "$_mp_help not found" _doc_lang=$_language test -d DOCS/xml/$_doc_lang || _doc_lang=en +echores "using $_language (man pages: $MAN_LANG)" + echocheck "enable sighandler" if test "$_sighandler" = yes ; then @@ -6085,7 +6084,7 @@ # -------- Generated by configure ----------- LANG = C -LANGUAGES = $LANGUAGES +MAN_LANG = $MAN_LANG TARGET_OS = $system_name DESTDIR = prefix = \$(DESTDIR)$_prefix @@ -6902,7 +6901,7 @@ Messages/GUI: $_language EOF -echo -n " Manual pages: $LANGUAGES" +echo -n " Manual pages: $MAN_LANG" test "$LANGUAGES" = en && echo -n " (no localization selected, use --language=all)" echo