diff options
| author | Antoine Pitrou <solipsis@pitrou.net> | 2010-09-10 18:47:36 +0000 |
|---|---|---|
| committer | Antoine Pitrou <solipsis@pitrou.net> | 2010-09-10 18:47:36 +0000 |
| commit | b170f17bacf77996667b8814ed4f0940409b1810 (patch) | |
| tree | a8d6fbd8a20788aa0a2ef05ad0af59b73b827783 /configure.in | |
| parent | cc676a0d7f683888e658925e2b622e4b88e35605 (diff) | |
| download | cpython-git-b170f17bacf77996667b8814ed4f0940409b1810.tar.gz | |
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.
........
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 36 |
1 files changed, 16 insertions, 20 deletions
diff --git a/configure.in b/configure.in index 1d13b18c17..2c0bf4f3f8 100644 --- a/configure.in +++ b/configure.in @@ -2774,27 +2774,23 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ [AC_MSG_RESULT(no) ]) -AC_MSG_CHECKING(for flock) -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 +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_LINK_IFELSE([AC_LANG_PROGRAM([[ - #include <sys/file.h> - ]], [[void *p = flock; 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) |