From 802cd995efd1a3aef97d17895fe4115067195aaf Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@dv9000.openelec.tv>
Date: Mon, 18 May 2009 04:11:55 +0200
Subject: [PATCH] update to Python-2.6.2

---
 packages/graphics/libdrm/nouveau-updates.diff |   26 +
 ...ff => 002-configure-python-2.6.2-0.6.diff} | 2294 ++++++++---------
 packages/lang/Python/url                      |    2 +-
 packages/x11/driver/xf86-video-intel/build    |    4 +-
 scripts/build                                 |    4 +-
 5 files changed, 1151 insertions(+), 1179 deletions(-)
 create mode 100644 packages/graphics/libdrm/nouveau-updates.diff
 rename packages/lang/Python/patches/{002-configure-python-2.6.1-0.6.diff => 002-configure-python-2.6.2-0.6.diff} (96%)

diff --git a/packages/graphics/libdrm/nouveau-updates.diff b/packages/graphics/libdrm/nouveau-updates.diff
new file mode 100644
index 0000000000..606b3df898
--- /dev/null
+++ b/packages/graphics/libdrm/nouveau-updates.diff
@@ -0,0 +1,26 @@
+diff --git a/libdrm/nouveau/nouveau_bo.c b/libdrm/nouveau/nouveau_bo.c
+index 023c6be..66466e3 100644
+--- a/libdrm/nouveau/nouveau_bo.c
++++ b/libdrm/nouveau/nouveau_bo.c
+@@ -404,7 +404,8 @@ nouveau_bo_handle_ref(struct nouveau_device *dev, uint32_t handle,
+ 		nvbo->size = req.size;
+ 		nvbo->handle = req.handle;
+ 	}
+- 
++
++	nvbo->base.handle = nvbo->handle;
+ 	return 0;
+ } 
+ 
+diff --git a/libdrm/nouveau/nouveau_dma.c b/libdrm/nouveau/nouveau_dma.c
+index 23da64b..b084f70 100644
+--- a/libdrm/nouveau/nouveau_dma.c
++++ b/libdrm/nouveau/nouveau_dma.c
+@@ -41,6 +41,7 @@ WRITE_PUT(struct nouveau_channel_priv *nvchan, uint32_t val)
+ 	volatile int dum;
+ 
+ 	NOUVEAU_DMA_BARRIER;
++	dum = nvchan->pushbuf[0];
+ 	dum = READ_GET(nvchan);
+ 
+ 	*nvchan->put = put;
diff --git a/packages/lang/Python/patches/002-configure-python-2.6.1-0.6.diff b/packages/lang/Python/patches/002-configure-python-2.6.2-0.6.diff
similarity index 96%
rename from packages/lang/Python/patches/002-configure-python-2.6.1-0.6.diff
rename to packages/lang/Python/patches/002-configure-python-2.6.2-0.6.diff
index c549de399b..d46289ff2c 100644
--- a/packages/lang/Python/patches/002-configure-python-2.6.1-0.6.diff
+++ b/packages/lang/Python/patches/002-configure-python-2.6.2-0.6.diff
@@ -1,9 +1,10 @@
-diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
---- Python-2.6.1/configure	2008-11-16 18:57:10.000000000 +0100
-+++ Python-2.6.1.patch/configure	2009-02-17 14:34:23.000000000 +0100
+diff -Naur Python-2.6.2/configure Python-2.6.2.patch/configure
+--- Python-2.6.2/configure	2009-03-30 19:56:14.000000000 +0200
++++ Python-2.6.2.patch/configure	2009-05-18 03:56:24.887938839 +0200
 @@ -1,12 +1,12 @@
  #! /bin/sh
- # From configure.in Revision: 67229 .
+-# From configure.in Revision: 68599 .
++# From configure.in Revision: 70731 .
  # Guess values for system-dependent variables and create Makefiles.
 -# Generated by GNU Autoconf 2.61 for python 2.6.
 +# Generated by GNU Autoconf 2.63 for python 2.6.
@@ -1098,7 +1099,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  
  fi
  
-@@ -2037,8 +2157,8 @@
+@@ -2039,8 +2159,8 @@
  ##
  # Set name for machine-dependent library files
  
@@ -1109,7 +1110,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  if test -z "$MACHDEP"
  then
  	ac_sys_system=`uname -s`
-@@ -2201,14 +2321,14 @@
+@@ -2203,14 +2323,14 @@
          LDFLAGS="$SGI_ABI $LDFLAGS"
          MACHDEP=`echo "${MACHDEP}${SGI_ABI}" | sed 's/ *//g'`
  fi
@@ -1128,7 +1129,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  if test -z "$EXTRAPLATDIR"
  then
  	case $MACHDEP in
-@@ -2222,8 +2342,8 @@
+@@ -2224,8 +2344,8 @@
  		;;
  	esac
  fi
@@ -1139,7 +1140,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  
  # Record the configure-time value of MACOSX_DEPLOYMENT_TARGET,
  # it may influence the way we can build extensions, so distutils
-@@ -2233,11 +2353,11 @@
+@@ -2235,11 +2355,11 @@
  CONFIGURE_MACOSX_DEPLOYMENT_TARGET=
  EXPORT_MACOSX_DEPLOYMENT_TARGET='#'
  
@@ -1155,7 +1156,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  
  # checks for alternative programs
  
-@@ -2249,8 +2369,8 @@
+@@ -2251,8 +2371,8 @@
  
  # XXX shouldn't some/most/all of this code be merged with the stuff later
  # on that fiddles with OPT and BASECFLAGS?
@@ -1166,7 +1167,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  
  # Check whether --with-gcc was given.
  if test "${with_gcc+set}" = set; then
-@@ -2283,8 +2403,8 @@
+@@ -2285,8 +2405,8 @@
  			OPT="$OPT -O"
  			;;
  		*)
@@ -1177,7 +1178,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
     { (exit 1); exit 1; }; }
  			;;
  		esac
-@@ -2298,15 +2418,15 @@
+@@ -2300,15 +2420,15 @@
  	esac
  fi
  
@@ -1197,7 +1198,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  (it is also a good idea to do 'make clean' before compiling)" >&2;}
     { (exit 1); exit 1; }; }
  fi
-@@ -2319,10 +2439,10 @@
+@@ -2321,10 +2441,10 @@
  if test -n "$ac_tool_prefix"; then
    # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
  set dummy ${ac_tool_prefix}gcc; ac_word=$2
@@ -1211,7 +1212,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    if test -n "$CC"; then
    ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -2335,7 +2455,7 @@
+@@ -2337,7 +2457,7 @@
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_CC="${ac_tool_prefix}gcc"
@@ -1220,7 +1221,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
      break 2
    fi
  done
-@@ -2346,11 +2466,11 @@
+@@ -2348,11 +2468,11 @@
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
@@ -1236,7 +1237,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  fi
  
  
-@@ -2359,10 +2479,10 @@
+@@ -2361,10 +2481,10 @@
    ac_ct_CC=$CC
    # Extract the first word of "gcc", so it can be a program name with args.
  set dummy gcc; ac_word=$2
@@ -1250,7 +1251,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    if test -n "$ac_ct_CC"; then
    ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-@@ -2375,7 +2495,7 @@
+@@ -2377,7 +2497,7 @@
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_ac_ct_CC="gcc"
@@ -1259,7 +1260,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
      break 2
    fi
  done
-@@ -2386,11 +2506,11 @@
+@@ -2388,11 +2508,11 @@
  fi
  ac_ct_CC=$ac_cv_prog_ac_ct_CC
  if test -n "$ac_ct_CC"; then
@@ -1275,7 +1276,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  fi
  
    if test "x$ac_ct_CC" = x; then
-@@ -2398,12 +2518,8 @@
+@@ -2400,12 +2520,8 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -1290,7 +1291,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  ac_tool_warned=yes ;;
  esac
      CC=$ac_ct_CC
-@@ -2416,10 +2532,10 @@
+@@ -2418,10 +2534,10 @@
            if test -n "$ac_tool_prefix"; then
      # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
  set dummy ${ac_tool_prefix}cc; ac_word=$2
@@ -1304,7 +1305,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    if test -n "$CC"; then
    ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -2432,7 +2548,7 @@
+@@ -2434,7 +2550,7 @@
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_CC="${ac_tool_prefix}cc"
@@ -1313,7 +1314,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
      break 2
    fi
  done
-@@ -2443,11 +2559,11 @@
+@@ -2445,11 +2561,11 @@
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
@@ -1329,7 +1330,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  fi
  
  
-@@ -2456,10 +2572,10 @@
+@@ -2458,10 +2574,10 @@
  if test -z "$CC"; then
    # Extract the first word of "cc", so it can be a program name with args.
  set dummy cc; ac_word=$2
@@ -1343,7 +1344,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    if test -n "$CC"; then
    ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -2477,7 +2593,7 @@
+@@ -2479,7 +2595,7 @@
         continue
       fi
      ac_cv_prog_CC="cc"
@@ -1352,7 +1353,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
      break 2
    fi
  done
-@@ -2500,11 +2616,11 @@
+@@ -2502,11 +2618,11 @@
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
@@ -1368,7 +1369,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  fi
  
  
-@@ -2515,10 +2631,10 @@
+@@ -2517,10 +2633,10 @@
    do
      # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
  set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -1382,7 +1383,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    if test -n "$CC"; then
    ac_cv_prog_CC="$CC" # Let the user override the test.
-@@ -2531,7 +2647,7 @@
+@@ -2533,7 +2649,7 @@
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
@@ -1391,7 +1392,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
      break 2
    fi
  done
-@@ -2542,11 +2658,11 @@
+@@ -2544,11 +2660,11 @@
  fi
  CC=$ac_cv_prog_CC
  if test -n "$CC"; then
@@ -1407,7 +1408,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  fi
  
  
-@@ -2559,10 +2675,10 @@
+@@ -2561,10 +2677,10 @@
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
@@ -1421,7 +1422,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    if test -n "$ac_ct_CC"; then
    ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-@@ -2575,7 +2691,7 @@
+@@ -2577,7 +2693,7 @@
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_ac_ct_CC="$ac_prog"
@@ -1430,7 +1431,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
      break 2
    fi
  done
-@@ -2586,11 +2702,11 @@
+@@ -2588,11 +2704,11 @@
  fi
  ac_ct_CC=$ac_cv_prog_ac_ct_CC
  if test -n "$ac_ct_CC"; then
@@ -1446,7 +1447,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  fi
  
  
-@@ -2602,12 +2718,8 @@
+@@ -2604,12 +2720,8 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -1461,7 +1462,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  ac_tool_warned=yes ;;
  esac
      CC=$ac_ct_CC
-@@ -2617,44 +2729,50 @@
+@@ -2619,44 +2731,50 @@
  fi
  
  
@@ -1523,7 +1524,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    (exit $ac_status); }
  
  cat >conftest.$ac_ext <<_ACEOF
-@@ -2673,27 +2791,22 @@
+@@ -2675,27 +2793,22 @@
  }
  _ACEOF
  ac_clean_files_save=$ac_clean_files
@@ -1560,7 +1561,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
      * ) ac_rmfiles="$ac_rmfiles $ac_file";;
    esac
  done
-@@ -2704,10 +2817,11 @@
+@@ -2706,10 +2819,11 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -1574,7 +1575,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    (exit $ac_status); }; then
    # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
  # So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
-@@ -2718,7 +2832,7 @@
+@@ -2720,7 +2834,7 @@
  do
    test -f "$ac_file" || continue
    case $ac_file in
@@ -1583,7 +1584,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  	;;
      [ab].out )
  	# We found the default executable, but exeext='' is most
-@@ -2745,25 +2859,27 @@
+@@ -2747,25 +2861,27 @@
    ac_file=''
  fi
  
@@ -1619,7 +1620,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
  # If not cross compiling, check that we can run a simple program.
  if test "$cross_compiling" != yes; then
-@@ -2772,49 +2888,53 @@
+@@ -2774,49 +2890,53 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -1689,7 +1690,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    (exit $ac_status); }; then
    # If both `conftest.exe' and `conftest' are `present' (well, observable)
  # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
-@@ -2823,31 +2943,33 @@
+@@ -2825,31 +2945,33 @@
  for ac_file in conftest.exe conftest conftest.*; do
    test -f "$ac_file" || continue
    case $ac_file in
@@ -1732,7 +1733,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -2870,40 +2992,43 @@
+@@ -2872,40 +2994,43 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -1788,7 +1789,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -2929,20 +3054,21 @@
+@@ -2931,20 +3056,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -1813,7 +1814,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_compiler_gnu=no
-@@ -2952,15 +3078,19 @@
+@@ -2954,15 +3080,19 @@
  ac_cv_c_compiler_gnu=$ac_compiler_gnu
  
  fi
@@ -1839,7 +1840,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    ac_save_c_werror_flag=$ac_c_werror_flag
     ac_c_werror_flag=yes
-@@ -2987,20 +3117,21 @@
+@@ -2989,20 +3119,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -1864,7 +1865,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	CFLAGS=""
-@@ -3025,20 +3156,21 @@
+@@ -3027,20 +3158,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -1889,7 +1890,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_c_werror_flag=$ac_save_c_werror_flag
-@@ -3064,20 +3196,21 @@
+@@ -3066,20 +3198,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -1914,7 +1915,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
-@@ -3092,8 +3225,8 @@
+@@ -3094,8 +3227,8 @@
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
     ac_c_werror_flag=$ac_save_c_werror_flag
  fi
@@ -1925,7 +1926,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  if test "$ac_test_CFLAGS" = set; then
    CFLAGS=$ac_save_CFLAGS
  elif test $ac_cv_prog_cc_g = yes; then
-@@ -3109,10 +3242,10 @@
+@@ -3111,10 +3244,10 @@
      CFLAGS=
    fi
  fi
@@ -1939,7 +1940,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    ac_cv_prog_cc_c89=no
  ac_save_CC=$CC
-@@ -3183,20 +3316,21 @@
+@@ -3185,20 +3318,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -1964,7 +1965,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
-@@ -3212,15 +3346,15 @@
+@@ -3214,15 +3348,15 @@
  # AC_CACHE_VAL
  case "x$ac_cv_prog_cc_c89" in
    x)
@@ -1986,7 +1987,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  esac
  
  
-@@ -3233,8 +3367,8 @@
+@@ -3235,8 +3369,8 @@
  
  
  
@@ -1997,7 +1998,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  
  # Check whether --with-cxx_main was given.
  if test "${with_cxx_main+set}" = set; then
-@@ -3259,8 +3393,8 @@
+@@ -3261,8 +3395,8 @@
  
  fi
  
@@ -2008,7 +2009,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  
  preset_cxx="$CXX"
  if test -z "$CXX"
-@@ -3268,10 +3402,10 @@
+@@ -3270,10 +3404,10 @@
          case "$CC" in
          gcc)    # Extract the first word of "g++", so it can be a program name with args.
  set dummy g++; ac_word=$2
@@ -2022,7 +2023,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    case $CXX in
    [\\/]* | ?:[\\/]*)
-@@ -3286,7 +3420,7 @@
+@@ -3288,7 +3422,7 @@
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_path_CXX="$as_dir/$ac_word$ac_exec_ext"
@@ -2031,7 +2032,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
      break 2
    fi
  done
-@@ -3299,20 +3433,20 @@
+@@ -3301,20 +3435,20 @@
  fi
  CXX=$ac_cv_path_CXX
  if test -n "$CXX"; then
@@ -2059,7 +2060,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    case $CXX in
    [\\/]* | ?:[\\/]*)
-@@ -3327,7 +3461,7 @@
+@@ -3329,7 +3463,7 @@
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_path_CXX="$as_dir/$ac_word$ac_exec_ext"
@@ -2068,7 +2069,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
      break 2
    fi
  done
-@@ -3340,11 +3474,11 @@
+@@ -3342,11 +3476,11 @@
  fi
  CXX=$ac_cv_path_CXX
  if test -n "$CXX"; then
@@ -2084,7 +2085,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  fi
  
   ;;
-@@ -3360,10 +3494,10 @@
+@@ -3362,10 +3496,10 @@
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
@@ -2098,7 +2099,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    if test -n "$CXX"; then
    ac_cv_prog_CXX="$CXX" # Let the user override the test.
-@@ -3376,7 +3510,7 @@
+@@ -3378,7 +3512,7 @@
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_CXX="$ac_prog"
@@ -2107,7 +2108,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
      break 2
    fi
  done
-@@ -3387,11 +3521,11 @@
+@@ -3389,11 +3523,11 @@
  fi
  CXX=$ac_cv_prog_CXX
  if test -n "$CXX"; then
@@ -2123,7 +2124,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  fi
  
  
-@@ -3406,12 +3540,12 @@
+@@ -3408,12 +3542,12 @@
  fi
  if test "$preset_cxx" != "$CXX"
  then
@@ -2138,7 +2139,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  
    By default, distutils will build C++ extension modules with \"$CXX\".
    If this is not intended, then set CXX on the configure command line.
-@@ -3426,15 +3560,15 @@
+@@ -3428,15 +3562,15 @@
  ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
  ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
@@ -2157,7 +2158,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
        # Double quotes because CPP needs to be expanded
      for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-@@ -3466,20 +3600,21 @@
+@@ -3468,20 +3602,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -2182,7 +2183,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
    # Broken: fails on valid input.
-@@ -3503,13 +3638,14 @@
+@@ -3505,13 +3640,14 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -2199,7 +2200,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    (exit $ac_status); } >/dev/null && {
  	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-@@ -3517,7 +3653,7 @@
+@@ -3519,7 +3655,7 @@
    # Broken: success on invalid input.
  continue
  else
@@ -2208,7 +2209,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
    # Passes both tests.
-@@ -3542,8 +3678,8 @@
+@@ -3544,8 +3680,8 @@
  else
    ac_cv_prog_CPP=$CPP
  fi
@@ -2219,7 +2220,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  ac_preproc_ok=false
  for ac_c_preproc_warn_flag in '' yes
  do
-@@ -3571,20 +3707,21 @@
+@@ -3573,20 +3709,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -2244,7 +2245,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
    # Broken: fails on valid input.
-@@ -3608,13 +3745,14 @@
+@@ -3610,13 +3747,14 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -2261,7 +2262,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    (exit $ac_status); } >/dev/null && {
  	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-@@ -3622,7 +3760,7 @@
+@@ -3624,7 +3762,7 @@
    # Broken: success on invalid input.
  continue
  else
@@ -2270,7 +2271,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
    # Passes both tests.
-@@ -3638,11 +3776,13 @@
+@@ -3640,11 +3778,13 @@
  if $ac_preproc_ok; then
    :
  else
@@ -2287,21 +2288,21 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  fi
  
  ac_ext=c
-@@ -3652,42 +3792,37 @@
+@@ -3654,42 +3794,37 @@
  ac_compiler_gnu=$ac_cv_c_compiler_gnu
  
  
 -{ echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
 -echo $ECHO_N "checking for grep that handles long lines and -e... $ECHO_C" >&6; }
--if test "${ac_cv_path_GREP+set}" = set; then
++{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
++$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
+ if test "${ac_cv_path_GREP+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 -else
 -  # Extract the first word of "grep ggrep" to use in msg output
 -if test -z "$GREP"; then
 -set dummy grep ggrep; ac_prog_name=$2
-+{ $as_echo "$as_me:$LINENO: checking for grep that handles long lines and -e" >&5
-+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
- if test "${ac_cv_path_GREP+set}" = set; then
+-if test "${ac_cv_path_GREP+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 +  $as_echo_n "(cached) " >&6
  else
@@ -2342,7 +2343,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
      "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
      diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
      ac_count=`expr $ac_count + 1`
-@@ -3702,74 +3837,60 @@
+@@ -3704,74 +3839,60 @@
    rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
  esac
  
@@ -2437,7 +2438,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
      "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
      diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
      ac_count=`expr $ac_count + 1`
-@@ -3784,63 +3905,510 @@
+@@ -3786,63 +3907,510 @@
    rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
  esac
  
@@ -2984,7 +2985,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  
  
  
-@@ -3853,8 +4421,8 @@
+@@ -3855,8 +4423,8 @@
  esac
  
  
@@ -2995,7 +2996,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  
  # Check whether --with-suffix was given.
  if test "${with_suffix+set}" = set; then
-@@ -3866,26 +4434,26 @@
+@@ -3868,26 +4436,26 @@
  	esac
  fi
  
@@ -3030,7 +3031,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  	BUILDEXEEXT=$EXEEXT
  fi
  rmdir CaseSensitiveTestDir
-@@ -3918,14 +4486,14 @@
+@@ -3920,14 +4488,14 @@
  
  
  
@@ -3049,7 +3050,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  
  # LDLIBRARY is the name of the library to link against (as opposed to the
  # name of the library into which to insert object files). BLDLIBRARY is also
-@@ -3960,8 +4528,8 @@
+@@ -3962,8 +4530,8 @@
  # This is altered for AIX in order to build the export list before
  # linking.
  
@@ -3060,7 +3061,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  if test -z "$LINKCC"
  then
  	LINKCC='$(PURIFY) $(MAINCC)'
-@@ -3981,11 +4549,11 @@
+@@ -3983,11 +4551,11 @@
  	   LINKCC=qcc;;
  	esac
  fi
@@ -3076,7 +3077,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  # Check whether --enable-shared was given.
  if test "${enable_shared+set}" = set; then
    enableval=$enable_shared;
-@@ -4001,11 +4569,11 @@
+@@ -4003,11 +4571,11 @@
      enable_shared="no";;
    esac
  fi
@@ -3092,7 +3093,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  # Check whether --enable-profiling was given.
  if test "${enable_profiling+set}" = set; then
    enableval=$enable_profiling; ac_save_cc="$CC"
-@@ -4027,29 +4595,32 @@
+@@ -4029,29 +4597,32 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -3131,7 +3132,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  
-@@ -4057,8 +4628,8 @@
+@@ -4059,8 +4630,8 @@
   CC="$ac_save_cc"
  fi
  
@@ -3142,7 +3143,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  
  case "$ac_enable_profiling" in
      "yes")
-@@ -4067,8 +4638,8 @@
+@@ -4069,8 +4640,8 @@
      ;;
  esac
  
@@ -3153,7 +3154,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  
  # MacOSX framework builds need more magic. LDLIBRARY is the dynamic
  # library that we build, but we do not want to link against it (we
-@@ -4149,16 +4720,16 @@
+@@ -4157,16 +4728,16 @@
    esac
  fi
  
@@ -3175,7 +3176,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    if test -n "$RANLIB"; then
    ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-@@ -4171,7 +4742,7 @@
+@@ -4179,7 +4750,7 @@
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
@@ -3184,7 +3185,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
      break 2
    fi
  done
-@@ -4182,11 +4753,11 @@
+@@ -4190,11 +4761,11 @@
  fi
  RANLIB=$ac_cv_prog_RANLIB
  if test -n "$RANLIB"; then
@@ -3200,7 +3201,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  fi
  
  
-@@ -4195,10 +4766,10 @@
+@@ -4203,10 +4774,10 @@
    ac_ct_RANLIB=$RANLIB
    # Extract the first word of "ranlib", so it can be a program name with args.
  set dummy ranlib; ac_word=$2
@@ -3214,7 +3215,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    if test -n "$ac_ct_RANLIB"; then
    ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-@@ -4211,7 +4782,7 @@
+@@ -4219,7 +4790,7 @@
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_ac_ct_RANLIB="ranlib"
@@ -3223,7 +3224,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
      break 2
    fi
  done
-@@ -4222,11 +4793,11 @@
+@@ -4230,11 +4801,11 @@
  fi
  ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
  if test -n "$ac_ct_RANLIB"; then
@@ -3239,7 +3240,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  fi
  
    if test "x$ac_ct_RANLIB" = x; then
-@@ -4234,12 +4805,8 @@
+@@ -4242,12 +4813,8 @@
    else
      case $cross_compiling:$ac_tool_warned in
  yes:)
@@ -3254,7 +3255,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  ac_tool_warned=yes ;;
  esac
      RANLIB=$ac_ct_RANLIB
-@@ -4253,10 +4820,10 @@
+@@ -4261,10 +4828,10 @@
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
@@ -3268,7 +3269,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    if test -n "$AR"; then
    ac_cv_prog_AR="$AR" # Let the user override the test.
-@@ -4269,7 +4836,7 @@
+@@ -4277,7 +4844,7 @@
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_AR="$ac_prog"
@@ -3277,7 +3278,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
      break 2
    fi
  done
-@@ -4280,11 +4847,11 @@
+@@ -4288,11 +4855,11 @@
  fi
  AR=$ac_cv_prog_AR
  if test -n "$AR"; then
@@ -3293,7 +3294,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  fi
  
  
-@@ -4296,10 +4863,10 @@
+@@ -4304,10 +4871,10 @@
  
  # Extract the first word of "svnversion", so it can be a program name with args.
  set dummy svnversion; ac_word=$2
@@ -3307,7 +3308,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    if test -n "$SVNVERSION"; then
    ac_cv_prog_SVNVERSION="$SVNVERSION" # Let the user override the test.
-@@ -4312,7 +4879,7 @@
+@@ -4320,7 +4887,7 @@
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_SVNVERSION="found"
@@ -3316,7 +3317,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
      break 2
    fi
  done
-@@ -4324,11 +4891,11 @@
+@@ -4332,11 +4899,11 @@
  fi
  SVNVERSION=$ac_cv_prog_SVNVERSION
  if test -n "$SVNVERSION"; then
@@ -3332,7 +3333,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  fi
  
  
-@@ -4364,8 +4931,8 @@
+@@ -4372,8 +4939,8 @@
    fi
  done
  if test -z "$ac_aux_dir"; then
@@ -3343,7 +3344,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
     { (exit 1); exit 1; }; }
  fi
  
