Remove some debug code and update to mutt's gettext.m4

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@922 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

diff --git a/ChangeLog b/ChangeLog
index d8884d6a5ba7172a6321c771670aa9ccbd2facab..6a29190bf02314320cbf5de539bc3354e4d8a240 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -45,6 +45,8 @@ CVS Code -
        - Spanish translation updates (Jordi).
 - po/fr.po:
        - French translation updates (Michel Robitaille).
+- m4/gettext.m4:
+       - diff against mutt 1.2.5's gettext.m4.
 
 nano-1.1.3 - 10/26/2001
 - General

diff --git a/color.c b/color.c
index 1ebc1e51844054ca2b3853c5dd96a99cb066ea91..30eb7de6c17da8bded679486cc07413319902f5b 100644 (file)
--- a/color.c
+++ b/color.c
@@ -134,7 +134,9 @@ int do_colorinit(void)
            else /* They picked a fg and bg color */
                init_pair(i, tmpcolor->fg, tmpcolor->bg);
 
+#ifdef DEBUG
            fprintf(stderr, "Running init_pair with fg = %d and bg = %d\n", tmpcolor->fg, tmpcolor->bg);
+#endif
 
            tmpcolor->pairnum = i;
            i++;

diff --git a/m4/gettext.m4 b/m4/gettext.m4
index 890dd49a475ecabedeac656a332c49904acda8b9..b6d037ff2a510b2645453e5450d3d850320b4f87 100644 (file)
--- a/m4/gettext.m4
+++ b/m4/gettext.m4
@@ -21,21 +21,9 @@ AC_DEFUN(NANO_AM_WITH_NLS,
 
     USE_INCLUDED_LIBINTL=no
 
-    AC_ARG_WITH(locale-dir,
-      [  --with-locale-dir=DIR   specify locale directory],
-      LOCALE_DIR=$withval)
-    test -z "$LOCALE_DIR" && LOCALE_DIR='$(datadir)/locale'
-    AC_SUBST(LOCALE_DIR)
-
-    AC_ARG_WITH(gnu-locale-dir,
-      [  --with-gnu-locale-dir=DIR specify GNU locale directory],
-      GNU_LOCALE_DIR=$withval)
-    test -z "$GNU_LOCALE_DIR" && GNU_LOCALE_DIR='$(prefix)/share/locale'
-    AC_SUBST(GNU_LOCALE_DIR)
-
     dnl If we use NLS figure out what method
     if test "$USE_NLS" = "yes"; then
-      AC_DEFINE(ENABLE_NLS, 1, [Define to 1 if NLS is requested.])
+      AC_DEFINE(ENABLE_NLS)
       AC_MSG_CHECKING([whether included gettext is requested])
       AC_ARG_WITH(included-gettext,
         [  --with-included-gettext use the GNU gettext library included here],
@@ -60,13 +48,18 @@ AC_DEFUN(NANO_AM_WITH_NLS,
 
           if test "$gt_cv_func_gettext_libc" != "yes"; then
             AC_CHECK_LIB(intl, bindtextdomain,
-              [AC_CHECK_LIB(intl, gettext)])
+              [AC_CHECK_LIB(intl, gettext,
+                gt_cv_func_gettext_libintl=yes,
+                gt_cv_func_gettext_libintl=no)])
+          fi
+          
+          if test "$gt_cv_func_gettext_libintl" = yes; then
+            LIBS="$LIBS -lintl"
           fi
 
           if test "$gt_cv_func_gettext_libc" = "yes" \
-             || test "$ac_cv_lib_intl_gettext" = "yes"; then
-             AC_DEFINE(HAVE_GETTEXT, 1,
-         [Define to 1 if you have gettext and don't want to use GNU gettext.])
+             || test "$gt_cv_func_gettext_libintl" = "yes"; then
+             AC_DEFINE(HAVE_GETTEXT)
              NANO_AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
                [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl
              if test "$MSGFMT" != "no"; then

diff --git a/nano.c b/nano.c
index 6bd1e2c85df1d9575ac19b8f49ffa9b1c45be31f..3c403dba46108d684380bebb883ca806e2ed929a 100644 (file)
--- a/nano.c
+++ b/nano.c
@@ -2906,7 +2906,6 @@ int main(int argc, char *argv[])
 #ifdef ENABLE_COLOR
     do_colorinit();
 
-    fprintf(stderr, "COLORS = %d, COLOR_PAIRS = %d\n", COLORS, COLOR_PAIRS);
 #endif /* ENABLE_COLOR */
 
 #ifdef DEBUG