# HG changeset patch # User rfelker # Date 1143756884 0 # Node ID f21e0fe4e965af819319798ac1eecc5ac244b509 # Parent 7bb7f54b4cfa9df90259fb8374eee2f858ffc15a 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. diff -r 7bb7f54b4cfa -r f21e0fe4e965 Makefile --- a/Makefile Thu Mar 30 14:50:16 2006 +0000 +++ b/Makefile Thu Mar 30 22:14:44 2006 +0000 @@ -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) \ diff -r 7bb7f54b4cfa -r f21e0fe4e965 configure --- a/configure Thu Mar 30 14:50:16 2006 +0000 +++ b/configure Thu Mar 30 22:14:44 2006 +0000 @@ -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 < -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 -r 7bb7f54b4cfa -r f21e0fe4e965 mp_msg.c --- a/mp_msg.c Thu Mar 30 14:50:16 2006 +0000 +++ b/mp_msg.c Thu Mar 30 22:14:44 2006 +0000 @@ -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