From: Bruno Haible <bruno@clisp.org>
Date: Sat, 7 May 2011 10:04:35 +0000 (+0200)
Subject: flock: Move AC_LIBOBJ invocations to module description.
X-Git-Tag: v0.1~2586
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=bd07dfe0287e48e5d7241ab4a41e884c598edf34;p=gnulib.git

flock: Move AC_LIBOBJ invocations to module description.

* m4/flock.m4 (gl_FUNC_FLOCK): Move AC_LIBOBJ and gl_PREREQ_FLOCK
invocations from here...
* modules/flock (configure.ac): ... to here.
---

diff --git a/ChangeLog b/ChangeLog
index a7e19738e..56ced8388 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2011-05-07  Bruno Haible  <bruno@clisp.org>
 
+	flock: Move AC_LIBOBJ invocations to module description.
+	* m4/flock.m4 (gl_FUNC_FLOCK): Move AC_LIBOBJ and gl_PREREQ_FLOCK
+	invocations from here...
+	* modules/flock (configure.ac): ... to here.
+
+2011-05-07  Bruno Haible  <bruno@clisp.org>
+
 	fileblocks: Move AC_LIBOBJ invocations to module description.
 	* m4/fileblocks.m4 (gl_FILEBLOCKS): Move AC_LIBOBJ and
 	gl_PREREQ_FILEBLOCKS invocations from here...
diff --git a/m4/flock.m4 b/m4/flock.m4
index 7d8c7030d..c1b64c807 100644
--- a/m4/flock.m4
+++ b/m4/flock.m4
@@ -1,4 +1,4 @@
-# flock.m4 serial 2
+# flock.m4 serial 3
 dnl Copyright (C) 2008-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,8 +10,6 @@ AC_DEFUN([gl_FUNC_FLOCK],
   AC_CHECK_FUNCS_ONCE([flock])
   if test $ac_cv_func_flock = no; then
     HAVE_FLOCK=0
-    AC_LIBOBJ([flock])
-    gl_PREREQ_FLOCK
   fi
 ])
 
diff --git a/modules/flock b/modules/flock
index 9134d517c..56ef9b264 100644
--- a/modules/flock
+++ b/modules/flock
@@ -10,6 +10,10 @@ sys_file
 
 configure.ac:
 gl_FUNC_FLOCK
+if test $HAVE_FLOCK = 0; then
+  AC_LIBOBJ([flock])
+  gl_PREREQ_FLOCK
+fi
 gl_HEADER_SYS_FILE_MODULE_INDICATOR([flock])
 
 Makefile.am: