aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/bin/psql/psql.c7
-rw-r--r--src/include/config.h.in5
2 files changed, 9 insertions, 3 deletions
diff --git a/src/bin/psql/psql.c b/src/bin/psql/psql.c
index 97125d79579..a13ac63545e 100644
--- a/src/bin/psql/psql.c
+++ b/src/bin/psql/psql.c
@@ -7,7 +7,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.141 1998/05/12 23:04:01 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.142 1998/05/12 23:05:12 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -39,7 +39,7 @@
#ifdef HAVE_READLINE_H
#include <readline.h>
#define USE_READLINE 1
-#if defined(HAVE_HISTORY)
+#if defined(HAVE_HISTORY_H)
#include <history.h>
#define USE_HISTORY 1
#endif
@@ -53,6 +53,9 @@
#endif
#endif
#endif
+#if defined(HAVE_HISTORY) && !defined(USE_HISTORY)
+#define USE_HISTORY 1
+#endif
#endif
/* This prompt string is assumed to have at least 3 characters by code in MainLoop().
diff --git a/src/include/config.h.in b/src/include/config.h.in
index 9d76e3af6a6..2293c68f539 100644
--- a/src/include/config.h.in
+++ b/src/include/config.h.in
@@ -63,7 +63,7 @@
#undef HAVE_READLINE_H
/* Set to 1 if you have <history.h> */
-#undef HAVE_HISTORY
+#undef HAVE_HISTORY_H
/* Set to 1 if you have <readline/history.h> */
#undef HAVE_READLINE_HISTORY_H
@@ -71,6 +71,9 @@
/* Set to 1 if you have <readline/readline.h> */
#undef HAVE_READLINE_READLINE_H
+/* Set to 1 if you have libreadline and it includes history functions */
+#undef HAVE_HISTORY
+
/* Set to 1 if you have <dld.h> */
#undef HAVE_DLD_H