[Python-checkins] r75727 - in python/branches/release31-maint: Modules/readline.c configure configure.in pyconfig.h.in

[antoine.pitrou]

Author: antoine.pitrou
Date: Mon Oct 26 20:32:51 2009
New Revision: 75727

Log:
Merged revisions 75726 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r75726 | antoine.pitrou | 2009-10-26 20:22:14 +0100 (lun., 26 oct. 2009) | 10 lines
  
  Merged revisions 75725 via svnmerge from 
  svn+ssh://pythondev@svn.python.org/python/trunk
  
  ........
    r75725 | antoine.pitrou | 2009-10-26 20:16:46 +0100 (lun., 26 oct. 2009) | 4 lines
    
    Some platforms have rl_completion_append_character but not rl_completion_suppress_append.
    Reported by Mark D.
  ........
................


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Modules/readline.c
   python/branches/release31-maint/configure
   python/branches/release31-maint/configure.in
   python/branches/release31-maint/pyconfig.h.in

Modified: python/branches/release31-maint/Modules/readline.c
==============================================================================
--- python/branches/release31-maint/Modules/readline.c	(original)
+++ python/branches/release31-maint/Modules/readline.c	Mon Oct 26 20:32:51 2009
@@ -760,6 +760,8 @@
 {
 #ifdef HAVE_RL_COMPLETION_APPEND_CHARACTER
 	rl_completion_append_character ='\0';
+#endif
+#ifdef HAVE_RL_COMPLETION_SUPPRESS_APPEND
 	rl_completion_suppress_append = 0;
 #endif
 	Py_XDECREF(begidx);

Modified: python/branches/release31-maint/configure
==============================================================================
--- python/branches/release31-maint/configure	(original)
+++ python/branches/release31-maint/configure	Mon Oct 26 20:32:51 2009
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 74747 .
+# From configure.in Revision: 74980 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for python 3.1.
 #
@@ -3802,7 +3802,7 @@
   { echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6; }
 fi
-rm -f -r conftest*
+rm -f conftest*
 
 
 
@@ -5350,7 +5350,7 @@
 else
   ac_cv_header_stdc=no
 fi
-rm -f -r conftest*
+rm -f conftest*
 
 fi
 
@@ -5371,7 +5371,7 @@
 else
   ac_cv_header_stdc=no
 fi
-rm -f -r conftest*
+rm -f conftest*
 
 fi
 
@@ -6469,7 +6469,7 @@
 
 
 fi
-rm -f -r conftest*
+rm -f conftest*
 
 { echo "$as_me:$LINENO: result: $was_it_defined" >&5
 echo "${ECHO_T}$was_it_defined" >&6; }
@@ -6999,7 +6999,7 @@
 else
   ac_cv_type_uid_t=no
 fi
-rm -f -r conftest*
+rm -f conftest*
 
 fi
 { echo "$as_me:$LINENO: result: $ac_cv_type_uid_t" >&5
@@ -14409,7 +14409,7 @@
 else
   unistd_defines_pthreads=no
 fi
-rm -f -r conftest*
+rm -f conftest*
 
     { echo "$as_me:$LINENO: result: $unistd_defines_pthreads" >&5
 echo "${ECHO_T}$unistd_defines_pthreads" >&6; }
@@ -15877,7 +15877,7 @@
   $EGREP "yes" >/dev/null 2>&1; then
   ipv6type=$i
 fi
-rm -f -r conftest*
+rm -f conftest*
 
 			;;
 		kame)
@@ -15900,7 +15900,7 @@
 				ipv6libdir=/usr/local/v6/lib
 				ipv6trylibc=yes
 fi
-rm -f -r conftest*
+rm -f conftest*
 
 			;;
 		linux-glibc)
@@ -15921,7 +15921,7 @@
   ipv6type=$i;
 				ipv6trylibc=yes
 fi
-rm -f -r conftest*
+rm -f conftest*
 
 			;;
 		linux-inet6)
@@ -15959,7 +15959,7 @@
 				ipv6lib=inet6;
 				ipv6libdir=/usr/local/v6/lib
 fi
-rm -f -r conftest*
+rm -f conftest*
 
 			;;
 		v6d)
@@ -15982,7 +15982,7 @@
 				ipv6libdir=/usr/local/v6/lib;
 				BASECFLAGS="-I/usr/local/v6/include $BASECFLAGS"
 fi
-rm -f -r conftest*
+rm -f conftest*
 
 			;;
 		zeta)
@@ -16004,7 +16004,7 @@
 				ipv6lib=inet6;
 				ipv6libdir=/usr/local/v6/lib
 fi
-rm -f -r conftest*
+rm -f conftest*
 
 			;;
 		esac
@@ -23989,7 +23989,26 @@
 _ACEOF
 
 fi
-rm -f -r conftest*
+rm -f conftest*
+
+  cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <readline/readline.h>
+
+_ACEOF
+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
+  $EGREP "extern int rl_completion_suppress_append;" >/dev/null 2>&1; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_RL_COMPLETION_SUPPRESS_APPEND 1
+_ACEOF
+
+fi
+rm -f conftest*
 
 fi
 
@@ -24259,7 +24278,7 @@
 _ACEOF
 
 fi
-rm -f -r conftest*
+rm -f conftest*
 
 fi
 

Modified: python/branches/release31-maint/configure.in
==============================================================================
--- python/branches/release31-maint/configure.in	(original)
+++ python/branches/release31-maint/configure.in	Mon Oct 26 20:32:51 2009
@@ -3568,6 +3568,10 @@
   [readline/readline.h],
   AC_DEFINE(HAVE_RL_COMPLETION_APPEND_CHARACTER, 1,
   [Define if you have readline 2.2]), )
+  AC_EGREP_HEADER([extern int rl_completion_suppress_append;],
+  [readline/readline.h],
+  AC_DEFINE(HAVE_RL_COMPLETION_SUPPRESS_APPEND, 1,
+  [Define if you have rl_completion_suppress_append]), )
 fi
 
 # check for readline 4.0

Modified: python/branches/release31-maint/pyconfig.h.in
==============================================================================
--- python/branches/release31-maint/pyconfig.h.in	(original)
+++ python/branches/release31-maint/pyconfig.h.in	Mon Oct 26 20:32:51 2009
@@ -524,6 +524,9 @@
 /* Define if you have readline 4.2 */
 #undef HAVE_RL_COMPLETION_MATCHES
 
+/* Define if you have rl_completion_suppress_append */
+#undef HAVE_RL_COMPLETION_SUPPRESS_APPEND
+
 /* Define if you have readline 4.0 */
 #undef HAVE_RL_PRE_INPUT_HOOK