[Python-checkins] r78782 - in python/branches/py3k: configure configure.in

Mon Mar 8 08:02:03 CET 2010

Author: ronald.oussoren
Date: Mon Mar 8 08:02:03 2010
New Revision: 78782
Log:
Fix for issue 8067
Modified:
 python/branches/py3k/configure
 python/branches/py3k/configure.in
Modified: python/branches/py3k/configure
==============================================================================

--- python/branches/py3k/configure	(original)
+++ python/branches/py3k/configure	Mon Mar 8 08:02:03 2010
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 78196 .
+# From configure.in Revision: 78476 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for python 3.2.
 #
@@ -2154,6 +2154,8 @@
 # has no effect, don't bother defining them
 Darwin/[6789].*)
 define_xopen_source=no;;
+ Darwin/1[6789].*)
+ define_xopen_source=no;;
 # On AIX 4 and 5.1, mbstate_t is defined only when _XOPEN_SOURCE == 500 but
 # used in wcsnrtombs() and mbsnrtowcs() even if _XOPEN_SOURCE is not defined
 # or has another value. By not (re)defining it, the defaults come in place.
@@ -3829,7 +3831,7 @@
 { echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6; }
 fi
-rm -f conftest*
+rm -f -r conftest*
 
 
 
@@ -5404,7 +5406,7 @@
 else
 ac_cv_header_stdc=no
 fi
-rm -f conftest*
+rm -f -r conftest*
 
 fi
 
@@ -5425,7 +5427,7 @@
 else
 ac_cv_header_stdc=no
 fi
-rm -f conftest*
+rm -f -r conftest*
 
 fi
 
@@ -6525,7 +6527,7 @@
 
 
 fi
-rm -f conftest*
+rm -f -r conftest*
 
 { echo "$as_me:$LINENO: result: $was_it_defined" >&5
 echo "${ECHO_T}$was_it_defined" >&6; }
@@ -7055,7 +7057,7 @@
 else
 ac_cv_type_uid_t=no
 fi
-rm -f conftest*
+rm -f -r conftest*
 
 fi
 { echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5
@@ -15724,7 +15726,7 @@
 else
 unistd_defines_pthreads=no
 fi
-rm -f conftest*
+rm -f -r conftest*
 
 { echo "$as_me:$LINENO: result: $unistd_defines_pthreads" >&5
 echo "${ECHO_T}$unistd_defines_pthreads" >&6; }
@@ -17022,7 +17024,7 @@
 $EGREP "yes" >/dev/null 2>&1; then
 ipv6type=$i
 fi
-rm -f conftest*
+rm -f -r conftest*
 
 			;;
 		kame)
@@ -17045,7 +17047,7 @@
 				ipv6libdir=/usr/local/v6/lib
 				ipv6trylibc=yes
 fi
-rm -f conftest*
+rm -f -r conftest*
 
 			;;
 		linux-glibc)
@@ -17066,7 +17068,7 @@
 ipv6type=$i;
 				ipv6trylibc=yes
 fi
-rm -f conftest*
+rm -f -r conftest*
 
 			;;
 		linux-inet6)
@@ -17104,7 +17106,7 @@
 				ipv6lib=inet6;
 				ipv6libdir=/usr/local/v6/lib
 fi
-rm -f conftest*
+rm -f -r conftest*
 
 			;;
 		v6d)
@@ -17127,7 +17129,7 @@
 				ipv6libdir=/usr/local/v6/lib;
 				BASECFLAGS="-I/usr/local/v6/include $BASECFLAGS"
 fi
-rm -f conftest*
+rm -f -r conftest*
 
 			;;
 		zeta)
@@ -17149,7 +17151,7 @@
 				ipv6lib=inet6;
 				ipv6libdir=/usr/local/v6/lib
 fi
-rm -f conftest*
+rm -f -r conftest*
 
 			;;
 		esac
@@ -25664,7 +25666,7 @@
 _ACEOF
 
 fi
-rm -f conftest*
+rm -f -r conftest*
 
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h. */
@@ -25683,7 +25685,7 @@
 _ACEOF
 
 fi
-rm -f conftest*
+rm -f -r conftest*
 
 fi
 
@@ -25953,7 +25955,7 @@
 _ACEOF
 
 fi
-rm -f conftest*
+rm -f -r conftest*
 
 fi
 
Modified: python/branches/py3k/configure.in
==============================================================================
--- python/branches/py3k/configure.in	(original)
+++ python/branches/py3k/configure.in	Mon Mar 8 08:02:03 2010
@@ -319,6 +319,8 @@
 # has no effect, don't bother defining them
 Darwin/@<:@6789@:>@.*)
 define_xopen_source=no;;
+ Darwin/1@<:@6789@:>@.*)
+ define_xopen_source=no;;
 # On AIX 4 and 5.1, mbstate_t is defined only when _XOPEN_SOURCE == 500 but
 # used in wcsnrtombs() and mbsnrtowcs() even if _XOPEN_SOURCE is not defined
 # or has another value. By not (re)defining it, the defaults come in place.
