[PATCH] Rename _AC_CHECK_HEADER_OLD and _AC_CHECK_HEADER_NEW.

[Paolo Bonzini]

Separated and pushed, thanks!

Paolo



* lib/autoconf/headers.m4 (AC_CHECK_HEADER): Adjust naming.
(_AC_CHECK_HEADER_PREPROC_BODY): New name of _AC_CHECK_HEADER_OLD_BODY.
(_AC_CHECK_HEADER_COMPILE_BODY): New name of _AC_CHECK_HEADER_NEW_BODY.
(_AC_CHECK_HEADER_PREPROC): New name of _AC_CHECK_HEADER_OLD.
(_AC_CHECK_HEADER_COMPILE): New name of _AC_CHECK_HEADER_NEW.
* tests/semantics.at (AC_CHECK_HEADERS_OLD, AC_CHECK_HEADER_NEW):
Give better name.
---
 ChangeLog               |   11 ++++++++++
 lib/autoconf/headers.m4 |   52 +++++++++++++++++++++++-----------------------
 tests/semantics.at      |    4 +-
 3 files changed, 39 insertions(+), 28 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 926053d..9f44468 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2008-10-31  Paolo Bonzini  <address@hidden>
+
+       Rename _AC_CHECK_HEADER_OLD and _AC_CHECK_HEADER_NEW.
+       * lib/autoconf/headers.m4 (AC_CHECK_HEADER): Adjust naming.
+       (_AC_CHECK_HEADER_PREPROC_BODY): New name of _AC_CHECK_HEADER_OLD_BODY.
+       (_AC_CHECK_HEADER_COMPILE_BODY): New name of _AC_CHECK_HEADER_NEW_BODY.
+       (_AC_CHECK_HEADER_PREPROC): New name of _AC_CHECK_HEADER_OLD.
+       (_AC_CHECK_HEADER_COMPILE): New name of _AC_CHECK_HEADER_NEW.
+       * tests/semantics.at (AC_CHECK_HEADERS_OLD, AC_CHECK_HEADER_NEW):
+       Give better name.
+
 2008-10-30  Paolo Bonzini  <address@hidden>
 
        Do not check for $LINENO in generated scripts.
diff --git a/lib/autoconf/headers.m4 b/lib/autoconf/headers.m4
index fb6eb0c..ae0da81 100644
--- a/lib/autoconf/headers.m4
+++ b/lib/autoconf/headers.m4
@@ -89,8 +89,8 @@
 AC_DEFUN([AC_CHECK_HEADER],
 [m4_indir(m4_case([$4],
                  [],  [[_AC_CHECK_HEADER_MONGREL]],
-                 [-], [[_AC_CHECK_HEADER_OLD]],
-                      [[_AC_CHECK_HEADER_NEW]]), $@)
+                 [-], [[_AC_CHECK_HEADER_PREPROC]],
+                      [[_AC_CHECK_HEADER_COMPILE]]), $@)
 ])# AC_CHECK_HEADER
 
 
@@ -147,10 +147,10 @@ esac
 # Check using both the compiler and the preprocessor.  If they disagree,
 # warn, and the preproc wins.
 #
-# This is not based on _AC_CHECK_HEADER_NEW and _AC_CHECK_HEADER_OLD
+# This is not based on _AC_CHECK_HEADER_COMPILE and _AC_CHECK_HEADER_PREPROC
 # because it obfuscate the code to try to factor everything, in particular
 # because of the cache variables, and the `checking...' messages.
