From: Martin v. Löwis <martin@v.loewis.de>
Date: Mon, 9 May 2011 05:41:32 +0000 (+0200)
Subject: merge 11347.
X-Git-Tag: v3.3.0a1~2349
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4e9da47d8fa9bf11267071596f24a1aeda3910a1;p=thirdparty%2FPython%2Fcpython.git

merge 11347.
---

4e9da47d8fa9bf11267071596f24a1aeda3910a1
diff --cc configure
index 4111aea6e287,a0c8ca0894f7..da4c9024bfa1
--- a/configure
+++ b/configure
@@@ -1,7 -1,7 +1,7 @@@
  #! /bin/sh
  # From configure.in Revision.
  # Guess values for system-dependent variables and create Makefiles.
- # Generated by GNU Autoconf 2.65 for python 3.3.
 -# Generated by GNU Autoconf 2.68 for python 3.2.
++# Generated by GNU Autoconf 2.68 for python 3.3.
  #
  # Report bugs to <http://bugs.python.org/>.
  #
@@@ -1508,10 -1521,10 +1518,10 @@@ f
  test -n "$ac_init_help" && exit $ac_status
  if $ac_init_version; then
    cat <<\_ACEOF
 -python configure 3.2
 +python configure 3.3
- generated by GNU Autoconf 2.65
+ generated by GNU Autoconf 2.68
  
- Copyright (C) 2009 Free Software Foundation, Inc.
+ Copyright (C) 2010 Free Software Foundation, Inc.
  This configure script is free software; the Free Software Foundation
  gives unlimited permission to copy, distribute and modify it.
  _ACEOF
@@@ -2336,8 -2352,8 +2349,8 @@@ cat >config.log <<_ACEO
  This file contains any messages produced by compilers while
  running configure, to aid debugging if configure makes a mistake.
  
 -It was created by python $as_me 3.2, which was
 +It was created by python $as_me 3.3, which was
- generated by GNU Autoconf 2.65.  Invocation command line was
+ generated by GNU Autoconf 2.68.  Invocation command line was
  
    $ $0 $@
  
@@@ -7658,54 -7779,9 +7688,54 @@@ $as_echo "$SHLIBS" >&6; 
  
  
  # checks for libraries
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sendfile in -lsendfile" >&5
 +$as_echo_n "checking for sendfile in -lsendfile... " >&6; }
- if test "${ac_cv_lib_sendfile_sendfile+set}" = set; then :
++if ${ac_cv_lib_sendfile_sendfile+:} false; then :
 +  $as_echo_n "(cached) " >&6
 +else
 +  ac_check_lib_save_LIBS=$LIBS
 +LIBS="-lsendfile  $LIBS"
 +cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 +/* end confdefs.h.  */
 +
 +/* Override any GCC internal prototype to avoid an error.
 +   Use char because int might match the return type of a GCC
 +   builtin and then its argument prototype would still apply.  */
 +#ifdef __cplusplus
 +extern "C"
 +#endif
 +char sendfile ();
 +int
 +main ()
 +{
 +return sendfile ();
 +  ;
 +  return 0;
 +}
 +_ACEOF
 +if ac_fn_c_try_link "$LINENO"; then :
 +  ac_cv_lib_sendfile_sendfile=yes
 +else
 +  ac_cv_lib_sendfile_sendfile=no
 +fi
 +rm -f core conftest.err conftest.$ac_objext \
 +    conftest$ac_exeext conftest.$ac_ext
 +LIBS=$ac_check_lib_save_LIBS
 +fi
 +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sendfile_sendfile" >&5
 +$as_echo "$ac_cv_lib_sendfile_sendfile" >&6; }
- if test "x$ac_cv_lib_sendfile_sendfile" = x""yes; then :
++if test "x$ac_cv_lib_sendfile_sendfile" = xyes; then :
 +  cat >>confdefs.h <<_ACEOF
 +#define HAVE_LIBSENDFILE 1
 +_ACEOF
 +
 +  LIBS="-lsendfile $LIBS"
 +
 +fi
 +
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
  $as_echo_n "checking for dlopen in -ldl... " >&6; }
- if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
+ if ${ac_cv_lib_dl_dlopen+:} false; then :
    $as_echo_n "(cached) " >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@@ -13759,8 -13843,12 +13803,8 @@@ $as_echo "#define HAVE_BROKEN_PIPE_BUF 
  esac
  
  
 -case $ac_sys_system in
 -  OSF*) as_fn_error $? "OSF* systems are deprecated unless somebody volunteers. Check http://bugs.python.org/issue8606" "$LINENO" 5 ;;
 -esac
 -
  ac_fn_c_check_func "$LINENO" "pipe2" "ac_cv_func_pipe2"
- if test "x$ac_cv_func_pipe2" = x""yes; then :
+ if test "x$ac_cv_func_pipe2" = xyes; then :
  
  $as_echo "#define HAVE_PIPE2 1" >>confdefs.h
  
@@@ -14297,8 -14398,8 +14354,8 @@@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wr
  # report actual input values of CONFIG_FILES etc. instead of their
  # values after options handling.
  ac_log="
 -This file was extended by python $as_me 3.2, which was
 +This file was extended by python $as_me 3.3, which was
- generated by GNU Autoconf 2.65.  Invocation command line was
+ generated by GNU Autoconf 2.68.  Invocation command line was
  
    CONFIG_FILES    = $CONFIG_FILES
    CONFIG_HEADERS  = $CONFIG_HEADERS
@@@ -14359,11 -14460,11 +14416,11 @@@ _ACEO
  cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
  ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
  ac_cs_version="\\
 -python config.status 3.2
 +python config.status 3.3
- configured by $0, generated by GNU Autoconf 2.65,
+ configured by $0, generated by GNU Autoconf 2.68,
    with options \\"\$ac_cs_config\\"
  
- Copyright (C) 2009 Free Software Foundation, Inc.
+ Copyright (C) 2010 Free Software Foundation, Inc.
  This config.status script is free software; the Free Software Foundation
  gives unlimited permission to copy, distribute and modify it."