Assume <locale.h> exists.

diff --git a/gettext-runtime/ChangeLog b/gettext-runtime/ChangeLog
index 0a1b71fcd1b5516bdd06b1c5540faafe4f129576..ff535c71861a2160945b026c92348ad700589a0c 100644 (file)
--- a/gettext-runtime/ChangeLog
+++ b/gettext-runtime/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-27  Bruno Haible  <bruno@clisp.org>
+
+       * Makefile.am (config.h_vms, config.h.msvc): Drop unused HAVE_LOCALE_H
+       substitution.
+
 2006-04-14  Bruno Haible  <bruno@clisp.org>
 
        Assume autoconf >= 2.60.

diff --git a/gettext-runtime/Makefile.am b/gettext-runtime/Makefile.am
index e0917dcf65b175e41ecf7f6883d5c6da221d578c..3efd3c31aa98c65fe0484e94e12c4a77b959c882 100644 (file)
--- a/gettext-runtime/Makefile.am
+++ b/gettext-runtime/Makefile.am
@@ -68,7 +68,6 @@ config.h_vms: config.h.in ../version.sh
             -e 's/#undef HAVE_LANGINFO_CODESET$$/#define HAVE_LANGINFO_CODESET 1/' \
             -e 's/#undef HAVE_LC_MESSAGES$$/#define HAVE_LC_MESSAGES 1/' \
             -e 's/#undef HAVE_LIMITS_H$$/#define HAVE_LIMITS_H 1/' \
-            -e 's/#undef HAVE_LOCALE_H$$/#define HAVE_LOCALE_H 1/' \
             -e 's/#undef HAVE_LONG_DOUBLE$$/#define HAVE_LONG_DOUBLE 1/' \
             -e 's/#undef HAVE_LONG_LONG$$/#define HAVE_LONG_LONG 1/' \
             -e 's/#undef HAVE_MEMMOVE$$/#define HAVE_MEMMOVE 1/' \
@@ -143,7 +142,6 @@ config.h.msvc: config.h.in ../version.sh
            -e 's/#undef HAVE_GETCWD$$/#define HAVE_GETCWD 1/' \
            -e 's/#undef HAVE_ICONV$$/#define HAVE_ICONV 1/' \
            -e 's/#undef HAVE_LIMITS_H$$/#define HAVE_LIMITS_H 1/' \
-           -e 's/#undef HAVE_LOCALE_H$$/#define HAVE_LOCALE_H 1/' \
            -e 's/#undef HAVE_LONG_DOUBLE$$/#define HAVE_LONG_DOUBLE 1/' \
            -e 's/#undef HAVE_MEMMOVE$$/#define HAVE_MEMMOVE 1/' \
            -e 's/#undef HAVE_PTRDIFF_T$$/#define HAVE_PTRDIFF_T 1/' \

diff --git a/gettext-tools/ChangeLog b/gettext-tools/ChangeLog
index 90991b771f409fadcfb768ebf48b24a7fbc5be76..6cc767151b4479909ec3a2d154271fac389c1de0 100644 (file)
--- a/gettext-tools/ChangeLog
+++ b/gettext-tools/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-27  Bruno Haible  <bruno@clisp.org>
+
+       * Makefile.am (config.h_vms, config.h.msvc): Drop unused HAVE_LOCALE_H
+       substitution.
+
 2006-04-14  Bruno Haible  <bruno@clisp.org>
 
        Assume autoconf >= 2.60.

diff --git a/gettext-tools/Makefile.am b/gettext-tools/Makefile.am
index 5b08fe4985ec3baea6e373ce8e38dcb497620466..f61fe1913477159b7247044ed7a483cf86e6f6b2 100644 (file)
--- a/gettext-tools/Makefile.am
+++ b/gettext-tools/Makefile.am
@@ -73,7 +73,6 @@ config.h_vms: config.h.in ../version.sh
             -e 's/#undef HAVE_LC_MESSAGES$$/#define HAVE_LC_MESSAGES 1/' \
             -e 's/#undef HAVE_LIBEXPAT$$/#define HAVE_LIBEXPAT 1/' \
             -e 's/#undef HAVE_LIMITS_H$$/#define HAVE_LIMITS_H 1/' \
-            -e 's/#undef HAVE_LOCALE_H$$/#define HAVE_LOCALE_H 1/' \
             -e 's/#undef HAVE_LONG_FILE_NAMES$$/#define HAVE_LONG_FILE_NAMES 1/' \
             -e 's/#undef HAVE_MALLOC_H$$/#define HAVE_MALLOC_H 1/' \
             -e 's/#undef HAVE_MBRTOWC$$/#define HAVE_MBRTOWC 1/' \
@@ -179,7 +178,6 @@ config.h.msvc: config.h.in ../version.sh
            -e 's/#undef HAVE_ISWCNTRL$$/#define HAVE_ISWCNTRL 1/' \
            -e 's/#undef HAVE_ISWPRINT$$/#define HAVE_ISWPRINT 1/' \
            -e 's/#undef HAVE_LIMITS_H$$/#define HAVE_LIMITS_H 1/' \
-           -e 's/#undef HAVE_LOCALE_H$$/#define HAVE_LOCALE_H 1/' \
            -e 's/#undef HAVE_LONG_FILE_NAMES$$/#define HAVE_LONG_FILE_NAMES 1/' \
            -e 's/#undef HAVE_MEMCHR$$/#define HAVE_MEMCHR 1/' \
            -e 's/#undef HAVE_MEMMOVE$$/#define HAVE_MEMMOVE 1/' \

diff --git a/gettext-tools/m4/ChangeLog b/gettext-tools/m4/ChangeLog
index 993188ca57998bdc76c05408c0c3c37ccf0422eb..ef98a88622a7feaab74bd4cf65051e69ff3eddeb 100644 (file)
--- a/gettext-tools/m4/ChangeLog
+++ b/gettext-tools/m4/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-27  Bruno Haible  <bruno@clisp.org>
+
+       * setlocale.m4 (gt_SETLOCALE): Assume <locale.h> exists.
+
 2006-04-14  Bruno Haible  <bruno@clisp.org>
 
        Assume autoconf >= 2.60.

diff --git a/gettext-tools/m4/setlocale.m4 b/gettext-tools/m4/setlocale.m4
index d8e536d7010fd67190ae984413760437d06b643e..dfa2b7c3a0ef2c1588ded92b6ef3e3e79bc13282 100644 (file)
--- a/gettext-tools/m4/setlocale.m4
+++ b/gettext-tools/m4/setlocale.m4
@@ -1,5 +1,5 @@
-# setlocale.m4 serial 2 (gettext-0.10.40)
-dnl Copyright (C) 2001-2002 Free Software Foundation, Inc.
+# setlocale.m4 serial 3 (gettext-0.15)
+dnl Copyright (C) 2001-2002, 2006 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -7,7 +7,6 @@ dnl with or without modifications, as long as this notice is preserved.
 # Check for setlocale declaration.
 
 AC_DEFUN([gt_SETLOCALE],[
-AC_CHECK_HEADERS([locale.h])
 AC_MSG_CHECKING([for setlocale declaration])
 AC_CACHE_VAL(gt_cv_proto_setlocale, [
 AC_TRY_COMPILE([