diff options
author | Peter Eisentraut <peter_e@gmx.net> | 2002-04-10 22:47:09 +0000 |
---|---|---|
committer | Peter Eisentraut <peter_e@gmx.net> | 2002-04-10 22:47:09 +0000 |
commit | 5c1f31d2d47110f49d16bd56295125d656401855 (patch) | |
tree | 8e3cd0ad3576df4af07ede841db0f68b3908a2b7 /src/bin/psql/input.c | |
parent | 563673e15db995b6f531b44be7bb162330ac157a (diff) |
Readline and Zlib now required by default. Add options --without-readline
and --without-zlib to turn them off.
Diffstat (limited to 'src/bin/psql/input.c')
-rw-r--r-- | src/bin/psql/input.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/bin/psql/input.c b/src/bin/psql/input.c index 32872e9d71f..6e083506f3e 100644 --- a/src/bin/psql/input.c +++ b/src/bin/psql/input.c @@ -3,7 +3,7 @@ * * Copyright 2000 by PostgreSQL Global Development Group * - * $Header: /cvsroot/pgsql/src/bin/psql/input.c,v 1.18 2001/10/25 05:49:54 momjian Exp $ + * $Header: /cvsroot/pgsql/src/bin/psql/input.c,v 1.19 2002/04/10 22:46:58 petere Exp $ */ #include "postgres_fe.h" #include "input.h" @@ -19,8 +19,6 @@ /* (of course there is no runtime command for doing that :) */ #ifdef USE_READLINE static bool useReadline; -#endif -#ifdef USE_HISTORY static bool useHistory; #endif @@ -44,7 +42,7 @@ gets_interactive(char *prompt) { char *s; -#ifdef USE_HISTORY +#ifdef USE_READLINE const char *var; static char *prev_hist = NULL; #endif @@ -62,7 +60,7 @@ gets_interactive(char *prompt) } #endif -#ifdef USE_HISTORY +#ifdef USE_READLINE if (useHistory && s && s[0] != '\0') { var = GetVariable(pset.vars, "HISTCONTROL"); @@ -133,7 +131,7 @@ initializeInput(int flags) } #endif -#ifdef USE_HISTORY +#ifdef USE_READLINE if (flags == 1) { const char *home; @@ -168,7 +166,7 @@ initializeInput(int flags) bool saveHistory(char *fname) { -#ifdef USE_HISTORY +#ifdef USE_READLINE if (useHistory && fname) { if (write_history(fname) != 0) @@ -194,7 +192,7 @@ finishInput(void) finishInput(int exitstatus, void *arg) #endif { -#ifdef USE_HISTORY +#ifdef USE_READLINE if (useHistory) { char *home; |