mirror of
https://github.com/postgres/postgres.git
synced 2025-06-23 14:01:44 +03:00
this patch solve 2 problemes :
probleme number 1 :
- configure can find the library readline , but don't
find the header file . so in this case we don't use lib readline
.
probleme number 2 :
- when you have postgres 6.2.1 and readline installed
with the same prefix( and generally all your software ) . you
can compile the version 6.3 . I use this prefix , when configure
ask me for "Additional directories to search for include files"
.
( because there a conflict in the header when you
compile psql.c ) In this case, you must permut the sequence of
directive -I .
Erwan MAS
This commit is contained in:
Bruce Momjian
@ -7,14 +7,14 @@
|
||||
#
|
||||
#
|
||||
# IDENTIFICATION
|
||||
# $Header: /cvsroot/pgsql/src/bin/psql/Attic/Makefile.in,v 1.6 1998/01/04 19:12:21 scrappy Exp $
|
||||
# $Header: /cvsroot/pgsql/src/bin/psql/Attic/Makefile.in,v 1.7 1998/04/05 21:29:35 momjian Exp $
|
||||
#
|
||||
#-------------------------------------------------------------------------
|
||||
|
||||
SRCDIR= ../..
|
||||
include ../../Makefile.global
|
||||
|
||||
CFLAGS+= -I$(LIBPQDIR)
|
||||
CFLAGS:= -I$(LIBPQDIR) $(CFLAGS)
|
||||
|
||||
#
|
||||
# And where libpq goes, so goes the authentication stuff...
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.137 1998/03/16 14:27:38 momjian Exp $
|
||||
* $Header: /cvsroot/pgsql/src/bin/psql/Attic/psql.c,v 1.138 1998/04/05 21:29:36 momjian Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@ -38,13 +38,19 @@
|
||||
#ifdef HAVE_LIBREADLINE
|
||||
#ifdef HAVE_READLINE_H
|
||||
#include <readline.h>
|
||||
#define USE_READLINE 1
|
||||
#if defined(HAVE_HISTORY)
|
||||
#include <history.h>
|
||||
#define USE_HISTORY 1
|
||||
#endif
|
||||
#else
|
||||
#if defined(HAVE_READLINE_READLINE_H)
|
||||
#include <readline/readline.h>
|
||||
#define USE_READLINE 1
|
||||
#if defined(HAVE_READLINE_HISTORY_H)
|
||||
#include <readline/history.h>
|
||||
#define USE_HISTORY 1
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
@ -931,7 +937,7 @@ gets_readline(char *prompt, FILE *source)
|
||||
{
|
||||
char *s;
|
||||
|
||||
#ifdef HAVE_LIBREADLINE
|
||||
#ifdef USE_READLINE
|
||||
s = readline(prompt);
|
||||
#else
|
||||
char buf[500];
|
||||
@ -2013,7 +2019,7 @@ HandleSlashCmds(PsqlSettings *pset,
|
||||
case 's': /* \s is save history to a file */
|
||||
if (!optarg)
|
||||
optarg = "/dev/tty";
|
||||
#ifdef HAVE_HISTORY
|
||||
#ifdef USE_HISTORY
|
||||
if (write_history(optarg) != 0)
|
||||
fprintf(stderr, "cannot write history to %s\n", optarg);
|
||||
#endif
|
||||
@ -2137,7 +2143,7 @@ MainLoop(PsqlSettings *pset, char *query, FILE *source)
|
||||
sprintf(pset->prompt, "%s%s", PQdb(pset->db), PROMPT);
|
||||
if (pset->useReadline)
|
||||
{
|
||||
#ifdef HAVE_HISTORY
|
||||
#ifdef USE_HISTORY
|
||||
using_history();
|
||||
#endif
|
||||
GetNextLine = gets_readline;
|
||||
@ -2187,7 +2193,7 @@ MainLoop(PsqlSettings *pset, char *query, FILE *source)
|
||||
pset->prompt[strlen(pset->prompt) - 3] = PROMPT_READY;
|
||||
}
|
||||
line = GetNextLine(pset->prompt, source);
|
||||
#ifdef HAVE_HISTORY
|
||||
#ifdef USE_HISTORY
|
||||
if (interactive && pset->useReadline && line != NULL)
|
||||
add_history(line); /* save non-empty lines in history */
|
||||
#endif
|
||||
@ -2454,7 +2460,7 @@ main(int argc, char **argv)
|
||||
settings.opt.pager = 1;
|
||||
if (!isatty(0) || !isatty(1))
|
||||
settings.notty = 1;
|
||||
#ifdef HAVE_LIBREADLINE
|
||||
#ifdef USE_READLINE
|
||||
else
|
||||
settings.useReadline = 1;
|
||||
#endif
|
||||
|
||||
119
src/configure
vendored
119
src/configure
vendored
@ -2898,7 +2898,7 @@ else
|
||||
fi
|
||||
done
|
||||
|
||||
for ac_hdr in readline/history.h ieeefp.h fp_class.h netinet/in.h
|
||||
for ac_hdr in readline/readline.h readline/history.h ieeefp.h fp_class.h
|
||||
do
|
||||
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
|
||||
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
|
||||
@ -2938,7 +2938,7 @@ else
|
||||
fi
|
||||
done
|
||||
|
||||
for ac_hdr in string.h strings.h
|
||||
for ac_hdr in netinet/in.h string.h strings.h
|
||||
do
|
||||
ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
|
||||
echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
|
||||
@ -4541,12 +4541,12 @@ fi
|
||||
|
||||
if test "$USE_X" = true; then
|
||||
|
||||
ice_save_LIBS="$LIBS"
|
||||
ice_save_CFLAGS="$CFLAGS"
|
||||
ice_save_CPPFLAGS="$CPPFLAGS"
|
||||
ice_save_LDFLAGS="$LDFLAGS"
|
||||
ice_save_LIBS="$LIBS"
|
||||
ice_save_CFLAGS="$CFLAGS"
|
||||
ice_save_CPPFLAGS="$CPPFLAGS"
|
||||
ice_save_LDFLAGS="$LDFLAGS"
|
||||
|
||||
# If we find X, set shell vars x_includes and x_libraries to the
|
||||
# If we find X, set shell vars x_includes and x_libraries to the
|
||||
# paths, otherwise set no_x=yes.
|
||||
# Uses ac_ vars as temps to allow command line to override cache and checks.
|
||||
# --without-x overrides everything else, but does not touch the cache.
|
||||
@ -5381,14 +5381,14 @@ fi
|
||||
fi
|
||||
|
||||
|
||||
LIBS="$LIBS $X_EXTRA_LIBS"
|
||||
CFLAGS="$CFLAGS $X_CFLAGS"
|
||||
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
|
||||
LDFLAGS="$LDFLAGS $X_LIBS"
|
||||
LIBS="$LIBS $X_EXTRA_LIBS"
|
||||
CFLAGS="$CFLAGS $X_CFLAGS"
|
||||
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
|
||||
LDFLAGS="$LDFLAGS $X_LIBS"
|
||||
|
||||
|
||||
X11_LIBS=""
|
||||
echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6
|
||||
X11_LIBS=""
|
||||
echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6
|
||||
echo "configure:5393: checking for XOpenDisplay in -lX11" >&5
|
||||
ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'`
|
||||
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
|
||||
@ -5428,27 +5428,27 @@ else
|
||||
echo "$ac_t""no" 1>&6
|
||||
fi
|
||||
|
||||
if test "$X11_LIBS" = ""; then
|
||||
echo "configure: warning: The X11 library '-lX11' could not be found.
|
||||
if test "$X11_LIBS" = ""; then
|
||||
echo "configure: warning: The X11 library '-lX11' could not be found.
|
||||
Please use the configure options '--x-includes=DIR'
|
||||
and '--x-libraries=DIR' to specify the X location.
|
||||
See the file 'config.log' for further diagnostics." 1>&2
|
||||
fi
|
||||
fi
|
||||
|
||||
|
||||
|
||||
|
||||
LIBS="$ice_save_LIBS"
|
||||
CFLAGS="$ice_save_CFLAGS"
|
||||
CPPFLAGS="$ice_save_CPPFLAGS"
|
||||
LDFLAGS="$ice_save_LDFLAGS"
|
||||
LIBS="$ice_save_LIBS"
|
||||
CFLAGS="$ice_save_CFLAGS"
|
||||
CPPFLAGS="$ice_save_CPPFLAGS"
|
||||
LDFLAGS="$ice_save_LDFLAGS"
|
||||
fi
|
||||
|
||||
|
||||
if test "$USE_TCL" = "true"
|
||||
then
|
||||
TCL_INCDIR=no
|
||||
ac_safe=`echo "tcl.h" | sed 'y%./+-%__p_%'`
|
||||
TCL_INCDIR=no
|
||||
ac_safe=`echo "tcl.h" | sed 'y%./+-%__p_%'`
|
||||
echo $ac_n "checking for tcl.h""... $ac_c" 1>&6
|
||||
echo "configure:5454: checking for tcl.h" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
|
||||
@ -5481,10 +5481,10 @@ else
|
||||
echo "$ac_t""no" 1>&6
|
||||
fi
|
||||
|
||||
if test "$TCL_INCDIR" = "no"; then
|
||||
echo "configure: warning: tcl support disabled; tcl.h missing" 1>&2
|
||||
USE_TCL=
|
||||
fi
|
||||
if test "$TCL_INCDIR" = "no"; then
|
||||
echo "configure: warning: tcl support disabled; tcl.h missing" 1>&2
|
||||
USE_TCL=
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$USE_TCL" = "true"; then
|
||||
@ -5542,28 +5542,27 @@ fi
|
||||
|
||||
if test "$USE_TCL" = "true"
|
||||
then
|
||||
ice_save_LIBS="$LIBS"
|
||||
ice_save_CFLAGS="$CFLAGS"
|
||||
ice_save_CPPFLAGS="$CPPFLAGS"
|
||||
ice_save_LDFLAGS="$LDFLAGS"
|
||||
|
||||
ice_save_LIBS="$LIBS"
|
||||
ice_save_CFLAGS="$CFLAGS"
|
||||
ice_save_CPPFLAGS="$CPPFLAGS"
|
||||
ice_save_LDFLAGS="$LDFLAGS"
|
||||
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
|
||||
|
||||
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
|
||||
|
||||
TK_INCDIR=no
|
||||
ac_safe=`echo "tk.h" | sed 'y%./+-%__p_%'`
|
||||
TK_INCDIR=no
|
||||
ac_safe=`echo "tk.h" | sed 'y%./+-%__p_%'`
|
||||
echo $ac_n "checking for tk.h""... $ac_c" 1>&6
|
||||
echo "configure:5557: checking for tk.h" >&5
|
||||
echo "configure:5556: checking for tk.h" >&5
|
||||
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
|
||||
echo $ac_n "(cached) $ac_c" 1>&6
|
||||
else
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 5562 "configure"
|
||||
#line 5561 "configure"
|
||||
#include "confdefs.h"
|
||||
#include <tk.h>
|
||||
EOF
|
||||
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
|
||||
{ (eval echo configure:5567: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
{ (eval echo configure:5566: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
|
||||
ac_err=`grep -v '^ *+' conftest.out`
|
||||
if test -z "$ac_err"; then
|
||||
rm -rf conftest*
|
||||
@ -5584,28 +5583,29 @@ else
|
||||
echo "$ac_t""no" 1>&6
|
||||
fi
|
||||
|
||||
if test "$TK_INCDIR" = "no"; then
|
||||
echo "configure: warning: tcl support disabled; tk.h missing" 1>&2
|
||||
USE_TCL=
|
||||
fi
|
||||
if test "$TK_INCDIR" = "no"; then
|
||||
echo "configure: warning: tcl support disabled; tk.h missing" 1>&2
|
||||
USE_TCL=
|
||||
fi
|
||||
|
||||
LIBS="$ice_save_LIBS"
|
||||
CFLAGS="$ice_save_CFLAGS"
|
||||
CPPFLAGS="$ice_save_CPPFLAGS"
|
||||
LDFLAGS="$ice_save_LDFLAGS"
|
||||
LIBS="$ice_save_LIBS"
|
||||
CFLAGS="$ice_save_CFLAGS"
|
||||
CPPFLAGS="$ice_save_CPPFLAGS"
|
||||
LDFLAGS="$ice_save_LDFLAGS"
|
||||
fi
|
||||
|
||||
if test "$USE_TCL" = "true"
|
||||
then
|
||||
ice_save_LIBS="$LIBS"
|
||||
ice_save_CFLAGS="$CFLAGS"
|
||||
ice_save_CPPFLAGS="$CPPFLAGS"
|
||||
ice_save_LDFLAGS="$LDFLAGS"
|
||||
LIBS="$LIBS $X_EXTRA_LIBS"
|
||||
CFLAGS="$CFLAGS $X_CFLAGS"
|
||||
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
|
||||
LDFLAGS="$LDFLAGS $X_LIBS"
|
||||
TK_LIB=
|
||||
ice_save_LIBS="$LIBS"
|
||||
ice_save_CFLAGS="$CFLAGS"
|
||||
ice_save_CPPFLAGS="$CPPFLAGS"
|
||||
ice_save_LDFLAGS="$LDFLAGS"
|
||||
|
||||
LIBS="$LIBS $X_EXTRA_LIBS"
|
||||
CFLAGS="$CFLAGS $X_CFLAGS"
|
||||
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
|
||||
LDFLAGS="$LDFLAGS $X_LIBS"
|
||||
|
||||
TK_LIB=
|
||||
tk_libs="tk8.0 tk80 tk4.2 tk42 tk"
|
||||
for tk_lib in $tk_libs; do
|
||||
@ -5655,11 +5655,12 @@ fi
|
||||
TK_LIB=-l$TK_LIB
|
||||
fi
|
||||
|
||||
fi
|
||||
LIBS="$ice_save_LIBS"
|
||||
CFLAGS="$ice_save_CFLAGS"
|
||||
CPPFLAGS="$ice_save_CPPFLAGS"
|
||||
LDFLAGS="$ice_save_LDFLAGS"
|
||||
|
||||
|
||||
LIBS="$ice_save_LIBS"
|
||||
CFLAGS="$ice_save_CFLAGS"
|
||||
CPPFLAGS="$ice_save_CPPFLAGS"
|
||||
LDFLAGS="$ice_save_LDFLAGS"
|
||||
fi
|
||||
|
||||
trap '' 1 2 15
|
||||
|
||||
@ -453,8 +453,8 @@ AC_HEADER_SYS_WAIT
|
||||
AC_CHECK_HEADERS(limits.h unistd.h termios.h values.h sys/select.h)
|
||||
AC_CHECK_HEADERS(sys/resource.h netdb.h arpa/inet.h getopt.h)
|
||||
AC_CHECK_HEADERS(readline.h history.h dld.h crypt.h endian.h float.h)
|
||||
AC_CHECK_HEADERS(readline/history.h ieeefp.h fp_class.h netinet/in.h)
|
||||
AC_CHECK_HEADERS(string.h strings.h)
|
||||
AC_CHECK_HEADERS(readline/readline.h readline/history.h ieeefp.h fp_class.h)
|
||||
AC_CHECK_HEADERS(netinet/in.h string.h strings.h)
|
||||
|
||||
dnl Checks for typedefs, structures, and compiler characteristics.
|
||||
AC_C_CONST
|
||||
|
||||
@ -68,6 +68,9 @@
|
||||
/* Set to 1 if you have <readline/history.h> */
|
||||
#undef HAVE_READLINE_HISTORY_H
|
||||
|
||||
/* Set to 1 if you have <readline/readline.h> */
|
||||
#undef HAVE_READLINE_READLINE_H
|
||||
|
||||
/* Set to 1 if you have <dld.h> */
|
||||
#undef HAVE_DLD_H
|
||||
|
||||
|
||||
Reference in New Issue
Block a user