.

diff --git a/m4/onceonly_2_57.m4 b/m4/onceonly.m4
similarity index 66%
rename from m4/onceonly_2_57.m4
rename to m4/onceonly.m4
index fbc0e73598d124d63d018092ac83905109b62e51..0a7deb1c16b0acc735471b95e48e9c08bd2f2e47 100644 (file)
--- a/m4/onceonly_2_57.m4
+++ b/m4/onceonly.m4
@@ -1,4 +1,4 @@
-# onceonly_2_57.m4 serial 1
+# onceonly.m4 serial 1
 dnl Copyright (C) 2002 Free Software Foundation, Inc.
 dnl This file is free software, distributed under the terms of the GNU
 dnl General Public License.  As a special exception to the GNU General
@@ -21,31 +21,17 @@ dnl inside an AC_DEFUNed function, the gl_CHECK_HEADERS macro call expands to
 dnl empty, and the check will be inserted before the body of the AC_DEFUNed
 dnl function.
 
-dnl This is like onceonly.m4, except that it uses diversions to named sections
-dnl DEFAULTS and INIT_PREPARE in order to check all requested headers at once,
-dnl thus reducing the size of 'configure'. Works with autoconf-2.57. The
-dnl size reduction is ca. 9%.
-
 # AC_CHECK_HEADERS_ONCE(HEADER1 HEADER2 ...) is a once-only variant of
 # AC_CHECK_HEADERS(HEADER1 HEADER2 ...).
 AC_DEFUN([AC_CHECK_HEADERS_ONCE], [
   :
   AC_FOREACH([gl_HEADER_NAME], [$1], [
     AC_DEFUN([gl_CHECK_HEADER_]translit(gl_HEADER_NAME,[./-], [___]), [
-      m4_divert_text([INIT_PREPARE],
-        [gl_header_list="$gl_header_list gl_HEADER_NAME"])
-      gl_HEADERS_EXPANSION
-      AH_TEMPLATE(AS_TR_CPP(HAVE_[]gl_HEADER_NAME),
-        [Define to 1 if you have the <]gl_HEADER_NAME[> header file.])
+      AC_CHECK_HEADERS(gl_HEADER_NAME)
     ])
     AC_REQUIRE([gl_CHECK_HEADER_]translit(gl_HEADER_NAME,[./-], [___]))
   ])
 ])
-m4_define([gl_HEADERS_EXPANSION], [
-  m4_divert_text([DEFAULTS], [gl_header_list=])
-  AC_CHECK_HEADERS([$gl_header_list])
-  m4_define([gl_HEADERS_EXPANSION], [])
-])
 
 # AC_CHECK_FUNCS_ONCE(FUNC1 FUNC2 ...) is a once-only variant of
 # AC_CHECK_FUNCS(FUNC1 FUNC2 ...).
@@ -53,20 +39,11 @@ AC_DEFUN([AC_CHECK_FUNCS_ONCE], [
   :
   AC_FOREACH([gl_FUNC_NAME], [$1], [
     AC_DEFUN([gl_CHECK_FUNC_]gl_FUNC_NAME, [
-      m4_divert_text([INIT_PREPARE],
-        [gl_func_list="$gl_func_list gl_FUNC_NAME"])
-      gl_FUNCS_EXPANSION
-      AH_TEMPLATE(AS_TR_CPP(HAVE_[]gl_FUNC_NAME),
-        [Define to 1 if you have the `]gl_FUNC_NAME[' function.])
+      AC_CHECK_FUNCS(gl_FUNC_NAME)
     ])
     AC_REQUIRE([gl_CHECK_FUNC_]gl_FUNC_NAME)
   ])
 ])
-m4_define([gl_FUNCS_EXPANSION], [
-  m4_divert_text([DEFAULTS], [gl_func_list=])
-  AC_CHECK_FUNCS([$gl_func_list])
-  m4_define([gl_FUNCS_EXPANSION], [])
-])
 
 # AC_CHECK_DECLS_ONCE(DECL1 DECL2 ...) is a once-only variant of
 # AC_CHECK_DECLS(DECL1, DECL2, ...).