diff options
| author | Simon Josefsson <simon@josefsson.org> | 2009-08-15 09:58:09 +0200 |
|---|---|---|
| committer | Simon Josefsson <simon@josefsson.org> | 2009-08-15 09:58:09 +0200 |
| commit | b5157c8944c1d999a45e4177ebcc52b9feea088f (patch) | |
| tree | b03af6d0c4e8b931c57cccc737cc056ac11b5116 /gl/m4 | |
| parent | 331dc98fc52955825a5bbc91b2cc4c24e97c8e8b (diff) | |
| download | gnutls-b5157c8944c1d999a45e4177ebcc52b9feea088f.tar.gz | |
Update gnulib files.
Diffstat (limited to 'gl/m4')
| -rw-r--r-- | gl/m4/gnulib-comp.m4 | 4 | ||||
| -rw-r--r-- | gl/m4/wchar.m4 | 7 |
2 files changed, 9 insertions, 2 deletions
diff --git a/gl/m4/gnulib-comp.m4 b/gl/m4/gnulib-comp.m4 index 88719afb8a..e471c1cae8 100644 --- a/gl/m4/gnulib-comp.m4 +++ b/gl/m4/gnulib-comp.m4 @@ -173,6 +173,7 @@ AC_SUBST([LTALLOCA]) gl_TYPE_SOCKLEN_T gl_STDARG_H AM_STDBOOL_H + gl_STDDEF_H gl_STDINT_H gl_STDIO_H gl_STDLIB_H @@ -417,6 +418,7 @@ AC_DEFUN([gl_FILE_LIST], [ lib/sockets.h lib/stdarg.in.h lib/stdbool.in.h + lib/stddef.in.h lib/stdint.in.h lib/stdio-impl.h lib/stdio-write.c @@ -489,6 +491,7 @@ AC_DEFUN([gl_FILE_LIST], [ m4/sockpfaf.m4 m4/stdarg.m4 m4/stdbool.m4 + m4/stddef_h.m4 m4/stdint.m4 m4/stdint_h.m4 m4/stdio_h.m4 @@ -537,6 +540,7 @@ AC_DEFUN([gl_FILE_LIST], [ tests/test-snprintf.c tests/test-sockets.c tests/test-stdbool.c + tests/test-stddef.c tests/test-stdint.c tests/test-stdio.c tests/test-stdlib.c diff --git a/gl/m4/wchar.m4 b/gl/m4/wchar.m4 index 2e52a82acf..ce53a45cf5 100644 --- a/gl/m4/wchar.m4 +++ b/gl/m4/wchar.m4 @@ -7,7 +7,7 @@ dnl with or without modifications, as long as this notice is preserved. dnl Written by Eric Blake. -# wchar.m4 serial 23 +# wchar.m4 serial 25 AC_DEFUN([gl_WCHAR_H], [ @@ -27,7 +27,10 @@ wchar_t w;]], fi AC_SUBST([HAVE_WINT_T]) - if test $gl_cv_header_wchar_h_standalone != yes || test $gt_cv_c_wint_t != yes; then + dnl If <stddef.h> is replaced, then <wchar.h> must also be replaced. + AC_REQUIRE([gl_STDDEF_H]) + + if test $gl_cv_header_wchar_h_standalone != yes || test $gt_cv_c_wint_t != yes || test -n "$STDDEF_H"; then WCHAR_H=wchar.h fi |