Make it possible to use AM_LC_MESSAGES outside gettext.m4.

diff --git a/m4/ChangeLog b/m4/ChangeLog
index 9a40fd506d25fa02d79252ad65ee077ffdbc837f..1339dc3bbe36ba5b805bd369ac65de4e9a64393d 100644 (file)
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,8 @@
+2002-06-12  Bruno Haible  <bruno@clisp.org>
+
+       * lcmessage.m4 (AM_LC_MESSAGES): Don't test ac_cv_header_locale_h here.
+       * gettext.m4 (AM_INTL_SUBDIR): Test it here.
+
 2002-06-07  Bruno Haible  <bruno@clisp.org>
 
        * intdiv0.m4: New file.

diff --git a/m4/gettext.m4 b/m4/gettext.m4
index 146cef2f8547d705fffb9e1702ee7dfb27107959..1c95d979bcee14c51ae9f8e66135e717d65c3c49 100644 (file)
--- a/m4/gettext.m4
+++ b/m4/gettext.m4
@@ -504,7 +504,9 @@ strcasecmp strdup strtoul tsearch __argz_count __argz_stringify __argz_next])
 
   AM_ICONV
   AM_LANGINFO_CODESET
-  AM_LC_MESSAGES
+  if test $ac_cv_header_locale_h = yes; then
+    AM_LC_MESSAGES
+  fi
 
   dnl intl/plural.c is generated from intl/plural.y. It requires bison,
   dnl because plural.y uses bison specific features. It requires at least

diff --git a/m4/lcmessage.m4 b/m4/lcmessage.m4
index ffbf915f1a9fbc3e9b697fb08a79767271791b03..ffd4008b8252a44bbbba1c30e167da2cc2a2a8c9 100644 (file)
--- a/m4/lcmessage.m4
+++ b/m4/lcmessage.m4
@@ -1,4 +1,4 @@
-# lcmessage.m4 serial 2 (gettext-0.10.40)
+# lcmessage.m4 serial 3 (gettext-0.11.3)
 dnl Copyright (C) 1995-2002 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
@@ -21,12 +21,12 @@ dnl   Ulrich Drepper <drepper@cygnus.com>, 1995.
 # Check whether LC_MESSAGES is available in <locale.h>.
 
 AC_DEFUN([AM_LC_MESSAGES],
-  [if test $ac_cv_header_locale_h = yes; then
-    AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
-      [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
+[
+  AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES,
+    [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES],
        am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)])
-    if test $am_cv_val_LC_MESSAGES = yes; then
-      AC_DEFINE(HAVE_LC_MESSAGES, 1,
-        [Define if your <locale.h> file defines LC_MESSAGES.])
-    fi
-  fi])
+  if test $am_cv_val_LC_MESSAGES = yes; then
+    AC_DEFINE(HAVE_LC_MESSAGES, 1,
+      [Define if your <locale.h> file defines LC_MESSAGES.])
+  fi
+])