Skip to content

P
Postgres FD Implementation
Commit 7ceec34a authored by Tom Lane's avatar Tom Lane
Browse files
Options

Improve documentation of configure's readline/libedit switches.

parent db2dcf58
Hide whitespace changes
Inline Side-by-side
Showing with 49 additions and 43 deletions
configure
View file @ 7ceec34a
...@@ -892,8 +892,8 @@ Optional Packages: ...@@ -892,8 +892,8 @@ Optional Packages:
--with-ldap build with LDAP support --with-ldap build with LDAP support
--with-bonjour build with Bonjour support --with-bonjour build with Bonjour support
--with-openssl build with OpenSSL support --with-openssl build with OpenSSL support
--without-readline do not use GNU Readline nor BSD Libedit for editing
--with-libedit-preferred prefer BSD Libedit over GNU Readline --with-libedit-preferred prefer BSD Libedit over GNU Readline
--without-readline do not use GNU Readline / BSD Libedit line editing
--without-zlib do not use Zlib --without-zlib do not use Zlib
--with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-gnu-ld assume the C compiler uses GNU ld [default=no]
...@@ -4087,15 +4087,15 @@ echo "${ECHO_T}$with_openssl" >&6 ...@@ -4087,15 +4087,15 @@ echo "${ECHO_T}$with_openssl" >&6
# #
# Prefer libedit # Readline
# #
# Check whether --with-libedit-preferred or --without-libedit-preferred was given. # Check whether --with-readline or --without-readline was given.
if test "${with_libedit_preferred+set}" = set; then if test "${with_readline+set}" = set; then
withval="$with_libedit_preferred" withval="$with_readline"
case $withval in case $withval in
yes) yes)
...@@ -4105,29 +4105,39 @@ if test "${with_libedit_preferred+set}" = set; then ...@@ -4105,29 +4105,39 @@ if test "${with_libedit_preferred+set}" = set; then
: :
;; ;;
*) *)
{ { echo "$as_me:$LINENO: error: no argument expected for --with-libedit-preferred option" >&5 { { echo "$as_me:$LINENO: error: no argument expected for --with-readline option" >&5
echo "$as_me: error: no argument expected for --with-libedit-preferred option" >&2;} echo "$as_me: error: no argument expected for --with-readline option" >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
;; ;;
esac esac
else else
with_libedit_preferred=no with_readline=yes
fi; fi;
# readline on MinGW has problems with backslashes in psql and other bugs.
# This is particularly a problem with non-US code pages.
# Therefore disable its use until we understand the cause. 2004-07-20
if test "$PORTNAME" = "win32"; then
if test "$with_readline" = yes; then
{ echo "$as_me:$LINENO: WARNING: *** Readline does not work on MinGW --- disabling" >&5
echo "$as_me: WARNING: *** Readline does not work on MinGW --- disabling" >&2;}
with_readline=no
fi
fi
# #
# Readline # Prefer libedit
# #
# Check whether --with-readline or --without-readline was given. # Check whether --with-libedit-preferred or --without-libedit-preferred was given.
if test "${with_readline+set}" = set; then if test "${with_libedit_preferred+set}" = set; then
withval="$with_readline" withval="$with_libedit_preferred"
case $withval in case $withval in
yes) yes)
...@@ -4137,27 +4147,17 @@ if test "${with_readline+set}" = set; then ...@@ -4137,27 +4147,17 @@ if test "${with_readline+set}" = set; then
: :
;; ;;
*) *)
{ { echo "$as_me:$LINENO: error: no argument expected for --with-readline option" >&5 { { echo "$as_me:$LINENO: error: no argument expected for --with-libedit-preferred option" >&5
echo "$as_me: error: no argument expected for --with-readline option" >&2;} echo "$as_me: error: no argument expected for --with-libedit-preferred option" >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
;; ;;
esac esac
else else
with_readline=yes with_libedit_preferred=no
fi; fi;
# readline on MinGW has problems with backslashes in psql and other bugs.
# This is particularly a problem with non-US code pages.
# Therefore disable its use until we understand the cause. 2004-07-20
if test "$PORTNAME" = "win32"; then
if test "$with_readline" = yes; then
{ echo "$as_me:$LINENO: WARNING: *** Readline does not work on MinGW --- disabling" >&5
echo "$as_me: WARNING: *** Readline does not work on MinGW --- disabling" >&2;}
with_readline=no
fi
fi
# #
...@@ -22955,8 +22955,8 @@ with_pam) ;; ...@@ -22955,8 +22955,8 @@ with_pam) ;;
with_ldap) ;; with_ldap) ;;
with_bonjour) ;; with_bonjour) ;;
with_openssl) ;; with_openssl) ;;
with_libedit_preferred) ;;
with_readline) ;; with_readline) ;;
with_libedit_preferred) ;;
with_zlib) ;; with_zlib) ;;
with_gnu_ld) ;; with_gnu_ld) ;;
......
configure.in
View file @ 7ceec34a
dnl Process this file with autoconf to produce a configure script. dnl Process this file with autoconf to produce a configure script.
dnl $PostgreSQL: pgsql/configure.in,v 1.476 2006/09/27 16:29:45 tgl Exp $ dnl $PostgreSQL: pgsql/configure.in,v 1.477 2006/10/01 23:47:16 tgl Exp $
dnl dnl
dnl Developers, please strive to achieve this order: dnl Developers, please strive to achieve this order:
dnl dnl
...@@ -508,18 +508,11 @@ AC_MSG_RESULT([$with_openssl]) ...@@ -508,18 +508,11 @@ AC_MSG_RESULT([$with_openssl])
AC_SUBST(with_openssl) AC_SUBST(with_openssl)
#
# Prefer libedit
#
PGAC_ARG_BOOL(with, libedit-preferred, no,
[ --with-libedit-preferred prefer BSD Libedit over GNU Readline])
# #
# Readline # Readline
# #
PGAC_ARG_BOOL(with, readline, yes, PGAC_ARG_BOOL(with, readline, yes,
[ --without-readline do not use GNU Readline / BSD Libedit line editing]) [ --without-readline do not use GNU Readline nor BSD Libedit for editing])
# readline on MinGW has problems with backslashes in psql and other bugs. # readline on MinGW has problems with backslashes in psql and other bugs.
# This is particularly a problem with non-US code pages. # This is particularly a problem with non-US code pages.
# Therefore disable its use until we understand the cause. 2004-07-20 # Therefore disable its use until we understand the cause. 2004-07-20
...@@ -531,6 +524,13 @@ if test "$PORTNAME" = "win32"; then ...@@ -531,6 +524,13 @@ if test "$PORTNAME" = "win32"; then
fi fi
#
# Prefer libedit
#
PGAC_ARG_BOOL(with, libedit-preferred, no,
[ --with-libedit-preferred prefer BSD Libedit over GNU Readline])
# #
# Zlib # Zlib
# #
......
doc/src/sgml/installation.sgml
View file @ 7ceec34a
<!-- $PostgreSQL: pgsql/doc/src/sgml/installation.sgml,v 1.262 2006/09/16 00:30:14 momjian Exp $ --> <!-- $PostgreSQL: pgsql/doc/src/sgml/installation.sgml,v 1.263 2006/10/01 23:47:16 tgl Exp $ -->
<chapter id="installation"> <chapter id="installation">
<title><![%standalone-include[<productname>PostgreSQL</>]]> <title><![%standalone-include[<productname>PostgreSQL</>]]>
...@@ -105,6 +105,9 @@ su - postgres ...@@ -105,6 +105,9 @@ su - postgres
<indexterm> <indexterm>
<primary>readline</primary> <primary>readline</primary>
</indexterm> </indexterm>
<indexterm>
<primary>libedit</primary>
</indexterm>
The <acronym>GNU</> <productname>Readline</> library (for The <acronym>GNU</> <productname>Readline</> library (for
simple line editing and command history retrieval) is simple line editing and command history retrieval) is
...@@ -866,22 +869,25 @@ su - postgres ...@@ -866,22 +869,25 @@ su - postgres
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><option>--with-libedit-preferred</option></term> <term><option>--without-readline</option></term>
<listitem> <listitem>
<para> <para>
Favors the use of the BSD-licensed <application>libedit</> library Prevents use of the <application>Readline</> library
rather than GPL-licensed <application>Readline</>. (and <application>libedit</> as well). This option disables
command-line editing and history in
<application>psql</application>, so it is not recommended.
</para> </para>
</listitem> </listitem>
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><option>--without-readline</option></term> <term><option>--with-libedit-preferred</option></term>
<listitem> <listitem>
<para> <para>
Prevents use of the <application>Readline</> library. This disables Favors the use of the BSD-licensed <application>libedit</> library
command-line editing and history in rather than GPL-licensed <application>Readline</>. This option
<application>psql</application>, so it is not recommended. is significant only if you have both libraries installed; the
default in that case is to use <application>Readline</>.
</para> </para>
</listitem> </listitem>
</varlistentry> </varlistentry>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment