X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fjm-glibc-io.m4;h=d485b103bf8005eade13fd7b859a1e25dccaf4be;hb=9988b8061774009801b30317af2309eb24f94e3f;hp=868fa43928c2b17159eba29a200dbf265ad3b285;hpb=1840ed72ecb24eb89d54416f4e3042c3d49caf2f;p=gnulib.git

diff --git a/m4/jm-glibc-io.m4 b/m4/jm-glibc-io.m4
index 868fa4392..d485b103b 100644
--- a/m4/jm-glibc-io.m4
+++ b/m4/jm-glibc-io.m4
@@ -1,4 +1,4 @@
-#serial 2
+#serial 4
 
 dnl From Jim Meyering.
 dnl
@@ -8,6 +8,13 @@ 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, fputc_unlocked, fread_unlocked, fwrite_unlocked,
+	getc_unlocked, getchar_unlocked, putc_unlocked, putchar_unlocked])
+    fi
+
     io_functions='clearerr_unlocked feof_unlocked ferror_unlocked
     fflush_unlocked fputc_unlocked fread_unlocked fwrite_unlocked
     getc_unlocked getchar_unlocked putc_unlocked putchar_unlocked'
@@ -16,10 +23,10 @@ AC_DEFUN(jm_FUNC_GLIBC_UNLOCKED_IO,
       # 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.
-      jm_CHECK_DECLARATIONS([#include <stdio.h>
-			    ], $jm_io_func,
-			    jm_declared=yes,
-			    jm_declared=no)
+      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