From 8445dc1e96f8de00ff89b728a9f6cf749cc2c2b0 Mon Sep 17 00:00:00 2001
From: rfelker <rfelker@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Thu, 30 Mar 2006 22:14:44 +0000
Subject: [PATCH] remove deprecated, never-used gnu gettext cruft. proper
 runtime message catalogs will be added with catgets in the (near?) future.

this resolves complaints about mp_msg printing crap at startup when
gettext was (stupidly) enabled by default even though it was not
useful.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17999 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 Makefile  |  2 --
 configure | 31 -------------------------------
 mp_msg.c  | 13 -------------
 3 files changed, 46 deletions(-)

diff --git a/Makefile b/Makefile
index 5eb0069a42..60c115200a 100644
--- a/Makefile
+++ b/Makefile
@@ -392,7 +392,6 @@ LIBS_MPLAYER = libvo/libvo.a \
                $(LIRCC_LIB) \
                $(STATIC_LIB) \
                $(ARCH_LIB) \
-               $(I18NLIBS) \
                $(MATH_LIB) \
                $(LIBC_LIB) \
 
@@ -433,7 +432,6 @@ LIBS_MENCODER = libmpcodecs/libmpencoders.a \
                 $(LIRC_LIB) \
                 $(LIRCC_LIB) \
                 $(ARCH_LIB) \
-                $(I18NLIBS) \
                 $(MATH_LIB) \
                 $(LIBC_LIB) \
 
diff --git a/configure b/configure
index 742a6358e9..04a4177be5 100755
--- a/configure
+++ b/configure
@@ -1587,7 +1587,6 @@ _largefiles=no
 _shm=auto
 _linux_devfs=no
 #_charset=utf8
-_i18n=auto
 _dynamic_plugins=no
 _crash_debug=auto
 _sighandler=yes
@@ -1635,8 +1634,6 @@ for ac_option do
   # Real 2nd pass
   --enable-mencoder)	_mencoder=yes	;;
   --disable-mencoder)	_mencoder=no	;;
-  --enable-i18n)	_i18n=yes	;;
-  --disable-i18n)	_i18n=no	;;
   --enable-dynamic-plugins) _dynamic_plugins=yes ;;
   --disable-dynamic-plugins) _dynamic_plugins=no ;;
   --enable-x11)		_x11=yes	;;
@@ -2390,34 +2387,6 @@ else
   echores "no"
 fi
 
-# Checking for localization ...
-# CSAK EGY MARADHAT - A HEGYLAKO
-echocheck "i18n"
-if test "$_i18n" != no ; then
-  cat > $TMPC <<EOF
-#include <libintl.h>
-int main(void) { gettext("test"); return 0; }
-EOF
-  _i18n=no
-  _i18n_libs=""
-  if test "$_i18n" = auto ; then
-    cc_check && _i18n=yes
-  else
-    for i18n_lib in "" "-lintl"; do
-      cc_check $i18n_lib && _i18n=yes && _i18n_libs=$i18n_lib && break
-    done
-  fi
-fi
-if test "$_i18n" = yes ; then
-  _def_i18n='#define USE_I18N 1'
-else
-  _def_i18n='#undef USE_I18N'
-fi
-if test "$_i18n_libs" ; then
-  _res_comment="using $_i18n_libs"
-fi
-echores "$_i18n"
-
 
 echocheck "langinfo"
 if test "$_langinfo" = auto ; then
diff --git a/mp_msg.c b/mp_msg.c
index c3c38a674b..d65d9f9767 100644
--- a/mp_msg.c
+++ b/mp_msg.c
@@ -43,19 +43,6 @@ void mp_msg_init(void){
     char *env = getenv("MPLAYER_VERBOSE");
     if (env)
         verbose = atoi(env);
-#ifdef USE_I18N
-#ifdef MP_DEBUG
-    fprintf(stdout, "Using GNU internationalization\n");
-    fprintf(stdout, "Original domain: %s\n", textdomain(NULL));
-    fprintf(stdout, "Original dirname: %s\n", bindtextdomain(textdomain(NULL),NULL));
-#endif
-    bindtextdomain("mplayer", PREFIX"/share/locale");
-    textdomain("mplayer");
-#ifdef MP_DEBUG
-    fprintf(stdout, "Current domain: %s\n", textdomain(NULL));
-    fprintf(stdout, "Current dirname: %s\n\n", bindtextdomain(textdomain(NULL),NULL));
-#endif
-#endif
     for(i=0;i<MSGT_MAX;i++) mp_msg_levels[i] = -2;
 #ifdef USE_ICONV
     mp_msg_charset = getenv("MPLAYER_CHARSET");