Fix inclusions of readline/editline header files so that we only attempt to

#include the version of history.h that is in the same directory as the
readline.h we are using.  This avoids problems in some scenarios where both
readline and editline are installed.  Report and patch by Zdenek Kotala.

diff --git a/src/bin/psql/input.h b/src/bin/psql/input.h
index 73879c88b2228c1f05d20715007918b481a7cc26..b2515c42f86001a640919a61343085938dcecda8 100644 (file)
--- a/src/bin/psql/input.h
+++ b/src/bin/psql/input.h
@@ -3,7 +3,7 @@
  *
  * Copyright (c) 2000-2009, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/psql/input.h,v 1.31 2009/01/01 17:23:55 momjian Exp $
+ * $PostgreSQL: pgsql/src/bin/psql/input.h,v 1.32 2009/08/24 16:18:13 tgl Exp $
  */
 #ifndef INPUT_H
 #define INPUT_H
@@ -16,21 +16,27 @@
  */
 #ifdef HAVE_LIBREADLINE
 #define USE_READLINE 1
+
 #if defined(HAVE_READLINE_READLINE_H)
 #include 
+#if defined(HAVE_READLINE_HISTORY_H)
+#include 
+#endif
+
 #elif defined(HAVE_EDITLINE_READLINE_H)
 #include 
+#if defined(HAVE_EDITLINE_HISTORY_H)
+#include 
+#endif
+
 #elif defined(HAVE_READLINE_H)
 #include 
-#endif
-#if defined(HAVE_READLINE_HISTORY_H)
-#include 
-#elif defined(HAVE_EDITLINE_HISTORY_H)
-#include 
-#elif defined(HAVE_HISTORY_H)
+#if defined(HAVE_HISTORY_H)
 #include 
 #endif
-#endif
+
+#endif /* HAVE_READLINE_READLINE_H, etc */
+#endif /* HAVE_LIBREADLINE */
 
 #include "pqexpbuffer.h"