-@@ -4391,11 +4958,12 @@
+@@ -4399,11 +4966,12 @@
  # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
  # OS/2's system install, which has a completely different semantic
  # ./install, which can be erroneously created by make from ./install.sh.
@@ -3359,7 +3360,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
  for as_dir in $PATH
-@@ -4424,17 +4992,29 @@
+@@ -4432,17 +5000,29 @@
  	    # program-specific install script used by HP pwplus--don't use.
  	    :
  	  else
@@ -3391,7 +3392,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  
  fi
    if test "${ac_cv_path_install+set}" = set; then
-@@ -4447,8 +5027,8 @@
+@@ -4455,8 +5035,8 @@
      INSTALL=$ac_install_sh
    fi
  fi
@@ -3402,7 +3403,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  
  # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
  # It thinks the first close brace ends the variable substitution.
-@@ -4471,8 +5051,8 @@
+@@ -4479,8 +5059,8 @@
  fi
  
  # Check for --with-pydebug
@@ -3413,7 +3414,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  
  # Check whether --with-pydebug was given.
  if test "${with_pydebug+set}" = set; then
-@@ -4484,15 +5064,15 @@
+@@ -4492,15 +5072,15 @@
  #define Py_DEBUG 1
  _ACEOF
  
@@ -3435,7 +3436,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  fi
  
  
-@@ -4570,8 +5150,8 @@
+@@ -4578,8 +5158,8 @@
      # Python violates C99 rules, by casting between incompatible
      # pointer types. GCC may generate bad code as a result of that,
      # so use -fno-strict-aliasing if supported.
@@ -3446,7 +3447,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
       ac_save_cc="$CC"
       CC="$CC -fno-strict-aliasing"
       if test "$cross_compiling" = yes; then
-@@ -4591,36 +5171,39 @@
+@@ -4599,36 +5179,39 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -3494,7 +3495,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
      if test $ac_cv_no_strict_aliasing_ok = yes
      then
        BASECFLAGS="$BASECFLAGS -fno-strict-aliasing"
-@@ -4659,8 +5242,8 @@
+@@ -4667,8 +5250,8 @@
  		   ARCH_RUN_32BIT="arch -i386 -ppc"
  
  		 else
@@ -3505,7 +3506,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
     { (exit 1); exit 1; }; }
  
  		 fi
-@@ -4734,10 +5317,10 @@
+@@ -4742,10 +5325,10 @@
    ac_cv_opt_olimit_ok=no
  fi
  
@@ -3519,7 +3520,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    ac_save_cc="$CC"
  CC="$CC -OPT:Olimit=0"
-@@ -4758,29 +5341,32 @@
+@@ -4766,29 +5349,32 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -3558,7 +3559,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  
-@@ -4788,8 +5374,8 @@
+@@ -4796,8 +5382,8 @@
  CC="$ac_save_cc"
  fi
  
@@ -3569,7 +3570,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  if test $ac_cv_opt_olimit_ok = yes; then
      case $ac_sys_system in
  	# XXX is this branch needed? On MacOSX 10.2.2 the result of the
-@@ -4802,10 +5388,10 @@
+@@ -4810,10 +5396,10 @@
  	    ;;
      esac
  else
@@ -3583,7 +3584,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    ac_save_cc="$CC"
    CC="$CC -Olimit 1500"
-@@ -4826,29 +5412,32 @@
+@@ -4834,29 +5420,32 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -3622,7 +3623,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  
-@@ -4856,8 +5445,8 @@
+@@ -4864,8 +5453,8 @@
    CC="$ac_save_cc"
  fi
  
@@ -3633,7 +3634,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    if test $ac_cv_olimit_ok = yes; then
      BASECFLAGS="$BASECFLAGS -Olimit 1500"
    fi
-@@ -4866,8 +5455,8 @@
+@@ -4874,8 +5463,8 @@
  # Check whether GCC supports PyArg_ParseTuple format
  if test "$GCC" = "yes"
  then
@@ -3644,7 +3645,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    save_CFLAGS=$CFLAGS
    CFLAGS="$CFLAGS -Werror"
    cat >conftest.$ac_ext <<_ACEOF
-@@ -4893,13 +5482,14 @@
+@@ -4901,13 +5490,14 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -3661,7 +3662,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-@@ -4909,14 +5499,14 @@
+@@ -4917,14 +5507,14 @@
  #define HAVE_ATTRIBUTE_FORMAT_PARSETUPLE 1
  _ACEOF
  
@@ -3681,7 +3682,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  
  fi
  
-@@ -4929,10 +5519,10 @@
+@@ -4937,10 +5527,10 @@
  # complain if unaccepted options are passed (e.g. gcc on Mac OS X).
  # So we have to see first whether pthreads are available without
  # options before we can check whether -Kpthread improves anything.
@@ -3695,7 +3696,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    if test "$cross_compiling" = yes; then
    ac_cv_pthread_is_default=no
-@@ -4963,19 +5553,21 @@
+@@ -4971,19 +5561,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -3721,7 +3722,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    (exit $ac_status); }; }; then
  
    ac_cv_pthread_is_default=yes
-@@ -4983,13 +5575,14 @@
+@@ -4991,13 +5583,14 @@
    ac_cv_pthread=no
  
  else
@@ -3738,7 +3739,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  
-@@ -4997,8 +5590,8 @@
+@@ -5005,8 +5598,8 @@
  
  fi
  
@@ -3749,7 +3750,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  
  
  if test $ac_cv_pthread_is_default = yes
-@@ -5010,10 +5603,10 @@
+@@ -5018,10 +5611,10 @@
  # Some compilers won't report that they do not support -Kpthread,
  # so we need to run a program to see whether it really made the
  # function available.
@@ -3763,7 +3764,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    ac_save_cc="$CC"
  CC="$CC -Kpthread"
-@@ -5046,29 +5639,32 @@
+@@ -5054,29 +5647,32 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -3802,7 +3803,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  
-@@ -5076,8 +5672,8 @@
+@@ -5084,8 +5680,8 @@
  CC="$ac_save_cc"
  fi
  
@@ -3813,7 +3814,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  fi
  
  if test $ac_cv_kpthread = no -a $ac_cv_pthread_is_default = no
-@@ -5087,10 +5683,10 @@
+@@ -5095,10 +5691,10 @@
  # Some compilers won't report that they do not support -Kthread,
  # so we need to run a program to see whether it really made the
  # function available.
@@ -3827,7 +3828,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    ac_save_cc="$CC"
  CC="$CC -Kthread"
-@@ -5123,29 +5719,32 @@
+@@ -5131,29 +5727,32 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -3866,7 +3867,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  
-@@ -5153,8 +5752,8 @@
+@@ -5161,8 +5760,8 @@
  CC="$ac_save_cc"
  fi
  
@@ -3877,7 +3878,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  fi
  
  if test $ac_cv_kthread = no -a $ac_cv_pthread_is_default = no
-@@ -5164,10 +5763,10 @@
+@@ -5172,10 +5771,10 @@
  # Some compilers won't report that they do not support -pthread,
  # so we need to run a program to see whether it really made the
  # function available.
@@ -3891,7 +3892,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    ac_save_cc="$CC"
  CC="$CC -pthread"
-@@ -5200,29 +5799,32 @@
+@@ -5208,29 +5807,32 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -3930,7 +3931,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  
-@@ -5230,8 +5832,8 @@
+@@ -5238,8 +5840,8 @@
  CC="$ac_save_cc"
  fi
  
@@ -3941,7 +3942,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  fi
  
  # If we have set a CC compiler flag for thread support then
-@@ -5239,8 +5841,8 @@
+@@ -5247,8 +5849,8 @@
  ac_cv_cxx_thread=no
  if test ! -z "$CXX"
  then
@@ -3952,7 +3953,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  ac_save_cxx="$CXX"
  
  if test "$ac_cv_kpthread" = "yes"
-@@ -5270,17 +5872,17 @@
+@@ -5278,17 +5880,17 @@
    fi
    rm -fr conftest*
  fi
@@ -3975,7 +3976,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -5307,20 +5909,21 @@
+@@ -5315,20 +5917,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -4000,7 +4001,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_header_stdc=no
-@@ -5412,37 +6015,40 @@
+@@ -5420,37 +6023,40 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -4049,7 +4050,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  if test $ac_cv_header_stdc = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -5451,75 +6057,6 @@
+@@ -5459,75 +6065,6 @@
  
  fi
  
@@ -4125,7 +4126,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  
  
  
-@@ -5587,20 +6124,21 @@
+@@ -5595,20 +6132,21 @@
  sys/resource.h netpacket/packet.h sysexits.h bluetooth.h \
  bluetooth/bluetooth.h linux/tipc.h
  do
@@ -4156,7 +4157,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -5616,32 +6154,33 @@
+@@ -5624,32 +6162,33 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -4197,7 +4198,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -5655,51 +6194,52 @@
+@@ -5663,51 +6202,52 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -4271,7 +4272,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
      ( cat <<\_ASBOX
  ## ------------------------------------------------ ##
  ## Report this to http://www.python.org/python-bugs ##
-@@ -5708,21 +6248,24 @@
+@@ -5716,21 +6256,24 @@
       ) | sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
@@ -4304,7 +4305,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  _ACEOF
  
  fi
-@@ -5736,11 +6279,11 @@
+@@ -5744,11 +6287,11 @@
  
  ac_header_dirent=no
  for ac_hdr in dirent.h sys/ndir.h sys/dir.h ndir.h; do
@@ -4320,7 +4321,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -5766,20 +6309,21 @@
+@@ -5774,20 +6317,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -4345,7 +4346,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	eval "$as_ac_Header=no"
-@@ -5787,12 +6331,15 @@
+@@ -5795,12 +6339,15 @@
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
@@ -4366,7 +4367,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  _ACEOF
  
  ac_header_dirent=$ac_hdr; break
-@@ -5801,10 +6348,10 @@
+@@ -5809,10 +6356,10 @@
  done
  # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix.
  if test $ac_header_dirent = dirent.h; then
@@ -4380,7 +4381,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    ac_func_search_save_LIBS=$LIBS
  cat >conftest.$ac_ext <<_ACEOF
-@@ -5842,26 +6389,30 @@
+@@ -5850,26 +6397,30 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -4416,7 +4417,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext
    if test "${ac_cv_search_opendir+set}" = set; then
-@@ -5876,8 +6427,8 @@
+@@ -5884,8 +6435,8 @@
  rm conftest.$ac_ext
  LIBS=$ac_func_search_save_LIBS
  fi
@@ -4427,7 +4428,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  ac_res=$ac_cv_search_opendir
  if test "$ac_res" != no; then
    test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-@@ -5885,10 +6436,10 @@
+@@ -5893,10 +6444,10 @@
  fi
  
  else
@@ -4441,7 +4442,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    ac_func_search_save_LIBS=$LIBS
  cat >conftest.$ac_ext <<_ACEOF
-@@ -5926,26 +6477,30 @@
+@@ -5934,26 +6485,30 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -4477,7 +4478,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext
    if test "${ac_cv_search_opendir+set}" = set; then
-@@ -5960,8 +6515,8 @@
+@@ -5968,8 +6523,8 @@
  rm conftest.$ac_ext
  LIBS=$ac_func_search_save_LIBS
  fi
@@ -4488,7 +4489,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  ac_res=$ac_cv_search_opendir
  if test "$ac_res" != no; then
    test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-@@ -5970,10 +6525,10 @@
+@@ -5978,10 +6533,10 @@
  
  fi
  
@@ -4502,7 +4503,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -5996,46 +6551,50 @@
+@@ -6004,46 +6559,50 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -4567,7 +4568,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -6051,32 +6610,33 @@
+@@ -6059,32 +6618,33 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -4608,7 +4609,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -6090,51 +6650,52 @@
+@@ -6098,51 +6658,52 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -4682,7 +4683,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
      ( cat <<\_ASBOX
  ## ------------------------------------------------ ##
  ## Report this to http://www.python.org/python-bugs ##
-@@ -6143,18 +6704,18 @@
+@@ -6151,18 +6712,18 @@
       ) | sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
@@ -4707,7 +4708,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define MAJOR_IN_MKDEV 1
-@@ -6166,17 +6727,17 @@
+@@ -6174,17 +6735,17 @@
  
    if test $ac_cv_header_sys_mkdev_h = no; then
      if test "${ac_cv_header_sys_sysmacros_h+set}" = set; then
@@ -4732,7 +4733,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -6192,32 +6753,33 @@
+@@ -6200,32 +6761,33 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -4773,7 +4774,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -6231,51 +6793,52 @@
+@@ -6239,51 +6801,52 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -4847,7 +4848,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
      ( cat <<\_ASBOX
  ## ------------------------------------------------ ##
  ## Report this to http://www.python.org/python-bugs ##
-@@ -6284,18 +6847,18 @@
+@@ -6292,18 +6855,18 @@
       ) | sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
@@ -4872,7 +4873,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define MAJOR_IN_SYSMACROS 1
-@@ -6312,11 +6875,11 @@
+@@ -6320,11 +6883,11 @@
  
  for ac_header in term.h
  do
@@ -4888,7 +4889,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -6338,20 +6901,21 @@
+@@ -6346,20 +6909,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -4913,7 +4914,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	eval "$as_ac_Header=no"
-@@ -6359,12 +6923,15 @@
+@@ -6367,12 +6931,15 @@
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
@@ -4934,7 +4935,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  _ACEOF
  
  fi
-@@ -6376,11 +6943,11 @@
+@@ -6384,11 +6951,11 @@
  
  for ac_header in linux/netlink.h
  do
@@ -4950,7 +4951,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -6405,20 +6972,21 @@
+@@ -6413,20 +6980,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -4975,7 +4976,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	eval "$as_ac_Header=no"
-@@ -6426,12 +6994,15 @@
+@@ -6434,12 +7002,15 @@
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
@@ -4996,7 +4997,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  _ACEOF
  
  fi
-@@ -6441,8 +7012,8 @@
+@@ -6449,8 +7020,8 @@
  
  # checks for typedefs
  was_it_defined=no
@@ -5007,7 +5008,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -6466,12 +7037,12 @@
+@@ -6474,12 +7045,12 @@
  fi
  rm -f conftest*
  
@@ -5024,7 +5025,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -6493,26 +7064,30 @@
+@@ -6501,26 +7072,30 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -5060,7 +5061,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  if test "$ac_cv_has_makedev" = "no"; then
-@@ -6541,26 +7116,30 @@
+@@ -6549,26 +7124,30 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -5096,7 +5097,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
      if test "$ac_cv_has_makedev" = "yes"; then
-@@ -6571,8 +7150,8 @@
+@@ -6579,8 +7158,8 @@
  
      fi
  fi
@@ -5107,7 +5108,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  if test "$ac_cv_has_makedev" = "yes"; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -6589,8 +7168,8 @@
+@@ -6597,8 +7176,8 @@
  # work-around, disable LFS on such configurations
  
  use_lfs=yes
@@ -5118,7 +5119,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -6616,28 +7195,29 @@
+@@ -6624,28 +7203,29 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -5153,7 +5154,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  if test "$sol_lfs_bug" = "yes"; then
    use_lfs=no
  fi
-@@ -6665,11 +7245,150 @@
+@@ -6673,26 +7253,58 @@
  EOF
  
  # Type availability checks
@@ -5164,22 +5165,27 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  if test "${ac_cv_type_mode_t+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
 +  $as_echo_n "(cached) " >&6
-+else
+ else
+-  cat >conftest.$ac_ext <<_ACEOF
 +  ac_cv_type_mode_t=no
 +cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+int
-+main ()
-+{
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-typedef mode_t ac__type_new_;
+ int
+ main ()
+ {
+-if ((ac__type_new_ *) 0)
+-  return 0;
+-if (sizeof (ac__type_new_))
 +if (sizeof (mode_t))
 +       return 0;
 +  ;
-+  return 0;
+   return 0;
 +}
 +_ACEOF
 +rm -f conftest.$ac_objext
@@ -5211,120 +5217,11 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
 +main ()
 +{
 +if (sizeof ((mode_t)))
-+	  return 0;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-+  :
-+else
-+  $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_type_mode_t=yes
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+else
-+  $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+fi
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_mode_t" >&5
-+$as_echo "$ac_cv_type_mode_t" >&6; }
-+if test "x$ac_cv_type_mode_t" = x""yes; then
-+  :
-+else
-+
-+cat >>confdefs.h <<_ACEOF
-+#define mode_t int
-+_ACEOF
-+
-+fi
-+
-+{ $as_echo "$as_me:$LINENO: checking for off_t" >&5
-+$as_echo_n "checking for off_t... " >&6; }
-+if test "${ac_cv_type_off_t+set}" = set; then
-+  $as_echo_n "(cached) " >&6
- else
-+  ac_cv_type_off_t=no
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+$ac_includes_default
-+int
-+main ()
-+{
-+if (sizeof (off_t))
-+       return 0;
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext
-+if { (ac_try="$ac_compile"
-+case "(($ac_try" in
-+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+  *) ac_try_echo=$ac_try;;
-+esac
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-+  (eval "$ac_compile") 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -6677,14 +7396,11 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--typedef mode_t ac__type_new_;
- int
- main ()
- {
--if ((ac__type_new_ *) 0)
--  return 0;
--if (sizeof (ac__type_new_))
--  return 0;
-+if (sizeof ((off_t)))
 +	  return 0;
    ;
    return 0;
  }
-@@ -6695,59 +7411,66 @@
+@@ -6703,30 +7315,39 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -5348,7 +5245,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
 +  $as_echo "$as_me: failed program was:" >&5
 +sed 's/^/| /' conftest.$ac_ext >&5
 +
-+	ac_cv_type_off_t=yes
++	ac_cv_type_mode_t=yes
 +fi
 +
 +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -5366,30 +5263,26 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
 -{ echo "$as_me:$LINENO: result: $ac_cv_type_mode_t" >&5
 -echo "${ECHO_T}$ac_cv_type_mode_t" >&6; }
 -if test $ac_cv_type_mode_t = yes; then
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
-+$as_echo "$ac_cv_type_off_t" >&6; }
-+if test "x$ac_cv_type_off_t" = x""yes; then
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_mode_t" >&5
++$as_echo "$ac_cv_type_mode_t" >&6; }
++if test "x$ac_cv_type_mode_t" = x""yes; then
    :
  else
  
- cat >>confdefs.h <<_ACEOF
--#define mode_t int
-+#define off_t long int
- _ACEOF
+@@ -6736,26 +7357,58 @@
  
  fi
  
 -{ echo "$as_me:$LINENO: checking for off_t" >&5
 -echo $ECHO_N "checking for off_t... $ECHO_C" >&6; }
--if test "${ac_cv_type_off_t+set}" = set; then
++{ $as_echo "$as_me:$LINENO: checking for off_t" >&5
++$as_echo_n "checking for off_t... " >&6; }
+ if test "${ac_cv_type_off_t+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+{ $as_echo "$as_me:$LINENO: checking for pid_t" >&5
-+$as_echo_n "checking for pid_t... " >&6; }
-+if test "${ac_cv_type_pid_t+set}" = set; then
 +  $as_echo_n "(cached) " >&6
  else
 -  cat >conftest.$ac_ext <<_ACEOF
-+  ac_cv_type_pid_t=no
++  ac_cv_type_off_t=no
 +cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
@@ -5404,13 +5297,46 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
 -if ((ac__type_new_ *) 0)
 -  return 0;
 -if (sizeof (ac__type_new_))
--  return 0;
-+if (sizeof (pid_t))
++if (sizeof (off_t))
 +       return 0;
++  ;
+   return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_compile") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
++  cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++if (sizeof ((off_t)))
++	  return 0;
    ;
    return 0;
  }
-@@ -6758,44 +7481,18 @@
+@@ -6766,30 +7419,39 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -5429,36 +5355,86 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  	 test ! -s conftest.err
         } && test -s conftest.$ac_objext; then
 -  ac_cv_type_off_t=yes
--else
++  :
++else
++  $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++	ac_cv_type_off_t=yes
++fi
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ else
 -  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
 -	ac_cv_type_off_t=no
