From 9c931e08ba18401945b2c2f6d78b061a8d9efdd4 Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Tue, 28 Jan 1997 03:47:01 +0000 Subject: [PATCH] Moved readline stuff into Makefile.global. --- src/Makefile.global | 36 ++++++++++++++++++++++++++---------- src/README.readline | 38 -------------------------------------- 2 files changed, 26 insertions(+), 48 deletions(-) delete mode 100644 src/README.readline diff --git a/src/Makefile.global b/src/Makefile.global index 0ec38ee55c..0ae35cc802 100644 --- a/src/Makefile.global +++ b/src/Makefile.global @@ -7,7 +7,7 @@ # # # IDENTIFICATION -# $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.102 1997/01/26 20:21:43 momjian Exp $ +# $Header: /cvsroot/pgsql/src/Attic/Makefile.global,v 1.103 1997/01/28 03:46:58 momjian Exp $ # # NOTES # Essentially all Postgres make files include this file and use the @@ -150,19 +150,35 @@ ENFORCE_ALIGNMENT= true # psql does not require the GNU readline and history libraries. Hence, we # do not compile with them by default. However, there are hooks in the # program which supports the use of GNU readline and history. Should you -# decide to use them, change USE_READLINE to true and change READLINE_INCDIR -# and READLINE_LIBDIR to reflect the location of the readline and history -# headers and libraries. +# decide to use them, change USE_READLINE to true and change the other +# defines to reflect the location of the readline and history headers +# and libraries. # USE_READLINE= false -# directories for the readline and history libraries. -#READLINE_INC= -I/home/tools/include -#READLINE_LIB= -L/home/tools/lib -lreadline +# not optional if USE_READLINE enabled +#READLINE_INC+= -DHAVE_LIBREADLINE -# use the following if your readline has a separate history lib -#HISTORY_INC= -I/home/tools/include -I/home/tools/include/readline -#HISTORY_LIB= -L/home/tools/lib -lhistory +# if , define this +#READLINE_INC+= -DHAVE_READLINE_H + +# if you have either or +#READLINE_INC+= -DHAVE_HISTORY + +# if you have a libhistory.a +#READLINE_INC+= -DHAVE_LIBHISTORY + +# where to find includes +#READLINE_INC+= -I/home/tools/include + +# where to find library files +#READLINE_LIB+= -L/home/tools/lib + +# not optional if USE_READLINE enabled +#READLINE_LIB+= -lreadline + +# if you have a libhistory.a +#READLINE_LIB+= -lhistory # curses is required by readline. Ncurses has obsoleted curses, and may # in fact be what goes by the name "curses" on this system. diff --git a/src/README.readline b/src/README.readline deleted file mode 100644 index 9cacd37078..0000000000 --- a/src/README.readline +++ /dev/null @@ -1,38 +0,0 @@ - -In preparation for using configure to compile PostgreSQL, various -define cleanups have been performed. - -The most confusing has been psql's use of -lreadline - -In order to turn on support for readline, your Makefile.custom file -*must* contain lines similar to: - -USE_READLINE= yes -READLINE_INC= -READLINE_LIB= - - -READLINE_INC can contain: - - -DHAVE_LIBREADLINE - not optional if USE_READLINE enabled - -DHAVE_READLINE_H - if , define this - -DHAVE_HISTORY - if you have either or - -DHAVE_LIBHISTORY - if you have a libhistory.a - -READLINE_LIB can contain: - - -lreadline - not optional if USE_READLINE enabled - -lhistory - if you have a libhistory.a - - -Once support for configure is integrated into the distribution, this will -all be hidden "behind the scenes" - -Marc G. Fournier -scrappy@hub.org -- 2.11.0