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.
........
diff --git a/Modules/readline.c b/Modules/readline.c
index 51844f7..705d766 100644
--- a/Modules/readline.c
+++ b/Modules/readline.c
@@ -802,6 +802,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);
diff --git a/configure b/configure
index 9a09bc9..ff1a560 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.in Revision: 75678 .
+# From configure.in Revision: 75684 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for python 3.2.
#
@@ -25056,6 +25056,25 @@
fi
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
# check for readline 4.0
diff --git a/configure.in b/configure.in
index 23d3ee4..6db50b9 100644
--- a/configure.in
+++ b/configure.in
@@ -3528,6 +3528,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
diff --git a/pyconfig.h.in b/pyconfig.h.in
index 3df44d4..eb25449 100644
--- a/pyconfig.h.in
+++ b/pyconfig.h.in
@@ -533,6 +533,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