--fi
--
--rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
++
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
 -{ echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
 -echo "${ECHO_T}$ac_cv_type_off_t" >&6; }
 -if test $ac_cv_type_off_t = yes; then
--  :
--else
--
--cat >>confdefs.h <<_ACEOF
--#define off_t long int
--_ACEOF
--
--fi
--
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5
++$as_echo "$ac_cv_type_off_t" >&6; }
++if test "x$ac_cv_type_off_t" = x""yes; then
+   :
+ else
+ 
+@@ -6799,11 +7461,46 @@
+ 
+ fi
+ 
 -{ echo "$as_me:$LINENO: checking for pid_t" >&5
 -echo $ECHO_N "checking for pid_t... $ECHO_C" >&6; }
--if test "${ac_cv_type_pid_t+set}" = set; then
++{ $as_echo "$as_me:$LINENO: checking for pid_t" >&5
++$as_echo_n "checking for pid_t... " >&6; }
+ if test "${ac_cv_type_pid_t+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
++  $as_echo_n "(cached) " >&6
+ else
++  ac_cv_type_pid_t=no
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++$ac_includes_default
++int
++main ()
++{
++if (sizeof (pid_t))
++       return 0;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (ac_try="$ac_compile"
++case "(($ac_try" in
++  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++  *) ac_try_echo=$ac_try;;
++esac
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
++  (eval "$ac_compile") 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } && {
++	 test -z "$ac_c_werror_flag" ||
++	 test ! -s conftest.err
++       } && test -s conftest.$ac_objext; then
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -6803,14 +7500,11 @@
+@@ -6811,14 +7508,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -5475,7 +5451,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    ;
    return 0;
  }
-@@ -6821,30 +7515,39 @@
+@@ -6829,30 +7523,39 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -5495,35 +5471,35 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
         } && test -s conftest.$ac_objext; then
 -  ac_cv_type_pid_t=yes
 +  :
-+else
-+  $as_echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+	ac_cv_type_pid_t=yes
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  else
 -  echo "$as_me: failed program was:" >&5
 +  $as_echo "$as_me: failed program was:" >&5
  sed 's/^/| /' conftest.$ac_ext >&5
  
 -	ac_cv_type_pid_t=no
-+
++	ac_cv_type_pid_t=yes
  fi
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++else
++  $as_echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++
  fi
 -{ echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5
 -echo "${ECHO_T}$ac_cv_type_pid_t" >&6; }
 -if test $ac_cv_type_pid_t = yes; then
++
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++fi
 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_type_pid_t" >&5
 +$as_echo "$ac_cv_type_pid_t" >&6; }
 +if test "x$ac_cv_type_pid_t" = x""yes; then
    :
  else
  
-@@ -6854,10 +7557,10 @@
+@@ -6862,10 +7565,10 @@
  
  fi
  
@@ -5537,7 +5513,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -6882,20 +7585,21 @@
+@@ -6890,20 +7593,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -5562,7 +5538,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_type_signal=void
-@@ -6903,34 +7607,66 @@
+@@ -6911,34 +7615,66 @@
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
@@ -5639,7 +5615,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    ;
    return 0;
  }
-@@ -6941,30 +7677,39 @@
+@@ -6949,30 +7685,39 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -5687,7 +5663,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    :
  else
  
-@@ -6974,10 +7719,10 @@
+@@ -6982,10 +7727,10 @@
  
  fi
  
@@ -5701,7 +5677,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -6997,8 +7742,8 @@
+@@ -7005,8 +7750,8 @@
  rm -f conftest*
  
  fi
@@ -5712,7 +5688,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  if test $ac_cv_type_uid_t = no; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -7012,26 +7757,24 @@
+@@ -7020,26 +7765,24 @@
  
  fi
  
@@ -5746,7 +5722,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    ;
    return 0;
  }
-@@ -7042,45 +7785,18 @@
+@@ -7050,45 +7793,18 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -5795,7 +5771,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -7088,14 +7804,11 @@
+@@ -7096,14 +7812,11 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -5812,7 +5788,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    ;
    return 0;
  }
-@@ -7106,38 +7819,57 @@
+@@ -7114,38 +7827,57 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -5862,8 +5838,8 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
 +_ACEOF
 +
 +fi
-+
  
++
 +# Sizes of various common basic types
 +# ANSI C requires sizeof(char) == 1, so no need to check it
  # The cast to long int works around a bug in the HP C Compiler
@@ -5880,7 +5856,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    if test "$cross_compiling" = yes; then
    # Depending upon the size, compute the lo and hi bounds.
-@@ -7148,11 +7880,10 @@
+@@ -7156,11 +7888,10 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -5893,7 +5869,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  test_array [0] = 0
  
    ;
-@@ -7165,13 +7896,14 @@
+@@ -7173,13 +7904,14 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -5910,7 +5886,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-@@ -7185,11 +7917,10 @@
+@@ -7193,11 +7925,10 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -5923,7 +5899,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  test_array [0] = 0
  
    ;
-@@ -7202,20 +7933,21 @@
+@@ -7210,20 +7941,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -5948,7 +5924,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_lo=`expr $ac_mid + 1`
-@@ -7229,7 +7961,7 @@
+@@ -7237,7 +7969,7 @@
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
@@ -5957,7 +5933,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	cat >conftest.$ac_ext <<_ACEOF
-@@ -7239,11 +7971,10 @@
+@@ -7247,11 +7979,10 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -5970,7 +5946,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  test_array [0] = 0
  
    ;
-@@ -7256,13 +7987,14 @@
+@@ -7264,13 +7995,14 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -5987,7 +5963,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-@@ -7276,11 +8008,10 @@
+@@ -7284,11 +8016,10 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -6000,7 +5976,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  test_array [0] = 0
  
    ;
-@@ -7293,20 +8024,21 @@
+@@ -7301,20 +8032,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -6025,7 +6001,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_hi=`expr '(' $ac_mid ')' - 1`
-@@ -7320,7 +8052,7 @@
+@@ -7328,7 +8060,7 @@
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
@@ -6034,7 +6010,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_lo= ac_hi=
-@@ -7340,11 +8072,10 @@
+@@ -7348,11 +8080,10 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -6047,7 +6023,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  test_array [0] = 0
  
    ;
-@@ -7357,20 +8088,21 @@
+@@ -7365,20 +8096,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -6072,7 +6048,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_lo=`expr '(' $ac_mid ')' + 1`
-@@ -7381,11 +8113,13 @@
+@@ -7389,11 +8121,13 @@
  case $ac_lo in
  ?*) ac_cv_sizeof_int=$ac_lo;;
  '') if test "$ac_cv_type_int" = yes; then
@@ -6089,7 +6065,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
     else
       ac_cv_sizeof_int=0
     fi ;;
-@@ -7398,9 +8132,8 @@
+@@ -7406,9 +8140,8 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -6101,7 +6077,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  #include <stdio.h>
  #include <stdlib.h>
  int
-@@ -7410,20 +8143,22 @@
+@@ -7418,20 +8151,22 @@
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
      return 1;
@@ -6129,7 +6105,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    return ferror (f) || fclose (f) != 0;
  
    ;
-@@ -7436,43 +8171,48 @@
+@@ -7444,43 +8179,48 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -6189,7 +6165,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  
  
  
-@@ -7481,68 +8221,14 @@
+@@ -7489,68 +8229,14 @@
  _ACEOF
  
  
@@ -6261,7 +6237,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    if test "$cross_compiling" = yes; then
    # Depending upon the size, compute the lo and hi bounds.
-@@ -7553,11 +8239,10 @@
+@@ -7561,11 +8247,10 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -6274,7 +6250,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  test_array [0] = 0
  
    ;
-@@ -7570,13 +8255,14 @@
+@@ -7578,13 +8263,14 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -6291,7 +6267,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-@@ -7590,11 +8276,10 @@
+@@ -7598,11 +8284,10 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -6304,7 +6280,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  test_array [0] = 0
  
    ;
-@@ -7607,20 +8292,21 @@
+@@ -7615,20 +8300,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -6329,7 +6305,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_lo=`expr $ac_mid + 1`
-@@ -7634,7 +8320,7 @@
+@@ -7642,7 +8328,7 @@
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
@@ -6338,7 +6314,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	cat >conftest.$ac_ext <<_ACEOF
-@@ -7644,11 +8330,10 @@
+@@ -7652,11 +8338,10 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -6351,7 +6327,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  test_array [0] = 0
  
    ;
-@@ -7661,13 +8346,14 @@
+@@ -7669,13 +8354,14 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -6368,7 +6344,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-@@ -7681,11 +8367,10 @@
+@@ -7689,11 +8375,10 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -6381,7 +6357,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  test_array [0] = 0
  
    ;
-@@ -7698,20 +8383,21 @@
+@@ -7706,20 +8391,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -6406,7 +6382,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_hi=`expr '(' $ac_mid ')' - 1`
-@@ -7725,7 +8411,7 @@
+@@ -7733,7 +8419,7 @@
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
@@ -6415,7 +6391,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_lo= ac_hi=
-@@ -7745,11 +8431,10 @@
+@@ -7753,11 +8439,10 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -6428,7 +6404,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  test_array [0] = 0
  
    ;
-@@ -7762,20 +8447,21 @@
+@@ -7770,20 +8455,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -6453,7 +6429,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_lo=`expr '(' $ac_mid ')' + 1`
-@@ -7786,11 +8472,13 @@
+@@ -7794,11 +8480,13 @@
  case $ac_lo in
  ?*) ac_cv_sizeof_long=$ac_lo;;
  '') if test "$ac_cv_type_long" = yes; then
@@ -6470,7 +6446,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
     else
       ac_cv_sizeof_long=0
     fi ;;
-@@ -7803,9 +8491,8 @@
+@@ -7811,9 +8499,8 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -6482,7 +6458,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  #include <stdio.h>
  #include <stdlib.h>
  int
-@@ -7815,20 +8502,22 @@
+@@ -7823,20 +8510,22 @@
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
      return 1;
@@ -6510,7 +6486,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    return ferror (f) || fclose (f) != 0;
  
    ;
-@@ -7841,43 +8530,48 @@
+@@ -7849,43 +8538,48 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -6570,7 +6546,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  
  
  
-@@ -7886,68 +8580,14 @@
+@@ -7894,68 +8588,14 @@
  _ACEOF
  
  
@@ -6642,7 +6618,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    if test "$cross_compiling" = yes; then
    # Depending upon the size, compute the lo and hi bounds.
-@@ -7958,11 +8598,10 @@
+@@ -7966,11 +8606,10 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -6655,7 +6631,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  test_array [0] = 0
  
    ;
-@@ -7975,13 +8614,14 @@
+@@ -7983,13 +8622,14 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -6672,7 +6648,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-@@ -7995,11 +8635,10 @@
+@@ -8003,11 +8643,10 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -6685,7 +6661,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  test_array [0] = 0
  
    ;
-@@ -8012,20 +8651,21 @@
+@@ -8020,20 +8659,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -6710,7 +6686,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_lo=`expr $ac_mid + 1`
-@@ -8039,7 +8679,7 @@
+@@ -8047,7 +8687,7 @@
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
@@ -6719,7 +6695,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	cat >conftest.$ac_ext <<_ACEOF
-@@ -8049,11 +8689,10 @@
+@@ -8057,11 +8697,10 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -6732,7 +6708,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  test_array [0] = 0
  
    ;
-@@ -8066,13 +8705,14 @@
+@@ -8074,13 +8713,14 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -6749,7 +6725,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-@@ -8086,11 +8726,10 @@
+@@ -8094,11 +8734,10 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -6762,7 +6738,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  test_array [0] = 0
  
    ;
-@@ -8103,20 +8742,21 @@
+@@ -8111,20 +8750,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -6787,7 +6763,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_hi=`expr '(' $ac_mid ')' - 1`
-@@ -8130,7 +8770,7 @@
+@@ -8138,7 +8778,7 @@
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
@@ -6796,7 +6772,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_lo= ac_hi=
-@@ -8150,11 +8790,10 @@
+@@ -8158,11 +8798,10 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -6809,7 +6785,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  test_array [0] = 0
  
    ;
-@@ -8167,20 +8806,21 @@
+@@ -8175,20 +8814,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -6834,7 +6810,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_lo=`expr '(' $ac_mid ')' + 1`
-@@ -8191,11 +8831,13 @@
+@@ -8199,11 +8839,13 @@
  case $ac_lo in
  ?*) ac_cv_sizeof_void_p=$ac_lo;;
  '') if test "$ac_cv_type_void_p" = yes; then
@@ -6851,7 +6827,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
     else
       ac_cv_sizeof_void_p=0
     fi ;;
-@@ -8208,9 +8850,8 @@
+@@ -8216,9 +8858,8 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -6863,7 +6839,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  #include <stdio.h>
  #include <stdlib.h>
  int
-@@ -8220,20 +8861,22 @@
+@@ -8228,20 +8869,22 @@
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
      return 1;
@@ -6891,7 +6867,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    return ferror (f) || fclose (f) != 0;
  
    ;
-@@ -8246,113 +8889,64 @@
+@@ -8254,43 +8897,48 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -6936,23 +6912,25 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
 -   { (exit 77); exit 77; }; }
 +   { (exit 77); exit 77; }; }; }
     else
--     ac_cv_sizeof_void_p=0
--   fi
--fi
--rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
--fi
--rm -f conftest.val
--fi
+      ac_cv_sizeof_void_p=0
+    fi
+ fi
++rm -rf conftest.dSYM
+ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ rm -f conftest.val
+ fi
 -{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_void_p" >&5
 -echo "${ECHO_T}$ac_cv_sizeof_void_p" >&6; }
--
--
--
--cat >>confdefs.h <<_ACEOF
--#define SIZEOF_VOID_P $ac_cv_sizeof_void_p
--_ACEOF
--
--
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_void_p" >&5
++$as_echo "$ac_cv_sizeof_void_p" >&6; }
+ 
+ 
+ 
+@@ -8299,68 +8947,14 @@
+ _ACEOF
+ 
+ 
 -{ echo "$as_me:$LINENO: checking for short" >&5
 -echo $ECHO_N "checking for short... $ECHO_C" >&6; }
 -if test "${ac_cv_type_short+set}" = set; then
@@ -7000,28 +6978,13 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
 -sed 's/^/| /' conftest.$ac_ext >&5
 -
 -	ac_cv_type_short=no
-+     ac_cv_sizeof_void_p=0
-+   fi
- fi
+-fi
 -
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+rm -rf conftest.dSYM
-+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-+fi
-+rm -f conftest.val
- fi
+-fi
 -{ echo "$as_me:$LINENO: result: $ac_cv_type_short" >&5
 -echo "${ECHO_T}$ac_cv_type_short" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_void_p" >&5
-+$as_echo "$ac_cv_sizeof_void_p" >&6; }
-+
-+
-+
-+cat >>confdefs.h <<_ACEOF
-+#define SIZEOF_VOID_P $ac_cv_sizeof_void_p
-+_ACEOF
-+
- 
+-
  # The cast to long int works around a bug in the HP C Compiler
  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
@@ -7036,7 +6999,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    if test "$cross_compiling" = yes; then
    # Depending upon the size, compute the lo and hi bounds.
-@@ -8363,11 +8957,10 @@
+@@ -8371,11 +8965,10 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -7049,7 +7012,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  test_array [0] = 0
  
    ;
-@@ -8380,13 +8973,14 @@
+@@ -8388,13 +8981,14 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -7066,7 +7029,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-@@ -8400,11 +8994,10 @@
+@@ -8408,11 +9002,10 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -7079,7 +7042,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  test_array [0] = 0
  
    ;
-@@ -8417,20 +9010,21 @@
+@@ -8425,20 +9018,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -7104,7 +7067,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_lo=`expr $ac_mid + 1`
-@@ -8444,7 +9038,7 @@
+@@ -8452,7 +9046,7 @@
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
@@ -7113,7 +7076,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	cat >conftest.$ac_ext <<_ACEOF
-@@ -8454,11 +9048,10 @@
+@@ -8462,11 +9056,10 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -7126,7 +7089,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  test_array [0] = 0
  
    ;
-@@ -8471,13 +9064,14 @@
+@@ -8479,13 +9072,14 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -7143,7 +7106,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-@@ -8491,11 +9085,10 @@
+@@ -8499,11 +9093,10 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -7156,7 +7119,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  test_array [0] = 0
  
    ;
-@@ -8508,20 +9101,21 @@
+@@ -8516,20 +9109,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -7181,7 +7144,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_hi=`expr '(' $ac_mid ')' - 1`
-@@ -8535,7 +9129,7 @@
+@@ -8543,7 +9137,7 @@
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
@@ -7190,7 +7153,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_lo= ac_hi=
-@@ -8555,11 +9149,10 @@
+@@ -8563,11 +9157,10 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -7203,7 +7166,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  test_array [0] = 0
  
    ;
-@@ -8572,20 +9165,21 @@
+@@ -8580,20 +9173,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -7228,7 +7191,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_lo=`expr '(' $ac_mid ')' + 1`
-@@ -8596,11 +9190,13 @@
+@@ -8604,11 +9198,13 @@
  case $ac_lo in
  ?*) ac_cv_sizeof_short=$ac_lo;;
  '') if test "$ac_cv_type_short" = yes; then
@@ -7245,7 +7208,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
     else
       ac_cv_sizeof_short=0
     fi ;;
-@@ -8613,9 +9209,8 @@
+@@ -8621,9 +9217,8 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -7257,7 +7220,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  #include <stdio.h>
  #include <stdlib.h>
  int
-@@ -8625,20 +9220,22 @@
+@@ -8633,20 +9228,22 @@
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
      return 1;
@@ -7285,7 +7248,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    return ferror (f) || fclose (f) != 0;
  
    ;
-@@ -8651,43 +9248,48 @@
+@@ -8659,113 +9256,64 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -7340,15 +7303,16 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  fi
 -{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
 -echo "${ECHO_T}$ac_cv_sizeof_short" >&6; }
+-
 +{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_short" >&5
 +$as_echo "$ac_cv_sizeof_short" >&6; }
  
  
- 
-@@ -8696,68 +9298,14 @@
- _ACEOF
- 
- 
+-cat >>confdefs.h <<_ACEOF
+-#define SIZEOF_SHORT $ac_cv_sizeof_short
+-_ACEOF
+-
+-
 -{ echo "$as_me:$LINENO: checking for float" >&5
 -echo $ECHO_N "checking for float... $ECHO_C" >&6; }
 -if test "${ac_cv_type_float+set}" = set; then
@@ -7397,12 +7361,16 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
 -
 -	ac_cv_type_float=no
 -fi
--
+ 
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 -fi
 -{ echo "$as_me:$LINENO: result: $ac_cv_type_float" >&5
 -echo "${ECHO_T}$ac_cv_type_float" >&6; }
--
++cat >>confdefs.h <<_ACEOF
++#define SIZEOF_SHORT $ac_cv_sizeof_short
++_ACEOF
++
+ 
  # The cast to long int works around a bug in the HP C Compiler
  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
@@ -7417,7 +7385,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    if test "$cross_compiling" = yes; then
    # Depending upon the size, compute the lo and hi bounds.
-@@ -8768,11 +9316,10 @@
+@@ -8776,11 +9324,10 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -7430,7 +7398,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  test_array [0] = 0
  
    ;
-@@ -8785,13 +9332,14 @@
+@@ -8793,13 +9340,14 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -7447,7 +7415,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-@@ -8805,11 +9353,10 @@
+@@ -8813,11 +9361,10 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -7460,7 +7428,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  test_array [0] = 0
  
    ;
-@@ -8822,20 +9369,21 @@
+@@ -8830,20 +9377,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -7485,7 +7453,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_lo=`expr $ac_mid + 1`
-@@ -8849,7 +9397,7 @@
+@@ -8857,7 +9405,7 @@
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
@@ -7494,7 +7462,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	cat >conftest.$ac_ext <<_ACEOF
-@@ -8859,11 +9407,10 @@
+@@ -8867,11 +9415,10 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -7507,7 +7475,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  test_array [0] = 0
  
    ;
-@@ -8876,13 +9423,14 @@
+@@ -8884,13 +9431,14 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -7524,7 +7492,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-@@ -8896,11 +9444,10 @@
+@@ -8904,11 +9452,10 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -7537,7 +7505,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  test_array [0] = 0
  
    ;
-@@ -8913,20 +9460,21 @@
+@@ -8921,20 +9468,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -7562,7 +7530,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_hi=`expr '(' $ac_mid ')' - 1`
-@@ -8940,7 +9488,7 @@
+@@ -8948,7 +9496,7 @@
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
@@ -7571,7 +7539,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_lo= ac_hi=
-@@ -8960,11 +9508,10 @@
+@@ -8968,11 +9516,10 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -7584,7 +7552,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  test_array [0] = 0
  
    ;
-@@ -8977,20 +9524,21 @@
+@@ -8985,20 +9532,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -7609,7 +7577,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_lo=`expr '(' $ac_mid ')' + 1`
-@@ -9001,11 +9549,13 @@
+@@ -9009,11 +9557,13 @@
  case $ac_lo in
  ?*) ac_cv_sizeof_float=$ac_lo;;
  '') if test "$ac_cv_type_float" = yes; then
@@ -7626,7 +7594,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
     else
       ac_cv_sizeof_float=0
     fi ;;
-@@ -9018,9 +9568,8 @@
+@@ -9026,9 +9576,8 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -7638,7 +7606,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  #include <stdio.h>
  #include <stdlib.h>
  int
-@@ -9030,20 +9579,22 @@
+@@ -9038,20 +9587,22 @@
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
      return 1;
@@ -7666,7 +7634,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    return ferror (f) || fclose (f) != 0;
  
    ;
-@@ -9056,43 +9607,48 @@
+@@ -9064,43 +9615,48 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -7726,7 +7694,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  
  
  
-@@ -9101,68 +9657,14 @@
+@@ -9109,68 +9665,14 @@
  _ACEOF
  
  
@@ -7798,7 +7766,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    if test "$cross_compiling" = yes; then
    # Depending upon the size, compute the lo and hi bounds.
-@@ -9173,11 +9675,10 @@
+@@ -9181,11 +9683,10 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -7811,7 +7779,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  test_array [0] = 0
  
    ;
-@@ -9190,13 +9691,14 @@
+@@ -9198,13 +9699,14 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -7828,7 +7796,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-@@ -9210,11 +9712,10 @@
+@@ -9218,11 +9720,10 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -7841,7 +7809,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  test_array [0] = 0
  
    ;
-@@ -9227,20 +9728,21 @@
+@@ -9235,20 +9736,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -7866,7 +7834,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_lo=`expr $ac_mid + 1`
-@@ -9254,7 +9756,7 @@
+@@ -9262,7 +9764,7 @@
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
@@ -7875,7 +7843,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	cat >conftest.$ac_ext <<_ACEOF
-@@ -9264,11 +9766,10 @@
+@@ -9272,11 +9774,10 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -7888,7 +7856,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  test_array [0] = 0
  
    ;
