always enable NLS, screw'em

Signed-off-by: Pierre Habouzit <madcoder@debian.org>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c4570ac..b8b3f3e 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,8 +5,6 @@ SET(CMAKE_MODULE_PATH  ${madmutt_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
 # TODO {{{
 # USE_SETGID
 # DOTLOCK_{GROUP,PERMISSION}
-# ENABLE_NLS
-SET(ENABLE_NLS 1)
 # }}}
 
 INCLUDE(CMakeDetermineCCompiler)

diff --git a/charset.cpkg b/charset.cpkg
index 0056160..2da4379 100644 (file)
--- a/charset.cpkg
+++ b/charset.cpkg
@@ -59,9 +59,7 @@ static char *charset_init(void)
         res = buff2;
     }
 #endif
-#ifdef ENABLE_NLS
     bind_textdomain_codeset(PACKAGE, res);
-#endif
     return m_strdup(res);
 }
 

diff --git a/config.h.cmake b/config.h.cmake
index 25a7f59..e56e82a 100644 (file)
--- a/config.h.cmake
+++ b/config.h.cmake
@@ -69,7 +69,6 @@
 #cmakedefine HAVE_RESIZETERM         1
 
 /* libraries */
-#cmakedefine ENABLE_NLS              1
 #cmakedefine HAVE_GDBM               1
 #cmakedefine HAVE_GPGME              1
 #cmakedefine HAVE_LIBIDN             1

diff --git a/main.c b/main.c
index 35f084e..e0c00f2 100644 (file)
--- a/main.c
+++ b/main.c
@@ -214,15 +214,6 @@ static void show_version (void)
          "+USE_LIBESMTP  "
 #else
          "-USE_LIBESMTP  "
-#endif
-         "\n  "
-    );
-
-  puts (
-#ifdef ENABLE_NLS
-         "+ENABLE_NLS  "
-#else
-         "-ENABLE_NLS  "
 #endif
 #ifdef HAVE_LIBIDN
          "+HAVE_LIBIDN  "
@@ -324,13 +315,9 @@ int main (int argc, char **argv)
     exit (1);
   }
 
-#ifdef ENABLE_NLS
-  /* FIXME what about init.c:1439 ? */
   setlocale (LC_ALL, "");
   bindtextdomain (PACKAGE, MUTTLOCALEDIR);
   textdomain (PACKAGE);
-#endif
-
   setlocale (LC_CTYPE, "");
 
   mutt_error = mutt_message = mutt_nocurses_error;