From 582efcf6eb5d62f6a9072e6fdf5bbc9dfe31d7b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADtor=20Santos=20Costa?= Date: Mon, 15 Sep 2014 03:13:21 -0500 Subject: [PATCH] try again t fix readline paths in config --- configure | 542 +++++++++++++++++++++++++++++---------------------- configure.in | 70 +++---- os/pl-rl.c | 35 +--- 3 files changed, 347 insertions(+), 300 deletions(-) diff --git a/configure b/configure index 1d2b12e25..33a9e0fd2 100755 --- a/configure +++ b/configure @@ -1984,60 +1984,6 @@ fi } # ac_fn_c_try_link -# ac_fn_c_check_type LINENO TYPE VAR INCLUDES -# ------------------------------------------- -# Tests whether TYPE exists after having included INCLUDES, setting cache -# variable VAR accordingly. -ac_fn_c_check_type () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if eval \${$3+:} false; then : - $as_echo_n "(cached) " >&6 -else - eval "$3=no" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -int -main () -{ -if (sizeof ($2)) - return 0; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -int -main () -{ -if (sizeof (($2))) - return 0; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - -else - eval "$3=yes" -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - -} # ac_fn_c_check_type - # ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES # ------------------------------------------------------- # Tests whether HEADER exists, giving a warning if it cannot be compiled using @@ -2196,6 +2142,60 @@ $as_echo "$ac_res" >&6; } } # ac_fn_c_check_func +# ac_fn_c_check_type LINENO TYPE VAR INCLUDES +# ------------------------------------------- +# Tests whether TYPE exists after having included INCLUDES, setting cache +# variable VAR accordingly. +ac_fn_c_check_type () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 +$as_echo_n "checking for $2... " >&6; } +if eval \${$3+:} false; then : + $as_echo_n "(cached) " >&6 +else + eval "$3=no" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +if (sizeof ($2)) + return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +$4 +int +main () +{ +if (sizeof (($2))) + return 0; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + +else + eval "$3=yes" +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +fi +eval ac_res=\$$3 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 +$as_echo "$ac_res" >&6; } + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + +} # ac_fn_c_check_type + # ac_fn_c_compute_int LINENO EXPR VAR INCLUDES # -------------------------------------------- # Tries to find the compile-time value of EXPR in a program that includes @@ -6815,110 +6815,6 @@ _ACEOF LIBS="-lpthread $LIBS" -fi - -fi - -if test "$yap_cv_readline" != "no" -then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lncurses" >&5 -$as_echo_n "checking for main in -lncurses... " >&6; } -if ${ac_cv_lib_ncurses_main+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lncurses $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - -int -main () -{ -return main (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_ncurses_main=yes -else - ac_cv_lib_ncurses_main=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_main" >&5 -$as_echo "$ac_cv_lib_ncurses_main" >&6; } -if test "x$ac_cv_lib_ncurses_main" = xyes; then : - - LIBS="-lncurses $LIBS" - -fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lreadline" >&5 -$as_echo_n "checking for main in -lreadline... " >&6; } -if ${ac_cv_lib_readline_main+:} false; then : - $as_echo_n "(cached) " >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lreadline $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - - -int -main () -{ -return main (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_readline_main=yes -else - ac_cv_lib_readline_main=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_main" >&5 -$as_echo "$ac_cv_lib_readline_main" >&6; } -if test "x$ac_cv_lib_readline_main" = xyes; then : - - -$as_echo "#define HAVE_LIBREADLINE 1" >>confdefs.h - - LIBS="-lreadline $LIBS" - ac_fn_c_check_type "$LINENO" "rl_hook_func_t" "ac_cv_type_rl_hook_func_t" "$ac_includes_default" -if test "x$ac_cv_type_rl_hook_func_t" = xyes; then : - -cat >>confdefs.h <<_ACEOF -#define HAVE_RL_HOOK_FUNC_T 1 -_ACEOF - - -fi -ac_fn_c_check_type "$LINENO" "rl_completion_func_t" "ac_cv_type_rl_completion_func_t" "$ac_includes_default" -if test "x$ac_cv_type_rl_completion_func_t" = xyes; then : - -cat >>confdefs.h <<_ACEOF -#define HAVE_RL_COMPLETION_FUNC_T 1 -_ACEOF - - -fi - - -else - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: test for readline failed" >&5 -$as_echo "test for readline failed" >&6; } - - fi fi @@ -8373,6 +8269,255 @@ fi done +if test "$yap_cv_readline" != "no" +then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lncurses" >&5 +$as_echo_n "checking for main in -lncurses... " >&6; } +if ${ac_cv_lib_ncurses_main+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lncurses $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + +int +main () +{ +return main (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_ncurses_main=yes +else + ac_cv_lib_ncurses_main=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_main" >&5 +$as_echo "$ac_cv_lib_ncurses_main" >&6; } +if test "x$ac_cv_lib_ncurses_main" = xyes; then : + + LIBS="-lncurses $LIBS" + +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lreadline" >&5 +$as_echo_n "checking for main in -lreadline... " >&6; } +if ${ac_cv_lib_readline_main+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lreadline $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + +int +main () +{ +return main (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_readline_main=yes +else + ac_cv_lib_readline_main=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_readline_main" >&5 +$as_echo "$ac_cv_lib_readline_main" >&6; } +if test "x$ac_cv_lib_readline_main" = xyes; then : + + for ac_header in readline/readline.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "readline/readline.h" "ac_cv_header_readline_readline_h" "$ac_includes_default" +if test "x$ac_cv_header_readline_readline_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_READLINE_READLINE_H 1 +_ACEOF + +fi + +done + + for ac_header in readline/history.h +do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` +ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +_ACEOF + +fi + +done + + if test "x$ac_cv_header_readline_readline_h" = xyes + then + +$as_echo "#define HAVE_LIBREADLINE 1" >>confdefs.h + + LIBS="-lreadline $LIBS" + ac_fn_c_check_type "$LINENO" "rl_hook_func_t" "ac_cv_type_rl_hook_func_t" " + #include + #include + +" +if test "x$ac_cv_type_rl_hook_func_t" = xyes; then : + +cat >>confdefs.h <<_ACEOF +#define HAVE_RL_HOOK_FUNC_T 1 +_ACEOF + + +fi +ac_fn_c_check_type "$LINENO" "rl_completion_func_t" "ac_cv_type_rl_completion_func_t" " + #include + #include + +" +if test "x$ac_cv_type_rl_completion_func_t" = xyes; then : + +cat >>confdefs.h <<_ACEOF +#define HAVE_RL_COMPLETION_FUNC_T 1 +_ACEOF + + +fi + + for ac_func in rl_completion_matches rl_clear_pending_input rl_reset_after_signal +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + + for ac_func in rl_filename_completion_function rl_free_line_state rl_insert_close +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + + for ac_func in rl_set_prompt rl_free_line_state rl_insert_close add_history +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + + for ac_func in rl_begin_undo_group rl_discard_argument +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + + ac_fn_c_check_decl "$LINENO" "rl_event_hook" "ac_cv_have_decl_rl_event_hook" " + #include + #include + +" +if test "x$ac_cv_have_decl_rl_event_hook" = xyes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_RL_EVENT_HOOK $ac_have_decl +_ACEOF +ac_fn_c_check_decl "$LINENO" "rl_catch_signals " "ac_cv_have_decl_rl_catch_signals_" " + #include + #include + +" +if test "x$ac_cv_have_decl_rl_catch_signals_" = xyes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_RL_CATCH_SIGNALS_ $ac_have_decl +_ACEOF +ac_fn_c_check_decl "$LINENO" "rl_readline_state" "ac_cv_have_decl_rl_readline_state" " + #include + #include + +" +if test "x$ac_cv_have_decl_rl_readline_state" = xyes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_RL_READLINE_STATE $ac_have_decl +_ACEOF +ac_fn_c_check_decl "$LINENO" "rl_done " "ac_cv_have_decl_rl_done_" " + #include + #include + +" +if test "x$ac_cv_have_decl_rl_done_" = xyes; then : + ac_have_decl=1 +else + ac_have_decl=0 +fi + +cat >>confdefs.h <<_ACEOF +#define HAVE_DECL_RL_DONE_ $ac_have_decl +_ACEOF + + else + yap_cv_readline=no + { $as_echo "$as_me:${as_lineno-$LINENO}: result: test for readline failed" >&5 +$as_echo "test for readline failed" >&6; } + fi + +else + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: test for readline failed" >&5 +$as_echo "test for readline failed" >&6; } + + +fi + +fi + if test "$yap_cv_gmp" != "no" then for ac_header in gmp.h @@ -8416,79 +8561,6 @@ $as_echo "#define USE_JUDY 1" >>confdefs.h fi fi -if test "$yap_cv_readline" != "no" -then - for ac_header in readline/readline.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "readline/readline.h" "ac_cv_header_readline_readline_h" "$ac_includes_default" -if test "x$ac_cv_header_readline_readline_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_READLINE_READLINE_H 1 -_ACEOF - -fi - -done - - for ac_header in readline/history.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "readline/history.h" "ac_cv_header_readline_history_h" "$ac_includes_default" -if test "x$ac_cv_header_readline_history_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_READLINE_HISTORY_H 1 -_ACEOF - -fi - -done - - for ac_func in rl_completion_matches rl_clear_pending_input rl_cleanup_after_signal rl_event_hook rl_filename_completion_function rl_free_line_state rl_insert_close rl_set_prompt rl_state_initialized -do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - -fi -done - - -if ${yap_cv_rl_catch+:} false; then : - $as_echo_n "(cached) " >&6 -else - -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - -int -main () -{ -printf("Signal value is %d\n", rl_catch_signal); - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - yap_cv_rl_catch=yes -else - yap_cv_rl_catch=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $yap_cv_rl_catch" >&5 -$as_echo "$yap_cv_rl_catch" >&6; } -if test "$yap_cv_rl_catch" = yes -then - -$as_echo "#define HAVE_RL_CATCH_SIGNAL 1" >>confdefs.h - -fi -fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5 $as_echo_n "checking for inline... " >&6; } @@ -13742,7 +13814,7 @@ else JAVA_TEST=Test.java CLASS_TEST=Test.class cat << \EOF > $JAVA_TEST -/* #line 13745 "configure" */ +/* #line 13817 "configure" */ public class Test { } EOF @@ -13918,7 +13990,7 @@ EOF if uudecode$EXEEXT Test.uue; then ac_cv_prog_uudecode_base64=yes else - echo "configure: 13921: uudecode had trouble decoding base 64 file 'Test.uue'" >&5 + echo "configure: 13993: uudecode had trouble decoding base 64 file 'Test.uue'" >&5 echo "configure: failed file was:" >&5 cat Test.uue >&5 ac_cv_prog_uudecode_base64=no @@ -14049,7 +14121,7 @@ else JAVA_TEST=Test.java CLASS_TEST=Test.class cat << \EOF > $JAVA_TEST -/* #line 14052 "configure" */ +/* #line 14124 "configure" */ public class Test { } EOF @@ -14084,7 +14156,7 @@ JAVA_TEST=Test.java CLASS_TEST=Test.class TEST=Test cat << \EOF > $JAVA_TEST -/* [#]line 14087 "configure" */ +/* [#]line 14159 "configure" */ public class Test { public static void main (String args[]) { System.exit (0); diff --git a/configure.in b/configure.in index 23bffb70d..5c8b8c221 100755 --- a/configure.in +++ b/configure.in @@ -650,22 +650,6 @@ else AC_CHECK_LIB(pthread,pthread_create) fi -if test "$yap_cv_readline" != "no" -then - AC_CHECK_LIB([ncurses], [main],[ - LIBS="-lncurses $LIBS" - ]) - AC_CHECK_LIB([readline], [main],[ - AC_DEFINE([HAVE_LIBREADLINE], [1], [Define if you have libreadline]) - LIBS="-lreadline $LIBS" - AC_CHECK_TYPES([rl_hook_func_t, rl_completion_func_t]) - ], - [ - AC_MSG_RESULT( [test for readline failed]) - ] - ) -fi - if test "$yap_cv_gmp" != "no" then AC_CHECK_LIB(gmp,main) @@ -1264,6 +1248,41 @@ AC_CHECK_HEADERS(wctype.h winsock.h winsock2.h) AC_CHECK_HEADERS(zlib.h zutil.h) AC_CHECK_HEADERS(mach-o/dyld.h LibLoaderAPI.h) +if test "$yap_cv_readline" != "no" +then + AC_CHECK_LIB([ncurses], [main],[ + LIBS="-lncurses $LIBS" + ]) + AC_CHECK_LIB([readline], [main],[ + AC_CHECK_HEADERS( readline/readline.h) + AC_CHECK_HEADERS( readline/history.h ) + if test "x$ac_cv_header_readline_readline_h" = xyes + then + AC_DEFINE([HAVE_LIBREADLINE], [1], [Define if you have libreadline]) + LIBS="-lreadline $LIBS" + AC_CHECK_TYPES([rl_hook_func_t, rl_completion_func_t], [], [], [ + [#include ] + [#include ] + ] ) + AC_CHECK_FUNCS( rl_completion_matches rl_clear_pending_input rl_reset_after_signal ) + AC_CHECK_FUNCS( rl_filename_completion_function rl_free_line_state rl_insert_close ) + AC_CHECK_FUNCS( rl_set_prompt rl_free_line_state rl_insert_close add_history ) + AC_CHECK_FUNCS( rl_begin_undo_group rl_discard_argument ) + AC_CHECK_DECLS( [ rl_event_hook, rl_catch_signals , rl_readline_state, rl_done ], [], [], [ + [#include ] + [#include ] + ] ) + else + yap_cv_readline=no + AC_MSG_RESULT( [test for readline failed]) + fi + ], + [ + AC_MSG_RESULT( [test for readline failed]) + ] + ) +fi + if test "$yap_cv_gmp" != "no" then AC_CHECK_HEADERS(gmp.h) @@ -1281,25 +1300,6 @@ if test "$yap_cv_judy" != "no"; then fi fi -if test "$yap_cv_readline" != "no" -then - AC_CHECK_HEADERS( readline/readline.h) - AC_CHECK_HEADERS( readline/history.h) - AC_CHECK_FUNCS( rl_completion_matches rl_clear_pending_input rl_cleanup_after_signal rl_event_hook rl_filename_completion_function rl_free_line_state rl_insert_close rl_set_prompt rl_state_initialized ) - -AC_CACHE_VAL(yap_cv_rl_catch,[ -AC_TRY_COMPILE( - #include - , - printf("Signal value is %d\n", rl_catch_signal); - , - yap_cv_rl_catch=yes,yap_cv_rl_catch=no ) ] ) -AC_MSG_RESULT($yap_cv_rl_catch) -if test "$yap_cv_rl_catch" = yes -then - AC_DEFINE(HAVE_RL_CATCH_SIGNAL, 1, [Defined if you can turn off readline's signal handling.]) -fi -fi dnl Checks for typedefs, structures, and compiler characteristics. AC_C_INLINE diff --git a/os/pl-rl.c b/os/pl-rl.c index ee7fc405f..76ab00cab 100755 --- a/os/pl-rl.c +++ b/os/pl-rl.c @@ -99,28 +99,9 @@ extern int rl_done; /* should be in readline.h, but */ /* isn't in some versions ... */ #ifdef HAVE_READLINE_HISTORY_H #include -#else -extern void add_history(char *); /* should be in readline.h */ #endif /* missing prototypes in older */ /* readline.h versions */ -extern int rl_begin_undo_group(void); /* delete when conflict arrises! */ -extern int rl_end_undo_group(void); - -#if HAVE_RL_HOOK_FUNC_T -extern rl_hook_func_t *rl_event_hook; -#else -extern Function *rl_event_hook; -#endif - -#ifndef HAVE_RL_FILENAME_COMPLETION_FUNCTION -#define rl_filename_completion_function filename_completion_function -extern char *filename_completion_function(const char *, int); -#endif - -#ifndef HAVE_RL_COMPLETION_MATCHES -#define rl_completion_matches completion_matches -#endif #ifndef RL_STATE_INITIALIZED int rl_readline_state = 0; @@ -459,14 +440,8 @@ Sread_readline(void *handle, char *buf, size_t size) } #endif -#ifdef HAVE_RL_EVENT_HOOK - if ( PL_dispatch(0, PL_DISPATCH_INSTALLED) ) { -#if HAVE_RL_HOOK_FUNC_T - rl_event_hook = event_hook; -#else - rl_event_hook = (Function *)event_hook; -#endif - } else { +#if HAVE_DECL_RL_EVENT_HOOK_ + if ( !PL_dispatch(0, PL_DISPATCH_INSTALLED) ) { rl_event_hook = NULL; } #endif @@ -535,7 +510,7 @@ static int prolog_complete(int ignore, int key) { if ( rl_point > 0 && rl_line_buffer[rl_point-1] != ' ' ) { -#if HAVE_RL_CATCH_SIGNAL /* actually version >= 1.2, or true readline */ +#if HAVE_DECL_RL_CATCH_SIGNALS_ /* actually version >= 1.2, or true readline */ rl_begin_undo_group(); rl_complete(ignore, key); if ( rl_point > 0 && rl_line_buffer[rl_point-1] == ' ' ) @@ -608,7 +583,7 @@ PL_install_readline(void) #endif alevel = setAccessLevel(ACCESS_LEVEL_SYSTEM); -#if HAVE_RL_CATCH_SIGNAL +#if HAVE_DECL_RL_CATCH_SIGNALS_ rl_catch_signals = 0; #endif rl_readline_name = "Prolog"; @@ -621,7 +596,7 @@ PL_install_readline(void) #ifdef HAVE_RL_COMPLETION_FUNC_T rl_add_defun("prolog-complete", prolog_complete, '\t'); #else - rl_add_defun("prolog-complete", (Function *)prolog_complete, '\t'); + rl_add_defun("prolog-complete", (void *)prolog_complete, '\t'); #endif #if HAVE_RL_INSERT_CLOSE rl_add_defun("insert-close", rl_insert_close, ')');