From: Akim Demaille Date: Fri, 17 Nov 2000 16:45:24 +0000 (+0000) Subject: * acgeneral.m4 (_AC_INIT_DEFAULTS) : Include X-Git-Tag: autoconf-2.50~411 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7abc919fd0d68dee9e35201afaa3236d9d2190c0;p=thirdparty%2Fautoconf.git * acgeneral.m4 (_AC_INIT_DEFAULTS) : Include sys/stat.h. * acspecific.m4 (AC_STRUCT_ST_BLKSIZE, AC_STRUCT_ST_BLOCKS) (AC_STRUCT_ST_RDEV): Simplify. * acfunctions.m4 (AC_FUNC_MMAP): Include sys/stat.h unconditionally. * doc/autoconf.texi (Default Includes): Adjust. (Particular Structures) : Adjust. --- diff --git a/ChangeLog b/ChangeLog index 1f46366d4..397add564 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2000-11-17 Akim Demaille + + * acgeneral.m4 (_AC_INIT_DEFAULTS) : Include + sys/stat.h. + * acspecific.m4 (AC_STRUCT_ST_BLKSIZE, AC_STRUCT_ST_BLOCKS) + (AC_STRUCT_ST_RDEV): Simplify. + * acfunctions.m4 (AC_FUNC_MMAP): Include sys/stat.h unconditionally. + * doc/autoconf.texi (Default Includes): Adjust. + (Particular Structures) : + Adjust. + 2000-11-16 Akim Demaille * doc/autoconf.texi (Limitations of Usual Tools) : diff --git a/acfunctions.m4 b/acfunctions.m4 index e499f2bab..72998fe42 100644 --- a/acfunctions.m4 +++ b/acfunctions.m4 @@ -948,7 +948,7 @@ fi # AC_FUNC_MMAP # ------------ AC_DEFUN([AC_FUNC_MMAP], -[AC_CHECK_HEADERS(stdlib.h unistd.h sys/stat.h) +[AC_CHECK_HEADERS(stdlib.h unistd.h) AC_CHECK_FUNCS(getpagesize) AC_CACHE_CHECK(for working mmap, ac_cv_func_mmap_fixed_mapped, [AC_TRY_RUN( @@ -985,9 +985,7 @@ char *malloc (); #if HAVE_UNISTD_H # include #endif -#if HAVE_SYS_STAT_H -# include -#endif +#include /* This mess was copied from the GNU getpagesize.h. */ #if !HAVE_GETPAGESIZE diff --git a/acgeneral.m4 b/acgeneral.m4 index d9effa7a9..c3d3c2fff 100644 --- a/acgeneral.m4 +++ b/acgeneral.m4 @@ -810,6 +810,7 @@ dnl If ever you change this variable, please keep autoconf.texi in sync. ac_includes_default="\ #include #include +#include #if STDC_HEADERS # include # include diff --git a/acspecific.m4 b/acspecific.m4 index 1d5d6faef..2ef36d6dd 100644 --- a/acspecific.m4 +++ b/acspecific.m4 @@ -528,13 +528,10 @@ AU_DEFUN([AC_STRUCT_ST_BLKSIZE], `HAVE_STRUCT_STAT_ST_BLKSIZE'. Remove this warning and the `AC_DEFINE' when you adjust the code.]) AC_CHECK_MEMBERS([struct stat.st_blksize], - [AC_DEFINE(HAVE_ST_BLKSIZE, 1, - [Define if your `struct stat' has - `st_blksize'. Deprecated, use - `HAVE_STRUCT_STAT_ST_BLKSIZE' instead.])],, - [#include -#include -])dnl + [AC_DEFINE(HAVE_ST_BLKSIZE, 1, + [Define if your `struct stat' has + `st_blksize'. Deprecated, use + `HAVE_STRUCT_STAT_ST_BLKSIZE' instead.])]) ])# AC_STRUCT_ST_BLKSIZE @@ -558,10 +555,7 @@ AC_DEFUN([AC_STRUCT_ST_BLOCKS], [Define if your `struct stat' has `st_blocks'. Deprecated, use `HAVE_STRUCT_STAT_ST_BLOCKS' instead.])], - [AC_LIBOBJ([fileblocks])], - [#include -#include -])dnl + [AC_LIBOBJ([fileblocks])]) ])# AC_STRUCT_ST_BLOCKS @@ -576,10 +570,7 @@ AC_CHECK_MEMBERS([struct stat.st_rdev], [AC_DEFINE(HAVE_ST_RDEV, 1, [Define if your `struct stat' has `st_rdev'. Deprecated, use `HAVE_STRUCT_STAT_ST_RDEV' - instead.])],, - [#include -#include -])dnl + instead.])]) ])# AC_STRUCT_ST_RDEV diff --git a/doc/autoconf.texi b/doc/autoconf.texi index 360e24829..b8be6c0fe 100644 --- a/doc/autoconf.texi +++ b/doc/autoconf.texi @@ -55,7 +55,7 @@ This file documents the GNU Autoconf package for creating scripts to configure source code packages using templates and an @code{m4} macro package. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000 Free Software +Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000 Free Software Foundation, Inc. Permission is granted to make and distribute verbatim copies of this @@ -2631,6 +2631,7 @@ Most generic macros provide the following default set of includes: @group #include #include +#include #if STDC_HEADERS # include # include @@ -3843,11 +3844,7 @@ If @code{struct stat} contains an @code{st_blksize} member, define the future. This macro is obsoleted, and should be replaced by @example -@group -AC_CHECK_MEMBERS([struct stat.st_blksize],,, -[#include -#include ]) -@end group +AC_CHECK_MEMBERS([struct stat.st_blksize]) @end example @end defmac @@ -3873,13 +3870,8 @@ is to be avoided, as its support will cease in the future. This macro is obsoleted, and should be replaced by @example -@group -AC_CHECK_MEMBERS([struct stat.st_rdev],,, -[#include -#include ]) -@end group +AC_CHECK_MEMBERS([struct stat.st_rdev]) @end example - @end defmac @defmac AC_STRUCT_TM diff --git a/lib/autoconf/functions.m4 b/lib/autoconf/functions.m4 index e499f2bab..72998fe42 100644 --- a/lib/autoconf/functions.m4 +++ b/lib/autoconf/functions.m4 @@ -948,7 +948,7 @@ fi # AC_FUNC_MMAP # ------------ AC_DEFUN([AC_FUNC_MMAP], -[AC_CHECK_HEADERS(stdlib.h unistd.h sys/stat.h) +[AC_CHECK_HEADERS(stdlib.h unistd.h) AC_CHECK_FUNCS(getpagesize) AC_CACHE_CHECK(for working mmap, ac_cv_func_mmap_fixed_mapped, [AC_TRY_RUN( @@ -985,9 +985,7 @@ char *malloc (); #if HAVE_UNISTD_H # include #endif -#if HAVE_SYS_STAT_H -# include -#endif +#include /* This mess was copied from the GNU getpagesize.h. */ #if !HAVE_GETPAGESIZE diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4 index d9effa7a9..c3d3c2fff 100644 --- a/lib/autoconf/general.m4 +++ b/lib/autoconf/general.m4 @@ -810,6 +810,7 @@ dnl If ever you change this variable, please keep autoconf.texi in sync. ac_includes_default="\ #include #include +#include #if STDC_HEADERS # include # include diff --git a/lib/autoconf/specific.m4 b/lib/autoconf/specific.m4 index 1d5d6faef..2ef36d6dd 100644 --- a/lib/autoconf/specific.m4 +++ b/lib/autoconf/specific.m4 @@ -528,13 +528,10 @@ AU_DEFUN([AC_STRUCT_ST_BLKSIZE], `HAVE_STRUCT_STAT_ST_BLKSIZE'. Remove this warning and the `AC_DEFINE' when you adjust the code.]) AC_CHECK_MEMBERS([struct stat.st_blksize], - [AC_DEFINE(HAVE_ST_BLKSIZE, 1, - [Define if your `struct stat' has - `st_blksize'. Deprecated, use - `HAVE_STRUCT_STAT_ST_BLKSIZE' instead.])],, - [#include -#include -])dnl + [AC_DEFINE(HAVE_ST_BLKSIZE, 1, + [Define if your `struct stat' has + `st_blksize'. Deprecated, use + `HAVE_STRUCT_STAT_ST_BLKSIZE' instead.])]) ])# AC_STRUCT_ST_BLKSIZE @@ -558,10 +555,7 @@ AC_DEFUN([AC_STRUCT_ST_BLOCKS], [Define if your `struct stat' has `st_blocks'. Deprecated, use `HAVE_STRUCT_STAT_ST_BLOCKS' instead.])], - [AC_LIBOBJ([fileblocks])], - [#include -#include -])dnl + [AC_LIBOBJ([fileblocks])]) ])# AC_STRUCT_ST_BLOCKS @@ -576,10 +570,7 @@ AC_CHECK_MEMBERS([struct stat.st_rdev], [AC_DEFINE(HAVE_ST_RDEV, 1, [Define if your `struct stat' has `st_rdev'. Deprecated, use `HAVE_STRUCT_STAT_ST_RDEV' - instead.])],, - [#include -#include -])dnl + instead.])]) ])# AC_STRUCT_ST_RDEV