From adc68058bd8f88d6a9c59493468f734fdf3af895 Mon Sep 17 00:00:00 2001 From: diego Date: Thu, 17 Jul 2008 12:36:54 +0000 Subject: Rewrite translation handling in the build system. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27311 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 55 +++++++++++++++++++++++++++++++++---------------------- 1 file changed, 33 insertions(+), 22 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 57911b98be..e20345491a 100755 --- a/configure +++ b/configure @@ -191,9 +191,9 @@ case `echo -n` in *) _echo_n='-n ' _echo_c= ;; # BSD echo esac -msg_langs=`echo help/help_mp-??.h help/help_mp-??_??.h | sed -e "s:help/help_mp-\(..\).h:\1:g" -e "s:help/help_mp-\(.....\).h:\1:g"` -man_langs=`echo DOCS/man/??/mplayer.1 | sed -e "s:DOCS/man/\(..\)/mplayer.1:\1:g"` -doc_langs=`echo DOCS/xml/??/ DOCS/xml/??_??/ | sed -e "s:DOCS/xml/\(..\)/:\1:g" -e "s:DOCS/xml/\(.._..\)/:\1:g"` +msg_lang_all=`echo help/help_mp-??.h help/help_mp-??_??.h | sed -e "s:help/help_mp-\(..\).h:\1:g" -e "s:help/help_mp-\(.....\).h:\1:g"` +man_lang_all=`echo DOCS/man/??/mplayer.1 | sed -e "s:DOCS/man/\(..\)/mplayer.1:\1:g"` +doc_lang_all=`echo DOCS/xml/??/ DOCS/xml/??_??/ | sed -e "s:DOCS/xml/\(..\)/:\1:g" -e "s:DOCS/xml/\(.._..\)/:\1:g"` show_help(){ cat << EOF @@ -419,7 +419,7 @@ Miscellaneous options: translated man pages, the first language is used for messages and the GUI (the environment variable \$LINGUAS is also honored) [en] - (Available: all $msg_langs) + (Available: all $msg_lang_all) --with-install=PATH path to a custom install program Advanced options: @@ -2604,28 +2604,38 @@ echores "$_langinfo" echocheck "language" test -z "$_language" && _language=$LINGUAS _language=`echo $_language | tr , " "` -echo $_language | grep -q all || msg_langs="$_language en" +if $(echo $_language | grep -q all) ; then + doc_lang=en ; doc_langs=$doc_lang_all + man_lang=en ; man_langs=$man_lang_all + msg_lang=en +else + for lang in $_language ; do + if test -d DOCS/man/$lang ; then + tmp_man_langs="$tmp_man_langs $lang" + fi + if test -d DOCS/xml/$lang ; then + tmp_doc_langs="$tmp_doc_langs $lang" + fi + done + man_langs=$tmp_man_langs + doc_langs=$tmp_man_langs for lang in $_language ; do - test "$lang" = all && lang=en if test -f "help/help_mp-${lang}.h" ; then - _language=$lang + msg_lang=$lang break else echo ${_echo_n} "$lang not found, ${_echo_c}" _language=`echo $_language | sed "s/$lang *//"` fi done -test -z "$_language" && _language=en -_mp_help="help/help_mp-${_language}.h" -for lang in $msg_langs ; do - if test -f "DOCS/man/$lang/mplayer.1" ; then - MAN_LANG_ALL="$lang $MAN_LANG_ALL" - fi -done -MAN_LANG="$(echo $MAN_LANG_ALL | sed 's/en//')" -doc_lang=$_language -test -d DOCS/xml/$doc_lang || doc_lang=en -echores "using $_language (man pages: $MAN_LANG_ALL)" +fi +test -z "$doc_langs" && doc_langs=en +test -z "$man_langs" && man_langs=en +test -z "$doc_lang" && doc_lang=$(echo $doc_langs | cut -f1 -d" ") +test -z "$man_lang" && man_lang=$(echo $man_langs | cut -f1 -d" ") +test -z "$msg_lang" && msg_lang=en +_mp_help="help/help_mp-${_msg_lang}.h" +echores "messages: $msg_lang - man pages: $man_langs - documentation: $doc_langs" echocheck "enable sighandler" @@ -7609,8 +7619,9 @@ cat > config.mak << EOF # Ensure that locale settings do not interfere with shell commands. export LC_ALL = C -MAN_LANG = $MAN_LANG -MAN_LANG_ALL = $MAN_LANG_ALL +MAN_LANG = $man_lang +MAN_LANGS = $man_langs +MAN_LANG_ALL = $man_lang_all DESTDIR = prefix = \$(DESTDIR)$_prefix @@ -8604,8 +8615,8 @@ Config files successfully generated by ./configure $_configuration ! Optimizing for: $_optimizing Languages: - Messages/GUI: $_language - Manual pages: $MAN_LANG_ALL + Messages/GUI: $msg_lang + Manual pages: $man_langs Enabled optional drivers: Input: $_inputmodules -- cgit v1.2.3