Modifications to handle the situation where readline.h exists, but

history.h doesn't...previously, it was assumed that both existed, or
didn't exist...but this assumption fails on the one sparc_solaris box
that I have access to, and could exist in other circumstances

diff --git a/src/bin/psql/psql.c b/src/bin/psql/psql.c
index 6095c3a9cd091bcf5b176a67063e9c09ef568ebe..409705b48c70b8ab2dc56b61e6f765b76da8787a 100644 (file)
--- 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.50 1997/01/25 03:51:59 scrappy Exp $
+ *    $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.51 1997/01/25 21:58:08 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -35,10 +35,14 @@
 #else
 # ifdef HAVE_READLINE_H
 #  include <readline.h>
-#  include <history.h>
+#  ifdef HAVE_HISTORY_H
+#   include <history.h>
+#  endif
 # else
 #  include <readline/readline.h>
-#  include <readline/history.h>
+#  ifdef HAVE_READLINE_HISTORY_H
+#   include <readline/history.h>
+#  endif
 # endif
 #endif