From 06e2b8bb734f7be670bb57b9e29eb37ea96490e0 Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Fri, 7 Jun 2002 09:50:32 +0000 Subject: [PATCH] * lib/autoconf/functions.m4 (AC_REPLACE_FUNC_FNMATCH): Typo, rename as... (AC_REPLACE_FNMATCH): this. * tests/mktests.sh (exclude_list): Exclude AC_REPLACE_FNMATCH, AC_FUNC_FNMATCH_GNU. --- ChangeLog | 8 ++++++++ lib/autoconf/functions.m4 | 8 ++++---- tests/acfunctions.at | 3 --- tests/mktests.sh | 20 +++++++++++++++++--- 4 files changed, 29 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index aea0e27c..2932e975 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2002-06-07 Akim Demaille + + * lib/autoconf/functions.m4 (AC_REPLACE_FUNC_FNMATCH): Typo, + rename as... + (AC_REPLACE_FNMATCH): this. + * tests/mktests.sh (exclude_list): Exclude AC_REPLACE_FNMATCH, + AC_FUNC_FNMATCH_GNU. + 2002-06-07 Akim Demaille * doc/autoconf.texi (Systemology): Point to Tru64 docs, and the diff --git a/lib/autoconf/functions.m4 b/lib/autoconf/functions.m4 index f6f055e4..45352952 100644 --- a/lib/autoconf/functions.m4 +++ b/lib/autoconf/functions.m4 @@ -409,13 +409,13 @@ AC_DEFINE(fnmatch, rpl_fnmatch, ])# _AC_LIBOBJ_FNMATCH -# AC_REPLACE_FUNC_FNMATCH -# ----------------------- -AC_DEFUN([AC_REPLACE_FUNC_FNMATCH], +# AC_REPLACE_FNMATCH +# ------------------ +AC_DEFUN([AC_REPLACE_FNMATCH], [_AC_FUNC_FNMATCH_IF([POSIX], [ac_cv_func_fnmatch_works], [rm -f $ac_config_libobj_dir/fnmatch.h], [_AC_LIBOBJ_FNMATCH]) -])# AC_REPLACE_FUNC_FNMATCH +])# AC_REPLACE_FNMATCH # AC_FUNC_FNMATCH_GNU diff --git a/tests/acfunctions.at b/tests/acfunctions.at index 592cfa5e..2a58ba71 100644 --- a/tests/acfunctions.at +++ b/tests/acfunctions.at @@ -8,7 +8,6 @@ AT_CHECK_MACRO([AC_FUNC_CHOWN]) AT_CHECK_MACRO([AC_FUNC_CLOSEDIR_VOID]) AT_CHECK_MACRO([AC_FUNC_ERROR_AT_LINE]) AT_CHECK_MACRO([AC_FUNC_FNMATCH]) -AT_CHECK_MACRO([AC_FUNC_FNMATCH_GNU]) AT_CHECK_MACRO([AC_FUNC_FORK]) AT_CHECK_MACRO([AC_FUNC_FSEEKO]) AT_CHECK_MACRO([AC_FUNC_GETGROUPS]) @@ -30,7 +29,5 @@ AT_CHECK_MACRO([AC_FUNC_STRNLEN]) AT_CHECK_MACRO([AC_FUNC_STRTOD]) AT_CHECK_MACRO([AC_FUNC_UTIME_NULL]) AT_CHECK_MACRO([AC_FUNC_VPRINTF]) -AT_CHECK_MACRO([AC_REPLACE_FNMATCH_GNU]) -AT_CHECK_MACRO([AC_REPLACE_FUNC_FNMATCH]) # Obsolete macros. diff --git a/tests/mktests.sh b/tests/mktests.sh index abb1c201..26b2797b 100755 --- a/tests/mktests.sh +++ b/tests/mktests.sh @@ -81,34 +81,48 @@ exclude_list='^ac_cv_prog_(gcc|gxx|g77)$ # # - AC_CANONICALIZE, AC_PREFIX_PROGRAM, AC_PREREQ # Need an argument. +# # - AC_CHECK decl, file, func, header, lib, member, prog, sizeof, type # Performed in the semantics tests. +# # - AC_CONFIG # They fail when the source does not exist. -# - AC_FUNC_GETLOADAVG -# Requires a file that is not shipped with Autoconf. But it should. +# +# - AC_FUNC_GETLOADAVG, AC_REPLACE_FNMATCH, AC_FUNC_FNMATCH_GNU +# Require a file that is not shipped with Autoconf. But it should. +# # - AC_INIT # AC_INIT includes all the AC_INIT macros. Note that there is an # infinite m4 recursion if AC_INIT it used twice. +# # - AC_LANG* # Heavily used by other macros. +# # - AC_PATH_PROGS?, AC_F77_FUNC # They produce `= val' because $1, the variable used to store the result, # is empty. +# # - AC_TRY, AC_.*_IFELSE, AC_RUN_LOG. # Used in many places. +# # - _AC_ # Internal macros are used elsewhere. +# # - AC_OUTPUT # Already tested by `AT_CHECK_MACRO'. +# # - AC_FD_CC # Is a number. +# # - AC_PROG_CC, AC_C_(CONST|INLINE|VOLATILE), AC_PATH_XTRA # Checked in semantics. +# # - AC_CYGWIN, AC_CYGWIN32, AC_EMXOS2, AC_MING32, AC_EXEEXT, AC_OBJEXT # AU defined to nothing. +# # - AC_PATH_XTRA # Checked in semantics. +# # - AC_SYS_RESTARTABLE_SYSCALLS, AC_FUNC_WAIT3 # Obsolete, checked in semantics. # @@ -117,7 +131,7 @@ ac_exclude_list='^AC_ARG_VAR$ ^AC_CHECK_(DECL|FILE|FUNC|HEADER|LIB|MEMBER|PROG|SIZEOF|TOOL|TYPE)S?$ ^AC_CONFIG ^AC_F77_FUNC$ -^AC_FUNC_GETLOADAVG$ +^AC_(FUNC_GETLOADAVG|REPLACE_FNMATCH|FUNC_FNMATCH_GNU)$ ^AC_INIT ^AC_LANG ^AC_LINKER_OPTION$