[Python-checkins] python/dist/src configure,1.387,1.388 configure.in,1.398,1.399 pyconfig.h.in,1.75,1.76
loewis@users.sourceforge.net
loewis@users.sourceforge.net
Sun, 30 Mar 2003 09:23:51 -0800
Update of /cvsroot/python/python/dist/src
In directory sc8-pr-cvs1:/tmp/cvs-serv15696
Modified Files:
configure configure.in pyconfig.h.in
Log Message:
Patch #650412: Check whether the address of flock and getpagesize
can be taken, and use _SC_PAGE_SIZE if getpagesize is not available.
Index: configure
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure,v
retrieving revision 1.387
retrieving revision 1.388
diff -C2 -d -r1.387 -r1.388
*** configure 29 Mar 2003 22:07:47 -0000 1.387
--- configure 30 Mar 2003 17:23:46 -0000 1.388
***************
*** 1,4 ****
#! /bin/sh
! # From configure.in Revision: 1.397 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.53 for python 2.3.
--- 1,4 ----
#! /bin/sh
! # From configure.in Revision: 1.398 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.53 for python 2.3.
***************
*** 909,913 ****
# absolute.
ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
! ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd`
ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
--- 909,913 ----
# absolute.
ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
! ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
***************
*** 12108,12114 ****
-
for ac_func in alarm chown clock confstr ctermid execv \
! fchdir flock fork fsync fdatasync fpathconf ftime ftruncate \
gai_strerror getgroups getlogin getloadavg getpeername getpgid getpid \
getpriority getpwent getwd \
--- 12108,12113 ----
for ac_func in alarm chown clock confstr ctermid execv \
! fchdir fork fsync fdatasync fpathconf ftime ftruncate \
gai_strerror getgroups getlogin getloadavg getpeername getpgid getpid \
getpriority getpwent getwd \
***************
*** 12397,12400 ****
--- 12396,12501 ----
rm -f conftest.$ac_objext conftest.$ac_ext
+ echo "$as_me:$LINENO: checking for flock" >&5
+ echo $ECHO_N "checking for flock... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ #include "confdefs.h"
+
+ #include "confdefs.h"
+ #include <sys/file.h>
+
+ #ifdef F77_DUMMY_MAIN
+ # ifdef __cplusplus
+ extern "C"
+ # endif
+ int F77_DUMMY_MAIN() { return 1; }
+ #endif
+ int
+ main ()
+ {
+ void* p = flock
+ ;
+ return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_FLOCK 1
+ _ACEOF
+
+ echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+ echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6
+
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+
+ echo "$as_me:$LINENO: checking for getpagesize" >&5
+ echo $ECHO_N "checking for getpagesize... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+ #line $LINENO "configure"
+ #include "confdefs.h"
+
+ #include "confdefs.h"
+ #include <unistd.h>
+
+ #ifdef F77_DUMMY_MAIN
+ # ifdef __cplusplus
+ extern "C"
+ # endif
+ int F77_DUMMY_MAIN() { return 1; }
+ #endif
+ int
+ main ()
+ {
+ void* p = getpagesize
+ ;
+ return 0;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+
+ cat >>confdefs.h <<\_ACEOF
+ #define HAVE_GETPAGESIZE 1
+ _ACEOF
+
+ echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+ echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6
+
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+
echo "$as_me:$LINENO: checking for setgroups" >&5
echo $ECHO_N "checking for setgroups... $ECHO_C" >&6
***************
*** 17723,17727 ****
# absolute.
ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
! ac_abs_top_builddir=`cd "$ac_dir" && cd $ac_top_builddir && pwd`
ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
--- 17824,17828 ----
# absolute.
ac_abs_builddir=`cd "$ac_dir" && cd $ac_builddir && pwd`
! ac_abs_top_builddir=`cd "$ac_dir" && cd ${ac_top_builddir}. && pwd`
ac_abs_srcdir=`cd "$ac_dir" && cd $ac_srcdir && pwd`
ac_abs_top_srcdir=`cd "$ac_dir" && cd $ac_top_srcdir && pwd`
Index: configure.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure.in,v
retrieving revision 1.398
retrieving revision 1.399
diff -C2 -d -r1.398 -r1.399
*** configure.in 29 Mar 2003 22:07:47 -0000 1.398
--- configure.in 30 Mar 2003 17:23:49 -0000 1.399
***************
*** 1850,1854 ****
# checks for library functions
AC_CHECK_FUNCS(alarm chown clock confstr ctermid execv \
! fchdir flock fork fsync fdatasync fpathconf ftime ftruncate \
gai_strerror getgroups getlogin getloadavg getpeername getpgid getpid \
getpriority getpwent getwd \
--- 1850,1854 ----
# checks for library functions
AC_CHECK_FUNCS(alarm chown clock confstr ctermid execv \
! fchdir fork fsync fdatasync fpathconf ftime ftruncate \
gai_strerror getgroups getlogin getloadavg getpeername getpgid getpid \
getpriority getpwent getwd \
***************
*** 1895,1898 ****
--- 1895,1918 ----
], void* p = ctermid_r,
AC_DEFINE(HAVE_CTERMID_R, 1, Define if you have the 'ctermid_r' function.)
+ AC_MSG_RESULT(yes),
+ AC_MSG_RESULT(no)
+ )
+
+ AC_MSG_CHECKING(for flock)
+ 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.)
+ AC_MSG_RESULT(yes),
+ AC_MSG_RESULT(no)
+ )
+
+ AC_MSG_CHECKING(for getpagesize)
+ AC_TRY_COMPILE([
+ #include "confdefs.h"
+ #include <unistd.h>
+ ], void* p = getpagesize,
+ AC_DEFINE(HAVE_GETPAGESIZE, 1, Define if you have the 'getpagesize' function.)
AC_MSG_RESULT(yes),
AC_MSG_RESULT(no)
Index: pyconfig.h.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/pyconfig.h.in,v
retrieving revision 1.75
retrieving revision 1.76
diff -C2 -d -r1.75 -r1.76
*** pyconfig.h.in 28 Mar 2003 18:37:01 -0000 1.75
--- pyconfig.h.in 30 Mar 2003 17:23:49 -0000 1.76
***************
*** 103,107 ****
#undef HAVE_FDATASYNC
! /* Define to 1 if you have the `flock' function. */
#undef HAVE_FLOCK
--- 103,107 ----
#undef HAVE_FDATASYNC
! /* Define if you have the 'flock' function. */
#undef HAVE_FLOCK
***************
*** 178,181 ****
--- 178,184 ----
#undef HAVE_GETNAMEINFO
+ /* Define if you have the 'getpagesize' function. */
+ #undef HAVE_GETPAGESIZE
+
/* Define to 1 if you have the `getpeername' function. */
#undef HAVE_GETPEERNAME
***************
*** 682,688 ****
/* Define if setpgrp() must be called as setpgrp(0, 0). */
#undef SETPGRP_HAVE_ARG
-
- /* Define to 1 if the `setpgrp' function takes no argument. */
- #undef SETPGRP_VOID
/* Define if i>>j for signed int i does not extend the sign bit when i < 0 */
--- 685,688 ----