Changes so that it actually checks for <readline/history.h>, instead

of assuming it does exist

src/bin/psql/psql.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *    $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.81 1997/08/03 02:37:58 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.82 1997/08/17 00:48:45 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -37,12 +37,12 @@
 #ifdef HAVE_LIBREADLINE
 # ifdef HAVE_READLINE_H
 #  include <readline.h>
-#  if defined(HAVE_HISTORY) || defined(HAVE_LIBHISTORY)
+#  if defined(HAVE_HISTORY)
 #   include <history.h>
 #  endif
 # else
 #  include <readline/readline.h>
-#  if defined(HAVE_HISTORY) || defined(HAVE_LIBHISTORY)
+#  if defined(HAVE_READLINE_HISTORY_H)
 #   include <readline/history.h>
 #  endif
 # endif

src/configure.in

@@ -383,6 +383,7 @@ AC_HEADER_SYS_WAIT
 AC_CHECK_HEADERS(limits.h unistd.h termios.h values.h sys/select.h)
 AC_CHECK_HEADERS(sys/resource.h netdb.h)
 AC_CHECK_HEADERS(readline.h history.h dld.h crypt.h endian.h float.h)
+AC_CHECK_HEADERS(readline/history.h)
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST

src/include/config.h.in

@@ -44,6 +44,9 @@
 /* Set to 1 if you have <history.h> */
 #undef HAVE_HISTORY
 
+/* Set to 1 if you have <readline/history.h> */
+#undef HAVE_READLINE_HISTORY_H
+
 /* Set to 1 if you have <dld.h> */
 #undef HAVE_DLD_H