From: Bruno Haible <bruno@clisp.org>
Date: Sat, 21 May 2011 11:48:24 +0000 (+0200)
Subject: lseek: Move AC_LIBOBJ invocations to module description.
X-Git-Tag: v0.1~2500
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=20d9dfda7fccd05a619cb2f18f70b10449bf8daa;p=gnulib.git

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.
---

diff --git a/ChangeLog b/ChangeLog
index c4f43cb97..38ef36e03 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 f6452f6f2..b45488445 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 33de968df..5b4a267a6 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: