Index: configure.in
===================================================================
--- configure.in	(revision 84594)
+++ configure.in	(working copy)
@@ -2641,14 +2641,12 @@
   [AC_MSG_RESULT(no)
 ])
 
-AC_MSG_CHECKING(for flock)
+AC_MSG_CHECKING(for flock declaration)
 have_flock=no
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #include <sys/file.h>
 ]], [[void* p = flock]])],
-  [AC_DEFINE(HAVE_FLOCK, 1, Define if you have the 'flock' function.)
-   have_flock=yes
-])
+  [have_flock=yes])
 AC_MSG_RESULT($have_flock)
 
 if test "$have_flock" = yes ; then
@@ -2660,10 +2658,14 @@
     [AC_MSG_RESULT(yes)
      AC_CHECK_LIB(bsd,flock, [
       AC_DEFINE(FLOCK_NEEDS_LIBBSD, 1, Define if flock needs to be linked with bsd library.)
-      ])
+      ], [have_flock=no])
   ])
 fi
 
+if test "$have_flock" = yes ; then
+	AC_DEFINE(HAVE_FLOCK, 1, Define if you have the 'flock' function.)
+fi
+
 AC_MSG_CHECKING(for getpagesize)
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
 #include <unistd.h>