diff --git a/configure b/configure
index 9372e37f3685f1753cba015c961e106f1edcb153..a69e586813b52cad8ccdd92a566fabe597c4c865 100755
--- a/configure
+++ b/configure
@@ -892,8 +892,8 @@ Optional Packages:
--with-ldap build with LDAP support
--with-bonjour build with Bonjour 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
- --without-readline do not use GNU Readline / BSD Libedit line editing
--without-zlib do not use Zlib
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
@@ -4087,15 +4087,15 @@ echo "${ECHO_T}$with_openssl" >&6
#
-# Prefer libedit
+# Readline
#
-# Check whether --with-libedit-preferred or --without-libedit-preferred was given.
-if test "${with_libedit_preferred+set}" = set; then
- withval="$with_libedit_preferred"
+# Check whether --with-readline or --without-readline was given.
+if test "${with_readline+set}" = set; then
+ withval="$with_readline"
case $withval in
yes)
@@ -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: error: no argument expected for --with-libedit-preferred option" >&2;}
+ { { echo "$as_me:$LINENO: error: no argument expected for --with-readline option" >&5
+echo "$as_me: error: no argument expected for --with-readline option" >&2;}
{ (exit 1); exit 1; }; }
;;
esac
else
- with_libedit_preferred=no
+ with_readline=yes
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.
-if test "${with_readline+set}" = set; then
- withval="$with_readline"
+# Check whether --with-libedit-preferred or --without-libedit-preferred was given.
+if test "${with_libedit_preferred+set}" = set; then
+ withval="$with_libedit_preferred"
case $withval in
yes)
@@ -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: error: no argument expected for --with-readline option" >&2;}
+ { { echo "$as_me:$LINENO: error: no argument expected for --with-libedit-preferred option" >&5
+echo "$as_me: error: no argument expected for --with-libedit-preferred option" >&2;}
{ (exit 1); exit 1; }; }
;;
esac
else
- with_readline=yes
+ with_libedit_preferred=no
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) ;;
with_ldap) ;;
with_bonjour) ;;
with_openssl) ;;
-with_libedit_preferred) ;;
with_readline) ;;
+with_libedit_preferred) ;;
with_zlib) ;;
with_gnu_ld) ;;
diff --git a/configure.in b/configure.in
index 818a6f59fc3b6f08bf1c16c3686714eaf7142700..6b36bfea23fd46782db291cb14159b5d43851736 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
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 Developers, please strive to achieve this order:
dnl
@@ -508,18 +508,11 @@ AC_MSG_RESULT([$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
#
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.
# This is particularly a problem with non-US code pages.
# Therefore disable its use until we understand the cause. 2004-07-20
@@ -531,6 +524,13 @@ if test "$PORTNAME" = "win32"; then
fi
+#
+# Prefer libedit
+#
+PGAC_ARG_BOOL(with, libedit-preferred, no,
+ [ --with-libedit-preferred prefer BSD Libedit over GNU Readline])
+
+
#
# Zlib
#
diff --git a/doc/src/sgml/installation.sgml b/doc/src/sgml/installation.sgml
index da9022396e5571a485c90c5d2c997ac8b7cc6edf..069bb20040ae07010914996aceb86f247c1e6980 100644
--- a/doc/src/sgml/installation.sgml
+++ b/doc/src/sgml/installation.sgml
@@ -1,4 +1,4 @@
-<!-- $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">
<title><![%standalone-include[<productname>PostgreSQL</>]]>
@@ -105,6 +105,9 @@ su - postgres
<indexterm>
<primary>readline</primary>
</indexterm>
+ <indexterm>
+ <primary>libedit</primary>
+ </indexterm>
The <acronym>GNU</> <productname>Readline</> library (for
simple line editing and command history retrieval) is
@@ -866,22 +869,25 @@ su - postgres
</varlistentry>
<varlistentry>
- <term><option>--with-libedit-preferred</option></term>
+ <term><option>--without-readline</option></term>
<listitem>
<para>
- Favors the use of the BSD-licensed <application>libedit</> library
- rather than GPL-licensed <application>Readline</>.
+ Prevents use of the <application>Readline</> library
+ (and <application>libedit</> as well). This option disables
+ command-line editing and history in
+ <application>psql</application>, so it is not recommended.
</para>
</listitem>
</varlistentry>
<varlistentry>
- <term><option>--without-readline</option></term>
+ <term><option>--with-libedit-preferred</option></term>
<listitem>
<para>
- Prevents use of the <application>Readline</> library. This disables
- command-line editing and history in
- <application>psql</application>, so it is not recommended.
+ Favors the use of the BSD-licensed <application>libedit</> library
+ rather than GPL-licensed <application>Readline</>. This option
+ is significant only if you have both libraries installed; the
+ default in that case is to use <application>Readline</>.
</para>
</listitem>
</varlistentry>