summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2011-05-21 13:48:24 +0200
committerBruno Haible <bruno@clisp.org>2011-06-16 00:06:25 +0200
commit20d9dfda7fccd05a619cb2f18f70b10449bf8daa (patch)
tree8c06f011cdddc50ae88a12efeca46f9f2cb72109
parent267355298d6117c03db350bf97878979f7aa9d48 (diff)
downloadgnulib-20d9dfda7fccd05a619cb2f18f70b10449bf8daa.tar.gz
lseek: Move AC_LIBOBJ invocations to module description.
* m4/lseek.m4 (gl_REPLACE_LSEEK): Remove macro. (gl_FUNC_LSEEK): Inline it here. Move AC_LIBOBJ invocation from here... * modules/lseek (configure.ac): ... to here.
-rw-r--r--ChangeLog7
-rw-r--r--m4/lseek.m415
-rw-r--r--modules/lseek3
3 files changed, 14 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index c4f43cb97b..38ef36e03d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2011-05-21 Bruno Haible <bruno@clisp.org>
+ lseek: Move AC_LIBOBJ invocations to module description.
+ * m4/lseek.m4 (gl_REPLACE_LSEEK): Remove macro.
+ (gl_FUNC_LSEEK): Inline it here. Move AC_LIBOBJ invocation from here...
+ * modules/lseek (configure.ac): ... to here.
+
+2011-05-21 Bruno Haible <bruno@clisp.org>
+
linkat: Move AC_LIBOBJ invocations to module description.
* m4/linkat.m4 (gl_FUNC_LINKAT): Move AC_LIBOBJ invocations from
here...
diff --git a/m4/lseek.m4 b/m4/lseek.m4
index f6452f6f20..b45488445d 100644
--- a/m4/lseek.m4
+++ b/m4/lseek.m4
@@ -1,4 +1,4 @@
-# lseek.m4 serial 6
+# lseek.m4 serial 7
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,
@@ -35,15 +35,8 @@ AC_DEFUN([gl_FUNC_LSEEK],
[gl_cv_func_lseek_pipe=yes], [gl_cv_func_lseek_pipe=no])
fi])
if test $gl_cv_func_lseek_pipe = no; then
- gl_REPLACE_LSEEK
+ REPLACE_LSEEK=1
+ AC_DEFINE([LSEEK_PIPE_BROKEN], [1],
+ [Define to 1 if lseek does not detect pipes.])
fi
])
-
-AC_DEFUN([gl_REPLACE_LSEEK],
-[
- AC_LIBOBJ([lseek])
- AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
- REPLACE_LSEEK=1
- AC_DEFINE([LSEEK_PIPE_BROKEN], [1],
- [Define to 1 if lseek does not detect pipes.])
-])
diff --git a/modules/lseek b/modules/lseek
index 33de968df7..5b4a267a62 100644
--- a/modules/lseek
+++ b/modules/lseek
@@ -10,6 +10,9 @@ unistd
configure.ac:
gl_FUNC_LSEEK
+if test $REPLACE_LSEEK = 1; then
+ AC_LIBOBJ([lseek])
+fi
gl_UNISTD_MODULE_INDICATOR([lseek])
Makefile.am: