From: Akim Demaille Date: Tue, 19 Sep 2000 18:08:38 +0000 (+0000) Subject: * tests/atspecific.m4 (AT_TEST_MACRO): Rename as... X-Git-Tag: autoconf-2.50~621 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c550ac5ae53eb44b41cda3ed80e713058b5074c3;p=thirdparty%2Fautoconf.git * tests/atspecific.m4 (AT_TEST_MACRO): Rename as... (AT_CHECK_MACRO): this. All dependencies adjusted. --- diff --git a/ChangeLog b/ChangeLog index db3f829d5..2aa4c43ed 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2000-09-19 Akim Demaille + + * tests/atspecific.m4 (AT_TEST_MACRO): Rename as... + (AT_CHECK_MACRO): this. All dependencies adjusted. + 2000-09-19 Akim Demaille * tests/aclocal.m4.new (AC_ENV_SAVE): Skip POW_LIB, used by diff --git a/tests/Makefile.am b/tests/Makefile.am index bc07ea605..fee39e934 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -66,7 +66,7 @@ testsuite: atgeneral.m4 atspecific.m4 suite.m4 macros.m4 $(SUITE) # - _AC_ # Internal macros are used elsewhere. # - AC_OUTPUT -# Already tested by `AT_TEST_MACRO'. +# Already tested by `AT_CHECK_MACRO'. # - AC_FD_CC # Is a number. # - AC_PROG_CC, AC_C_(CONST|INLINE|VOLATILE) @@ -113,7 +113,7 @@ macros.m4: $(MACRO_FILES) $(srcdir)/Makefile.am sort | uniq >requires for macro in `cat defuns`; do \ if fgrep "$$macro" requires >/dev/null 2>&1; then :; else \ - echo "AT_TEST_MACRO([$$macro])" >>$@-t; \ + echo "AT_CHECK_MACRO([$$macro])" >>$@-t; \ fi; \ done rm defuns requires diff --git a/tests/Makefile.in b/tests/Makefile.in index c9475e4a4..796d1595c 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -99,7 +99,7 @@ PERL = perl # - _AC_ # Internal macros are used elsewhere. # - AC_OUTPUT -# Already tested by `AT_TEST_MACRO'. +# Already tested by `AT_CHECK_MACRO'. # - AC_FD_CC # Is a number. # - AC_PROG_CC, AC_C_(CONST|INLINE|VOLATILE) @@ -252,7 +252,7 @@ macros.m4: $(MACRO_FILES) $(srcdir)/Makefile.am sort | uniq >requires for macro in `cat defuns`; do \ if fgrep "$$macro" requires >/dev/null 2>&1; then :; else \ - echo "AT_TEST_MACRO([$$macro])" >>$@-t; \ + echo "AT_CHECK_MACRO([$$macro])" >>$@-t; \ fi; \ done rm defuns requires diff --git a/tests/atspecific.m4 b/tests/atspecific.m4 index 81194808d..8643d555b 100644 --- a/tests/atspecific.m4 +++ b/tests/atspecific.m4 @@ -29,6 +29,7 @@ AT_DEFINE([m4_shift], AT_DEFINE([define], [builtin([define], $@)]) + # m4_for(VARIABLE, FROM, TO, EXPRESSION) # -------------------------------------- # Expand EXPRESSION defining VARIABLE to FROM, FROM + 1, ..., TO. @@ -107,22 +108,20 @@ fi ])# _AT_CHECK_AC_MACRO -# AT_TEST_MACRO(NAME-OF-THE-MACRO, [MACRO-USE], [ADDITIONAL-CMDS]) -# ---------------------------------------------------------------- +# AT_CHECK_MACRO(NAME-OF-THE-MACRO, [MACRO-USE], [ADDITIONAL-CMDS]) +# ----------------------------------------------------------------- # Create a minimalist configure.in running the macro named # NAME-OF-THE-MACRO, check that autoconf runs on that script, # and that the shell runs correctly the configure. # TOP_SRCDIR is needed to set the auxdir (some macros need `install-sh', # `config.guess' etc.). -AT_DEFINE([AT_TEST_MACRO], +AT_DEFINE([AT_CHECK_MACRO], [AT_SETUP([$1]) _AT_CHECK_AC_MACRO([ifelse([$2],,[$1], [$2])]) $3 AT_CLEANUP(configure config.status config.log config.cache config.hin config.h env-after)dnl -])# AT_TEST_MACRO - - +])# AT_CHECK_MACRO # AT_CHECK_DEFINES(CONTENT) diff --git a/tests/semantics.m4 b/tests/semantics.m4 index d019eb12b..e955a679f 100644 --- a/tests/semantics.m4 +++ b/tests/semantics.m4 @@ -9,7 +9,7 @@ EOF # AC_TRY_LINK_FUNC # ---------------- -AT_TEST_MACRO(AC_TRY_LINK_FUNC, +AT_CHECK_MACRO(AC_TRY_LINK_FUNC, [AC_TRY_LINK_FUNC(exit,, exit 1) AC_TRY_LINK_FUNC(Be_doomed_if_your_libc_has_a_function_named_like_this, exit 1)]) @@ -27,7 +27,7 @@ AC_TRY_LINK_FUNC(Be_doomed_if_your_libc_has_a_function_named_like_this, # in libm. Nor can I imagine a lib more likely to exists than libm. # But there are systems without libm, on which we don't want to have # this test fail, so exit successfully if `cos' is in libc. -AT_TEST_MACRO(AC_CHECK_LIB, +AT_CHECK_MACRO(AC_CHECK_LIB, [AC_TRY_LINK_FUNC(cos, exit 0) AC_CHECK_LIB(m, cos,, exit 1)]) @@ -36,7 +36,7 @@ AC_CHECK_LIB(m, cos,, exit 1)]) # -------------- # Check that it performs the correct actions: # Must define NEED_NO_DECL, but not NEED_YES_DECL. -AT_TEST_MACRO(AC_CHECK_DECLS, +AT_CHECK_MACRO(AC_CHECK_DECLS, [[AC_CHECK_DECLS([yes, no],,, [int yes = 1;])]], [AT_CHECK_DEFINES( @@ -49,7 +49,7 @@ AT_TEST_MACRO(AC_CHECK_DECLS, # -------------- # Check that it performs the correct actions: # Must define HAVE_EXIT, but not HAVE_AUTOCONF_TIXE -AT_TEST_MACRO(AC_CHECK_FUNCS, +AT_CHECK_MACRO(AC_CHECK_FUNCS, [AC_CHECK_FUNCS(exit autoconf_tixe)], [AT_CHECK_DEFINES( [/* #undef HAVE_AUTOCONF_TIXE */ @@ -62,7 +62,7 @@ AT_TEST_MACRO(AC_CHECK_FUNCS, # ---------------- # Check that it performs the correct actions: # Must define HAVE_STDIO_H, but not HAVE_AUTOCONF_IO_H. -AT_TEST_MACRO(AC_CHECK_HEADERS, +AT_CHECK_MACRO(AC_CHECK_HEADERS, [AC_CHECK_HEADERS(stdio.h autoconf_io.h)], [AT_CHECK_DEFINES( [/* #undef HAVE_AUTOCONF_IO_H */ @@ -75,7 +75,7 @@ AT_TEST_MACRO(AC_CHECK_HEADERS, # ---------------- # Check that it performs the correct actions. # Must define HAVE_STRUCT_YES_S_YES, but not HAVE_STRUCT_YES_S_NO. -AT_TEST_MACRO(AC_CHECK_MEMBERS, +AT_CHECK_MACRO(AC_CHECK_MEMBERS, [[AC_CHECK_MEMBERS([struct yes_s.yes, struct yes_s.no],,, [struct yes_s { int yes ;} ;])]], [AT_CHECK_DEFINES( @@ -86,7 +86,7 @@ AT_TEST_MACRO(AC_CHECK_MEMBERS, # AC_CHECK_SIZEOF # --------------- -AT_TEST_MACRO(AC_CHECK_SIZEOF, +AT_CHECK_MACRO(AC_CHECK_SIZEOF, [AC_CHECK_SIZEOF(char) AC_CHECK_SIZEOF(charchar,, [#include @@ -124,7 +124,7 @@ AC_CHECK_SIZEOF(ucharcharchar)], # Must define HAVE_STRUCT_YES_S, HAVE_INT, but not HAVE_STRUCT_NO_S. # `int' and `struct yes_s' are both checked to test both the compiler # builtin types, and defined types. -AT_TEST_MACRO(AC_CHECK_TYPES, +AT_CHECK_MACRO(AC_CHECK_TYPES, [[AC_CHECK_TYPES([int, struct yes_s, struct no_s],,, [struct yes_s { int yes ;} ;])]], [AT_CHECK_DEFINES( @@ -178,7 +178,7 @@ AT_CLEANUP(autoconf.err) # -------------- # FIXME: To really test HAVE_AC_EXISTS2 and HAVE_AC_MISSING2 we need to # open AH_TEMPLATE to `configure.in', which is not yet the case. -AT_TEST_MACRO(AC_CHECK_FILES, +AT_CHECK_MACRO(AC_CHECK_FILES, [touch ac-exists1 ac-exists2 ac_exists2=ac-exists2 ac_missing2=ac-missing2 @@ -299,7 +299,7 @@ AT_CLEANUP(path config.log config.cache configure) # C compiler # ---------- # GCC supports `const', `volatile', and `inline'. -AT_TEST_MACRO(C keywords, +AT_CHECK_MACRO(C keywords, [[AC_PROG_CC AC_C_CONST AC_C_INLINE