X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=m4%2Fflock.m4;h=c1b64c807d1e7d74d22e46a94ffac96e47d96221;hb=2394a603e7586e671226478e5b15d924c3841f42;hp=c5f29ac4e578c68b01983baea3c0b8dec57d3286;hpb=3030c5b5e0a5199e16b05927da72c43c42f211c3;p=gnulib.git

diff --git a/m4/flock.m4 b/m4/flock.m4
index c5f29ac4e..c1b64c807 100644
--- a/m4/flock.m4
+++ b/m4/flock.m4
@@ -1,5 +1,5 @@
-# flock.m4 serial 1
-dnl Copyright (C) 2008-2009 Free Software Foundation, Inc.
+# 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,
 dnl with or without modifications, as long as this notice is preserved.
@@ -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
 ])
 
@@ -19,7 +17,7 @@ dnl Prerequisites of lib/flock.c.
 AC_DEFUN([gl_PREREQ_FLOCK],
 [
   AC_CHECK_FUNCS_ONCE([fcntl])
-  AC_CHECK_HEADERS_ONCE([unistd.h fcntl.h])
+  AC_CHECK_HEADERS_ONCE([unistd.h])
 
   dnl Do we have a POSIX fcntl lock implementation?
   AC_CHECK_MEMBERS([struct flock.l_type],[],[],[[#include <fcntl.h>]])