Delete things related to old translation system

Remove the help/ subdirectory, configure code to create toplevel
help_mp.h, and all the '#include "help_mp.h"' lines from .c files.

1 files changed, 2 insertions, 32 deletions

diff --git a/configure b/configure
index 93804a8734..8a8f161d0b 100755
--- a/configure
+++ b/configure
@@ -197,7 +197,6 @@ case $(echo -n) in
   *)    _echo_n='-n '   _echo_c=        ;;      # BSD echo
 esac
 
-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 DOCS/man/??_??/mplayer.1 | sed -e "s:DOCS/man/\(..\)/mplayer.1:\1:g" -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")
 
@@ -403,7 +402,6 @@ Language options:
   --charset=charset      convert the console messages to this character set
   --language-doc=lang    language to use for the documentation [en]
   --language-man=lang    language to use for the man pages [en]
-  --language-msg=lang    language to use for the messages [en]
   --language=lang        default language to use [en]
 Specific options override --language. You can pass a list of languages separated
 by whitespace or commas instead of a single language. Nonexisting translations
@@ -411,7 +409,7 @@ will be dropped from each list. All documentation and man page translations
 available in the list will be installed, for the messages the first available
 translation will be used. The value "all" will activate all translations. The
 LINGUAS environment variable is honored. In all cases the fallback is English.
-Available values are: all $msg_lang_all
+Available values are: all $man_lang_all
 
 Miscellaneous options:
   --enable-runtime-cpudetection    enable runtime CPU detection [disable]
@@ -821,9 +819,6 @@ for ac_option do
   --language-man=*)
     language_man=$(echo $ac_option | cut -d '=' -f 2)
     ;;
-  --language-msg=*)
-    language_msg=$(echo $ac_option | cut -d '=' -f 2)
-    ;;
   --language=*)
     language=$(echo $ac_option | cut -d '=' -f 2)
     ;;
@@ -2848,14 +2843,11 @@ echocheck "language"
 test -z "$language" && language=$LINGUAS
 test -z "$language_doc" && language_doc=$language
 test -z "$language_man" && language_man=$language
-test -z "$language_msg" && language_msg=$language
 language_doc=$(echo $language_doc | tr , " ")
 language_man=$(echo $language_man | tr , " ")
-language_msg=$(echo $language_msg | tr , " ")
 
 test "$language_doc" = "all" && language_doc=$doc_lang_all
 test "$language_man" = "all" && language_man=$man_lang_all
-test "$language_msg" = "all" && language_msg=en
 
 # Prune non-existing translations from language lists.
 # Set message translation to the first available language.
@@ -2872,13 +2864,7 @@ done
 language_man=$tmp_language_man
 test -z "$language_man" && language_man=en
 
-for lang in $language_msg ; do
-  test -f "help/help_mp-${lang}.h" && tmp_language_msg=$lang && break
-done
-language_msg=$tmp_language_msg
-test -z "$language_msg" && language_msg=en
-_mp_help="help/help_mp-${language_msg}.h"
-echores "messages: $language_msg - man pages: $language_man - documentation: $language_doc"
+echores "man pages: $language_man - documentation: $language_doc"
 
 
 echocheck "enable sighandler"
@@ -7618,20 +7604,6 @@ else
   _charset="UTF-8"
 fi
 
-if test -n "$_charset" && test "$_charset" != "UTF-8" ; then
-echocheck "iconv program"
-iconv -f UTF-8 -t $_charset ${_mp_help} > /dev/null 2>> "$TMPLOG"
-if test "$?" -ne 0 ; then
-  echores "no"
-    echo "No working iconv program found, use "
-    echo "--charset=UTF-8 to continue anyway."
-    echo "If you also have problems with iconv library functions use --charset=noconv."
-    exit 1
-else
-  echores "yes"
-fi
-fi
-
 #############################################################################
 
 echocheck "automatic gdb attach"
@@ -7888,7 +7860,6 @@ MPDEPEND_CMD     = \$(CC) -MM \$(CFLAGS)   \$(filter-out %.xpm,\$(filter-out %.h
 MPDEPEND_CMD_CXX = \$(CC) -MM \$(CXXFLAGS) \$(filter-out %.hh,\$(filter-out %.h,$^))  | sed -e "s,[0-9a-z._-]*: \([a-z0-9/]*/\)[^/]* ,\1&," -e "s,\(.*\)\.o: ,\1.d &,"
 
 GETCH = $_getch
-HELP_FILE = $_mp_help
 TIMER = $_timer
 
 EXESUF = $_exesuf
@@ -8582,7 +8553,6 @@ Config files successfully generated by ./configure $_configuration !
   Optimizing for: $_optimizing
 
   Languages:
-    Messages: $language_msg
     Manual pages: $language_man
     Documentation: $language_doc