summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2011-05-07 13:26:48 +0200
committerBruno Haible <bruno@clisp.org>2011-06-13 13:05:47 +0200
commita7c988589e2875950db85c0cc6cc34b721e018c2 (patch)
treebc8fd1aed1bbf3e025c811a780f0205f9efa2e86
parenta3a01d04e02e926c59ec17e1bb30bc99193f1166 (diff)
downloadgnulib-a7c988589e2875950db85c0cc6cc34b721e018c2.tar.gz
fseek: Move AC_LIBOBJ invocations to module description.
* m4/fseek.m4 (gl_REPLACE_FSEEK): Remove macro. (gl_FUNC_FSEEK): Inline it here. Move AC_LIBOBJ invocation from here... * modules/fseek (configure.ac): ... to here.
-rw-r--r--ChangeLog7
-rw-r--r--m4/fseek.m411
-rw-r--r--modules/fseek3
3 files changed, 12 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 12b2559d7f..2529a95144 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2011-05-07 Bruno Haible <bruno@clisp.org>
+ fseek: Move AC_LIBOBJ invocations to module description.
+ * m4/fseek.m4 (gl_REPLACE_FSEEK): Remove macro.
+ (gl_FUNC_FSEEK): Inline it here. Move AC_LIBOBJ invocation from here...
+ * modules/fseek (configure.ac): ... to here.
+
+2011-05-07 Bruno Haible <bruno@clisp.org>
+
fseek: Respect rules for use of AC_LIBOBJ.
* m4/fseeko.m4 (gl_FUNC_FSEEKO): Move gl_REPLACE_FSEEK invocation from
here...
diff --git a/m4/fseek.m4 b/m4/fseek.m4
index c5fffc2227..135a22bdc8 100644
--- a/m4/fseek.m4
+++ b/m4/fseek.m4
@@ -1,4 +1,4 @@
-# fseek.m4 serial 3
+# fseek.m4 serial 4
dnl Copyright (C) 2007, 2009-2011 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -10,13 +10,6 @@ AC_DEFUN([gl_FUNC_FSEEK],
AC_REQUIRE([gl_FUNC_FSEEKO])
dnl When fseeko needs fixes, fseek needs them too.
if test $HAVE_FSEEKO = 0 || test $REPLACE_FSEEKO = 1; then
- gl_REPLACE_FSEEK
+ REPLACE_FSEEK=1
fi
])
-
-AC_DEFUN([gl_REPLACE_FSEEK],
-[
- AC_LIBOBJ([fseek])
- AC_REQUIRE([gl_STDIO_H_DEFAULTS])
- REPLACE_FSEEK=1
-])
diff --git a/modules/fseek b/modules/fseek
index 98c6d3f57f..ef0d4bb8d7 100644
--- a/modules/fseek
+++ b/modules/fseek
@@ -11,6 +11,9 @@ fseeko [test $REPLACE_FSEEK = 1]
configure.ac:
gl_FUNC_FSEEK
+if test $REPLACE_FSEEK = 1; then
+ AC_LIBOBJ([fseek])
+fi
gl_STDIO_MODULE_INDICATOR([fseek])
Makefile.am: