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 bba6f0944fa87349f884609670aca6c1a4e79f12..b71322f8beaea5716c1a0d001fd42174097ac456 100644 (file)
--- 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 076ea947b3b4c389abb121b94f0795c67b8ededc..a208ba8a238f3070fdd865978978c4cdd332f6b8 100644 (file)
--- 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 45271d0f38ca7e0127d45c84e5db6d1291a8b2a1..aa62ce0c0dc2153af485cdbb8d0e518a805031cc 100644 (file)
--- 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.