-@@ -9281,13 +9782,14 @@
+@@ -9289,13 +9790,14 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -7905,7 +7873,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-@@ -9301,11 +9803,10 @@
+@@ -9309,11 +9811,10 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -7918,7 +7886,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  test_array [0] = 0
  
    ;
-@@ -9318,20 +9819,21 @@
+@@ -9326,20 +9827,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -7943,7 +7911,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_hi=`expr '(' $ac_mid ')' - 1`
-@@ -9345,7 +9847,7 @@
+@@ -9353,7 +9855,7 @@
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
@@ -7952,7 +7920,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_lo= ac_hi=
-@@ -9365,11 +9867,10 @@
+@@ -9373,11 +9875,10 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -7965,7 +7933,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  test_array [0] = 0
  
    ;
-@@ -9382,20 +9883,21 @@
+@@ -9390,20 +9891,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -7990,7 +7958,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_lo=`expr '(' $ac_mid ')' + 1`
-@@ -9406,11 +9908,13 @@
+@@ -9414,11 +9916,13 @@
  case $ac_lo in
  ?*) ac_cv_sizeof_double=$ac_lo;;
  '') if test "$ac_cv_type_double" = yes; then
@@ -8007,7 +7975,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
     else
       ac_cv_sizeof_double=0
     fi ;;
-@@ -9423,9 +9927,8 @@
+@@ -9431,9 +9935,8 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -8019,7 +7987,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  #include <stdio.h>
  #include <stdlib.h>
  int
-@@ -9435,20 +9938,22 @@
+@@ -9443,20 +9946,22 @@
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
      return 1;
@@ -8047,7 +8015,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    return ferror (f) || fclose (f) != 0;
  
    ;
-@@ -9461,43 +9966,48 @@
+@@ -9469,43 +9974,48 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -8107,7 +8075,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  
  
  
-@@ -9506,68 +10016,14 @@
+@@ -9514,68 +10024,14 @@
  _ACEOF
  
  
@@ -8179,7 +8147,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    if test "$cross_compiling" = yes; then
    # Depending upon the size, compute the lo and hi bounds.
-@@ -9578,11 +10034,10 @@
+@@ -9586,11 +10042,10 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -8192,7 +8160,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  test_array [0] = 0
  
    ;
-@@ -9595,13 +10050,14 @@
+@@ -9603,13 +10058,14 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -8209,7 +8177,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-@@ -9615,11 +10071,10 @@
+@@ -9623,11 +10079,10 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -8222,7 +8190,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  test_array [0] = 0
  
    ;
-@@ -9632,20 +10087,21 @@
+@@ -9640,20 +10095,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -8247,7 +8215,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_lo=`expr $ac_mid + 1`
-@@ -9659,7 +10115,7 @@
+@@ -9667,7 +10123,7 @@
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
@@ -8256,7 +8224,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	cat >conftest.$ac_ext <<_ACEOF
-@@ -9669,11 +10125,10 @@
+@@ -9677,11 +10133,10 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -8269,7 +8237,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  test_array [0] = 0
  
    ;
-@@ -9686,13 +10141,14 @@
+@@ -9694,13 +10149,14 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -8286,7 +8254,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-@@ -9706,11 +10162,10 @@
+@@ -9714,11 +10170,10 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -8299,7 +8267,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  test_array [0] = 0
  
    ;
-@@ -9723,20 +10178,21 @@
+@@ -9731,20 +10186,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -8324,7 +8292,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_hi=`expr '(' $ac_mid ')' - 1`
-@@ -9750,7 +10206,7 @@
+@@ -9758,7 +10214,7 @@
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
@@ -8333,7 +8301,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_lo= ac_hi=
-@@ -9770,11 +10226,10 @@
+@@ -9778,11 +10234,10 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -8346,7 +8314,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  test_array [0] = 0
  
    ;
-@@ -9787,20 +10242,21 @@
+@@ -9795,20 +10250,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -8371,7 +8339,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_lo=`expr '(' $ac_mid ')' + 1`
-@@ -9811,11 +10267,13 @@
+@@ -9819,11 +10275,13 @@
  case $ac_lo in
  ?*) ac_cv_sizeof_fpos_t=$ac_lo;;
  '') if test "$ac_cv_type_fpos_t" = yes; then
@@ -8388,7 +8356,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
     else
       ac_cv_sizeof_fpos_t=0
     fi ;;
-@@ -9828,9 +10286,8 @@
+@@ -9836,9 +10294,8 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -8400,7 +8368,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  #include <stdio.h>
  #include <stdlib.h>
  int
-@@ -9840,20 +10297,22 @@
+@@ -9848,20 +10305,22 @@
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
      return 1;
@@ -8428,7 +8396,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    return ferror (f) || fclose (f) != 0;
  
    ;
-@@ -9866,43 +10325,48 @@
+@@ -9874,43 +10333,48 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -8488,7 +8456,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  
  
  
-@@ -9911,68 +10375,14 @@
+@@ -9919,68 +10383,14 @@
  _ACEOF
  
  
@@ -8560,7 +8528,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    if test "$cross_compiling" = yes; then
    # Depending upon the size, compute the lo and hi bounds.
-@@ -9983,11 +10393,10 @@
+@@ -9991,11 +10401,10 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -8573,7 +8541,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  test_array [0] = 0
  
    ;
-@@ -10000,13 +10409,14 @@
+@@ -10008,13 +10417,14 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -8590,7 +8558,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-@@ -10020,11 +10430,10 @@
+@@ -10028,11 +10438,10 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -8603,7 +8571,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  test_array [0] = 0
  
    ;
-@@ -10037,20 +10446,21 @@
+@@ -10045,20 +10454,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -8628,7 +8596,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_lo=`expr $ac_mid + 1`
-@@ -10064,7 +10474,7 @@
+@@ -10072,7 +10482,7 @@
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
@@ -8637,7 +8605,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	cat >conftest.$ac_ext <<_ACEOF
-@@ -10074,11 +10484,10 @@
+@@ -10082,11 +10492,10 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -8650,7 +8618,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  test_array [0] = 0
  
    ;
-@@ -10091,13 +10500,14 @@
+@@ -10099,13 +10508,14 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -8667,7 +8635,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-@@ -10111,11 +10521,10 @@
+@@ -10119,11 +10529,10 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -8680,7 +8648,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  test_array [0] = 0
  
    ;
-@@ -10128,20 +10537,21 @@
+@@ -10136,20 +10545,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -8705,7 +8673,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_hi=`expr '(' $ac_mid ')' - 1`
-@@ -10155,7 +10565,7 @@
+@@ -10163,7 +10573,7 @@
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
@@ -8714,7 +8682,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_lo= ac_hi=
-@@ -10175,11 +10585,10 @@
+@@ -10183,11 +10593,10 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -8727,7 +8695,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  test_array [0] = 0
  
    ;
-@@ -10192,20 +10601,21 @@
+@@ -10200,20 +10609,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -8752,7 +8720,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_lo=`expr '(' $ac_mid ')' + 1`
-@@ -10216,11 +10626,13 @@
+@@ -10224,11 +10634,13 @@
  case $ac_lo in
  ?*) ac_cv_sizeof_size_t=$ac_lo;;
  '') if test "$ac_cv_type_size_t" = yes; then
@@ -8769,7 +8737,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
     else
       ac_cv_sizeof_size_t=0
     fi ;;
-@@ -10233,9 +10645,8 @@
+@@ -10241,9 +10653,8 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -8781,7 +8749,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  #include <stdio.h>
  #include <stdlib.h>
  int
-@@ -10245,20 +10656,22 @@
+@@ -10253,20 +10664,22 @@
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
      return 1;
@@ -8809,7 +8777,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    return ferror (f) || fclose (f) != 0;
  
    ;
-@@ -10271,43 +10684,48 @@
+@@ -10279,43 +10692,48 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -8869,7 +8837,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  
  
  
-@@ -10316,68 +10734,14 @@
+@@ -10324,68 +10742,14 @@
  _ACEOF
  
  
@@ -8941,7 +8909,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    if test "$cross_compiling" = yes; then
    # Depending upon the size, compute the lo and hi bounds.
-@@ -10388,11 +10752,10 @@
+@@ -10396,11 +10760,10 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -8954,7 +8922,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  test_array [0] = 0
  
    ;
-@@ -10405,13 +10768,14 @@
+@@ -10413,13 +10776,14 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -8971,7 +8939,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-@@ -10425,11 +10789,10 @@
+@@ -10433,11 +10797,10 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -8984,7 +8952,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  test_array [0] = 0
  
    ;
-@@ -10442,20 +10805,21 @@
+@@ -10450,20 +10813,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -9009,7 +8977,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_lo=`expr $ac_mid + 1`
-@@ -10469,7 +10833,7 @@
+@@ -10477,7 +10841,7 @@
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
@@ -9018,7 +8986,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	cat >conftest.$ac_ext <<_ACEOF
-@@ -10479,11 +10843,10 @@
+@@ -10487,11 +10851,10 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -9031,7 +8999,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  test_array [0] = 0
  
    ;
-@@ -10496,13 +10859,14 @@
+@@ -10504,13 +10867,14 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -9048,7 +9016,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-@@ -10516,11 +10880,10 @@
+@@ -10524,11 +10888,10 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -9061,7 +9029,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  test_array [0] = 0
  
    ;
-@@ -10533,20 +10896,21 @@
+@@ -10541,20 +10904,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -9086,7 +9054,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_hi=`expr '(' $ac_mid ')' - 1`
-@@ -10560,7 +10924,7 @@
+@@ -10568,7 +10932,7 @@
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
@@ -9095,7 +9063,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_lo= ac_hi=
-@@ -10580,11 +10944,10 @@
+@@ -10588,11 +10952,10 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -9108,7 +9076,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  test_array [0] = 0
  
    ;
-@@ -10597,20 +10960,21 @@
+@@ -10605,20 +10968,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -9133,7 +9101,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_lo=`expr '(' $ac_mid ')' + 1`
-@@ -10621,11 +10985,13 @@
+@@ -10629,11 +10993,13 @@
  case $ac_lo in
  ?*) ac_cv_sizeof_pid_t=$ac_lo;;
  '') if test "$ac_cv_type_pid_t" = yes; then
@@ -9150,7 +9118,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
     else
       ac_cv_sizeof_pid_t=0
     fi ;;
-@@ -10638,9 +11004,8 @@
+@@ -10646,9 +11012,8 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -9162,7 +9130,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  #include <stdio.h>
  #include <stdlib.h>
  int
-@@ -10650,20 +11015,22 @@
+@@ -10658,20 +11023,22 @@
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
      return 1;
@@ -9190,7 +9158,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    return ferror (f) || fclose (f) != 0;
  
    ;
-@@ -10676,43 +11043,48 @@
+@@ -10684,43 +11051,48 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -9250,7 +9218,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  
  
  
-@@ -10722,8 +11094,8 @@
+@@ -10730,8 +11102,8 @@
  
  
  
@@ -9261,7 +9229,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  have_long_long=no
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -10746,13 +11118,14 @@
+@@ -10754,13 +11126,14 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -9278,7 +9246,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-@@ -10766,78 +11139,24 @@
+@@ -10774,78 +11147,24 @@
    have_long_long=yes
  
  else
@@ -9363,7 +9331,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    if test "$cross_compiling" = yes; then
    # Depending upon the size, compute the lo and hi bounds.
-@@ -10848,11 +11167,10 @@
+@@ -10856,11 +11175,10 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -9376,7 +9344,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  test_array [0] = 0
  
    ;
-@@ -10865,13 +11183,14 @@
+@@ -10873,13 +11191,14 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -9393,7 +9361,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-@@ -10885,11 +11204,10 @@
+@@ -10893,11 +11212,10 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -9406,7 +9374,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  test_array [0] = 0
  
    ;
-@@ -10902,20 +11220,21 @@
+@@ -10910,20 +11228,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -9431,7 +9399,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_lo=`expr $ac_mid + 1`
-@@ -10929,7 +11248,7 @@
+@@ -10937,7 +11256,7 @@
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
@@ -9440,7 +9408,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	cat >conftest.$ac_ext <<_ACEOF
-@@ -10939,11 +11258,10 @@
+@@ -10947,11 +11266,10 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -9453,7 +9421,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  test_array [0] = 0
  
    ;
-@@ -10956,13 +11274,14 @@
+@@ -10964,13 +11282,14 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -9470,7 +9438,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-@@ -10976,11 +11295,10 @@
+@@ -10984,11 +11303,10 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -9483,7 +9451,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  test_array [0] = 0
  
    ;
-@@ -10993,20 +11311,21 @@
+@@ -11001,20 +11319,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -9508,7 +9476,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_hi=`expr '(' $ac_mid ')' - 1`
-@@ -11020,7 +11339,7 @@
+@@ -11028,7 +11347,7 @@
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
@@ -9517,7 +9485,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_lo= ac_hi=
-@@ -11040,11 +11359,10 @@
+@@ -11048,11 +11367,10 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -9530,7 +9498,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  test_array [0] = 0
  
    ;
-@@ -11057,20 +11375,21 @@
+@@ -11065,20 +11383,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -9555,7 +9523,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_lo=`expr '(' $ac_mid ')' + 1`
-@@ -11081,11 +11400,13 @@
+@@ -11089,11 +11408,13 @@
  case $ac_lo in
  ?*) ac_cv_sizeof_long_long=$ac_lo;;
  '') if test "$ac_cv_type_long_long" = yes; then
@@ -9572,7 +9540,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
     else
       ac_cv_sizeof_long_long=0
     fi ;;
-@@ -11098,9 +11419,8 @@
+@@ -11106,9 +11427,8 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -9584,7 +9552,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  #include <stdio.h>
  #include <stdlib.h>
  int
-@@ -11110,20 +11430,22 @@
+@@ -11118,20 +11438,22 @@
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
      return 1;
@@ -9612,7 +9580,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    return ferror (f) || fclose (f) != 0;
  
    ;
-@@ -11136,43 +11458,48 @@
+@@ -11144,127 +11466,72 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -9659,84 +9627,37 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
     else
       ac_cv_sizeof_long_long=0
     fi
- fi
-+rm -rf conftest.dSYM
- rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
- fi
- rm -f conftest.val
- fi
+-fi
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+-fi
+-rm -f conftest.val
+-fi
 -{ echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long" >&5
 -echo "${ECHO_T}$ac_cv_sizeof_long_long" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long" >&5
-+$as_echo "$ac_cv_sizeof_long_long" >&6; }
- 
- 
- 
-@@ -11183,8 +11510,8 @@
- 
- fi
- 
+-
+-
+-
+-cat >>confdefs.h <<_ACEOF
+-#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
+-_ACEOF
+-
+-
+-fi
+-
 -{ echo "$as_me:$LINENO: checking for long double support" >&5
 -echo $ECHO_N "checking for long double support... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking for long double support" >&5
-+$as_echo_n "checking for long double support... " >&6; }
- have_long_double=no
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -11207,13 +11534,14 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_compile") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
-@@ -11227,78 +11555,24 @@
-   have_long_double=yes
- 
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 
- fi
- 
- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--{ echo "$as_me:$LINENO: result: $have_long_double" >&5
--echo "${ECHO_T}$have_long_double" >&6; }
-+{ $as_echo "$as_me:$LINENO: result: $have_long_double" >&5
-+$as_echo "$have_long_double" >&6; }
- if test "$have_long_double" = yes ; then
--{ echo "$as_me:$LINENO: checking for long double" >&5
--echo $ECHO_N "checking for long double... $ECHO_C" >&6; }
--if test "${ac_cv_type_long_double+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--  cat >conftest.$ac_ext <<_ACEOF
+-have_long_double=no
+-cat >conftest.$ac_ext <<_ACEOF
 -/* confdefs.h.  */
 -_ACEOF
 -cat confdefs.h >>conftest.$ac_ext
 -cat >>conftest.$ac_ext <<_ACEOF
 -/* end confdefs.h.  */
--$ac_includes_default
--typedef long double ac__type_new_;
+-
 -int
 -main ()
 -{
--if ((ac__type_new_ *) 0)
--  return 0;
--if (sizeof (ac__type_new_))
--  return 0;
+-long double x; x = (long double)0.;
 -  ;
 -  return 0;
 -}
@@ -9758,47 +9679,66 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
 -	 test -z "$ac_c_werror_flag" ||
 -	 test ! -s conftest.err
 -       } && test -s conftest.$ac_objext; then
--  ac_cv_type_long_double=yes
+-
++fi
++rm -rf conftest.dSYM
++rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
++fi
++rm -f conftest.val
++fi
++{ $as_echo "$as_me:$LINENO: result: $ac_cv_sizeof_long_long" >&5
++$as_echo "$ac_cv_sizeof_long_long" >&6; }
+ 
+-cat >>confdefs.h <<\_ACEOF
+-#define HAVE_LONG_DOUBLE 1
+-_ACEOF
+ 
+-  have_long_double=yes
+ 
 -else
 -  echo "$as_me: failed program was:" >&5
 -sed 's/^/| /' conftest.$ac_ext >&5
--
--	ac_cv_type_long_double=no
--fi
--
++cat >>confdefs.h <<_ACEOF
++#define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
++_ACEOF
+ 
+ 
+ fi
+ 
 -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--fi
--{ echo "$as_me:$LINENO: result: $ac_cv_type_long_double" >&5
--echo "${ECHO_T}$ac_cv_type_long_double" >&6; }
--
- # The cast to long int works around a bug in the HP C Compiler
- # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
- # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
- # This bug is HP SR number 8606223364.
--{ echo "$as_me:$LINENO: checking size of long double" >&5
--echo $ECHO_N "checking size of long double... $ECHO_C" >&6; }
-+{ $as_echo "$as_me:$LINENO: checking size of long double" >&5
-+$as_echo_n "checking size of long double... " >&6; }
- if test "${ac_cv_sizeof_long_double+set}" = set; then
+-{ echo "$as_me:$LINENO: result: $have_long_double" >&5
+-echo "${ECHO_T}$have_long_double" >&6; }
+-if test "$have_long_double" = yes ; then
+-{ echo "$as_me:$LINENO: checking for long double" >&5
+-echo $ECHO_N "checking for long double... $ECHO_C" >&6; }
+-if test "${ac_cv_type_long_double+set}" = set; then
 -  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   if test "$cross_compiling" = yes; then
-   # Depending upon the size, compute the lo and hi bounds.
-@@ -11309,11 +11583,10 @@
+-else
+-  cat >conftest.$ac_ext <<_ACEOF
++{ $as_echo "$as_me:$LINENO: checking for long double support" >&5
++$as_echo_n "checking for long double support... " >&6; }
++have_long_double=no
++cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
- $ac_includes_default
--   typedef long double ac__type_sizeof_;
+-$ac_includes_default
+-typedef long double ac__type_new_;
++
  int
  main ()
  {
--static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
-+static int test_array [1 - 2 * !(((long int) (sizeof (long double))) >= 0)];
- test_array [0] = 0
- 
+-if ((ac__type_new_ *) 0)
+-  return 0;
+-if (sizeof (ac__type_new_))
+-  return 0;
++long double x; x = (long double)0.;
    ;
-@@ -11326,13 +11599,14 @@
+   return 0;
+ }
+@@ -11275,38 +11542,45 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -9815,7 +9755,78 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-@@ -11346,11 +11620,10 @@
+        } && test -s conftest.$ac_objext; then
+-  ac_cv_type_long_double=yes
++
++
++cat >>confdefs.h <<\_ACEOF
++#define HAVE_LONG_DOUBLE 1
++_ACEOF
++
++  have_long_double=yes
++
+ else
+-  echo "$as_me: failed program was:" >&5
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+-	ac_cv_type_long_double=no
+-fi
+ 
+-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+ fi
+-{ echo "$as_me:$LINENO: result: $ac_cv_type_long_double" >&5
+-echo "${ECHO_T}$ac_cv_type_long_double" >&6; }
+ 
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++{ $as_echo "$as_me:$LINENO: result: $have_long_double" >&5
++$as_echo "$have_long_double" >&6; }
++if test "$have_long_double" = yes ; then
+ # The cast to long int works around a bug in the HP C Compiler
+ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+ # This bug is HP SR number 8606223364.
+-{ echo "$as_me:$LINENO: checking size of long double" >&5
+-echo $ECHO_N "checking size of long double... $ECHO_C" >&6; }
++{ $as_echo "$as_me:$LINENO: checking size of long double" >&5
++$as_echo_n "checking size of long double... " >&6; }
+ if test "${ac_cv_sizeof_long_double+set}" = set; then
+-  echo $ECHO_N "(cached) $ECHO_C" >&6
++  $as_echo_n "(cached) " >&6
+ else
+   if test "$cross_compiling" = yes; then
+   # Depending upon the size, compute the lo and hi bounds.
+@@ -11317,11 +11591,10 @@
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ $ac_includes_default
+-   typedef long double ac__type_sizeof_;
+ int
+ main ()
+ {
+-static int test_array [1 - 2 * !(((long int) (sizeof (ac__type_sizeof_))) >= 0)];
++static int test_array [1 - 2 * !(((long int) (sizeof (long double))) >= 0)];
+ test_array [0] = 0
+ 
+   ;
+@@ -11334,13 +11607,14 @@
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
++$as_echo "$ac_try_echo") >&5
+   (eval "$ac_compile") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } && {
+ 	 test -z "$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+@@ -11354,11 +11628,10 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -9828,7 +9839,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  test_array [0] = 0
  
    ;
-@@ -11363,20 +11636,21 @@
+@@ -11371,20 +11644,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -9853,7 +9864,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_lo=`expr $ac_mid + 1`
-@@ -11390,7 +11664,7 @@
+@@ -11398,7 +11672,7 @@
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
@@ -9862,7 +9873,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	cat >conftest.$ac_ext <<_ACEOF
-@@ -11400,11 +11674,10 @@
+@@ -11408,11 +11682,10 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -9875,7 +9886,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  test_array [0] = 0
  
    ;
-@@ -11417,13 +11690,14 @@
+@@ -11425,13 +11698,14 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -9892,7 +9903,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-@@ -11437,11 +11711,10 @@
+@@ -11445,11 +11719,10 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -9905,7 +9916,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  test_array [0] = 0
  
    ;
-@@ -11454,20 +11727,21 @@
+@@ -11462,20 +11735,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -9930,7 +9941,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_hi=`expr '(' $ac_mid ')' - 1`
-@@ -11481,7 +11755,7 @@
+@@ -11489,7 +11763,7 @@
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
@@ -9939,7 +9950,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_lo= ac_hi=
-@@ -11501,11 +11775,10 @@
+@@ -11509,11 +11783,10 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -9952,7 +9963,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  test_array [0] = 0
  
    ;
-@@ -11518,20 +11791,21 @@
+@@ -11526,20 +11799,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -9977,7 +9988,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_lo=`expr '(' $ac_mid ')' + 1`
-@@ -11542,11 +11816,13 @@
+@@ -11550,11 +11824,13 @@
  case $ac_lo in
  ?*) ac_cv_sizeof_long_double=$ac_lo;;
  '') if test "$ac_cv_type_long_double" = yes; then
