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 a7e19738ef01a67058a106bc7a3f431ae19a2a3c..56ced8388550e91c4b1d0c7849f80f248457ad3d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+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.

diff --git a/m4/flock.m4 b/m4/flock.m4
index 7d8c7030d1b260fb2fc259b8c6298baba60e3319..c1b64c807d1e7d74d22e46a94ffac96e47d96221 100644 (file)
--- 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 9134d517ce4e1ea2cc137f37319b94f1c2a0971f..56ef9b26457404a20c00a4662d4f3c56b70430e4 100644 (file)
--- 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: