diff options
| author | Bruce Momjian <bruce@momjian.us> | 2000-03-08 01:58:46 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 2000-03-08 01:58:46 +0000 |
| commit | f43ec05d05bb22e7bd398ea7a8399d157eca6fb4 (patch) | |
| tree | 6ba6e867726640a9f313539a51c2814b36dc511c /src/bin/psql/input.h | |
| parent | 26c953e3732150e8992f4d1ad3da703b9587e175 (diff) | |
| download | postgresql-f43ec05d05bb22e7bd398ea7a8399d157eca6fb4.tar.gz postgresql-f43ec05d05bb22e7bd398ea7a8399d157eca6fb4.zip | |
I've made a diff against the 7.0beta1 tree that accomplishes several things:
1) adds NetBSD shared lib support on both ELF and a.out platforms
2) replaces "-L$(LIBPQDIR) -lpq" with "$(LIBPQ)" defined in
Makefile.global. This makes it much easier to build stuff in
the source tree after you've already installed the libraries.
3) adds TEMPLATEDIR in Makefile.global that indicates where the
database templates are stored. This separates the template files
from real libraries that are installed in $(LIBDIR).
4) changes include order of <readline/readline.h> and <readline.h>.
The latest GNU readline installs its headers under a readline
subdirectory.
In addition to applying the patch below the following files need to be copied:
backend/port/dynloader:
bsd.h -> netbsd.h
bsd.c -> netbsd.c
include/port:
bsd.h -> netbsd.h
makefiles:
Makefile.bsd -> Makefile.netbsd
It would be great to see this incorporated into the source tree before
the 7.0 release is cut.
Thanks!
-- Johnny C. Lam <lamj@stat.cmu.edu>
Diffstat (limited to 'src/bin/psql/input.h')
| -rw-r--r-- | src/bin/psql/input.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/bin/psql/input.h b/src/bin/psql/input.h index e539ba29145..c141d1658cd 100644 --- a/src/bin/psql/input.h +++ b/src/bin/psql/input.h @@ -3,7 +3,7 @@ * * Copyright 2000 by PostgreSQL Global Development Group * - * $Header: /cvsroot/pgsql/src/bin/psql/input.h,v 1.8 2000/02/16 13:15:26 momjian Exp $ + * $Header: /cvsroot/pgsql/src/bin/psql/input.h,v 1.9 2000/03/08 01:58:22 momjian Exp $ */ #ifndef INPUT_H #define INPUT_H @@ -15,22 +15,22 @@ * USE_READLINE and USE_HISTORY are the definite pointers regarding existence or not. */ #ifdef HAVE_LIBREADLINE -# ifdef HAVE_READLINE_H -# include <readline.h> -# define USE_READLINE 1 -# elif defined(HAVE_READLINE_READLINE_H) +# if defined(HAVE_READLINE_READLINE_H) # include <readline/readline.h> # define USE_READLINE 1 +# elif defined(HAVE_READLINE_H) +# include <readline.h> +# define USE_READLINE 1 # endif #endif #if defined(HAVE_LIBHISTORY) || (defined(HAVE_LIBREADLINE) && defined(HAVE_HISTORY_IN_READLINE)) -# ifdef HAVE_HISTORY_H -# include <history.h> -# define USE_HISTORY 1 -# elif defined(HAVE_READLINE_HISTORY_H) +# if defined(HAVE_READLINE_HISTORY_H) # include <readline/history.h> # define USE_HISTORY 1 +# elif defined(HAVE_HISTORY_H) +# include <history.h> +# define USE_HISTORY 1 # endif #endif |