@@ -9994,7 +10005,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
     else
       ac_cv_sizeof_long_double=0
     fi ;;
-@@ -11559,9 +11835,8 @@
+@@ -11567,9 +11843,8 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -10006,7 +10017,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  #include <stdio.h>
  #include <stdlib.h>
  int
-@@ -11571,20 +11846,22 @@
+@@ -11579,20 +11854,22 @@
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
      return 1;
@@ -10034,7 +10045,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    return ferror (f) || fclose (f) != 0;
  
    ;
-@@ -11597,43 +11874,48 @@
+@@ -11605,43 +11882,48 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -10094,7 +10105,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  
  
  
-@@ -11644,8 +11926,8 @@
+@@ -11652,8 +11934,8 @@
  
  fi
  
@@ -10105,7 +10116,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  have_c99_bool=no
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -11668,13 +11950,14 @@
+@@ -11676,13 +11958,14 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -10122,7 +10133,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-@@ -11688,78 +11971,24 @@
+@@ -11696,78 +11979,24 @@
    have_c99_bool=yes
  
  else
@@ -10207,7 +10218,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    if test "$cross_compiling" = yes; then
    # Depending upon the size, compute the lo and hi bounds.
-@@ -11770,11 +11999,10 @@
+@@ -11778,11 +12007,10 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -10220,7 +10231,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  test_array [0] = 0
  
    ;
-@@ -11787,13 +12015,14 @@
+@@ -11795,13 +12023,14 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -10237,7 +10248,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-@@ -11807,11 +12036,10 @@
+@@ -11815,11 +12044,10 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -10250,7 +10261,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  test_array [0] = 0
  
    ;
-@@ -11824,20 +12052,21 @@
+@@ -11832,20 +12060,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -10275,7 +10286,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_lo=`expr $ac_mid + 1`
-@@ -11851,7 +12080,7 @@
+@@ -11859,7 +12088,7 @@
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
@@ -10284,7 +10295,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	cat >conftest.$ac_ext <<_ACEOF
-@@ -11861,11 +12090,10 @@
+@@ -11869,11 +12098,10 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -10297,7 +10308,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  test_array [0] = 0
  
    ;
-@@ -11878,13 +12106,14 @@
+@@ -11886,13 +12114,14 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -10314,7 +10325,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-@@ -11898,11 +12127,10 @@
+@@ -11906,11 +12135,10 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -10327,7 +10338,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  test_array [0] = 0
  
    ;
-@@ -11915,20 +12143,21 @@
+@@ -11923,20 +12151,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -10352,7 +10363,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_hi=`expr '(' $ac_mid ')' - 1`
-@@ -11942,7 +12171,7 @@
+@@ -11950,7 +12179,7 @@
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
@@ -10361,7 +10372,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_lo= ac_hi=
-@@ -11962,11 +12191,10 @@
+@@ -11970,11 +12199,10 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -10374,7 +10385,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  test_array [0] = 0
  
    ;
-@@ -11979,20 +12207,21 @@
+@@ -11987,20 +12215,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -10399,7 +10410,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_lo=`expr '(' $ac_mid ')' + 1`
-@@ -12003,11 +12232,13 @@
+@@ -12011,11 +12240,13 @@
  case $ac_lo in
  ?*) ac_cv_sizeof__Bool=$ac_lo;;
  '') if test "$ac_cv_type__Bool" = yes; then
@@ -10416,7 +10427,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
     else
       ac_cv_sizeof__Bool=0
     fi ;;
-@@ -12020,9 +12251,8 @@
+@@ -12028,9 +12259,8 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -10428,7 +10439,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  #include <stdio.h>
  #include <stdlib.h>
  int
-@@ -12032,20 +12262,22 @@
+@@ -12040,20 +12270,22 @@
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
      return 1;
@@ -10456,7 +10467,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    return ferror (f) || fclose (f) != 0;
  
    ;
-@@ -12058,43 +12290,48 @@
+@@ -12066,43 +12298,48 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -10516,7 +10527,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  
  
  
-@@ -12105,12 +12342,13 @@
+@@ -12113,12 +12350,13 @@
  
  fi
  
@@ -10534,7 +10545,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -12120,14 +12358,11 @@
+@@ -12128,14 +12366,11 @@
          #include <stdint.h>
          #endif
  
@@ -10551,7 +10562,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    ;
    return 0;
  }
-@@ -12138,55 +12373,33 @@
+@@ -12146,55 +12381,33 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -10616,7 +10627,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    ;
    return 0;
  }
-@@ -12197,38 +12410,52 @@
+@@ -12205,38 +12418,52 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -10679,7 +10690,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    if test "$cross_compiling" = yes; then
    # Depending upon the size, compute the lo and hi bounds.
-@@ -12239,11 +12466,10 @@
+@@ -12247,11 +12474,10 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -10692,7 +10703,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  test_array [0] = 0
  
    ;
-@@ -12256,13 +12482,14 @@
+@@ -12264,13 +12490,14 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -10709,7 +10720,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-@@ -12276,11 +12503,10 @@
+@@ -12284,11 +12511,10 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -10722,7 +10733,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  test_array [0] = 0
  
    ;
-@@ -12293,20 +12519,21 @@
+@@ -12301,20 +12527,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -10747,7 +10758,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_lo=`expr $ac_mid + 1`
-@@ -12320,7 +12547,7 @@
+@@ -12328,7 +12555,7 @@
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
@@ -10756,7 +10767,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	cat >conftest.$ac_ext <<_ACEOF
-@@ -12330,11 +12557,10 @@
+@@ -12338,11 +12565,10 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -10769,7 +10780,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  test_array [0] = 0
  
    ;
-@@ -12347,13 +12573,14 @@
+@@ -12355,13 +12581,14 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -10786,7 +10797,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-@@ -12367,11 +12594,10 @@
+@@ -12375,11 +12602,10 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -10799,7 +10810,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  test_array [0] = 0
  
    ;
-@@ -12384,20 +12610,21 @@
+@@ -12392,20 +12618,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -10824,7 +10835,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_hi=`expr '(' $ac_mid ')' - 1`
-@@ -12411,7 +12638,7 @@
+@@ -12419,7 +12646,7 @@
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
@@ -10833,7 +10844,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_lo= ac_hi=
-@@ -12431,11 +12658,10 @@
+@@ -12439,11 +12666,10 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -10846,7 +10857,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  test_array [0] = 0
  
    ;
-@@ -12448,20 +12674,21 @@
+@@ -12456,20 +12682,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -10871,7 +10882,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_lo=`expr '(' $ac_mid ')' + 1`
-@@ -12472,11 +12699,13 @@
+@@ -12480,11 +12707,13 @@
  case $ac_lo in
  ?*) ac_cv_sizeof_uintptr_t=$ac_lo;;
  '') if test "$ac_cv_type_uintptr_t" = yes; then
@@ -10888,7 +10899,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
     else
       ac_cv_sizeof_uintptr_t=0
     fi ;;
-@@ -12489,9 +12718,8 @@
+@@ -12497,9 +12726,8 @@
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  $ac_includes_default
@@ -10900,7 +10911,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  #include <stdio.h>
  #include <stdlib.h>
  int
-@@ -12501,20 +12729,22 @@
+@@ -12509,20 +12737,22 @@
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
      return 1;
@@ -10928,7 +10939,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    return ferror (f) || fclose (f) != 0;
  
    ;
-@@ -12527,43 +12757,48 @@
+@@ -12535,43 +12765,48 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -10988,7 +10999,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  
  
  
-@@ -12577,10 +12812,10 @@
+@@ -12585,10 +12820,10 @@
  
  
  # Hmph. AC_CHECK_SIZEOF() doesn't include <sys/types.h>.
@@ -11002,7 +11013,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    if test "$cross_compiling" = yes; then
    ac_cv_sizeof_off_t=4
-@@ -12607,29 +12842,32 @@
+@@ -12615,29 +12850,32 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -11041,7 +11052,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  
-@@ -12637,16 +12875,16 @@
+@@ -12645,16 +12883,16 @@
  
  fi
  
@@ -11062,7 +11073,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  if test "$have_long_long" = yes -a \
  	"$ac_cv_sizeof_off_t" -gt "$ac_cv_sizeof_long" -a \
  	"$ac_cv_sizeof_long_long" -ge "$ac_cv_sizeof_off_t"; then
-@@ -12655,18 +12893,18 @@
+@@ -12663,18 +12901,18 @@
  #define HAVE_LARGEFILE_SUPPORT 1
  _ACEOF
  
@@ -11088,7 +11099,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    if test "$cross_compiling" = yes; then
    ac_cv_sizeof_time_t=4
-@@ -12693,29 +12931,32 @@
+@@ -12701,29 +12939,32 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -11127,7 +11138,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  
-@@ -12723,8 +12964,8 @@
+@@ -12731,8 +12972,8 @@
  
  fi
  
@@ -11138,7 +11149,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  
  cat >>confdefs.h <<_ACEOF
  #define SIZEOF_TIME_T $ac_cv_sizeof_time_t
-@@ -12741,8 +12982,8 @@
+@@ -12749,8 +12990,8 @@
  elif test "$ac_cv_pthread" = "yes"
  then CC="$CC -pthread"
  fi
@@ -11149,7 +11160,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  have_pthread_t=no
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -12765,34 +13006,35 @@
+@@ -12773,34 +13014,35 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -11193,7 +11204,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    if test "$cross_compiling" = yes; then
    ac_cv_sizeof_pthread_t=4
-@@ -12819,29 +13061,32 @@
+@@ -12827,29 +13069,32 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -11232,7 +11243,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  
-@@ -12849,8 +13094,8 @@
+@@ -12857,8 +13102,8 @@
  
  fi
  
@@ -11243,7 +11254,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  
  cat >>confdefs.h <<_ACEOF
  #define SIZEOF_PTHREAD_T $ac_cv_sizeof_pthread_t
-@@ -12859,8 +13104,8 @@
+@@ -12867,8 +13112,8 @@
  fi
  CC="$ac_save_cc"
  
@@ -11254,7 +11265,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  # Check whether --enable-toolbox-glue was given.
  if test "${enable_toolbox_glue+set}" = set; then
    enableval=$enable_toolbox_glue;
-@@ -12891,8 +13136,8 @@
+@@ -12899,8 +13144,8 @@
  	extra_undefs=""
  	;;
  esac
@@ -11265,7 +11276,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  
  
  
-@@ -12929,8 +13174,8 @@
+@@ -12937,8 +13182,8 @@
      LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
  esac
  
@@ -11276,7 +11287,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  if test "$enable_framework"
  then
  	BASECFLAGS="$BASECFLAGS -fno-common -dynamic"
-@@ -12941,15 +13186,15 @@
+@@ -12949,15 +13194,15 @@
  #define WITH_NEXT_FRAMEWORK 1
  _ACEOF
  
