Merged revisions 84674 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r84674 | antoine.pitrou | 2010-09-10 20:39:00 +0200 (ven., 10 sept. 2010) | 3 lines
Followup to #4026: better patch for flock detection.
........
diff --git a/configure.in b/configure.in
index 99e8f9d..3ccb66a 100644
--- a/configure.in
+++ b/configure.in
@@ -2641,29 +2641,23 @@
AC_MSG_RESULT(no)
)
-AC_MSG_CHECKING(for flock)
-have_flock=no
-AC_TRY_COMPILE([
-#include "confdefs.h"
-#include <sys/file.h>
-], void* p = flock, [
- AC_DEFINE(HAVE_FLOCK, 1, Define if you have the 'flock' function.)
- have_flock=yes
+AC_CACHE_CHECK([for flock declaration], [ac_cv_flock_decl],
+ [AC_COMPILE_IFELSE(
+ [AC_LANG_PROGRAM(
+ [#include <sys/file.h>],
+ [void* p = flock]
+ )],
+ [ac_cv_flock_decl=yes],
+ [ac_cv_flock_decl=no]
+ )
])
-AC_MSG_RESULT($have_flock)
-
-if test "$have_flock" = yes ; then
- AC_MSG_CHECKING(if flock requires additional libraries.)
- AC_TRY_LINK([
- #include "confdefs.h"
- #include <sys/file.h>
- ], [flock(0, 0)],
- AC_MSG_RESULT(no), [
- 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.)
- ])
- ])
+if test "x${ac_cv_flock_decl}" = xyes; then
+ AC_CHECK_FUNCS(flock,,
+ AC_CHECK_LIB(bsd,flock,
+ [AC_DEFINE(HAVE_FLOCK)
+ AC_DEFINE(FLOCK_NEEDS_LIBBSD, 1, Define if flock needs to be linked with bsd library.)
+ ])
+ )
fi
AC_MSG_CHECKING(for getpagesize)