.

diff --git a/aclocal.m4 b/aclocal.m4
index caa527d607349db4d1633eaafb294ba9b0b4eff5..af8c7ea42855189f0c69085fb7863223972ca9e1 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -2811,9 +2811,7 @@ AC_DEFUN([jm_FUNC_NANOSLEEP],
  LIBS=$nanosleep_save_libs
 ])
 
-dnl This file is automatically generated from jm-glibc-io.m4n.
-
-#serial 6 -*- autoconf -*-
+#serial 7 -*- autoconf -*-
 
 dnl From Jim Meyering.
 dnl
@@ -2822,30 +2820,11 @@ dnl Use only those *_unlocked macros that are declared.
 dnl
 
 AC_DEFUN([jm_FUNC_GLIBC_UNLOCKED_IO],
-  [
-    # Kludge (not executed) to make autoheader do the right thing.
-    if test a = b; then
-      AC_CHECK_DECLS([clearerr_unlocked,feof_unlocked,ferror_unlocked,fflush_unlocked,fgets_unlocked,fputc_unlocked,fputs_unlocked,fread_unlocked,fwrite_unlocked,getc_unlocked,getchar_unlocked,putc_unlocked,putchar_unlocked])
-      AC_CHECK_FUNCS(clearerr_unlocked feof_unlocked ferror_unlocked fflush_unlocked fgets_unlocked fputc_unlocked fputs_unlocked fread_unlocked fwrite_unlocked getc_unlocked getchar_unlocked putc_unlocked putchar_unlocked)
-    fi
-
-    io_functions='clearerr_unlocked feof_unlocked ferror_unlocked fflush_unlocked fgets_unlocked fputc_unlocked fputs_unlocked fread_unlocked fwrite_unlocked getc_unlocked getchar_unlocked putc_unlocked putchar_unlocked'
-
-    for jm_io_func in $io_functions; do
-      # Check for the existence of each function only if it is declared.
-      # Otherwise, we'd get the Solaris5.5.1 functions that are not
-      # declared, and that have been removed from Solaris5.6.  The resulting
-      # 5.5.1 binaries would not run on 5.6 due to shared library differences.
-      AC_CHECK_DECLS([$jm_io_func],
-                    jm_declared=yes,
-                    jm_declared=no,
-                    [#include <stdio.h>])
-      if test $jm_declared = yes; then
-        AC_CHECK_FUNCS($jm_io_func)
-      fi
-    done
-  ]
-)
+  [AC_CHECK_DECLS(
+     [clearerr_unlocked, feof_unlocked, ferror_unlocked,
+      fflush_unlocked, fgets_unlocked, fputc_unlocked, fputs_unlocked,
+      fread_unlocked, fwrite_unlocked, getc_unlocked,
+      getchar_unlocked, putc_unlocked, putchar_unlocked])])
 
 #serial 3