summaryrefslogtreecommitdiff
path: root/gnulib-m4/locale_h.m4
diff options
context:
space:
mode:
authorAndreas Rottmann <a.rottmann@gmx.at>2009-09-14 12:34:37 +0200
committerAndreas Rottmann <a.rottmann@gmx.at>2009-09-14 12:34:37 +0200
commit3bebb94360f1c2333feb8d504a9fa4f96984d8b7 (patch)
treea8aaac2174791365ed3e9975ae81106a47902f2a /gnulib-m4/locale_h.m4
parentfa095a4504cbe668e4244547e2c141597bea4ecf (diff)
Imported Upstream version 0.9.1.1upstream/0.9.1.1
Diffstat (limited to 'gnulib-m4/locale_h.m4')
-rw-r--r--gnulib-m4/locale_h.m410
1 files changed, 7 insertions, 3 deletions
diff --git a/gnulib-m4/locale_h.m4 b/gnulib-m4/locale_h.m4
index 2bf5abcc..86123670 100644
--- a/gnulib-m4/locale_h.m4
+++ b/gnulib-m4/locale_h.m4
@@ -1,5 +1,5 @@
-# locale_h.m4 serial 2
-dnl Copyright (C) 2007 Free Software Foundation, Inc.
+# locale_h.m4 serial 3
+dnl Copyright (C) 2007, 2009 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.
@@ -12,7 +12,11 @@ AC_DEFUN([gl_LOCALE_H],
int x = LC_MESSAGES;], [],
[gl_cv_header_working_locale_h=yes],
[gl_cv_header_working_locale_h=no])])
- if test $gl_cv_header_working_locale_h = yes; then
+
+ dnl If <stddef.h> is replaced, then <locale.h> must also be replaced.
+ AC_REQUIRE([gl_STDDEF_H])
+
+ if test $gl_cv_header_working_locale_h = yes && test -z "$STDDEF_H"; then
LOCALE_H=
else
gl_CHECK_NEXT_HEADERS([locale.h])