[MPlayer-cvslog] CVS: main configure, 1.1151, 1.1152 Makefile, 1.357, 1.358 mp_msg.c, 1.38, 1.39

[Richard Felker CVS]

CVS change done by Richard Felker CVS

Update of /cvsroot/mplayer/main
In directory mail:/var2/tmp/cvs-serv16769

Modified Files:
	configure Makefile mp_msg.c 
Log Message:
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.


Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.1151
retrieving revision 1.1152
diff -u -r1.1151 -r1.1152
--- configure	29 Mar 2006 21:54:53 -0000	1.1151
+++ configure	30 Mar 2006 22:14:44 -0000	1.1152
@@ -1587,7 +1587,6 @@
 _shm=auto
 _linux_devfs=no
 #_charset=utf8
-_i18n=auto
 _dynamic_plugins=no
 _crash_debug=auto
 _sighandler=yes
@@ -1635,8 +1634,6 @@
   # 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 @@
   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

Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/Makefile,v
retrieving revision 1.357
retrieving revision 1.358
diff -u -r1.357 -r1.358
--- Makefile	28 Mar 2006 22:44:16 -0000	1.357
+++ Makefile	30 Mar 2006 22:14:44 -0000	1.358
@@ -392,7 +392,6 @@
                $(LIRCC_LIB) \
                $(STATIC_LIB) \
                $(ARCH_LIB) \
-               $(I18NLIBS) \
                $(MATH_LIB) \
                $(LIBC_LIB) \
 
@@ -433,7 +432,6 @@
                 $(LIRC_LIB) \
                 $(LIRCC_LIB) \
                 $(ARCH_LIB) \
-                $(I18NLIBS) \
                 $(MATH_LIB) \
                 $(LIBC_LIB) \
 

Index: mp_msg.c
===================================================================
RCS file: /cvsroot/mplayer/main/mp_msg.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- mp_msg.c	27 Mar 2006 08:38:32 -0000	1.38
+++ mp_msg.c	30 Mar 2006 22:14:44 -0000	1.39
@@ -43,19 +43,6 @@
     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");