@@ -11298,7 +11309,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  case $ac_sys_system/$ac_sys_release in
    Darwin/*)
  
-@@ -12957,12 +13202,12 @@
+@@ -12965,12 +13210,12 @@
  #define WITH_DYLD 1
  _ACEOF
  
@@ -11315,7 +11326,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  	;;
  esac
  
-@@ -12974,8 +13219,8 @@
+@@ -12982,8 +13227,8 @@
  
  # SO is the extension of shared libraries `(including the dot!)
  # -- usually .so, .sl on HP-UX, .dll on Cygwin
@@ -11326,7 +11337,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  if test -z "$SO"
  then
  	case $ac_sys_system in
-@@ -13000,8 +13245,8 @@
+@@ -13008,8 +13253,8 @@
          echo '====================================================================='
  	sleep 10
  fi
@@ -11335,9 +11346,9 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
 +{ $as_echo "$as_me:$LINENO: result: $SO" >&5
 +$as_echo "$SO" >&6; }
  
+ 
  cat >>confdefs.h <<_ACEOF
- #define SHLIB_EXT "$SO"
-@@ -13011,8 +13256,8 @@
+@@ -13020,8 +13265,8 @@
  # -- "cc -G" on SunOS 5.x, "ld -shared" on IRIX 5
  # (Shared libraries in this instance are shared modules to be loaded into
  # Python, as opposed to building Python itself as a shared library.)
@@ -11348,7 +11359,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  if test -z "$LDSHARED"
  then
  	case $ac_sys_system/$ac_sys_release in
-@@ -13118,13 +13363,13 @@
+@@ -13127,13 +13372,13 @@
  	*)	LDSHARED="ld";;
  	esac
  fi
@@ -11366,7 +11377,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  if test -z "$CCSHARED"
  then
  	case $ac_sys_system/$ac_sys_release in
-@@ -13159,12 +13404,12 @@
+@@ -13168,12 +13413,12 @@
  	atheos*) CCSHARED="-fPIC";;
  	esac
  fi
@@ -11383,7 +11394,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  if test -z "$LINKFORSHARED"
  then
  	case $ac_sys_system/$ac_sys_release in
-@@ -13219,13 +13464,13 @@
+@@ -13228,13 +13473,13 @@
  		LINKFORSHARED='-Wl,-E -N 2048K';;
  	esac
  fi
@@ -11401,7 +11412,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  if test ! "$LIBRARY" = "$LDLIBRARY"
  then
  	case $ac_sys_system in
-@@ -13237,8 +13482,8 @@
+@@ -13246,8 +13491,8 @@
  		CFLAGSFORSHARED='$(CCSHARED)'
  	esac
  fi
@@ -11412,7 +11423,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  
  # SHLIBS are libraries (except -lc and -lm) to link to the python shared
  # library (with --enable-shared).
-@@ -13249,22 +13494,22 @@
+@@ -13258,22 +13503,22 @@
  # don't need to link LIBS explicitly. The default should be only changed
  # on systems where this approach causes problems.
  
@@ -11442,7 +11453,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-ldl  $LIBS"
-@@ -13296,33 +13541,37 @@
+@@ -13305,33 +13550,37 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -11488,7 +11499,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBDL 1
  _ACEOF
-@@ -13332,10 +13581,10 @@
+@@ -13341,10 +13590,10 @@
  fi
  	# Dynamic linking for SunOS/Solaris and SYSV
  
@@ -11502,7 +11513,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-ldld  $LIBS"
-@@ -13367,33 +13616,37 @@
+@@ -13376,33 +13625,37 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -11548,9 +11559,9 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBDLD 1
  _ACEOF
-@@ -13405,10 +13658,10 @@
+@@ -13414,10 +13667,10 @@
  
- # only check for sem_ini if thread support is requested
+ # only check for sem_init if thread support is requested
  if test "$with_threads" = "yes" -o -z "$with_threads"; then
 -    { echo "$as_me:$LINENO: checking for library containing sem_init" >&5
 -echo $ECHO_N "checking for library containing sem_init... $ECHO_C" >&6; }
@@ -11562,7 +11573,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    ac_func_search_save_LIBS=$LIBS
  cat >conftest.$ac_ext <<_ACEOF
-@@ -13446,26 +13699,30 @@
+@@ -13455,26 +13708,30 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -11598,7 +11609,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext
    if test "${ac_cv_search_sem_init+set}" = set; then
-@@ -13480,8 +13737,8 @@
+@@ -13489,8 +13746,8 @@
  rm conftest.$ac_ext
  LIBS=$ac_func_search_save_LIBS
  fi
@@ -11609,7 +11620,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  ac_res=$ac_cv_search_sem_init
  if test "$ac_res" != no; then
    test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-@@ -13493,10 +13750,10 @@
+@@ -13502,10 +13759,10 @@
  fi
  
  # check if we need libintl for locale functions
@@ -11623,7 +11634,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lintl  $LIBS"
-@@ -13528,33 +13785,37 @@
+@@ -13537,33 +13794,37 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -11669,7 +11680,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define WITH_LIBINTL 1
-@@ -13565,8 +13826,8 @@
+@@ -13574,8 +13835,8 @@
  
  # checks for system dependent C++ extensions support
  case "$ac_sys_system" in
@@ -11680,7 +11691,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  		cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -13588,33 +13849,37 @@
+@@ -13597,33 +13858,37 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -11727,7 +11738,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext;;
  	*) ;;
-@@ -13622,10 +13887,10 @@
+@@ -13631,10 +13896,10 @@
  
  # Most SVR4 platforms (e.g. Solaris) need -lsocket and -lnsl.
  # BeOS' sockets are stashed in libnet.
@@ -11741,7 +11752,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lnsl  $LIBS"
-@@ -13657,40 +13922,44 @@
+@@ -13666,40 +13931,44 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -11797,7 +11808,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lsocket $LIBS $LIBS"
-@@ -13722,43 +13991,47 @@
+@@ -13731,43 +14000,47 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -11856,7 +11867,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lnet $LIBS $LIBS"
-@@ -13790,58 +14063,62 @@
+@@ -13799,58 +14072,62 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -11935,7 +11946,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  
  # Check whether --with-system_ffi was given.
  if test "${with_system_ffi+set}" = set; then
-@@ -13849,14 +14126,14 @@
+@@ -13858,14 +14135,14 @@
  fi
  
  
@@ -11954,7 +11965,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  
  # Check whether --with-signal-module was given.
  if test "${with_signal_module+set}" = set; then
-@@ -13867,8 +14144,8 @@
+@@ -13876,8 +14153,8 @@
  if test -z "$with_signal_module"
  then with_signal_module="yes"
  fi
@@ -11965,7 +11976,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  
  if test "${with_signal_module}" = "yes"; then
  	USE_SIGNAL_MODULE=""
-@@ -13882,22 +14159,22 @@
+@@ -13891,22 +14168,22 @@
  
  USE_THREAD_MODULE=""
  
@@ -11994,7 +12005,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  fi
  
  
-@@ -13910,8 +14187,8 @@
+@@ -13919,8 +14196,8 @@
  
  
  
@@ -12005,7 +12016,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  
  # Check whether --with-threads was given.
  if test "${with_threads+set}" = set; then
-@@ -13930,8 +14207,8 @@
+@@ -13939,8 +14216,8 @@
  if test -z "$with_threads"
  then with_threads="yes"
  fi
@@ -12016,7 +12027,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  
  
  if test "$with_threads" = "no"
-@@ -13997,8 +14274,8 @@
+@@ -14006,8 +14283,8 @@
      # According to the POSIX spec, a pthreads implementation must
      # define _POSIX_THREADS in unistd.h. Some apparently don't
      # (e.g. gnu pth with pthread emulation)
@@ -12027,7 +12038,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
      cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -14020,25 +14297,25 @@
+@@ -14029,25 +14306,25 @@
  fi
  rm -f conftest*
  
@@ -12062,7 +12073,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -14054,32 +14331,33 @@
+@@ -14063,32 +14340,33 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -12103,7 +12114,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -14093,51 +14371,52 @@
+@@ -14102,51 +14380,52 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -12177,7 +12188,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
      ( cat <<\_ASBOX
  ## ------------------------------------------------ ##
  ## Report this to http://www.python.org/python-bugs ##
-@@ -14146,18 +14425,18 @@
+@@ -14155,18 +14434,18 @@
       ) | sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
@@ -12202,7 +12213,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    cat >>confdefs.h <<\_ACEOF
  #define WITH_THREAD 1
  _ACEOF
-@@ -14176,17 +14455,17 @@
+@@ -14185,17 +14464,17 @@
  else
  
      if test "${ac_cv_header_mach_cthreads_h+set}" = set; then
@@ -12227,7 +12238,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -14202,32 +14481,33 @@
+@@ -14211,32 +14490,33 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -12268,7 +12279,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -14241,51 +14521,52 @@
+@@ -14250,51 +14530,52 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -12342,7 +12353,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
      ( cat <<\_ASBOX
  ## ------------------------------------------------ ##
  ## Report this to http://www.python.org/python-bugs ##
-@@ -14294,18 +14575,18 @@
+@@ -14303,18 +14584,18 @@
       ) | sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
@@ -12367,7 +12378,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    cat >>confdefs.h <<\_ACEOF
  #define WITH_THREAD 1
  _ACEOF
-@@ -14322,13 +14603,13 @@
+@@ -14331,13 +14612,13 @@
      THREADOBJ="Python/thread.o"
  else
  
@@ -12385,7 +12396,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
                    cat >>confdefs.h <<\_ACEOF
  #define WITH_THREAD 1
  _ACEOF
-@@ -14341,16 +14622,16 @@
+@@ -14350,16 +14631,16 @@
                    LIBS="-lpth $LIBS"
                    THREADOBJ="Python/thread.o"
  else
@@ -12406,7 +12417,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
      cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -14375,21 +14656,24 @@
+@@ -14384,21 +14665,24 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -12437,7 +12448,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
      cat >>confdefs.h <<\_ACEOF
  #define WITH_THREAD 1
  _ACEOF
-@@ -14397,15 +14681,15 @@
+@@ -14406,15 +14690,15 @@
      posix_threads=yes
      THREADOBJ="Python/thread.o"
  else
@@ -12457,7 +12468,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -14458,32 +14742,36 @@
+@@ -14467,32 +14751,36 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -12502,7 +12513,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    cat >>confdefs.h <<\_ACEOF
  #define WITH_THREAD 1
  _ACEOF
-@@ -14493,17 +14781,17 @@
+@@ -14502,17 +14790,17 @@
  else
  
      if test "${ac_cv_header_atheos_threads_h+set}" = set; then
@@ -12527,7 +12538,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -14519,32 +14807,33 @@
+@@ -14528,32 +14816,33 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -12568,7 +12579,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -14558,51 +14847,52 @@
+@@ -14567,51 +14856,52 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -12642,7 +12653,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
      ( cat <<\_ASBOX
  ## ------------------------------------------------ ##
  ## Report this to http://www.python.org/python-bugs ##
-@@ -14611,18 +14901,18 @@
+@@ -14620,18 +14910,18 @@
       ) | sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
@@ -12667,7 +12678,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    cat >>confdefs.h <<\_ACEOF
  #define WITH_THREAD 1
  _ACEOF
-@@ -14636,17 +14926,17 @@
+@@ -14645,17 +14935,17 @@
  else
  
      if test "${ac_cv_header_kernel_OS_h+set}" = set; then
@@ -12692,7 +12703,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -14662,32 +14952,33 @@
+@@ -14671,32 +14961,33 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -12733,7 +12744,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -14701,51 +14992,52 @@
+@@ -14710,51 +15001,52 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -12807,7 +12818,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
      ( cat <<\_ASBOX
  ## ------------------------------------------------ ##
  ## Report this to http://www.python.org/python-bugs ##
-@@ -14754,18 +15046,18 @@
+@@ -14763,18 +15055,18 @@
       ) | sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
@@ -12832,7 +12843,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    cat >>confdefs.h <<\_ACEOF
  #define WITH_THREAD 1
  _ACEOF
-@@ -14778,10 +15070,10 @@
+@@ -14787,10 +15079,10 @@
      THREADOBJ="Python/thread.o"
  else
  
@@ -12846,7 +12857,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lpthreads  $LIBS"
-@@ -14813,33 +15105,37 @@
+@@ -14822,33 +15114,37 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -12892,7 +12903,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    cat >>confdefs.h <<\_ACEOF
  #define WITH_THREAD 1
  _ACEOF
-@@ -14849,10 +15145,10 @@
+@@ -14858,10 +15154,10 @@
      THREADOBJ="Python/thread.o"
  else
  
@@ -12906,7 +12917,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lc_r  $LIBS"
-@@ -14884,33 +15180,37 @@
+@@ -14893,33 +15189,37 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -12952,7 +12963,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    cat >>confdefs.h <<\_ACEOF
  #define WITH_THREAD 1
  _ACEOF
-@@ -14920,10 +15220,10 @@
+@@ -14929,10 +15229,10 @@
      THREADOBJ="Python/thread.o"
  else
  
@@ -12966,7 +12977,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lpthread  $LIBS"
-@@ -14955,33 +15255,37 @@
+@@ -14964,33 +15264,37 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -13012,7 +13023,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    cat >>confdefs.h <<\_ACEOF
  #define WITH_THREAD 1
  _ACEOF
-@@ -14991,10 +15295,10 @@
+@@ -15000,10 +15304,10 @@
      THREADOBJ="Python/thread.o"
  else
  
@@ -13026,7 +13037,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lcma  $LIBS"
-@@ -15026,33 +15330,37 @@
+@@ -15035,33 +15339,37 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -13072,7 +13083,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    cat >>confdefs.h <<\_ACEOF
  #define WITH_THREAD 1
  _ACEOF
-@@ -15082,6 +15390,7 @@
+@@ -15091,6 +15399,7 @@
  
  fi
  
@@ -13080,7 +13091,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  fi
-@@ -15093,10 +15402,10 @@
+@@ -15102,10 +15411,10 @@
  
  
  
@@ -13094,7 +13105,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lmpc  $LIBS"
-@@ -15128,33 +15437,37 @@
+@@ -15137,33 +15446,37 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -13140,7 +13151,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    cat >>confdefs.h <<\_ACEOF
  #define WITH_THREAD 1
  _ACEOF
-@@ -15166,10 +15479,10 @@
+@@ -15175,10 +15488,10 @@
  
  
      if test "$posix_threads" != "yes"; then
@@ -13154,7 +13165,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lthread  $LIBS"
-@@ -15201,33 +15514,37 @@
+@@ -15210,33 +15523,37 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -13200,7 +13211,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    cat >>confdefs.h <<\_ACEOF
  #define WITH_THREAD 1
  _ACEOF
-@@ -15280,10 +15597,10 @@
+@@ -15289,10 +15606,10 @@
  		       ;;
        esac
  
@@ -13214,7 +13225,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    if test "$cross_compiling" = yes; then
    ac_cv_pthread_system_supported=no
-@@ -15313,29 +15630,32 @@
+@@ -15322,29 +15639,32 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -13253,7 +13264,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
  fi
  
-@@ -15343,8 +15663,8 @@
+@@ -15352,8 +15672,8 @@
  
  fi
  
@@ -13264,7 +13275,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
        if test "$ac_cv_pthread_system_supported" = "yes"; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -15355,11 +15675,11 @@
+@@ -15364,11 +15684,11 @@
  
  for ac_func in pthread_sigmask
  do
@@ -13280,7 +13291,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -15412,35 +15732,42 @@
+@@ -15421,35 +15741,42 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -13333,7 +13344,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  _ACEOF
   case $ac_sys_system in
          CYGWIN*)
-@@ -15460,18 +15787,18 @@
+@@ -15469,18 +15796,18 @@
  # Check for enable-ipv6
  
  
@@ -13358,7 +13369,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
         cat >>confdefs.h <<\_ACEOF
  #define ENABLE_IPV6 1
  _ACEOF
-@@ -15482,8 +15809,8 @@
+@@ -15491,8 +15818,8 @@
  else
  
    if test "$cross_compiling" = yes; then
@@ -13369,7 +13380,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    ipv6=no
  
  else
-@@ -15511,41 +15838,44 @@
+@@ -15520,41 +15847,44 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -13426,7 +13437,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  	cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -15569,26 +15899,27 @@
+@@ -15578,26 +15908,27 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -13461,7 +13472,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  		ipv6=no
  fi
  
-@@ -15610,8 +15941,8 @@
+@@ -15619,8 +15950,8 @@
  ipv6trylibc=no
  
  if test "$ipv6" = "yes"; then
@@ -13472,7 +13483,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  	for i in inria kame linux-glibc linux-inet6 solaris toshiba v6d zeta;
  	do
  		case $i in
-@@ -15767,8 +16098,8 @@
+@@ -15776,8 +16107,8 @@
  			break
  		fi
  	done
@@ -13483,7 +13494,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  fi
  
  if test "$ipv6" = "yes" -a "$ipv6lib" != "none"; then
-@@ -15787,8 +16118,8 @@
+@@ -15796,8 +16127,8 @@
  	fi
  fi
  
@@ -13494,7 +13505,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -15810,13 +16141,14 @@
+@@ -15819,13 +16150,14 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -13511,7 +13522,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-@@ -15826,22 +16158,22 @@
+@@ -15835,22 +16167,22 @@
  #define HAVE_OSX105_SDK 1
  _ACEOF
  
@@ -13541,7 +13552,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  
  # Check whether --with-doc-strings was given.
  if test "${with_doc_strings+set}" = set; then
-@@ -15860,12 +16192,12 @@
+@@ -15869,12 +16201,12 @@
  _ACEOF
  
  fi
@@ -13558,7 +13569,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  
  # Check whether --with-tsc was given.
  if test "${with_tsc+set}" = set; then
-@@ -15877,20 +16209,20 @@
+@@ -15886,20 +16218,20 @@
  #define WITH_TSC 1
  _ACEOF
  
@@ -13587,7 +13598,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  
  # Check whether --with-pymalloc was given.
  if test "${with_pymalloc+set}" = set; then
-@@ -15909,12 +16241,12 @@
+@@ -15918,12 +16250,12 @@
  _ACEOF
  
  fi
@@ -13604,7 +13615,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  
  # Check whether --with-wctype-functions was given.
  if test "${with_wctype_functions+set}" = set; then
-@@ -15926,14 +16258,14 @@
+@@ -15935,14 +16267,14 @@
  #define WANT_WCTYPE_FUNCTIONS 1
  _ACEOF
  
@@ -13625,7 +13636,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  fi
  
  
-@@ -15946,11 +16278,11 @@
+@@ -15955,11 +16287,11 @@
  
  for ac_func in dlopen
  do
@@ -13641,7 +13652,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -16003,35 +16335,42 @@
+@@ -16012,35 +16344,42 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -13694,7 +13705,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  _ACEOF
  
  fi
-@@ -16041,8 +16380,8 @@
+@@ -16050,8 +16389,8 @@
  # DYNLOADFILE specifies which dynload_*.o file we will use for dynamic
  # loading of modules.
  
@@ -13705,7 +13716,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  if test -z "$DYNLOADFILE"
  then
  	case $ac_sys_system/$ac_sys_release in
-@@ -16067,8 +16406,8 @@
+@@ -16076,8 +16415,8 @@
  	;;
  	esac
  fi
@@ -13716,7 +13727,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  if test "$DYNLOADFILE" != "dynload_stub.o"
  then
  
-@@ -16081,16 +16420,16 @@
+@@ -16090,16 +16429,16 @@
  # MACHDEP_OBJS can be set to platform-specific object files needed by Python
  
  
@@ -13737,7 +13748,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  
  # checks for library functions
  
-@@ -16187,11 +16526,11 @@
+@@ -16196,11 +16535,11 @@
   sysconf tcgetpgrp tcsetpgrp tempnam timegm times tmpfile tmpnam tmpnam_r \
   truncate uname unsetenv utimes waitpid wait3 wait4 wcscoll _getpty
  do
@@ -13753,7 +13764,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -16244,35 +16583,42 @@
+@@ -16253,35 +16592,42 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -13806,7 +13817,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  _ACEOF
  
  fi
-@@ -16281,8 +16627,8 @@
+@@ -16290,8 +16636,8 @@
  
  # For some functions, having a definition is not sufficient, since
  # we want to take their address.
@@ -13817,7 +13828,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -16304,13 +16650,14 @@
+@@ -16313,13 +16659,14 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -13834,7 +13845,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-@@ -16320,20 +16667,20 @@
+@@ -16329,20 +16676,20 @@
  #define HAVE_CHROOT 1
  _ACEOF
  
@@ -13862,7 +13873,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -16355,13 +16702,14 @@
+@@ -16364,13 +16711,14 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -13879,7 +13890,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-@@ -16371,20 +16719,20 @@
+@@ -16380,20 +16728,20 @@
  #define HAVE_LINK 1
  _ACEOF
  
@@ -13907,7 +13918,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -16406,13 +16754,14 @@
+@@ -16415,13 +16763,14 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -13924,7 +13935,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-@@ -16422,20 +16771,20 @@
+@@ -16431,20 +16780,20 @@
  #define HAVE_SYMLINK 1
  _ACEOF
  
@@ -13952,7 +13963,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -16457,13 +16806,14 @@
+@@ -16466,13 +16815,14 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -13969,7 +13980,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-@@ -16473,20 +16823,20 @@
+@@ -16482,20 +16832,20 @@
  #define HAVE_FCHDIR 1
  _ACEOF
  
@@ -13997,7 +14008,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -16508,13 +16858,14 @@
+@@ -16517,13 +16867,14 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -14014,7 +14025,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-@@ -16524,20 +16875,20 @@
+@@ -16533,20 +16884,20 @@
  #define HAVE_FSYNC 1
  _ACEOF
  
@@ -14042,7 +14053,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -16559,13 +16910,14 @@
+@@ -16568,13 +16919,14 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -14059,7 +14070,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-@@ -16575,20 +16927,20 @@
+@@ -16584,20 +16936,20 @@
  #define HAVE_FDATASYNC 1
  _ACEOF
  
@@ -14087,7 +14098,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -16610,13 +16962,14 @@
+@@ -16619,13 +16971,14 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -14104,7 +14115,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-@@ -16626,20 +16979,20 @@
+@@ -16635,20 +16988,20 @@
  #define HAVE_EPOLL 1
  _ACEOF
  
@@ -14132,7 +14143,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -16664,13 +17017,14 @@
+@@ -16673,13 +17026,14 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -14149,7 +14160,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-@@ -16680,14 +17034,14 @@
+@@ -16689,14 +17043,14 @@
  #define HAVE_KQUEUE 1
  _ACEOF
  
@@ -14169,7 +14180,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  
  fi
  
-@@ -16698,8 +17052,8 @@
+@@ -16707,8 +17061,8 @@
  # address to avoid compiler warnings and potential miscompilations
  # because of the missing prototypes.
  
@@ -14180,7 +14191,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -16724,13 +17078,14 @@
+@@ -16733,13 +17087,14 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -14197,7 +14208,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-@@ -16740,21 +17095,21 @@
+@@ -16749,21 +17104,21 @@
  #define HAVE_CTERMID_R 1
  _ACEOF
  
@@ -14226,7 +14237,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -16779,13 +17134,14 @@
+@@ -16788,13 +17143,14 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -14243,7 +14254,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-@@ -16795,21 +17151,21 @@
+@@ -16804,21 +17160,21 @@
  #define HAVE_FLOCK 1
  _ACEOF
  
@@ -14272,7 +14283,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -16834,13 +17190,14 @@
+@@ -16843,13 +17199,14 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -14289,7 +14300,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-@@ -16850,14 +17207,14 @@
+@@ -16859,14 +17216,14 @@
  #define HAVE_GETPAGESIZE 1
  _ACEOF
  
@@ -14309,7 +14320,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  
  fi
  
-@@ -16867,10 +17224,10 @@
+@@ -16876,10 +17233,10 @@
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
@@ -14323,7 +14334,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    if test -n "$TRUE"; then
    ac_cv_prog_TRUE="$TRUE" # Let the user override the test.
-@@ -16883,7 +17240,7 @@
+@@ -16892,7 +17249,7 @@
    for ac_exec_ext in '' $ac_executable_extensions; do
    if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
      ac_cv_prog_TRUE="$ac_prog"
@@ -14332,7 +14343,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
      break 2
    fi
  done
-@@ -16894,11 +17251,11 @@
+@@ -16903,11 +17260,11 @@
  fi
  TRUE=$ac_cv_prog_TRUE
  if test -n "$TRUE"; then
@@ -14348,7 +14359,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  fi
  
  
-@@ -16907,10 +17264,10 @@
+@@ -16916,10 +17273,10 @@
  test -n "$TRUE" || TRUE="/bin/true"
  
  
@@ -14362,7 +14373,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lc  $LIBS"
-@@ -16942,247 +17299,149 @@
+@@ -16951,247 +17308,149 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -14388,12 +14399,11 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    ac_cv_lib_c_inet_aton=yes
  else
 -  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	ac_cv_lib_c_inet_aton=no
- fi
- 
+-sed 's/^/| /' conftest.$ac_ext >&5
+-
+-	ac_cv_lib_c_inet_aton=no
+-fi
+-
 -rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 -      conftest$ac_exeext conftest.$ac_ext
 -LIBS=$ac_check_lib_save_LIBS
@@ -14536,8 +14546,9 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
 -else
 -  echo "$as_me: program exited with status $ac_status" >&5
 -echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
++  $as_echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
 -( exit $ac_status )
 -{ echo "$as_me:$LINENO: result: no" >&5
 -echo "${ECHO_T}no" >&6; }
@@ -14546,7 +14557,9 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
 -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 -fi
 -
--
++	ac_cv_lib_c_inet_aton=no
++fi
+ 
 +rm -rf conftest.dSYM
 +rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
 +      conftest$ac_exeext conftest.$ac_ext
@@ -14672,12 +14685,12 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
 +
 +  LIBS="-lresolv $LIBS"
 +
- fi
- 
- 
 +fi
 +
 +
+ fi
+ 
+ 
 +## On Tru64, chflags seems to be present, but calling it will
 +## exit Python
 +#AC_MSG_CHECKING(for chflags)
@@ -14712,7 +14725,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  
  case $ac_sys_system/$ac_sys_release in
  Darwin/*)
-@@ -17193,10 +17452,10 @@
+@@ -17202,10 +17461,10 @@
  	;;
  esac
  
@@ -14726,7 +14739,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lz  $LIBS"
-@@ -17228,33 +17487,37 @@
+@@ -17237,33 +17496,37 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -14772,7 +14785,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_ZLIB_COPY 1
-@@ -17270,8 +17533,8 @@
+@@ -17279,8 +17542,8 @@
  	;;
  esac
  
@@ -14783,7 +14796,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -17296,39 +17559,43 @@
+@@ -17305,39 +17568,43 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -14838,7 +14851,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -17356,39 +17623,43 @@
+@@ -17365,39 +17632,43 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -14893,7 +14906,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -17416,13 +17687,14 @@
+@@ -17425,13 +17696,14 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -14910,7 +14923,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-@@ -17432,22 +17704,22 @@
+@@ -17441,22 +17713,22 @@
  #define HAVE_INET_PTON 1
  _ACEOF
  
@@ -14940,7 +14953,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -17475,13 +17747,14 @@
+@@ -17484,13 +17756,14 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -14957,7 +14970,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-@@ -17491,14 +17764,14 @@
+@@ -17500,14 +17773,14 @@
  #define HAVE_SETGROUPS 1
  _ACEOF
  
@@ -14977,7 +14990,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  
  fi
  
-@@ -17509,11 +17782,11 @@
+@@ -17518,11 +17791,11 @@
  
  for ac_func in openpty
  do
@@ -14993,7 +15006,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -17566,42 +17839,49 @@
+@@ -17575,42 +17848,49 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -15056,7 +15069,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lutil  $LIBS"
-@@ -17633,42 +17913,46 @@
+@@ -17642,42 +17922,46 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -15114,7 +15127,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lbsd  $LIBS"
-@@ -17700,33 +17984,37 @@
+@@ -17709,33 +17993,37 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -15160,7 +15173,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    cat >>confdefs.h <<\_ACEOF
  #define HAVE_OPENPTY 1
  _ACEOF
-@@ -17743,11 +18031,11 @@
+@@ -17752,11 +18040,11 @@
  
  for ac_func in forkpty
  do
@@ -15176,7 +15189,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -17800,42 +18088,49 @@
+@@ -17809,42 +18097,49 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -15239,7 +15252,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lutil  $LIBS"
-@@ -17867,42 +18162,46 @@
+@@ -17876,42 +18171,46 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -15297,7 +15310,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lbsd  $LIBS"
-@@ -17934,33 +18233,37 @@
+@@ -17943,33 +18242,37 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -15343,7 +15356,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    cat >>confdefs.h <<\_ACEOF
  #define HAVE_FORKPTY 1
  _ACEOF
-@@ -17979,11 +18282,11 @@
+@@ -17988,11 +18291,11 @@
  
  for ac_func in memmove
  do
@@ -15359,7 +15372,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -18036,35 +18339,42 @@
+@@ -18045,35 +18348,42 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -15412,7 +15425,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  _ACEOF
  
  fi
-@@ -18080,11 +18390,11 @@
+@@ -18089,11 +18399,11 @@
  
  for ac_func in fseek64 fseeko fstatvfs ftell64 ftello statvfs
  do
@@ -15428,7 +15441,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -18137,35 +18447,42 @@
+@@ -18146,35 +18456,42 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -15481,7 +15494,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  _ACEOF
  
  fi
-@@ -18177,11 +18494,11 @@
+@@ -18186,11 +18503,11 @@
  
  for ac_func in dup2 getcwd strdup
  do
@@ -15497,7 +15510,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -18234,35 +18551,42 @@
+@@ -18243,35 +18560,42 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -15550,7 +15563,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  _ACEOF
  
  else
-@@ -18279,11 +18603,11 @@
+@@ -18288,11 +18612,11 @@
  
  for ac_func in getpgrp
  do
@@ -15566,7 +15579,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -18336,35 +18660,42 @@
+@@ -18345,35 +18669,42 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -15619,7 +15632,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  _ACEOF
   cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -18387,13 +18718,14 @@
+@@ -18396,13 +18727,14 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -15636,7 +15649,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-@@ -18405,7 +18737,7 @@
+@@ -18414,7 +18746,7 @@
  
  
  else
@@ -15645,7 +15658,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
-@@ -18419,11 +18751,11 @@
+@@ -18428,11 +18760,11 @@
  
  for ac_func in setpgrp
  do
@@ -15661,7 +15674,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -18476,35 +18808,42 @@
+@@ -18485,35 +18817,42 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -15714,7 +15727,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  _ACEOF
   cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -18527,13 +18866,14 @@
+@@ -18536,13 +18875,14 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -15731,7 +15744,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-@@ -18545,7 +18885,7 @@
+@@ -18554,7 +18894,7 @@
  
  
  else
@@ -15740,7 +15753,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
-@@ -18559,11 +18899,11 @@
+@@ -18568,11 +18908,11 @@
  
  for ac_func in gettimeofday
  do
@@ -15756,7 +15769,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -18616,35 +18956,42 @@
+@@ -18625,35 +18965,42 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -15809,7 +15822,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  _ACEOF
   cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -18667,20 +19014,21 @@
+@@ -18676,20 +19023,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -15834,7 +15847,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
-@@ -18697,8 +19045,8 @@
+@@ -18706,8 +19054,8 @@
  done
  
  
@@ -15845,7 +15858,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -18730,44 +19078,48 @@
+@@ -18739,44 +19087,48 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -15905,7 +15918,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -18796,26 +19148,29 @@
+@@ -18805,26 +19157,29 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -15945,7 +15958,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  buggygetaddrinfo=yes
  else
    cat >conftest.$ac_ext <<_ACEOF
-@@ -18918,48 +19273,52 @@
+@@ -18927,48 +19282,52 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -16011,7 +16024,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
  
-@@ -18979,11 +19338,11 @@
+@@ -18988,11 +19347,11 @@
  
  for ac_func in getnameinfo
  do
@@ -16027,7 +16040,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -19036,35 +19395,42 @@
+@@ -19045,35 +19404,42 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -16080,7 +16093,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  _ACEOF
  
  fi
-@@ -19072,10 +19438,10 @@
+@@ -19081,10 +19447,10 @@
  
  
  # checks for structures
@@ -16094,7 +16107,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -19102,20 +19468,21 @@
+@@ -19111,20 +19477,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -16119,7 +16132,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_header_time=no
-@@ -19123,8 +19490,8 @@
+@@ -19132,8 +19499,8 @@
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
@@ -16130,7 +16143,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  if test $ac_cv_header_time = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -19133,10 +19500,10 @@
+@@ -19142,10 +19509,10 @@
  
  fi
  
@@ -16144,7 +16157,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -19152,7 +19519,7 @@
+@@ -19161,7 +19528,7 @@
  {
  struct tm tm;
  				     int *p = &tm.tm_sec;
@@ -16153,7 +16166,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    ;
    return 0;
  }
-@@ -19163,20 +19530,21 @@
+@@ -19172,20 +19539,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -16178,7 +16191,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_struct_tm=sys/time.h
-@@ -19184,8 +19552,8 @@
+@@ -19193,8 +19561,8 @@
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
@@ -16189,7 +16202,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  if test $ac_cv_struct_tm = sys/time.h; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -19194,10 +19562,10 @@
+@@ -19203,10 +19571,10 @@
  
  fi
  
@@ -16203,7 +16216,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -19225,20 +19593,21 @@
+@@ -19234,20 +19602,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -16228,7 +16241,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	cat >conftest.$ac_ext <<_ACEOF
-@@ -19267,20 +19636,21 @@
+@@ -19276,20 +19645,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -16253,7 +16266,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_member_struct_tm_tm_zone=no
-@@ -19291,9 +19661,9 @@
+@@ -19300,9 +19670,9 @@
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
@@ -16266,7 +16279,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_STRUCT_TM_TM_ZONE 1
-@@ -19309,10 +19679,10 @@
+@@ -19318,10 +19688,10 @@
  _ACEOF
  
  else
@@ -16280,7 +16293,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -19339,20 +19709,21 @@
+@@ -19348,20 +19718,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -16305,7 +16318,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_have_decl_tzname=no
-@@ -19360,9 +19731,9 @@
+@@ -19369,9 +19740,9 @@
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
@@ -16318,7 +16331,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_DECL_TZNAME 1
-@@ -19378,10 +19749,10 @@
+@@ -19387,10 +19758,10 @@
  fi
  
  
@@ -16332,7 +16345,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -19408,31 +19779,35 @@
+@@ -19417,31 +19788,35 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -16375,7 +16388,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    if test $ac_cv_var_tzname = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -19442,10 +19817,10 @@
+@@ -19451,10 +19826,10 @@
    fi
  fi
  
@@ -16389,7 +16402,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -19470,20 +19845,21 @@
+@@ -19479,20 +19854,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -16414,7 +16427,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	cat >conftest.$ac_ext <<_ACEOF
-@@ -19509,20 +19885,21 @@
+@@ -19518,20 +19894,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -16439,7 +16452,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_member_struct_stat_st_rdev=no
-@@ -19533,9 +19910,9 @@
+@@ -19542,9 +19919,9 @@
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
@@ -16452,7 +16465,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_STRUCT_STAT_ST_RDEV 1
-@@ -19544,10 +19921,10 @@
+@@ -19553,10 +19930,10 @@
  
  fi
  
@@ -16466,7 +16479,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -19572,20 +19949,21 @@
+@@ -19581,20 +19958,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -16491,7 +16504,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	cat >conftest.$ac_ext <<_ACEOF
-@@ -19611,20 +19989,21 @@
+@@ -19620,20 +19998,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -16516,7 +16529,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_member_struct_stat_st_blksize=no
-@@ -19635,9 +20014,9 @@
+@@ -19644,9 +20023,9 @@
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
@@ -16529,7 +16542,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_STRUCT_STAT_ST_BLKSIZE 1
-@@ -19646,10 +20025,10 @@
+@@ -19655,10 +20034,10 @@
  
  fi
  
@@ -16543,7 +16556,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -19674,20 +20053,21 @@
+@@ -19683,20 +20062,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -16568,7 +16581,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	cat >conftest.$ac_ext <<_ACEOF
-@@ -19713,20 +20093,21 @@
+@@ -19722,20 +20102,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -16593,7 +16606,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_member_struct_stat_st_flags=no
-@@ -19737,9 +20118,9 @@
+@@ -19746,9 +20127,9 @@
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
@@ -16606,7 +16619,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_STRUCT_STAT_ST_FLAGS 1
-@@ -19748,10 +20129,10 @@
+@@ -19757,10 +20138,10 @@
  
  fi
  
@@ -16620,7 +16633,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -19776,20 +20157,21 @@
+@@ -19785,20 +20166,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -16645,7 +16658,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	cat >conftest.$ac_ext <<_ACEOF
-@@ -19815,20 +20197,21 @@
+@@ -19824,20 +20206,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -16670,7 +16683,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_member_struct_stat_st_gen=no
-@@ -19839,9 +20222,9 @@
+@@ -19848,9 +20231,9 @@
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
@@ -16683,7 +16696,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_STRUCT_STAT_ST_GEN 1
-@@ -19850,10 +20233,10 @@
+@@ -19859,10 +20242,10 @@
  
  fi
  
@@ -16697,7 +16710,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -19878,20 +20261,21 @@
+@@ -19887,20 +20270,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -16722,7 +16735,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	cat >conftest.$ac_ext <<_ACEOF
-@@ -19917,20 +20301,21 @@
+@@ -19926,20 +20310,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -16747,7 +16760,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_member_struct_stat_st_birthtime=no
-@@ -19941,9 +20326,9 @@
+@@ -19950,9 +20335,9 @@
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
@@ -16760,7 +16773,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_STRUCT_STAT_ST_BIRTHTIME 1
-@@ -19952,10 +20337,10 @@
+@@ -19961,10 +20346,10 @@
  
  fi
  
@@ -16774,7 +16787,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -19980,20 +20365,21 @@
+@@ -19989,20 +20374,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -16799,7 +16812,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	cat >conftest.$ac_ext <<_ACEOF
-@@ -20019,20 +20405,21 @@
+@@ -20028,20 +20414,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -16824,7 +16837,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_member_struct_stat_st_blocks=no
-@@ -20043,9 +20430,9 @@
+@@ -20052,9 +20439,9 @@
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
@@ -16837,7 +16850,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_STRUCT_STAT_ST_BLOCKS 1
-@@ -20067,10 +20454,10 @@
+@@ -20076,10 +20463,10 @@
  
  
  
@@ -16851,7 +16864,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -20093,20 +20480,21 @@
+@@ -20102,20 +20489,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -16876,7 +16889,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_header_time_altzone=no
-@@ -20115,8 +20503,8 @@
+@@ -20124,8 +20512,8 @@
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
  
@@ -16887,7 +16900,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  if test $ac_cv_header_time_altzone = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -20126,8 +20514,8 @@
+@@ -20135,8 +20523,8 @@
  fi
  
  was_it_defined=no
@@ -16898,7 +16911,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -20153,13 +20541,14 @@
+@@ -20162,13 +20550,14 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -16915,7 +16928,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-@@ -20173,20 +20562,20 @@
+@@ -20182,20 +20571,20 @@
    was_it_defined=yes
  
  else
@@ -16942,7 +16955,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -20210,20 +20599,21 @@
+@@ -20219,20 +20608,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -16967,7 +16980,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_struct_addrinfo=no
-@@ -20232,8 +20622,8 @@
+@@ -20241,8 +20631,8 @@
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
  
@@ -16978,7 +16991,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  if test $ac_cv_struct_addrinfo = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -20242,10 +20632,10 @@
+@@ -20251,10 +20641,10 @@
  
  fi
  
@@ -16992,7 +17005,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -20270,20 +20660,21 @@
+@@ -20279,20 +20669,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -17017,7 +17030,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_struct_sockaddr_storage=no
-@@ -20292,8 +20683,8 @@
+@@ -20301,8 +20692,8 @@
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
  
@@ -17028,7 +17041,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  if test $ac_cv_struct_sockaddr_storage = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -20305,10 +20696,10 @@
+@@ -20314,10 +20705,10 @@
  # checks for compiler characteristics
  
  
@@ -17042,7 +17055,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -20333,20 +20724,21 @@
+@@ -20342,20 +20733,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -17067,7 +17080,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_c_char_unsigned=yes
-@@ -20354,8 +20746,8 @@
+@@ -20363,8 +20755,8 @@
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
@@ -17078,7 +17091,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  if test $ac_cv_c_char_unsigned = yes && test "$GCC" != yes; then
    cat >>confdefs.h <<\_ACEOF
  #define __CHAR_UNSIGNED__ 1
-@@ -20363,10 +20755,10 @@
+@@ -20372,10 +20764,10 @@
  
  fi
  
@@ -17092,7 +17105,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -20438,20 +20830,21 @@
+@@ -20447,20 +20839,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -17117,7 +17130,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_c_const=no
-@@ -20459,20 +20852,20 @@
+@@ -20468,20 +20861,20 @@
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
@@ -17143,7 +17156,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -20494,37 +20887,38 @@
+@@ -20503,37 +20896,38 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -17190,7 +17203,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -20546,37 +20940,38 @@
+@@ -20555,37 +20949,38 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -17237,7 +17250,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -20598,13 +20993,14 @@
+@@ -20607,13 +21002,14 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -17254,7 +17267,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-@@ -20618,19 +21014,19 @@
+@@ -20627,19 +21023,19 @@
    have_prototypes=yes
  
  else
@@ -17279,7 +17292,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -20662,13 +21058,14 @@
+@@ -20671,13 +21067,14 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -17296,7 +17309,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-@@ -20682,19 +21079,19 @@
+@@ -20691,19 +21088,19 @@
    works=yes
  
  else
@@ -17321,7 +17334,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -20719,13 +21116,14 @@
+@@ -20728,13 +21125,14 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -17338,7 +17351,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-@@ -20735,22 +21133,22 @@
+@@ -20744,22 +21142,22 @@
  #define HAVE_SOCKETPAIR 1
  _ACEOF
  
@@ -17368,7 +17381,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -20774,37 +21172,38 @@
+@@ -20783,37 +21181,38 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -17416,7 +17429,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -20832,20 +21231,21 @@
+@@ -20841,20 +21240,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -17441,7 +17454,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
-@@ -20859,17 +21259,17 @@
+@@ -20868,17 +21268,17 @@
  fi
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
@@ -17464,7 +17477,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -20922,39 +21322,43 @@
+@@ -20931,39 +21331,43 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -17518,7 +17531,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    OLD_CFLAGS=$CFLAGS
    CFLAGS="$CFLAGS $MY_CPPFLAGS $MY_THREAD_CPPFLAGS $MY_CFLAGS"
    cat >conftest.$ac_ext <<_ACEOF
-@@ -20988,13 +21392,14 @@
+@@ -20997,13 +21401,14 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -17535,7 +17548,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-@@ -21009,18 +21414,18 @@
+@@ -21018,18 +21423,18 @@
  #define HAVE_GETHOSTBYNAME_R_6_ARG 1
  _ACEOF
  
@@ -17561,7 +17574,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
      cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -21052,13 +21457,14 @@
+@@ -21061,13 +21466,14 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -17578,7 +17591,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-@@ -21073,18 +21479,18 @@
+@@ -21082,18 +21488,18 @@
  #define HAVE_GETHOSTBYNAME_R_5_ARG 1
  _ACEOF
  
@@ -17604,7 +17617,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
        cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -21114,13 +21520,14 @@
+@@ -21123,13 +21529,14 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -17621,7 +17634,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-@@ -21135,16 +21542,16 @@
+@@ -21144,16 +21551,16 @@
  #define HAVE_GETHOSTBYNAME_R_3_ARG 1
  _ACEOF
  
@@ -17643,7 +17656,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  
  fi
  
-@@ -21164,11 +21571,11 @@
+@@ -21173,11 +21580,11 @@
  
  for ac_func in gethostbyname
  do
@@ -17659,7 +17672,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -21221,35 +21628,42 @@
+@@ -21230,35 +21637,42 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -17712,7 +17725,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  _ACEOF
  
  fi
-@@ -21268,10 +21682,10 @@
+@@ -21277,10 +21691,10 @@
  # (none yet)
  
  # Linux requires this for correct f.p. operations
@@ -17726,7 +17739,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -21324,39 +21738,43 @@
+@@ -21333,39 +21747,43 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -17781,7 +17794,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lieee  $LIBS"
-@@ -21388,33 +21806,37 @@
+@@ -21397,33 +21815,37 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -17827,7 +17840,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    cat >>confdefs.h <<_ACEOF
  #define HAVE_LIBIEEE 1
  _ACEOF
-@@ -21428,8 +21850,8 @@
+@@ -21437,8 +21859,8 @@
  
  
  # Check for --with-fpectl
@@ -17838,7 +17851,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  
  # Check whether --with-fpectl was given.
  if test "${with_fpectl+set}" = set; then
-@@ -21441,14 +21863,14 @@
+@@ -21450,14 +21872,14 @@
  #define WANT_SIGFPE_HANDLER 1
  _ACEOF
  
@@ -17859,7 +17872,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  fi
  
  
-@@ -21459,53 +21881,53 @@
+@@ -21468,53 +21890,53 @@
  BeOS) ;;
  *) LIBM=-lm
  esac
@@ -17933,7 +17946,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  fi
  
  
-@@ -21518,10 +21940,10 @@
+@@ -21527,10 +21949,10 @@
  
  # On FreeBSD 6.2, it appears that tanh(-0.) returns 0. instead of
  # -0. on some architectures.
@@ -17947,7 +17960,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
  
  if test "$cross_compiling" = yes; then
-@@ -21552,37 +21974,40 @@
+@@ -21561,37 +21983,40 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -17996,9 +18009,9 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  if test "$ac_cv_tanh_preserves_zero_sign" = yes
  then
  
-@@ -21595,11 +22020,11 @@
+@@ -21613,11 +22038,11 @@
  
- for ac_func in hypot
+ for ac_func in acosh asinh atanh copysign expm1 finite hypot isinf isnan log1p
  do
 -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
 -{ echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -18012,76 +18025,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -21652,35 +22077,42 @@
-   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-   *) ac_try_echo=$ac_try;;
- esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-+$as_echo "$ac_try_echo") >&5
-   (eval "$ac_link") 2>conftest.er1
-   ac_status=$?
-   grep -v '^ *+' conftest.er1 >conftest.err
-   rm -f conftest.er1
-   cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-   (exit $ac_status); } && {
- 	 test -z "$ac_c_werror_flag" ||
- 	 test ! -s conftest.err
--       } && test -s conftest$ac_exeext &&
--       $as_test_x conftest$ac_exeext; then
-+       } && test -s conftest$ac_exeext && {
-+	 test "$cross_compiling" = yes ||
-+	 $as_test_x conftest$ac_exeext
-+       }; then
-   eval "$as_ac_var=yes"
- else
--  echo "$as_me: failed program was:" >&5
-+  $as_echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
- 	eval "$as_ac_var=no"
- fi
- 
-+rm -rf conftest.dSYM
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-       conftest$ac_exeext conftest.$ac_ext
- fi
--ac_res=`eval echo '${'$as_ac_var'}'`
--	       { echo "$as_me:$LINENO: result: $ac_res" >&5
--echo "${ECHO_T}$ac_res" >&6; }
--if test `eval echo '${'$as_ac_var'}'` = yes; then
-+ac_res=`eval 'as_val=${'$as_ac_var'}
-+		 $as_echo "$as_val"'`
-+	       { $as_echo "$as_me:$LINENO: result: $ac_res" >&5
-+$as_echo "$ac_res" >&6; }
-+as_val=`eval 'as_val=${'$as_ac_var'}
-+		 $as_echo "$as_val"'`
-+   if test "x$as_val" = x""yes; then
-   cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
- _ACEOF
- 
- else
-@@ -21706,11 +22138,11 @@
- 
- for ac_func in acosh asinh atanh copysign expm1 finite isinf isnan log1p
- do
--as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
--{ echo "$as_me:$LINENO: checking for $ac_func" >&5
--echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6; }
-+as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-+{ $as_echo "$as_me:$LINENO: checking for $ac_func" >&5
-+$as_echo_n "checking for $ac_func... " >&6; }
- if { as_var=$as_ac_var; eval "test \"\${$as_var+set}\" = set"; }; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
-+  $as_echo_n "(cached) " >&6
- else
-   cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
-@@ -21763,35 +22195,42 @@
+@@ -21670,35 +22095,42 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -18134,7 +18078,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  _ACEOF
  
  fi
-@@ -21802,17 +22241,17 @@
+@@ -21709,17 +22141,17 @@
  
  # check for wchar.h
  if test "${ac_cv_header_wchar_h+set}" = set; then
@@ -18159,7 +18103,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -21828,32 +22267,33 @@
+@@ -21735,32 +22167,33 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -18200,7 +18144,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -21867,51 +22307,52 @@
+@@ -21774,51 +22207,52 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -18274,7 +18218,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
      ( cat <<\_ASBOX
  ## ------------------------------------------------ ##
  ## Report this to http://www.python.org/python-bugs ##
-@@ -21920,18 +22361,18 @@
+@@ -21827,18 +22261,18 @@
       ) | sed "s/^/$as_me: WARNING:     /" >&2
      ;;
  esac
@@ -18299,7 +18243,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  
  
  cat >>confdefs.h <<\_ACEOF
-@@ -21950,69 +22391,14 @@
+@@ -21857,69 +22291,14 @@
  # determine wchar_t size
  if test "$wchar_h" = yes
  then
@@ -18373,7 +18317,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    if test "$cross_compiling" = yes; then
    # Depending upon the size, compute the lo and hi bounds.
-@@ -22024,11 +22410,10 @@
+@@ -21931,11 +22310,10 @@
  /* end confdefs.h.  */
  #include <wchar.h>
  
