diff --git a/ChangeLog b/ChangeLog index 8af8fd0a..85a81c53 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +1999-10-31 Akim Demaille + + * acspecific.m4: Formating changes. + * acgeneral.m4: Likewise. + 1999-10-31 Akim Demaille * acspecific.m4 (AC_CHECK_MEMBER, AC_CHECK_MEMBERS): New macros. diff --git a/TODO b/TODO index e929843b..e6a87b0e 100644 --- a/TODO +++ b/TODO @@ -14,6 +14,7 @@ are also suggestions we should either satisfy right now (they're easy), or remove (obsoleted since then). ** AC_C_STRUCT_MEMBER needs a full rewrite. +And once done, the former specialized macros should be adapted. ** AC_CHECK_HEADER should not template config.h entries. Its entry in autoheader.m4 should be removed. diff --git a/acgeneral.m4 b/acgeneral.m4 index d21bc86e..a6235de4 100644 --- a/acgeneral.m4 +++ b/acgeneral.m4 @@ -2420,7 +2420,7 @@ AC_VAR_SET(ac_Lib, yes), AC_VAR_SET(ac_Lib, no)) LIBS="$ac_save_LIBS"]) AC_SHELL_IFELSE(test AC_VAR_GET(ac_Lib) = yes, m4_default([$3], - [AC_DEFINE_UNQUOTED(AC_TR_CPP(HAVE_LIB$1)) + [AC_DEFINE_UNQUOTED(AC_TR_CPP(HAVE_LIB$1)) LIBS="-l$1 $LIBS" ]), [$4])dnl @@ -2623,6 +2623,7 @@ dnl ### Checking for header files dnl AC_CHECK_HEADER(HEADER-FILE, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) +dnl ----------------------------------------------------------------------- AC_DEFUN(AC_CHECK_HEADER, [AC_VAR_PUSHDEF([ac_Header], [ac_cv_header_$1])dnl AC_CACHE_CHECK([for $1], ac_Header, @@ -2635,6 +2636,7 @@ AC_VAR_POPDEF([ac_Header])dnl dnl AC_CHECK_HEADERS(HEADER-FILE... dnl [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) +dnl ------------------------------------------------------------- AC_DEFUN(AC_CHECK_HEADERS, [for ac_header in $1 do @@ -2850,7 +2852,8 @@ AC_CACHE_CHECK([for $1], ac_Type, [AC_EGREP_CPP(dnl changequote(<<,>>)dnl <<(^|[^a-zA-Z_0-9])$1[^a-zA-Z_0-9]>>dnl -changequote([,]), m4_default([$3], [#include +changequote([,]), +m4_default([$3], [#include #include #if STDC_HEADERS # include @@ -2860,7 +2863,7 @@ changequote([,]), m4_default([$3], [#include AC_SHELL_IFELSE(test AC_VAR_GET(ac_Type) = yes,, [AC_DEFINE_UNQUOTED($1, $2, [Define to `$2' if - does not define.])])dnl + does not define `$1'.])])dnl AC_VAR_POPDEF([ac_Type])dnl ])dnl AC_CHECK_TYPE diff --git a/acspecific.m4 b/acspecific.m4 index a1a12a5e..06e0ee4f 100644 --- a/acspecific.m4 +++ b/acspecific.m4 @@ -994,6 +994,9 @@ fi ]) +dnl AC_HEADER_STAT +dnl -------------- +dnl FIXME: Shouldn't this be named AC_HEADER_SYS_STAT? AC_DEFUN(AC_HEADER_STAT, [AC_CACHE_CHECK(whether stat file-mode macros are broken, ac_cv_header_stat_broken, @@ -1029,7 +1032,7 @@ if test $ac_cv_header_stat_broken = yes; then [Define if the `S_IS*' macros in do not work properly.]) fi -]) +])dnl AC_HEADER_STAT dnl AC_DECL_SYS_SIGLIST dnl ------------------- @@ -1050,6 +1053,9 @@ if test $ac_cv_decl_sys_siglist = yes; then fi ])dnl AC_DECL_SYS_SIGLIST + +dnl AC_HEADER_SYS_WAIT +dnl ------------------ AC_DEFUN(AC_HEADER_SYS_WAIT, [AC_CACHE_CHECK([for sys/wait.h that is POSIX.1 compatible], ac_cv_header_sys_wait_h, @@ -1068,7 +1074,8 @@ if test $ac_cv_header_sys_wait_h = yes; then AC_DEFINE(HAVE_SYS_WAIT_H, 1, [Define if you have that is POSIX.1 compatible.]) fi -]) +])dnl AC_HEADER_SYS_WAIT + dnl A few hasbeen'd macros. @@ -1156,6 +1163,7 @@ AC_DEFUN(AC_TYPE_OFF_T, AC_DEFUN(AC_TYPE_MODE_T, [AC_CHECK_TYPE(mode_t, int)]) + dnl AC_TYPE_SIGNAL dnl -------------- dnl Note that identifiers starting with SIG are reserved by ANSI C. @@ -2139,6 +2147,10 @@ if test $ac_cv_header_time = yes; then fi ]) +dnl AC_STRUCT_TM +dnl ------------ +dnl FIXME: This macro is badly named, it should be AC_CHECK_TYPE_STRUCT_TM. +dnl Or something else, but what? AC_CHECK_TYPE_STRUCT_TM_IN_SYS_TIME? AC_DEFUN(AC_STRUCT_TM, [AC_CACHE_CHECK([whether struct tm is in sys/time.h or time.h], ac_cv_struct_tm, diff --git a/lib/autoconf/general.m4 b/lib/autoconf/general.m4 index d21bc86e..a6235de4 100644 --- a/lib/autoconf/general.m4 +++ b/lib/autoconf/general.m4 @@ -2420,7 +2420,7 @@ AC_VAR_SET(ac_Lib, yes), AC_VAR_SET(ac_Lib, no)) LIBS="$ac_save_LIBS"]) AC_SHELL_IFELSE(test AC_VAR_GET(ac_Lib) = yes, m4_default([$3], - [AC_DEFINE_UNQUOTED(AC_TR_CPP(HAVE_LIB$1)) + [AC_DEFINE_UNQUOTED(AC_TR_CPP(HAVE_LIB$1)) LIBS="-l$1 $LIBS" ]), [$4])dnl @@ -2623,6 +2623,7 @@ dnl ### Checking for header files dnl AC_CHECK_HEADER(HEADER-FILE, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) +dnl ----------------------------------------------------------------------- AC_DEFUN(AC_CHECK_HEADER, [AC_VAR_PUSHDEF([ac_Header], [ac_cv_header_$1])dnl AC_CACHE_CHECK([for $1], ac_Header, @@ -2635,6 +2636,7 @@ AC_VAR_POPDEF([ac_Header])dnl dnl AC_CHECK_HEADERS(HEADER-FILE... dnl [, ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]) +dnl ------------------------------------------------------------- AC_DEFUN(AC_CHECK_HEADERS, [for ac_header in $1 do @@ -2850,7 +2852,8 @@ AC_CACHE_CHECK([for $1], ac_Type, [AC_EGREP_CPP(dnl changequote(<<,>>)dnl <<(^|[^a-zA-Z_0-9])$1[^a-zA-Z_0-9]>>dnl -changequote([,]), m4_default([$3], [#include +changequote([,]), +m4_default([$3], [#include #include #if STDC_HEADERS # include @@ -2860,7 +2863,7 @@ changequote([,]), m4_default([$3], [#include AC_SHELL_IFELSE(test AC_VAR_GET(ac_Type) = yes,, [AC_DEFINE_UNQUOTED($1, $2, [Define to `$2' if - does not define.])])dnl + does not define `$1'.])])dnl AC_VAR_POPDEF([ac_Type])dnl ])dnl AC_CHECK_TYPE diff --git a/lib/autoconf/specific.m4 b/lib/autoconf/specific.m4 index a1a12a5e..06e0ee4f 100644 --- a/lib/autoconf/specific.m4 +++ b/lib/autoconf/specific.m4 @@ -994,6 +994,9 @@ fi ]) +dnl AC_HEADER_STAT +dnl -------------- +dnl FIXME: Shouldn't this be named AC_HEADER_SYS_STAT? AC_DEFUN(AC_HEADER_STAT, [AC_CACHE_CHECK(whether stat file-mode macros are broken, ac_cv_header_stat_broken, @@ -1029,7 +1032,7 @@ if test $ac_cv_header_stat_broken = yes; then [Define if the `S_IS*' macros in do not work properly.]) fi -]) +])dnl AC_HEADER_STAT dnl AC_DECL_SYS_SIGLIST dnl ------------------- @@ -1050,6 +1053,9 @@ if test $ac_cv_decl_sys_siglist = yes; then fi ])dnl AC_DECL_SYS_SIGLIST + +dnl AC_HEADER_SYS_WAIT +dnl ------------------ AC_DEFUN(AC_HEADER_SYS_WAIT, [AC_CACHE_CHECK([for sys/wait.h that is POSIX.1 compatible], ac_cv_header_sys_wait_h, @@ -1068,7 +1074,8 @@ if test $ac_cv_header_sys_wait_h = yes; then AC_DEFINE(HAVE_SYS_WAIT_H, 1, [Define if you have that is POSIX.1 compatible.]) fi -]) +])dnl AC_HEADER_SYS_WAIT + dnl A few hasbeen'd macros. @@ -1156,6 +1163,7 @@ AC_DEFUN(AC_TYPE_OFF_T, AC_DEFUN(AC_TYPE_MODE_T, [AC_CHECK_TYPE(mode_t, int)]) + dnl AC_TYPE_SIGNAL dnl -------------- dnl Note that identifiers starting with SIG are reserved by ANSI C. @@ -2139,6 +2147,10 @@ if test $ac_cv_header_time = yes; then fi ]) +dnl AC_STRUCT_TM +dnl ------------ +dnl FIXME: This macro is badly named, it should be AC_CHECK_TYPE_STRUCT_TM. +dnl Or something else, but what? AC_CHECK_TYPE_STRUCT_TM_IN_SYS_TIME? AC_DEFUN(AC_STRUCT_TM, [AC_CACHE_CHECK([whether struct tm is in sys/time.h or time.h], ac_cv_struct_tm,