traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Followup to #4026: better patch for flock detection.

This commit is contained in:
Antoine Pitrou 2010-09-10 18:39:00 +00:00
parent 66d00ad2ea
commit a4e4ae27fc
2 changed files with 42 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
configure vendored
View File

@ -1,5 +1,5 @@
#! /bin/sh #! /bin/sh
# From configure.in Revision: 84512 . # From configure.in Revision: 84584 .
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.65 for python 3.2. # Generated by GNU Autoconf 2.65 for python 3.2.
# #
@ -9586,56 +9586,45 @@ $as_echo "no" >&6; }
fi fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for flock" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for flock declaration" >&5
$as_echo_n "checking for flock... " >&6; } $as_echo_n "checking for flock declaration... " >&6; }
have_flock=no if test "${ac_cv_flock_decl+set}" = set; then :
cat confdefs.h - <<_ACEOF >conftest.$ac_ext $as_echo_n "(cached) " >&6
else
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */ /* end confdefs.h. */
#include <sys/file.h> #include <sys/file.h>
int int
main () main ()
{ {
void* p = flock void* p = flock
; ;
return 0; return 0;
} }
_ACEOF _ACEOF
if ac_fn_c_try_compile "$LINENO"; then : if ac_fn_c_try_compile "$LINENO"; then :
ac_cv_flock_decl=yes
$as_echo "#define HAVE_FLOCK 1" >>confdefs.h else
ac_cv_flock_decl=no
have_flock=yes
fi fi
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_flock" >&5
$as_echo "$have_flock" >&6; }
if test "$have_flock" = yes ; then fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if flock requires additional libraries." >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_flock_decl" >&5
$as_echo_n "checking if flock requires additional libraries.... " >&6; } $as_echo "$ac_cv_flock_decl" >&6; }
cat confdefs.h - <<_ACEOF >conftest.$ac_ext if test "x${ac_cv_flock_decl}" = xyes; then
/* end confdefs.h. */ for ac_func in flock
do :
#include <sys/file.h> ac_fn_c_check_func "$LINENO" "flock" "ac_cv_func_flock"
if test "x$ac_cv_func_flock" = x""yes; then :
int cat >>confdefs.h <<_ACEOF
main () #define HAVE_FLOCK 1
{
void *p = flock; flock(0, 0)
;
return 0;
}
_ACEOF _ACEOF
if ac_fn_c_try_link "$LINENO"; then :
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
else else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for flock in -lbsd" >&5
$as_echo "yes" >&6; }
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for flock in -lbsd" >&5
$as_echo_n "checking for flock in -lbsd... " >&6; } $as_echo_n "checking for flock in -lbsd... " >&6; }
if test "${ac_cv_lib_bsd_flock+set}" = set; then : if test "${ac_cv_lib_bsd_flock+set}" = set; then :
$as_echo_n "(cached) " >&6 $as_echo_n "(cached) " >&6
@ -9672,6 +9661,7 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_flock" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_flock" >&5
$as_echo "$ac_cv_lib_bsd_flock" >&6; } $as_echo "$ac_cv_lib_bsd_flock" >&6; }
if test "x$ac_cv_lib_bsd_flock" = x""yes; then : if test "x$ac_cv_lib_bsd_flock" = x""yes; then :
$as_echo "#define HAVE_FLOCK 1" >>confdefs.h
$as_echo "#define FLOCK_NEEDS_LIBBSD 1" >>confdefs.h $as_echo "#define FLOCK_NEEDS_LIBBSD 1" >>confdefs.h
@ -9681,8 +9671,8 @@ fi
fi fi
rm -f core conftest.err conftest.$ac_objext \ done
conftest$ac_exeext conftest.$ac_ext
fi fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for getpagesize" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getpagesize" >&5

36
configure.in
View File

@ -2641,27 +2641,23 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
[AC_MSG_RESULT(no) [AC_MSG_RESULT(no)
]) ])
AC_MSG_CHECKING(for flock) AC_CACHE_CHECK([for flock declaration], [ac_cv_flock_decl],
have_flock=no [AC_COMPILE_IFELSE(
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ [AC_LANG_PROGRAM(
#include <sys/file.h> [#include <sys/file.h>],
]], [[void* p = flock]])], [void* p = flock]
[AC_DEFINE(HAVE_FLOCK, 1, Define if you have the 'flock' function.) )],
have_flock=yes [ac_cv_flock_decl=yes],
[ac_cv_flock_decl=no]
)
]) ])
AC_MSG_RESULT($have_flock) if test "x${ac_cv_flock_decl}" = xyes; then
AC_CHECK_FUNCS(flock,,
if test "$have_flock" = yes ; then AC_CHECK_LIB(bsd,flock,
AC_MSG_CHECKING(if flock requires additional libraries.) [AC_DEFINE(HAVE_FLOCK)
AC_LINK_IFELSE([AC_LANG_PROGRAM([[ AC_DEFINE(FLOCK_NEEDS_LIBBSD, 1, Define if flock needs to be linked with bsd library.)
#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.)
])
])
fi fi
AC_MSG_CHECKING(for getpagesize) AC_MSG_CHECKING(for getpagesize)