@@ -18386,7 +18330,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  test_array [0] = 0
  
    ;
-@@ -22041,13 +22426,14 @@
+@@ -21948,13 +22326,14 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -18403,7 +18347,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-@@ -22062,11 +22448,10 @@
+@@ -21969,11 +22348,10 @@
  /* end confdefs.h.  */
  #include <wchar.h>
  
@@ -18416,7 +18360,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  test_array [0] = 0
  
    ;
-@@ -22079,20 +22464,21 @@
+@@ -21986,20 +22364,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -18441,7 +18385,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_lo=`expr $ac_mid + 1`
-@@ -22106,7 +22492,7 @@
+@@ -22013,7 +22392,7 @@
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
@@ -18450,7 +18394,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	cat >conftest.$ac_ext <<_ACEOF
-@@ -22117,11 +22503,10 @@
+@@ -22024,11 +22403,10 @@
  /* end confdefs.h.  */
  #include <wchar.h>
  
@@ -18463,7 +18407,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  test_array [0] = 0
  
    ;
-@@ -22134,13 +22519,14 @@
+@@ -22041,13 +22419,14 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -18480,7 +18424,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-@@ -22155,11 +22541,10 @@
+@@ -22062,11 +22441,10 @@
  /* end confdefs.h.  */
  #include <wchar.h>
  
@@ -18493,7 +18437,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  test_array [0] = 0
  
    ;
-@@ -22172,20 +22557,21 @@
+@@ -22079,20 +22457,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -18518,7 +18462,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_hi=`expr '(' $ac_mid ')' - 1`
-@@ -22199,7 +22585,7 @@
+@@ -22106,7 +22485,7 @@
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
    done
  else
@@ -18527,7 +18471,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_lo= ac_hi=
-@@ -22220,11 +22606,10 @@
+@@ -22127,11 +22506,10 @@
  /* end confdefs.h.  */
  #include <wchar.h>
  
@@ -18540,7 +18484,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  test_array [0] = 0
  
    ;
-@@ -22237,20 +22622,21 @@
+@@ -22144,20 +22522,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -18565,7 +18509,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_lo=`expr '(' $ac_mid ')' + 1`
-@@ -22261,11 +22647,13 @@
+@@ -22168,11 +22547,13 @@
  case $ac_lo in
  ?*) ac_cv_sizeof_wchar_t=$ac_lo;;
  '') if test "$ac_cv_type_wchar_t" = yes; then
@@ -18582,7 +18526,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
     else
       ac_cv_sizeof_wchar_t=0
     fi ;;
-@@ -22279,9 +22667,8 @@
+@@ -22186,9 +22567,8 @@
  /* end confdefs.h.  */
  #include <wchar.h>
  
@@ -18594,7 +18538,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  #include <stdio.h>
  #include <stdlib.h>
  int
-@@ -22291,20 +22678,22 @@
+@@ -22198,20 +22578,22 @@
    FILE *f = fopen ("conftest.val", "w");
    if (! f)
      return 1;
@@ -18622,7 +18566,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    return ferror (f) || fclose (f) != 0;
  
    ;
-@@ -22317,43 +22706,48 @@
+@@ -22224,43 +22606,48 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -18682,7 +18626,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  
  
  
-@@ -22364,8 +22758,8 @@
+@@ -22271,8 +22658,8 @@
  
  fi
  
@@ -18693,7 +18637,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  have_ucs4_tcl=no
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -22392,13 +22786,14 @@
+@@ -22299,13 +22686,14 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -18710,7 +18654,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-@@ -22412,24 +22807,24 @@
+@@ -22319,24 +22707,24 @@
    have_ucs4_tcl=yes
  
  else
@@ -18741,7 +18685,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
  
    if test "$cross_compiling" = yes; then
-@@ -22456,41 +22851,44 @@
+@@ -22363,41 +22751,44 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -18796,7 +18740,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  # Check whether --enable-unicode was given.
  if test "${enable_unicode+set}" = set; then
    enableval=$enable_unicode;
-@@ -22534,8 +22932,8 @@
+@@ -22441,8 +22832,8 @@
  if test "$enable_unicode" = "no"
  then
    UNICODE_OBJS=""
@@ -18807,7 +18751,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    UNICODE_OBJS="Objects/unicodeobject.o Objects/unicodectype.o"
  
-@@ -22575,33 +22973,83 @@
+@@ -22482,33 +22873,83 @@
    else
         PY_UNICODE_TYPE="no type found"
    fi
@@ -18903,7 +18847,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  
    ;
    return 0;
-@@ -22613,33 +23061,129 @@
+@@ -22520,33 +22961,129 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -19040,7 +18984,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  
    ;
    return 0;
-@@ -22651,20 +23195,21 @@
+@@ -22558,20 +23095,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -19065,7 +19009,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_c_bigendian=no
-@@ -22672,29 +23217,44 @@
+@@ -22579,29 +23117,44 @@
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  else
@@ -19123,7 +19067,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    ;
    return 0;
  }
