OLD | NEW |
1 dnl A placeholder for POSIX 2008 <stddef.h>, for platforms that have issues. | 1 dnl A placeholder for POSIX 2008 <stddef.h>, for platforms that have issues. |
2 # stddef_h.m4 serial 2 | 2 # stddef_h.m4 serial 4 |
3 dnl Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc. | 3 dnl Copyright (C) 2009-2012 Free Software Foundation, Inc. |
4 dnl This file is free software; the Free Software Foundation | 4 dnl This file is free software; the Free Software Foundation |
5 dnl gives unlimited permission to copy and/or distribute it, | 5 dnl gives unlimited permission to copy and/or distribute it, |
6 dnl with or without modifications, as long as this notice is preserved. | 6 dnl with or without modifications, as long as this notice is preserved. |
7 | 7 |
8 AC_DEFUN([gl_STDDEF_H], | 8 AC_DEFUN([gl_STDDEF_H], |
9 [ | 9 [ |
10 AC_REQUIRE([gl_STDDEF_H_DEFAULTS]) | 10 AC_REQUIRE([gl_STDDEF_H_DEFAULTS]) |
11 AC_REQUIRE([gt_TYPE_WCHAR_T]) | 11 AC_REQUIRE([gt_TYPE_WCHAR_T]) |
| 12 STDDEF_H= |
12 if test $gt_cv_c_wchar_t = no; then | 13 if test $gt_cv_c_wchar_t = no; then |
13 HAVE_WCHAR_T=0 | 14 HAVE_WCHAR_T=0 |
14 STDDEF_H=stddef.h | 15 STDDEF_H=stddef.h |
15 fi | 16 fi |
16 AC_CACHE_CHECK([whether NULL can be used in arbitrary expressions], | 17 AC_CACHE_CHECK([whether NULL can be used in arbitrary expressions], |
17 [gl_cv_decl_null_works], | 18 [gl_cv_decl_null_works], |
18 [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stddef.h> | 19 [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <stddef.h> |
19 int test[2 * (sizeof NULL == sizeof (void *)) -1]; | 20 int test[2 * (sizeof NULL == sizeof (void *)) -1]; |
20 ]])], | 21 ]])], |
21 [gl_cv_decl_null_works=yes], | 22 [gl_cv_decl_null_works=yes], |
22 [gl_cv_decl_null_works=no])]) | 23 [gl_cv_decl_null_works=no])]) |
23 if test $gl_cv_decl_null_works = no; then | 24 if test $gl_cv_decl_null_works = no; then |
24 REPLACE_NULL=1 | 25 REPLACE_NULL=1 |
25 STDDEF_H=stddef.h | 26 STDDEF_H=stddef.h |
26 fi | 27 fi |
| 28 AC_SUBST([STDDEF_H]) |
| 29 AM_CONDITIONAL([GL_GENERATE_STDDEF_H], [test -n "$STDDEF_H"]) |
27 if test -n "$STDDEF_H"; then | 30 if test -n "$STDDEF_H"; then |
28 gl_CHECK_NEXT_HEADERS([stddef.h]) | 31 gl_NEXT_HEADERS([stddef.h]) |
29 fi | 32 fi |
30 ]) | 33 ]) |
31 | 34 |
32 AC_DEFUN([gl_STDDEF_MODULE_INDICATOR], | 35 AC_DEFUN([gl_STDDEF_MODULE_INDICATOR], |
33 [ | 36 [ |
34 dnl Use AC_REQUIRE here, so that the default settings are expanded once only. | 37 dnl Use AC_REQUIRE here, so that the default settings are expanded once only. |
35 AC_REQUIRE([gl_STDDEF_H_DEFAULTS]) | 38 AC_REQUIRE([gl_STDDEF_H_DEFAULTS]) |
36 gl_MODULE_INDICATOR_SET_VARIABLE([$1]) | 39 gl_MODULE_INDICATOR_SET_VARIABLE([$1]) |
37 ]) | 40 ]) |
38 | 41 |
39 AC_DEFUN([gl_STDDEF_H_DEFAULTS], | 42 AC_DEFUN([gl_STDDEF_H_DEFAULTS], |
40 [ | 43 [ |
41 dnl Assume proper GNU behavior unless another module says otherwise. | 44 dnl Assume proper GNU behavior unless another module says otherwise. |
42 REPLACE_NULL=0; AC_SUBST([REPLACE_NULL]) | 45 REPLACE_NULL=0; AC_SUBST([REPLACE_NULL]) |
43 HAVE_WCHAR_T=1; AC_SUBST([HAVE_WCHAR_T]) | 46 HAVE_WCHAR_T=1; AC_SUBST([HAVE_WCHAR_T]) |
44 STDDEF_H=''; AC_SUBST([STDDEF_H]) | |
45 ]) | 47 ]) |
OLD | NEW |