Work with Readline 4.2.

configure.in

@@ -879,35 +879,18 @@ AC_CHECK_FUNC(rint,
 # Readline versions < 2.1 don't have rl_completion_append_character
 AC_MSG_CHECKING([for rl_completion_append_character])
 AC_TRY_LINK([#include <stdio.h>
-#ifdef HAVE_READLINE_H
-# include <readline.h>
-#endif
 #ifdef HAVE_READLINE_READLINE_H
 # include <readline/readline.h>
-#endif],
+#elif defined(HAVE_READLINE_H)
+# include <readline.h>
+#endif
+],
 [rl_completion_append_character = 'x';],
 [AC_MSG_RESULT(yes)
 AC_DEFINE(HAVE_RL_COMPLETION_APPEND_CHARACTER)],
 [AC_MSG_RESULT(no)])
 
-
-# Check whether readline's filename_completion_function is declared.
-# Some prehistoric versions of readline, in particular those shipped
-# with earlier Cygwins don't have this declared, although it's in the
-# library.
-AC_MSG_CHECKING([whether filename_completion_function is declared])
-if test "$ac_cv_header_readline_h" = yes; then
-    _readline_header='readline.h'
-elif test "$ac_cv_header_readline_readline_h" = yes; then
-    _readline_header='readline/readline.h'
-else
-    _readline_header='xxx'
-fi
-AC_EGREP_HEADER([filename_completion_function], [$_readline_header],
-[AC_DEFINE(HAVE_FILENAME_COMPLETION_FUNCTION_DECL)
-AC_MSG_RESULT(yes)],
-[AC_MSG_RESULT(no)])
-
+AC_CHECK_FUNCS([rl_completion_matches])
 
 
 dnl Cannot use AC_CHECK_FUNC because finite may be a macro

src/bin/psql/tab-complete.c

@@ -3,7 +3,7 @@
  *
  * Copyright 2000 by PostgreSQL Global Development Group
  *
- * $Header: /cvsroot/pgsql/src/bin/psql/tab-complete.c,v 1.29 2001/03/30 04:50:47 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/tab-complete.c,v 1.30 2001/04/14 22:55:02 petere Exp $
  */
 
 /*----------------------------------------------------------------------
@@ -60,9 +60,10 @@
 #include "common.h"
 #include "settings.h"
 
-#ifndef HAVE_FILENAME_COMPLETION_FUNCTION_DECL
-char	   *filename_completion_function(char *, int);
+extern char *filename_completion_function();
 
+#ifdef HAVE_RL_COMPLETION_MATCHES
+#define completion_matches(x, y) rl_completion_matches((x), ((rl_compentry_func_t *)(y)))
 #endif
 
 #define BUF_SIZE 2048
@@ -100,7 +101,7 @@ void
 initialize_readline(void)
 {
 	rl_readline_name = pset.progname;
-	rl_attempted_completion_function = psql_completion;
+	rl_attempted_completion_function = (void *)psql_completion;
 
 	rl_basic_word_break_characters = "\t\n@$><=;|&{( ";
 

src/include/config.h.in

@@ -8,7 +8,7 @@
  * or in config.h afterwards.  Of course, if you edit config.h, then your
  * changes will be overwritten the next time you run configure.
  *
- * $Id: config.h.in,v 1.161 2001/03/23 18:42:12 tgl Exp $
+ * $Id: config.h.in,v 1.162 2001/04/14 22:55:02 petere Exp $
  */
 
 #ifndef CONFIG_H
@@ -573,8 +573,8 @@ extern int fdatasync(int fildes);
 /* Set to 1 if your libreadline defines rl_completion_append_character */
 #undef HAVE_RL_COMPLETION_APPEND_CHARACTER
 
-/* Set to 1 if filename_completion_function is declared in the readline header */
-#undef HAVE_FILENAME_COMPLETION_FUNCTION_DECL
+/* Set to 1 if you have rl_completion_matches */
+#undef HAVE_RL_COMPLETION_MATCHES
 
 /* Set to 1 if you have getopt_long() (GNU long options) */
 #undef HAVE_GETOPT_LONG