Change how readline support is included in psql.c ...

See message to hackers@ mailing list concerning this...

2 files changed, 21 insertions, 11 deletions

diff --git a/src/bin/psql/psql.c b/src/bin/psql/psql.c
index 2e730724501..6095c3a9cd0 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.49 1997/01/13 02:35:32 momjian Exp $
+ *    $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.50 1997/01/25 03:51:59 scrappy Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -30,17 +30,16 @@
 #include "strdup.h"
 #endif
 
-#ifdef NOREADLINE
-#include "rlstubs.h"
+#ifndef HAVE_LIBREADLINE
+# include "rlstubs.h"
 #else
-/* from the GNU readline library */
-#ifdef OLD_READLINE
-#include "readline.h"
-#include "history.h"
-#else
-#include <readline/readline.h>
-#include <readline/history.h>
-#endif
+# ifdef HAVE_READLINE_H
+#  include <readline.h>
+#  include <history.h>
+# else
+#  include <readline/readline.h>
+#  include <readline/history.h>
+# endif
 #endif
 
 #define PROMPT "=> "
diff --git a/src/include/config.h b/src/include/config.h
index 66737fdf4b3..8dc0548988d 100644
--- a/src/include/config.h
+++ b/src/include/config.h
@@ -8,6 +8,17 @@
 
 #define BLCKSZ	8192
 
+/* Define to enable readline/history support in psql */
+/* #undef HAVE_LIBREADLINE */
+
+/* These two defines are not used until HAVE_LIBREADLINE
+ * are also defined
+ *
+ * Define if <readline.h> vs <readline/readline.h> 
+ */
+/* #undef HAVE_READLINE_H */
+
+
 #define HAVE_SYS_SELECT_H
 #define HAVE_TERMIOS_H
 #define HAVE_VALUES_H