-@@ -22705,30 +23265,31 @@
+@@ -22612,30 +23165,31 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -19169,7 +19113,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  
-@@ -22747,14 +23308,14 @@
+@@ -22654,14 +23208,14 @@
  main ()
  {
  
@@ -19192,7 +19136,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  
    ;
    return 0;
-@@ -22766,63 +23327,70 @@
+@@ -22673,63 +23227,70 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -19289,7 +19233,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
  
  if test "$cross_compiling" = yes; then
-@@ -22847,37 +23415,40 @@
+@@ -22754,37 +23315,40 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -19338,7 +19282,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  if test "$ac_cv_rshift_extends_sign" = no
  then
  
-@@ -22888,10 +23459,10 @@
+@@ -22795,10 +23359,10 @@
  fi
  
  # check for getc_unlocked and related locking functions
@@ -19352,7 +19296,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
  
  cat >conftest.$ac_ext <<_ACEOF
-@@ -22920,32 +23491,36 @@
+@@ -22827,32 +23391,36 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -19396,7 +19340,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  if test "$ac_cv_have_getc_unlocked" = yes
  then
  
-@@ -22963,8 +23538,8 @@
+@@ -22870,8 +23438,8 @@
  # library.  NOTE: Keep the precedence of listed libraries synchronised
  # with setup.py.
  py_cv_lib_readline=no
@@ -19407,7 +19351,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  for py_libtermcap in "" ncursesw ncurses curses termcap; do
    if test -z "$py_libtermcap"; then
      READLINE_LIBS="-lreadline"
-@@ -23000,26 +23575,30 @@
+@@ -22907,26 +23475,30 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -19443,7 +19387,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
        conftest$ac_exeext conftest.$ac_ext
    if test $py_cv_lib_readline = yes; then
-@@ -23029,11 +23608,11 @@
+@@ -22936,11 +23508,11 @@
  # Uncomment this line if you want to use READINE_LIBS in Makefile or scripts
  #AC_SUBST([READLINE_LIBS])
  if test $py_cv_lib_readline = no; then
@@ -19459,7 +19403,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_LIBREADLINE 1
-@@ -23042,10 +23621,10 @@
+@@ -22949,10 +23521,10 @@
  fi
  
  # check for readline 2.1
@@ -19473,7 +19417,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lreadline $READLINE_LIBS $LIBS"
-@@ -23077,33 +23656,37 @@
+@@ -22984,33 +23556,37 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -19519,7 +19463,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_RL_CALLBACK 1
-@@ -23126,20 +23709,21 @@
+@@ -23033,20 +23609,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -19544,7 +19488,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
    have_readline=no
-@@ -23170,10 +23754,10 @@
+@@ -23077,10 +23654,10 @@
  fi
  
  # check for readline 4.0
@@ -19558,7 +19502,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lreadline $READLINE_LIBS $LIBS"
-@@ -23205,33 +23789,37 @@
+@@ -23112,33 +23689,37 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -19604,7 +19548,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_RL_PRE_INPUT_HOOK 1
-@@ -23241,10 +23829,10 @@
+@@ -23148,10 +23729,10 @@
  
  
  # also in 4.0
@@ -19618,7 +19562,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lreadline $READLINE_LIBS $LIBS"
-@@ -23276,33 +23864,37 @@
+@@ -23183,33 +23764,37 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -19664,7 +19608,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_RL_COMPLETION_DISPLAY_MATCHES_HOOK 1
-@@ -23312,10 +23904,10 @@
+@@ -23219,10 +23804,10 @@
  
  
  # check for readline 4.2
@@ -19678,7 +19622,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    ac_check_lib_save_LIBS=$LIBS
  LIBS="-lreadline $READLINE_LIBS $LIBS"
-@@ -23347,33 +23939,37 @@
+@@ -23254,33 +23839,37 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -19724,7 +19668,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_RL_COMPLETION_MATCHES 1
-@@ -23396,20 +23992,21 @@
+@@ -23303,20 +23892,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -19749,7 +19693,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
    have_readline=no
-@@ -23442,10 +24039,10 @@
+@@ -23349,10 +23939,10 @@
  # End of readline checks: restore LIBS
  LIBS=$LIBS_no_readline
  
@@ -19763,7 +19707,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
  
  if test "$cross_compiling" = yes; then
-@@ -23473,37 +24070,40 @@
+@@ -23380,37 +23970,40 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -19812,7 +19756,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  if test "$ac_cv_broken_nice" = yes
  then
  
-@@ -23513,8 +24113,8 @@
+@@ -23420,8 +24013,8 @@
  
  fi
  
@@ -19823,7 +19767,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  if test "$cross_compiling" = yes; then
    ac_cv_broken_poll=no
  else
-@@ -23556,35 +24156,38 @@
+@@ -23463,35 +24056,38 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -19870,7 +19814,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  if test "$ac_cv_broken_poll" = yes
  then
  
-@@ -23597,10 +24200,10 @@
+@@ -23504,10 +24100,10 @@
  # Before we can test tzset, we need to check if struct tm has a tm_zone
  # (which is not required by ISO C or UNIX spec) and/or if we support
  # tzname[]
@@ -19884,7 +19828,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -23628,20 +24231,21 @@
+@@ -23535,20 +24131,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -19909,7 +19853,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	cat >conftest.$ac_ext <<_ACEOF
-@@ -23670,20 +24274,21 @@
+@@ -23577,20 +24174,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -19934,7 +19878,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_member_struct_tm_tm_zone=no
-@@ -23694,9 +24299,9 @@
+@@ -23601,9 +24199,9 @@
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
@@ -19947,7 +19891,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_STRUCT_TM_TM_ZONE 1
-@@ -23712,10 +24317,10 @@
+@@ -23619,10 +24217,10 @@
  _ACEOF
  
  else
@@ -19961,7 +19905,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -23742,20 +24347,21 @@
+@@ -23649,20 +24247,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -19986,7 +19930,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_have_decl_tzname=no
-@@ -23763,9 +24369,9 @@
+@@ -23670,9 +24269,9 @@
  
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
@@ -19999,7 +19943,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  
  cat >>confdefs.h <<_ACEOF
  #define HAVE_DECL_TZNAME 1
-@@ -23781,10 +24387,10 @@
+@@ -23688,10 +24287,10 @@
  fi
  
  
@@ -20013,7 +19957,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -23811,31 +24417,35 @@
+@@ -23718,31 +24317,35 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -20056,7 +20000,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    if test $ac_cv_var_tzname = yes; then
  
  cat >>confdefs.h <<\_ACEOF
-@@ -23847,10 +24457,10 @@
+@@ -23754,10 +24357,10 @@
  
  
  # check tzset(3) exists and works like we expect it to
@@ -20070,7 +20014,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
  
  if test "$cross_compiling" = yes; then
-@@ -23933,37 +24543,40 @@
+@@ -23840,37 +24443,40 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -20119,7 +20063,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  if test "$ac_cv_working_tzset" = yes
  then
  
-@@ -23974,10 +24587,10 @@
+@@ -23881,10 +24487,10 @@
  fi
  
  # Look for subsecond timestamps in struct stat
@@ -20133,7 +20077,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -24003,20 +24616,21 @@
+@@ -23910,20 +24516,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -20158,7 +20102,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_stat_tv_nsec=no
-@@ -24025,8 +24639,8 @@
+@@ -23932,8 +24539,8 @@
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
  
@@ -20169,7 +20113,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  if test "$ac_cv_stat_tv_nsec" = yes
  then
  
-@@ -24037,10 +24651,10 @@
+@@ -23944,10 +24551,10 @@
  fi
  
  # Look for BSD style subsecond timestamps in struct stat
@@ -20183,7 +20127,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -24066,20 +24680,21 @@
+@@ -23973,20 +24580,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -20208,7 +20152,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_stat_tv_nsec2=no
-@@ -24088,8 +24703,8 @@
+@@ -23995,8 +24603,8 @@
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
  
@@ -20219,7 +20163,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  if test "$ac_cv_stat_tv_nsec2" = yes
  then
  
-@@ -24100,10 +24715,10 @@
+@@ -24007,10 +24615,10 @@
  fi
  
  # On HP/UX 11.0, mvwdelch is a block with a return statement
@@ -20233,7 +20177,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -24129,20 +24744,21 @@
+@@ -24036,20 +24644,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -20258,7 +20202,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_mvwdelch_is_expression=no
-@@ -24151,8 +24767,8 @@
+@@ -24058,8 +24667,8 @@
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
  
@@ -20269,7 +20213,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  
  if test "$ac_cv_mvwdelch_is_expression" = yes
  then
-@@ -24163,10 +24779,10 @@
+@@ -24070,10 +24679,10 @@
  
  fi
  
@@ -20283,7 +20227,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
-@@ -24192,20 +24808,21 @@
+@@ -24099,20 +24708,21 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -20308,7 +20252,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  sed 's/^/| /' conftest.$ac_ext >&5
  
  	ac_cv_window_has_flags=no
-@@ -24214,8 +24831,8 @@
+@@ -24121,8 +24731,8 @@
  rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  fi
  
@@ -20319,7 +20263,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  
  
  if test "$ac_cv_window_has_flags" = yes
-@@ -24227,8 +24844,8 @@
+@@ -24134,8 +24744,8 @@
  
  fi
  
@@ -20330,7 +20274,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -24250,13 +24867,14 @@
+@@ -24157,13 +24767,14 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -20347,7 +20291,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-@@ -24266,21 +24884,21 @@
+@@ -24173,21 +24784,21 @@
  #define HAVE_CURSES_IS_TERM_RESIZED 1
  _ACEOF
  
@@ -20376,7 +20320,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -24302,13 +24920,14 @@
+@@ -24209,13 +24820,14 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -20393,7 +20337,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-@@ -24318,21 +24937,21 @@
+@@ -24225,21 +24837,21 @@
  #define HAVE_CURSES_RESIZE_TERM 1
  _ACEOF
  
@@ -20422,7 +20366,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -24354,13 +24973,14 @@
+@@ -24261,13 +24873,14 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -20439,7 +20383,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    (exit $ac_status); } && {
  	 test -z "$ac_c_werror_flag" ||
  	 test ! -s conftest.err
-@@ -24370,149 +24990,128 @@
+@@ -24277,149 +24890,128 @@
  #define HAVE_CURSES_RESIZETERM 1
  _ACEOF
  
@@ -20682,7 +20626,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -24528,14 +25127,11 @@
+@@ -24435,14 +25027,11 @@
  #endif
  
  
@@ -20699,7 +20643,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    ;
    return 0;
  }
-@@ -24546,30 +25142,39 @@
+@@ -24453,30 +25042,39 @@
    *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
    *) ac_try_echo=$ac_try;;
  esac
@@ -20747,7 +20691,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    :
  else
  
-@@ -24589,15 +25194,15 @@
+@@ -24496,15 +25094,15 @@
  
  
  SRCDIRS="Parser Grammar Objects Python Modules Mac"
@@ -20767,7 +20711,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  
  # generate output files
  ac_config_files="$ac_config_files Makefile.pre Modules/Setup.config"
-@@ -24629,11 +25234,12 @@
+@@ -24536,11 +25134,12 @@
      case $ac_val in #(
      *${as_nl}*)
        case $ac_var in #(
@@ -20782,7 +20726,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
        *) $as_unset $ac_var ;;
        esac ;;
      esac
-@@ -24666,12 +25272,12 @@
+@@ -24573,12 +25172,12 @@
  if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
    if test -w "$cache_file"; then
      test "x$cache_file" != "x/dev/null" &&
@@ -20799,7 +20743,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    fi
  fi
  rm -f confcache
-@@ -24687,7 +25293,7 @@
+@@ -24594,7 +25193,7 @@
  for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
    # 1. Remove the extension, and $U if already installed.
    ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
@@ -20808,7 +20752,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    # 2. Prepend LIBOBJDIR.  When used with automake>=1.10 LIBOBJDIR
    #    will be set to the directory where LIBOBJS objects are built.
    ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext"
-@@ -24699,12 +25305,14 @@
+@@ -24606,12 +25205,14 @@
  
  
  
@@ -20826,7 +20770,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  #! $SHELL
  # Generated by $as_me.
  # Run this file to recreate the current configuration.
-@@ -24717,7 +25325,7 @@
+@@ -24624,7 +25225,7 @@
  SHELL=\${CONFIG_SHELL-$SHELL}
  _ACEOF
  
@@ -20835,7 +20779,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  ## --------------------- ##
  ## M4sh Initialization.  ##
  ## --------------------- ##
-@@ -24727,7 +25335,7 @@
+@@ -24634,7 +25235,7 @@
  if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
    emulate sh
    NULLCMD=:
@@ -20844,7 +20788,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    # is contrary to our usage.  Disable this feature.
    alias -g '${1+"$@"}'='"$@"'
    setopt NO_GLOB_SUBST
-@@ -24749,17 +25357,45 @@
+@@ -24656,17 +25257,45 @@
  as_cr_digits='0123456789'
  as_cr_alnum=$as_cr_Letters$as_cr_digits
  
@@ -20899,7 +20843,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  fi
  
  # Support unset when possible.
-@@ -24775,8 +25411,6 @@
+@@ -24682,8 +25311,6 @@
  # there to prevent editors from complaining about space-tab.
  # (If _AS_PATH_WALK were called with IFS unset, it would disable word
  # splitting by setting IFS to empty value.)
@@ -20908,7 +20852,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  IFS=" ""	$as_nl"
  
  # Find who we are.  Look in the path if we contain no directory separator.
-@@ -24799,7 +25433,7 @@
+@@ -24706,7 +25333,7 @@
    as_myself=$0
  fi
  if test ! -f "$as_myself"; then
@@ -20917,7 +20861,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    { (exit 1); exit 1; }
  fi
  
-@@ -24812,17 +25446,10 @@
+@@ -24719,17 +25346,10 @@
  PS4='+ '
  
  # NLS nuisances.
@@ -20939,7 +20883,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  
  # Required to use basename.
  if expr a : '\(a\)' >/dev/null 2>&1 &&
-@@ -24844,7 +25471,7 @@
+@@ -24751,7 +25371,7 @@
  $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
  	 X"$0" : 'X\(//\)$' \| \
  	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
@@ -20948,7 +20892,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
      sed '/^.*\/\([^/][^/]*\)\/*$/{
  	    s//\1/
  	    q
-@@ -24895,7 +25522,7 @@
+@@ -24802,7 +25422,7 @@
        s/-\n.*//
      ' >$as_me.lineno &&
    chmod +x "$as_me.lineno" ||
@@ -20957,7 +20901,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
     { (exit 1); exit 1; }; }
  
    # Don't try to exec as it changes $[0], causing all sort of problems
-@@ -24923,7 +25550,6 @@
+@@ -24830,7 +25450,6 @@
  *)
    ECHO_N='-n';;
  esac
@@ -20965,7 +20909,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  if expr a : '\(a\)' >/dev/null 2>&1 &&
     test "X`expr 00001 : '.*\(...\)'`" = X001; then
    as_expr=expr
-@@ -24936,19 +25562,22 @@
+@@ -24843,19 +25462,22 @@
    rm -f conf$$.dir/conf$$.file
  else
    rm -f conf$$.dir
@@ -20999,7 +20943,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  else
    as_ln_s='cp -p'
  fi
-@@ -24973,10 +25602,10 @@
+@@ -24880,10 +25502,10 @@
    as_test_x='
      eval sh -c '\''
        if test -d "$1"; then
@@ -21012,7 +20956,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  	esac;
  	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
  	???[sx]*):;;*)false;;esac;fi
-@@ -24999,7 +25628,7 @@
+@@ -24906,7 +25528,7 @@
  # values after options handling.
  ac_log="
  This file was extended by python $as_me 2.6, which was
@@ -21021,7 +20965,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  
    CONFIG_FILES    = $CONFIG_FILES
    CONFIG_HEADERS  = $CONFIG_HEADERS
-@@ -25012,29 +25641,39 @@
+@@ -24919,29 +25541,39 @@
  
  _ACEOF
  
@@ -21069,7 +21013,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  
  Configuration files:
  $config_files
-@@ -25045,24 +25684,24 @@
+@@ -24952,24 +25584,24 @@
  Report bugs to <bug-autoconf@gnu.org>."
  
  _ACEOF
@@ -21101,7 +21045,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  ac_need_defaults=:
  while test $# != 0
  do
-@@ -25084,30 +25723,36 @@
+@@ -24991,30 +25623,36 @@
    -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
      ac_cs_recheck=: ;;
    --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
@@ -21144,7 +21088,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  Try \`$0 --help' for more information." >&2
     { (exit 1); exit 1; }; } ;;
  
-@@ -25126,30 +25771,32 @@
+@@ -25033,30 +25671,32 @@
  fi
  
  _ACEOF
@@ -21185,7 +21129,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  
  # Handling of arguments.
  for ac_config_target in $ac_config_targets
-@@ -25164,8 +25811,8 @@
+@@ -25071,8 +25711,8 @@
      "Makefile.pre") CONFIG_FILES="$CONFIG_FILES Makefile.pre" ;;
      "Modules/Setup.config") CONFIG_FILES="$CONFIG_FILES Modules/Setup.config" ;;
  
@@ -21196,7 +21140,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
     { (exit 1); exit 1; }; };;
    esac
  done
-@@ -25205,225 +25852,144 @@
+@@ -25112,225 +25752,144 @@
    (umask 077 && mkdir "$tmp")
  } ||
  {
@@ -21534,7 +21478,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  # VPATH may cause trouble with some makes, so we remove $(srcdir),
  # ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
  # trailing colons and then remove the whole line if VPATH becomes empty
-@@ -25439,19 +26005,133 @@
+@@ -25346,19 +25905,133 @@
  }'
  fi
  
@@ -21672,7 +21616,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
     { (exit 1); exit 1; }; };;
    :[FH]-) ac_tag=-:-;;
    :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
-@@ -25480,26 +26160,38 @@
+@@ -25387,26 +26060,38 @@
  	   [\\/$]*) false;;
  	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
  	   esac ||
@@ -21719,7 +21663,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
      esac
      ;;
    esac
-@@ -25509,7 +26201,7 @@
+@@ -25416,7 +26101,7 @@
  	 X"$ac_file" : 'X\(//\)[^/]' \| \
  	 X"$ac_file" : 'X\(//\)$' \| \
  	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
@@ -21728,7 +21672,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
      sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
  	    s//\1/
  	    q
-@@ -25535,7 +26227,7 @@
+@@ -25442,7 +26127,7 @@
      as_dirs=
      while :; do
        case $as_dir in #(
@@ -21737,7 +21681,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
        *) as_qdir=$as_dir;;
        esac
        as_dirs="'$as_qdir' $as_dirs"
-@@ -25544,7 +26236,7 @@
+@@ -25451,7 +26136,7 @@
  	 X"$as_dir" : 'X\(//\)[^/]' \| \
  	 X"$as_dir" : 'X\(//\)$' \| \
  	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
@@ -21746,7 +21690,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
      sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
  	    s//\1/
  	    q
-@@ -25565,17 +26257,17 @@
+@@ -25472,17 +26157,17 @@
        test -d "$as_dir" && break
      done
      test -z "$as_dirs" || eval "mkdir $as_dirs"
@@ -21768,7 +21712,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    case $ac_top_builddir_sub in
    "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
    *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
-@@ -25615,12 +26307,13 @@
+@@ -25522,12 +26207,13 @@
    esac
  _ACEOF
  
@@ -21784,7 +21728,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    p
    q
  }
-@@ -25629,13 +26322,14 @@
+@@ -25536,13 +26222,14 @@
  /@infodir@/p
  /@localedir@/p
  /@mandir@/p
@@ -21803,7 +21747,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
    ac_datarootdir_hack='
    s&@datadir@&$datadir&g
    s&@docdir@&$docdir&g
-@@ -25649,15 +26343,16 @@
+@@ -25556,15 +26243,16 @@
  # Neutralize VPATH when `$srcdir' = `.'.
  # Shell code in configure.ac might set extrasub.
  # FIXME: do we really want to maintain this feature?
@@ -21824,7 +21768,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  s&@srcdir@&$ac_srcdir&;t t
  s&@abs_srcdir@&$ac_abs_srcdir&;t t
  s&@top_srcdir@&$ac_top_srcdir&;t t
-@@ -25667,119 +26362,58 @@
+@@ -25574,119 +26262,58 @@
  s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
  s&@INSTALL@&$ac_INSTALL&;t t
  $ac_datarootdir_hack
@@ -21977,7 +21921,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
   ;;
  
  
-@@ -25793,6 +26427,11 @@
+@@ -25700,6 +26327,11 @@
  chmod +x $CONFIG_STATUS
  ac_clean_files=$ac_clean_files_save
  
@@ -21989,7 +21933,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  
  # configure is writing to config.log, and then calls config.status.
  # config.status does its own redirection, appending to config.log.
-@@ -25814,6 +26453,10 @@
+@@ -25721,6 +26353,10 @@
    # would make configure fail if this is the last instruction.
    $ac_cs_success || { (exit 1); exit 1; }
  fi
@@ -22000,7 +21944,7 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  
  
  echo "creating Modules/Setup"
-@@ -25835,12 +26478,12 @@
+@@ -25742,12 +26378,12 @@
  
  case $ac_sys_system in
  BeOS)
@@ -22015,10 +21959,10 @@ diff -Naur Python-2.6.1/configure Python-2.6.1.patch/configure
  
    Support for BeOS is deprecated as of Python 2.6.
    See PEP 11 for the gory details.
-diff -Naur Python-2.6.1/configure.in Python-2.6.1.patch/configure.in
---- Python-2.6.1/configure.in	2008-11-16 09:02:56.000000000 +0100
-+++ Python-2.6.1.patch/configure.in	2009-02-17 14:33:58.000000000 +0100
-@@ -2556,37 +2556,37 @@
+diff -Naur Python-2.6.2/configure.in Python-2.6.2.patch/configure.in
+--- Python-2.6.2/configure.in	2009-03-30 19:56:14.000000000 +0200
++++ Python-2.6.2.patch/configure.in	2009-05-18 03:56:01.440931334 +0200
+@@ -2565,37 +2565,37 @@
    AC_CHECK_LIB(resolv, inet_aton)
  )
  
@@ -22087,7 +22031,7 @@ diff -Naur Python-2.6.1/configure.in Python-2.6.1.patch/configure.in
  
  dnl Check if system zlib has *Copy() functions
  dnl
-@@ -3627,66 +3627,66 @@
+@@ -3634,66 +3634,66 @@
    AC_MSG_RESULT(no)
  )
  
@@ -22213,9 +22157,9 @@ diff -Naur Python-2.6.1/configure.in Python-2.6.1.patch/configure.in
  
  AC_CHECK_TYPE(socklen_t,,
    AC_DEFINE(socklen_t,int,
-diff -Naur Python-2.6.1/pyconfig.h.in Python-2.6.1.patch/pyconfig.h.in
---- Python-2.6.1/pyconfig.h.in	2008-09-07 07:15:18.000000000 +0200
-+++ Python-2.6.1.patch/pyconfig.h.in	2009-02-17 14:27:35.000000000 +0100
+diff -Naur Python-2.6.2/pyconfig.h.in Python-2.6.2.patch/pyconfig.h.in
+--- Python-2.6.2/pyconfig.h.in	2008-09-07 07:15:18.000000000 +0200
++++ Python-2.6.2.patch/pyconfig.h.in	2009-05-18 03:56:08.765941849 +0200
 @@ -5,6 +5,9 @@
  #define Py_PYCONFIG_H
  
diff --git a/packages/lang/Python/url b/packages/lang/Python/url
index 5dad43929a..fadab9afdb 100644
--- a/packages/lang/Python/url
+++ b/packages/lang/Python/url
@@ -1 +1 @@
-http://www.python.org/ftp/python/2.6.1/Python-2.6.1.tar.bz2
+http://www.python.org/ftp/python/2.6.2/Python-2.6.2.tar.bz2
diff --git a/packages/x11/driver/xf86-video-intel/build b/packages/x11/driver/xf86-video-intel/build
index cedded74c3..b7fa3b36ac 100755
--- a/packages/x11/driver/xf86-video-intel/build
+++ b/packages/x11/driver/xf86-video-intel/build
@@ -4,7 +4,9 @@
 
 $SCRIPTS/build toolchain
 
-CFLAGS="$CFLAGS -I$PKG_BUILD/src/xvmc"
+BUILD_DIR=`ls -d $PKG_BUILD`
+
+CFLAGS="$CFLAGS -I$BUILD_DIR/src/xvmc"
 
 cd $PKG_BUILD
 ./configure --host=$TARGET_NAME \
diff --git a/scripts/build b/scripts/build
index a2ecfb7a28..bf38a7404e 100755
--- a/scripts/build
+++ b/scripts/build
@@ -40,9 +40,9 @@ if [ ! -f $STAMP ]; then
     $PKG_DIR/build $@ >&$VERBOSE_OUT
     if [ "$DEBUG" = no ]; then
      $STRIP `find $BUILD/$1* -name "*.so"` >& /dev/null || \
-      echo "no *.so libs found"
+      echo "Information: no *.so libs found"
      $STRIP `find $BUILD/$1* -name "*.so.[0-9]*"` >& /dev/null ||\
-      echo "no *.so.[0-9]* libs found"
+      echo "Information: no *.so.[0-9]* libs found"
     fi
     for i in `find $SYSROOT_PREFIX/usr/lib/ -name "*.la"`; do \
       $SED "s:\(['= ]\)/usr:\\1$SYSROOT_PREFIX/usr:g" $i; \