diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2011-04-06 00:04:53 -0700 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-04-06 00:04:53 -0700 |
commit | 54fc1789b3451b42d3b243cc7cf7e10f3711a51e (patch) | |
tree | 8976c197c638557dc166a28971423cdca6fe7cd4 /m4/stddef_h.m4 | |
parent | 41cf7d1aec986e1b92ca14231ac4ec242c233d45 (diff) | |
parent | b69769da408705e40929b793d79d3bfe6a3a5a48 (diff) | |
download | emacs-54fc1789b3451b42d3b243cc7cf7e10f3711a51e.tar.gz |
* lib/gnulib.mk, m4/stdbool.m4, m4/stddef_h.m4, m4/stdint.m4: Merge from gnulib.
Diffstat (limited to 'm4/stddef_h.m4')
-rw-r--r-- | m4/stddef_h.m4 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/m4/stddef_h.m4 b/m4/stddef_h.m4 index 1942b6aa0df..1ae2344318e 100644 --- a/m4/stddef_h.m4 +++ b/m4/stddef_h.m4 @@ -1,5 +1,5 @@ dnl A placeholder for POSIX 2008 <stddef.h>, for platforms that have issues. -# stddef_h.m4 serial 3 +# stddef_h.m4 serial 4 dnl Copyright (C) 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -9,6 +9,7 @@ AC_DEFUN([gl_STDDEF_H], [ AC_REQUIRE([gl_STDDEF_H_DEFAULTS]) AC_REQUIRE([gt_TYPE_WCHAR_T]) + STDDEF_H= if test $gt_cv_c_wchar_t = no; then HAVE_WCHAR_T=0 STDDEF_H=stddef.h @@ -24,6 +25,8 @@ AC_DEFUN([gl_STDDEF_H], REPLACE_NULL=1 STDDEF_H=stddef.h fi + AC_SUBST([STDDEF_H]) + AM_CONDITIONAL([GL_GENERATE_STDDEF_H], [test -n "$STDDEF_H"]) if test -n "$STDDEF_H"; then gl_NEXT_HEADERS([stddef.h]) fi @@ -41,5 +44,4 @@ AC_DEFUN([gl_STDDEF_H_DEFAULTS], dnl Assume proper GNU behavior unless another module says otherwise. REPLACE_NULL=0; AC_SUBST([REPLACE_NULL]) HAVE_WCHAR_T=1; AC_SUBST([HAVE_WCHAR_T]) - STDDEF_H=''; AC_SUBST([STDDEF_H]) ]) |