diff options
| author | Andreas Rottmann <a.rottmann@gmx.at> | 2009-09-14 12:34:39 +0200 |
|---|---|---|
| committer | Andreas Rottmann <a.rottmann@gmx.at> | 2009-09-14 12:34:39 +0200 |
| commit | 79ca645d222db2e158784642c3b464a47bea26f3 (patch) | |
| tree | 73fa0e7f2f509013ca7ea3395b268c8471b2355b /gnulib-m4/locale_h.m4 | |
| parent | 8a927bfd7da41dbe61f3cfeaccbd37c761c0bc36 (diff) | |
| parent | 3bebb94360f1c2333feb8d504a9fa4f96984d8b7 (diff) | |
Merge commit 'upstream/0.9.1.1'
Diffstat (limited to 'gnulib-m4/locale_h.m4')
| -rw-r--r-- | gnulib-m4/locale_h.m4 | 10 |
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]) |