117724f21a94ff32f773af4c37be88fe0d2970e3~suv--- configure.orig 2011-10-31 13:23:35.000000000 +1100
117724f21a94ff32f773af4c37be88fe0d2970e3~suv+++ configure 2011-10-31 13:28:19.000000000 +1100
117724f21a94ff32f773af4c37be88fe0d2970e3~suv@@ -20985,9 +20985,9 @@
117724f21a94ff32f773af4c37be88fe0d2970e3~suv echo $ECHO_N "checking how to link readline libs... $ECHO_C" >&6; }
117724f21a94ff32f773af4c37be88fe0d2970e3~suv for py_libtermcap in "" ncursesw ncurses curses termcap; do
117724f21a94ff32f773af4c37be88fe0d2970e3~suv if test -z "$py_libtermcap"; then
117724f21a94ff32f773af4c37be88fe0d2970e3~suv- READLINE_LIBS="-lreadline"
117724f21a94ff32f773af4c37be88fe0d2970e3~suv+ READLINE_LIBS="-ledit"
117724f21a94ff32f773af4c37be88fe0d2970e3~suv- READLINE_LIBS="-lreadline -l$py_libtermcap"
117724f21a94ff32f773af4c37be88fe0d2970e3~suv+ READLINE_LIBS="-ledit -l$py_libtermcap"
117724f21a94ff32f773af4c37be88fe0d2970e3~suv LIBS="$READLINE_LIBS $LIBS_no_readline"
117724f21a94ff32f773af4c37be88fe0d2970e3~suv cat >conftest.$ac_ext <<_ACEOF
117724f21a94ff32f773af4c37be88fe0d2970e3~suv@@ -21060,13 +21060,13 @@
117724f21a94ff32f773af4c37be88fe0d2970e3~suv # check for readline 2.1
117724f21a94ff32f773af4c37be88fe0d2970e3~suv-{ echo "$as_me:$LINENO: checking for rl_callback_handler_install in -lreadline" >&5
117724f21a94ff32f773af4c37be88fe0d2970e3~suv-echo $ECHO_N "checking for rl_callback_handler_install in -lreadline... $ECHO_C" >&6; }
117724f21a94ff32f773af4c37be88fe0d2970e3~suv+{ echo "$as_me:$LINENO: checking for rl_callback_handler_install in -ledit" >&5
117724f21a94ff32f773af4c37be88fe0d2970e3~suv+echo $ECHO_N "checking for rl_callback_handler_install in -ledit... $ECHO_C" >&6; }
117724f21a94ff32f773af4c37be88fe0d2970e3~suv if test "${ac_cv_lib_readline_rl_callback_handler_install+set}" = set; then
117724f21a94ff32f773af4c37be88fe0d2970e3~suv echo $ECHO_N "(cached) $ECHO_C" >&6
117724f21a94ff32f773af4c37be88fe0d2970e3~suv ac_check_lib_save_LIBS=$LIBS
117724f21a94ff32f773af4c37be88fe0d2970e3~suv-LIBS="-lreadline $READLINE_LIBS $LIBS"
117724f21a94ff32f773af4c37be88fe0d2970e3~suv+LIBS="-ledit $READLINE_LIBS $LIBS"
117724f21a94ff32f773af4c37be88fe0d2970e3~suv cat >conftest.$ac_ext <<_ACEOF
117724f21a94ff32f773af4c37be88fe0d2970e3~suv@@ -21137,7 +21137,7 @@
117724f21a94ff32f773af4c37be88fe0d2970e3~suv cat confdefs.h >>conftest.$ac_ext
117724f21a94ff32f773af4c37be88fe0d2970e3~suv cat >>conftest.$ac_ext <<_ACEOF
117724f21a94ff32f773af4c37be88fe0d2970e3~suv if { (ac_try="$ac_cpp conftest.$ac_ext"
117724f21a94ff32f773af4c37be88fe0d2970e3~suv case "(($ac_try" in
117724f21a94ff32f773af4c37be88fe0d2970e3~suv@@ -21172,7 +21172,7 @@
117724f21a94ff32f773af4c37be88fe0d2970e3~suv cat confdefs.h >>conftest.$ac_ext
117724f21a94ff32f773af4c37be88fe0d2970e3~suv cat >>conftest.$ac_ext <<_ACEOF
117724f21a94ff32f773af4c37be88fe0d2970e3~suv if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
117724f21a94ff32f773af4c37be88fe0d2970e3~suv@@ -21188,13 +21188,13 @@
117724f21a94ff32f773af4c37be88fe0d2970e3~suv # check for readline 4.0
117724f21a94ff32f773af4c37be88fe0d2970e3~suv-{ echo "$as_me:$LINENO: checking for rl_pre_input_hook in -lreadline" >&5
117724f21a94ff32f773af4c37be88fe0d2970e3~suv-echo $ECHO_N "checking for rl_pre_input_hook in -lreadline... $ECHO_C" >&6; }
117724f21a94ff32f773af4c37be88fe0d2970e3~suv+{ echo "$as_me:$LINENO: checking for rl_pre_input_hook in -ledit" >&5
117724f21a94ff32f773af4c37be88fe0d2970e3~suv+echo $ECHO_N "checking for rl_pre_input_hook in -ledit... $ECHO_C" >&6; }
117724f21a94ff32f773af4c37be88fe0d2970e3~suv if test "${ac_cv_lib_readline_rl_pre_input_hook+set}" = set; then
117724f21a94ff32f773af4c37be88fe0d2970e3~suv echo $ECHO_N "(cached) $ECHO_C" >&6
117724f21a94ff32f773af4c37be88fe0d2970e3~suv ac_check_lib_save_LIBS=$LIBS
117724f21a94ff32f773af4c37be88fe0d2970e3~suv-LIBS="-lreadline $READLINE_LIBS $LIBS"
117724f21a94ff32f773af4c37be88fe0d2970e3~suv+LIBS="-ledit $READLINE_LIBS $LIBS"
117724f21a94ff32f773af4c37be88fe0d2970e3~suv cat >conftest.$ac_ext <<_ACEOF
117724f21a94ff32f773af4c37be88fe0d2970e3~suv@@ -21259,13 +21259,13 @@
117724f21a94ff32f773af4c37be88fe0d2970e3~suv # check for readline 4.2
117724f21a94ff32f773af4c37be88fe0d2970e3~suv-{ echo "$as_me:$LINENO: checking for rl_completion_matches in -lreadline" >&5
117724f21a94ff32f773af4c37be88fe0d2970e3~suv-echo $ECHO_N "checking for rl_completion_matches in -lreadline... $ECHO_C" >&6; }
117724f21a94ff32f773af4c37be88fe0d2970e3~suv+{ echo "$as_me:$LINENO: checking for rl_completion_matches in -ledit" >&5
117724f21a94ff32f773af4c37be88fe0d2970e3~suv+echo $ECHO_N "checking for rl_completion_matches in -ledit... $ECHO_C" >&6; }
117724f21a94ff32f773af4c37be88fe0d2970e3~suv if test "${ac_cv_lib_readline_rl_completion_matches+set}" = set; then
117724f21a94ff32f773af4c37be88fe0d2970e3~suv echo $ECHO_N "(cached) $ECHO_C" >&6
117724f21a94ff32f773af4c37be88fe0d2970e3~suv ac_check_lib_save_LIBS=$LIBS
117724f21a94ff32f773af4c37be88fe0d2970e3~suv-LIBS="-lreadline $READLINE_LIBS $LIBS"
117724f21a94ff32f773af4c37be88fe0d2970e3~suv+LIBS="-ledit $READLINE_LIBS $LIBS"
117724f21a94ff32f773af4c37be88fe0d2970e3~suv cat >conftest.$ac_ext <<_ACEOF
117724f21a94ff32f773af4c37be88fe0d2970e3~suv@@ -21336,7 +21336,7 @@
117724f21a94ff32f773af4c37be88fe0d2970e3~suv cat confdefs.h >>conftest.$ac_ext
117724f21a94ff32f773af4c37be88fe0d2970e3~suv cat >>conftest.$ac_ext <<_ACEOF
117724f21a94ff32f773af4c37be88fe0d2970e3~suv if { (ac_try="$ac_cpp conftest.$ac_ext"
117724f21a94ff32f773af4c37be88fe0d2970e3~suv case "(($ac_try" in
117724f21a94ff32f773af4c37be88fe0d2970e3~suv@@ -21371,7 +21371,7 @@
117724f21a94ff32f773af4c37be88fe0d2970e3~suv cat confdefs.h >>conftest.$ac_ext
117724f21a94ff32f773af4c37be88fe0d2970e3~suv cat >>conftest.$ac_ext <<_ACEOF
117724f21a94ff32f773af4c37be88fe0d2970e3~suv if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
117724f21a94ff32f773af4c37be88fe0d2970e3~suv--- setup.py.orig 2011-10-31 13:23:35.000000000 +1100
117724f21a94ff32f773af4c37be88fe0d2970e3~suv+++ setup.py 2011-10-31 13:32:40.000000000 +1100
117724f21a94ff32f773af4c37be88fe0d2970e3~suv@@ -488,7 +488,7 @@
117724f21a94ff32f773af4c37be88fe0d2970e3~suv readline_extra_link_args = ()
117724f21a94ff32f773af4c37be88fe0d2970e3~suv- readline_libs = ['readline']
117724f21a94ff32f773af4c37be88fe0d2970e3~suv+ readline_libs = ['edit']
117724f21a94ff32f773af4c37be88fe0d2970e3~suv 'ncursesw'):
117724f21a94ff32f773af4c37be88fe0d2970e3~suv--- Modules/readline.c.orig 2007-01-23 03:10:27.000000000 +1100
117724f21a94ff32f773af4c37be88fe0d2970e3~suv+++ Modules/readline.c 2011-10-31 14:00:36.000000000 +1100
117724f21a94ff32f773af4c37be88fe0d2970e3~suv@@ -28,8 +28,7 @@
117724f21a94ff32f773af4c37be88fe0d2970e3~suv /* GNU readline definitions */
117724f21a94ff32f773af4c37be88fe0d2970e3~suv #undef HAVE_CONFIG_H /* Else readline/chardefs.h includes strings.h */
117724f21a94ff32f773af4c37be88fe0d2970e3~suv #ifdef HAVE_RL_COMPLETION_MATCHES
117724f21a94ff32f773af4c37be88fe0d2970e3~suv #define completion_matches(x, y) \
117724f21a94ff32f773af4c37be88fe0d2970e3~suv@@ -794,7 +793,6 @@ readline_until_enter_or_signal(char *pro
117724f21a94ff32f773af4c37be88fe0d2970e3~suv PyEval_SaveThread();
117724f21a94ff32f773af4c37be88fe0d2970e3~suv if (s < 0) {
117724f21a94ff32f773af4c37be88fe0d2970e3~suv- rl_free_line_state();
117724f21a94ff32f773af4c37be88fe0d2970e3~suv rl_cleanup_after_signal();
117724f21a94ff32f773af4c37be88fe0d2970e3~suv rl_callback_handler_remove();
117724f21a94ff32f773af4c37be88fe0d2970e3~suv *signal = 1;