diff options
| author | Eric Blake <ebb9@byu.net> | 2009-12-30 09:47:55 -0700 |
|---|---|---|
| committer | Eric Blake <ebb9@byu.net> | 2009-12-31 06:03:31 -0700 |
| commit | f2f428037cd5dcf93c4cc8cfacf4dd92f0f250bd (patch) | |
| tree | 460b6c226224b430c141f88954633f60b9b97289 /m4/sys_utsname_h.m4 | |
| parent | 3542c9a082fdfb38d6ac7a051839bf70ccffef0f (diff) | |
| download | gnulib-f2f428037cd5dcf93c4cc8cfacf4dd92f0f250bd.tar.gz | |
sys_times, sys_utsname: use include_next
Another step towards being able to make GL_LINK_WARNING useful.
* m4/sys_times_h.m4 (gl_SYS_TIMES_H): Support wrapping an existing
header.
(gl_SYS_TIMES_H_DEFAULTS): Add another variable.
* m4/sys_utsname_h.m4 (gl_SYS_UTSNAME_H)
(gl_SYS_UTSNAME_H_DEFAULTS): Likewise.
* modules/sys_times (Depends-on): Add include_next.
(Makefile.am): Substitute additional values.
* modules/sys_utsname (Depends-on, Makefile.am): Likewise.
* lib/sys_times.in.h (includes): Include native header, if
available.
* lib/sys_utsname.in.h (includes): Likewise.
* tests/test-sys_times.c (main): Enhance test.
Signed-off-by: Eric Blake <ebb9@byu.net>
Diffstat (limited to 'm4/sys_utsname_h.m4')
| -rw-r--r-- | m4/sys_utsname_h.m4 | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/m4/sys_utsname_h.m4 b/m4/sys_utsname_h.m4 index 2e688fb15e..84b781f85e 100644 --- a/m4/sys_utsname_h.m4 +++ b/m4/sys_utsname_h.m4 @@ -1,4 +1,4 @@ -# sys_utsname_h.m4 serial 1 +# sys_utsname_h.m4 serial 2 dnl Copyright (C) 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, @@ -12,10 +12,19 @@ AC_DEFUN([gl_SYS_UTSNAME_H], dnl once only, before all statements that occur in other macros. AC_REQUIRE([gl_SYS_UTSNAME_H_DEFAULTS]) + gl_CHECK_NEXT_HEADERS([sys/utsname.h]) AC_CHECK_HEADERS_ONCE([sys/utsname.h]) if test $ac_cv_header_sys_utsname_h != yes; then SYS_UTSNAME_H='sys/utsname.h' + HAVE_SYS_UTSNAME_H=0 + HAVE_STRUCT_UTSNAME=0 + else + HAVE_SYS_UTSNAME_H=1 + AC_CHECK_TYPES([struct utsname], [], [HAVE_STRUCT_UTSNAME=0], [[ +#include <sys/utsname.h> + ]]) fi + AC_SUBST([HAVE_SYS_UTSNAME_H]) ]) AC_DEFUN([gl_SYS_UTSNAME_MODULE_INDICATOR], @@ -27,8 +36,9 @@ AC_DEFUN([gl_SYS_UTSNAME_MODULE_INDICATOR], AC_DEFUN([gl_SYS_UTSNAME_H_DEFAULTS], [ - GNULIB_UNAME=0; AC_SUBST([GNULIB_UNAME]) + GNULIB_UNAME=0; AC_SUBST([GNULIB_UNAME]) dnl Assume proper GNU behavior unless another module says otherwise. - HAVE_UNAME=1; AC_SUBST([HAVE_UNAME]) - SYS_UTSNAME_H=''; AC_SUBST([SYS_UTSNAME_H]) + HAVE_UNAME=1; AC_SUBST([HAVE_UNAME]) + HAVE_STRUCT_UTSNAME=1; AC_SUBST([HAVE_STRUCT_UTSNAME]) + SYS_UTSNAME_H=''; AC_SUBST([SYS_UTSNAME_H]) ]) |