-m4_define([_AC_CHECK_HEADER_MONGREL],
+AC_DEFUN([_AC_CHECK_HEADER_MONGREL],
 [AC_REQUIRE_SHELL_FN([ac_func_]_AC_LANG_ABBREV[_check_header_mongrel],
   [AS_FUNCTION_DESCRIBE([ac_func_]_AC_LANG_ABBREV[_check_header_mongrel],
     [LINENO HEADER VAR INCLUDES],
@@ -165,10 +165,10 @@ AS_VAR_IF([ac_Header], [yes], [$2], [$3])
 AS_VAR_POPDEF([ac_Header])])# _AC_CHECK_HEADER_MONGREL
 
 
-# _AC_CHECK_HEADER_NEW_BODY
-# -------------------------
-# Shell function body for _AC_CHECK_HEADER_NEW
-m4_define([_AC_CHECK_HEADER_NEW_BODY],
+# _AC_CHECK_HEADER_COMPILE_BODY
+# -----------------------------
+# Shell function body for _AC_CHECK_HEADER_COMPILE
+m4_define([_AC_CHECK_HEADER_COMPILE_BODY],
 [  AS_LINENO_PUSH([$[]1])
   AC_CACHE_CHECK([for $[]2], [$[]3],
                 [AC_COMPILE_IFELSE([AC_LANG_SOURCE([$[]4
@@ -176,56 +176,56 @@ m4_define([_AC_CHECK_HEADER_NEW_BODY],
                                    [AS_VAR_SET([$[]3], [yes])],
                                    [AS_VAR_SET([$[]3], [no])])])
   AS_LINENO_POP
-])# _AC_CHECK_HEADER_NEW_BODY
+])# _AC_CHECK_HEADER_COMPILE_BODY
 
-# _AC_CHECK_HEADER_NEW(HEADER-FILE,
+# _AC_CHECK_HEADER_COMPILE(HEADER-FILE,
 #                     [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND],
 #                     [INCLUDES = DEFAULT-INCLUDES])
 # --------------------------------------------------------------
 # Check the compiler accepts HEADER-FILE.  The INCLUDES are defaulted.
-AC_DEFUN([_AC_CHECK_HEADER_NEW],
-[AC_REQUIRE_SHELL_FN([ac_func_]_AC_LANG_ABBREV[_check_header_new],
-  [AS_FUNCTION_DESCRIBE([ac_func_]_AC_LANG_ABBREV[_check_header_new],
+AC_DEFUN([_AC_CHECK_HEADER_COMPILE],
+[AC_REQUIRE_SHELL_FN([ac_func_]_AC_LANG_ABBREV[_check_header_compile],
+  [AS_FUNCTION_DESCRIBE([ac_func_]_AC_LANG_ABBREV[_check_header_compile],
     [LINENO HEADER VAR INCLUDES],
     [Tests whether HEADER exists and can be compiled using the include files
      in INCLUDES, setting the cache variable VAR accordingly.])],
   [$0_BODY])]dnl
 [AS_VAR_PUSHDEF([ac_Header], [ac_cv_header_$1])]dnl
-[ac_func_[]_AC_LANG_ABBREV[]_check_header_new ]dnl
+[ac_func_[]_AC_LANG_ABBREV[]_check_header_compile ]dnl
 ["$LINENO" "$1" "ac_Header" "AS_ESCAPE([AC_INCLUDES_DEFAULT([$4])], [""])"
 AS_VAR_IF([ac_Header], [yes], [$2], [$3])
-AS_VAR_POPDEF([ac_Header])])# _AC_CHECK_HEADER_NEW
+AS_VAR_POPDEF([ac_Header])])# _AC_CHECK_HEADER_COMPILE
 
 
-# _AC_CHECK_HEADER_OLD_BODY
-# -------------------------
-# Shell function body for _AC_CHECK_HEADER_OLD.
-m4_define([_AC_CHECK_HEADER_OLD_BODY],
+# _AC_CHECK_HEADER_PREPROC_BODY
+# -----------------------------
+# Shell function body for _AC_CHECK_HEADER_PREPROC.
+m4_define([_AC_CHECK_HEADER_PREPROC_BODY],
 [  AS_LINENO_PUSH([$[]1])
   AC_CACHE_CHECK([for $[]2], [$[]3],
   [AC_PREPROC_IFELSE([AC_LANG_SOURCE(address@hidden:@include <$[]2>])],
                     [AS_VAR_SET([$[]3], [yes])],
                     [AS_VAR_SET([$[]3], [no])])])
   AS_LINENO_POP
-])# _AC_CHECK_HEADER_OLD_BODY
+])# _AC_CHECK_HEADER_PREPROC_BODY
 
 
 
-# _AC_CHECK_HEADER_OLD(HEADER-FILE,
+# _AC_CHECK_HEADER_PREPROC(HEADER-FILE,
 #                     [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
 # --------------------------------------------------------------
 # Check the preprocessor accepts HEADER-FILE.
-AC_DEFUN([_AC_CHECK_HEADER_OLD],
-[AC_REQUIRE_SHELL_FN([ac_func_]_AC_LANG_ABBREV[_check_header_old],
-  [AS_FUNCTION_DESCRIBE([ac_func_]_AC_LANG_ABBREV[_check_header_old],
+AC_DEFUN([_AC_CHECK_HEADER_PREPROC],
+[AC_REQUIRE_SHELL_FN([ac_func_]_AC_LANG_ABBREV[_check_header_preproc],
+  [AS_FUNCTION_DESCRIBE([ac_func_]_AC_LANG_ABBREV[_check_header_preproc],
     [LINENO HEADER VAR],
     [Tests whether HEADER is present, setting the cache variable VAR 
accordingly.])],
   [$0_BODY])]dnl
 [AS_VAR_PUSHDEF([ac_Header], [ac_cv_header_$1])]dnl
-[ac_func_[]_AC_LANG_ABBREV[]_check_header_old "$LINENO" "$1" "ac_Header"
+[ac_func_[]_AC_LANG_ABBREV[]_check_header_preproc "$LINENO" "$1" "ac_Header"
 AS_VAR_IF([ac_Header], [yes], [$2], [$3])
 AS_VAR_POPDEF([ac_Header])dnl
-])# _AC_CHECK_HEADER_OLD
+])# _AC_CHECK_HEADER_PREPROC
 
 
 # AH_CHECK_HEADERS(HEADER-FILE...)
diff --git a/tests/semantics.at b/tests/semantics.at
index 4075247..1c6d70b 100644
--- a/tests/semantics.at
+++ b/tests/semantics.at
@@ -182,7 +182,7 @@ AT_CHECK_MACRO([AC_CHECK_HEADERS],
 # --------------------
 # Check that it performs the correct actions:
 # Must not check prerequisites, hence define header2.h
-AT_SETUP([AC_CHECK_HEADERS_OLD])
+AT_SETUP([AC_CHECK_HEADERS (preprocessor test)])
 
 AT_DATA([header1.h],
 [typedef int foo;
@@ -209,7 +209,7 @@ AT_CLEANUP
 # --------------------
 # Check that it performs the correct actions:
 # Must check prerequisites, hence define header2.h but not header3.h
-AT_SETUP([AC_CHECK_HEADERS_NEW])
+AT_SETUP([AC_CHECK_HEADERS (compiler test)])
 
 AT_DATA([header1.h],
 [typedef int foo;
-- 
1.5.5