Ensure fseeko and ftello are declared on glibc systems.

diff --git a/ChangeLog b/ChangeLog
index ad0547e1888422f30fbc1d99174f45175278ae6f..b3ef5990b89ac25daaa213da1123c7becefee6a8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2007-04-26  Bruno Haible  <bruno@clisp.org>
+
+       Ensure fseeko, ftello are declared on glibc systems.
+       * modules/fflush (configure.ac-early): Require AC_FUNC_FSEEKO.
+       * modules/fseeko (configure.ac-early): Likewise.
+       * modules/ftello (configure.ac-early): Likewise.
+       * m4/fflush.m4 (gl_REPLACE_FFLUSH): Don't define HAVE_FSEEKO, rely on
+       AC_FUNC_FSEEKO for this.
+       * m4/fseeko.m4 (gl_FUNC_FSEEKO): Inline gl_CHECK_FSEEKO.
+       (gl_CHECK_FSEEKO): Remove macro.
+
 2007-04-26  Bruno Haible  <bruno@clisp.org>
 
        * tests/test-fflush.c (main): Also check the ftell result after

diff --git a/m4/fflush.m4 b/m4/fflush.m4
index fca7769be1e0289ee693ed0ccb0830612bfa8f7e..2399fe03d966805aabaee0d415288a443b8c03c3 100755 (executable)
--- a/m4/fflush.m4
+++ b/m4/fflush.m4
@@ -48,9 +48,4 @@ AC_DEFUN([gl_REPLACE_FFLUSH],
   AC_LIBOBJ([fseeko])
   AC_REQUIRE([gl_STDIO_H_DEFAULTS])
   REPLACE_FFLUSH=1
-  gl_CHECK_FSEEKO
-  if test $gl_cv_func_fseeko = yes; then
-    AC_DEFINE([HAVE_FSEEKO], 1,
-      [Define to 1 if you have the fseeko() function or macro.])
-  fi
 ])

diff --git a/m4/fseeko.m4 b/m4/fseeko.m4
index fd3f019f7ff2228acaf157f26b26ff14036b184e..86d42f40ccc9721abcfc9d600edf43266c407f18 100644 (file)
--- a/m4/fseeko.m4
+++ b/m4/fseeko.m4
@@ -7,18 +7,13 @@ dnl with or without modifications, as long as this notice is preserved.
 AC_DEFUN([gl_FUNC_FSEEKO],
 [
   AC_REQUIRE([gl_STDIO_H_DEFAULTS])
-  gl_CHECK_FSEEKO
-  if test $gl_cv_func_fseeko = no; then
-    HAVE_FSEEKO=0
-  fi
-])
-
-AC_DEFUN([gl_CHECK_FSEEKO],
-[
   AC_REQUIRE([AC_PROG_CC])
   AC_CACHE_CHECK([for fseeko], [gl_cv_func_fseeko],
     [
       AC_TRY_LINK([#include <stdio.h>], [fseeko (stdin, 0, 0);],
         [gl_cv_func_fseeko=yes], [gl_cv_func_fseeko=no])
     ])
+  if test $gl_cv_func_fseeko = no; then
+    HAVE_FSEEKO=0
+  fi
 ])

diff --git a/modules/fflush b/modules/fflush
index 62a2d597002968f6abcebd6b271451d9cafc0097..8cfc04661c85457e0dd948ecc8e8272ef9f7b5e1 100755 (executable)
--- a/modules/fflush
+++ b/modules/fflush
@@ -13,6 +13,9 @@ ftello
 stdio
 unistd
 
+configure.ac-early:
+AC_REQUIRE([AC_FUNC_FSEEKO])
+
 configure.ac:
 gl_FUNC_FFLUSH
 gl_STDIO_MODULE_INDICATOR([fflush])

diff --git a/modules/fseeko b/modules/fseeko
index ed72f14cc98539ead08ec14199f43e397035d632..e8c10f2d59ea24ed3ff4b71acd00a2f9f570d083 100644 (file)
--- a/modules/fseeko
+++ b/modules/fseeko
@@ -7,6 +7,9 @@ m4/fseeko.m4
 Depends-on:
 stdio
 
+configure.ac-early:
+AC_REQUIRE([AC_FUNC_FSEEKO])
+
 configure.ac:
 gl_FUNC_FSEEKO
 gl_STDIO_MODULE_INDICATOR([fseeko])

diff --git a/modules/ftello b/modules/ftello
index 0994f10d7d767dc4b9077da56b7af20360736514..daac68405118b4e732cb82c101fb21605715b92f 100644 (file)
--- a/modules/ftello
+++ b/modules/ftello
@@ -7,6 +7,9 @@ m4/ftello.m4
 Depends-on:
 stdio
 
+configure.ac-early:
+AC_REQUIRE([AC_FUNC_FSEEKO])
+
 configure.ac:
 gl_FUNC_FTELLO
 gl_STDIO_MODULE_INDICATOR([ftello])