From: Thomas Roessler <roessler@does-not-exist.org>
Date: Tue, 12 Jun 2001 12:45:28 +0000 (+0000)
Subject: gettext-related fixes.  Most of this may just be temporary if we
X-Git-Tag: mutt-1-3-20-rel~36
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7d60c800fb1fdd87ee44d4eb6fe5a293c8a61583;p=mutt

gettext-related fixes.  Most of this may just be temporary if we
decide to get rid of our own gettext.m4.
---

diff --git a/configure.in b/configure.in
index bba6f094..b71322f8 100644
--- a/configure.in
+++ b/configure.in
@@ -777,7 +777,7 @@ else
   AC_CHECK_FUNCS(bind_textdomain_codeset)
 fi
 
-MUTTLOCALEDIR=$mutt_cv_prefix/$DATADIRNAME/locale
+MUTTLOCALEDIR='$datadir/locale'
 AC_SUBST(MUTTLOCALEDIR)
 AC_DEFINE_UNQUOTED(MUTTLOCALEDIR, "$MUTTLOCALEDIR")
 
diff --git a/m4/gettext.m4 b/m4/gettext.m4
index 076ea947..a208ba8a 100644
--- a/m4/gettext.m4
+++ b/m4/gettext.m4
@@ -13,7 +13,7 @@
 
 # serial 109
 
-dnl Usage: AM_WITH_NLS([TOOLSYMBOL], [NEEDSYMBOL], [LIBDIR]).
+dnl Usage: MUTT_AM_WITH_NLS([TOOLSYMBOL], [NEEDSYMBOL], [LIBDIR]).
 dnl If TOOLSYMBOL is specified and is 'use-libtool', then a libtool library
 dnl    $(top_builddir)/intl/libintl.la will be created (shared and/or static,
 dnl    depending on --{enable,disable}-{shared,static} and on the presence of
@@ -277,7 +277,7 @@ changequote([,])dnl
     AC_SUBST(GENCAT)
   ])
 
-dnl Usage: Just like AM_WITH_NLS, which see.
+dnl Usage: Just like MUTT_AM_WITH_NLS, which see.
 AC_DEFUN([MUTT_AM_GNU_GETTEXT],
   [AC_REQUIRE([AC_PROG_MAKE_SET])dnl
    AC_REQUIRE([AC_PROG_CC])dnl
diff --git a/m4/progtest.m4 b/m4/progtest.m4
index 45271d0f..aa62ce0c 100644
--- a/m4/progtest.m4
+++ b/m4/progtest.m4
@@ -8,7 +8,7 @@
 
 # serial 1
 
-dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
+dnl MUTT_AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
 dnl   TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
 AC_DEFUN([MUTT_AM_PATH_PROG_WITH_TEST],
 [# Extract the first word of "$2", so it can be a program name with args.