Mercurial > hg > octave-nkf > gnulib-hg

changeset 14940:edad1aa593fe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Bruno Haible <bruno@clisp.org>
date Sat, 07 May 2011 12:04:35 +0200
parents c400cbc2e1e5
children 56ef3f2912e0
files ChangeLog m4/flock.m4 modules/flock
diffstat 3 files changed, 12 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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.
--- 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_CHECK_FUNCS_ONCE([flock])
   if test $ac_cv_func_flock = no; then
     HAVE_FLOCK=0
-    AC_LIBOBJ([flock])
-    gl_PREREQ_FLOCK
   fi
 ])
 
--- a/modules/flock
+++ b/modules/flock
@@ -10,6 +10,10 @@
 
 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: