aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.in2
-rw-r--r--src/bin/psql/tab-complete.c6
-rw-r--r--src/include/config.h.in5
3 files changed, 9 insertions, 4 deletions
diff --git a/configure.in b/configure.in
index d18e57e3cb9..045b890f35e 100644
--- a/configure.in
+++ b/configure.in
@@ -928,7 +928,7 @@ AC_TRY_LINK([#include <stdio.h>
AC_DEFINE(HAVE_RL_COMPLETION_APPEND_CHARACTER)],
[AC_MSG_RESULT(no)])
-AC_CHECK_FUNCS([rl_completion_matches])
+AC_CHECK_FUNCS([rl_completion_matches rl_filename_completion_function])
dnl Cannot use AC_CHECK_FUNC because finite may be a macro
diff --git a/src/bin/psql/tab-complete.c b/src/bin/psql/tab-complete.c
index dd323162dda..e8ed3c668ae 100644
--- a/src/bin/psql/tab-complete.c
+++ b/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.32 2001/05/08 21:06:43 petere Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/tab-complete.c,v 1.33 2001/06/11 22:12:48 momjian Exp $
*/
/*----------------------------------------------------------------------
@@ -60,7 +60,9 @@
#include "common.h"
#include "settings.h"
-extern char *filename_completion_function();
+#ifdef HAVE_RL_FILENAME_COMPLETION_FUNCTION
+#define filename_completion_function rl_filename_completion_function
+#endif
#ifdef HAVE_RL_COMPLETION_MATCHES
#define completion_matches(x, y) rl_completion_matches((x), ((rl_compentry_func_t *)(y)))
diff --git a/src/include/config.h.in b/src/include/config.h.in
index b574774b838..fde5a1385ba 100644
--- a/src/include/config.h.in
+++ b/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.165 2001/06/02 18:25:18 petere Exp $
+ * $Id: config.h.in,v 1.166 2001/06/11 22:12:48 momjian Exp $
*/
#ifndef CONFIG_H
@@ -589,6 +589,9 @@ extern int fdatasync(int fildes);
/* Set to 1 if you have rl_completion_matches */
#undef HAVE_RL_COMPLETION_MATCHES
+/* Set to 1 if you have rl_filename_completion_function */
+#undef HAVE_RL_FILENAME_COMPLETION_FUNCTION
+
/* Set to 1 if you have getopt_long() (GNU long options) */
#undef HAVE_GETOPT_LONG