@@ -892,8 +892,8 @@ Optional Packages:
892892 --with-ldap build with LDAP support
893893 --with-bonjour build with Bonjour support
894894 --with-openssl build with OpenSSL support
895+ --without-readline do not use GNU Readline nor BSD Libedit for editing
895896 --with-libedit-preferred prefer BSD Libedit over GNU Readline
896- --without-readline do not use GNU Readline / BSD Libedit line editing
897897 --without-zlib do not use Zlib
898898 --with-gnu-ld assume the C compiler uses GNU ld [default=no]
899899
@@ -4087,15 +4087,15 @@ echo "${ECHO_T}$with_openssl" >&6
40874087
40884088
40894089#
4090- #Prefer libedit
4090+ #Readline
40914091#
40924092
40934093
40944094
40954095
4096- # Check whether --with-libedit-preferred or --without-libedit-preferred was given.
4097- if test "${with_libedit_preferred +set}" = set; then
4098- withval="$with_libedit_preferred "
4096+ # Check whether --with-readline or --without-readline was given.
4097+ if test "${with_readline +set}" = set; then
4098+ withval="$with_readline "
40994099
41004100 case $withval in
41014101 yes)
@@ -4105,29 +4105,39 @@ if test "${with_libedit_preferred+set}" = set; then
41054105 :
41064106 ;;
41074107 *)
4108- { { echo "$as_me:$LINENO: error: no argument expected for --with-libedit-preferred option" >&5
4109- echo "$as_me: error: no argument expected for --with-libedit-preferred option" >&2;}
4108+ { { echo "$as_me:$LINENO: error: no argument expected for --with-readline option" >&5
4109+ echo "$as_me: error: no argument expected for --with-readline option" >&2;}
41104110 { (exit 1); exit 1; }; }
41114111 ;;
41124112 esac
41134113
41144114else
4115- with_libedit_preferred=no
4115+ with_readline=yes
41164116
41174117fi;
41184118
4119+ # readline on MinGW has problems with backslashes in psql and other bugs.
4120+ # This is particularly a problem with non-US code pages.
4121+ # Therefore disable its use until we understand the cause. 2004-07-20
4122+ if test "$PORTNAME" = "win32"; then
4123+ if test "$with_readline" = yes; then
4124+ { echo "$as_me:$LINENO: WARNING: *** Readline does not work on MinGW --- disabling" >&5
4125+ echo "$as_me: WARNING: *** Readline does not work on MinGW --- disabling" >&2;}
4126+ with_readline=no
4127+ fi
4128+ fi
41194129
41204130
41214131#
4122- #Readline
4132+ #Prefer libedit
41234133#
41244134
41254135
41264136
41274137
4128- # Check whether --with-readline or --without-readline was given.
4129- if test "${with_readline +set}" = set; then
4130- withval="$with_readline "
4138+ # Check whether --with-libedit-preferred or --without-libedit-preferred was given.
4139+ if test "${with_libedit_preferred +set}" = set; then
4140+ withval="$with_libedit_preferred "
41314141
41324142 case $withval in
41334143 yes)
@@ -4137,27 +4147,17 @@ if test "${with_readline+set}" = set; then
41374147 :
41384148 ;;
41394149 *)
4140- { { echo "$as_me:$LINENO: error: no argument expected for --with-readline option" >&5
4141- echo "$as_me: error: no argument expected for --with-readline option" >&2;}
4150+ { { echo "$as_me:$LINENO: error: no argument expected for --with-libedit-preferred option" >&5
4151+ echo "$as_me: error: no argument expected for --with-libedit-preferred option" >&2;}
41424152 { (exit 1); exit 1; }; }
41434153 ;;
41444154 esac
41454155
41464156else
4147- with_readline=yes
4157+ with_libedit_preferred=no
41484158
41494159fi;
41504160
4151- # readline on MinGW has problems with backslashes in psql and other bugs.
4152- # This is particularly a problem with non-US code pages.
4153- # Therefore disable its use until we understand the cause. 2004-07-20
4154- if test "$PORTNAME" = "win32"; then
4155- if test "$with_readline" = yes; then
4156- { echo "$as_me:$LINENO: WARNING: *** Readline does not work on MinGW --- disabling" >&5
4157- echo "$as_me: WARNING: *** Readline does not work on MinGW --- disabling" >&2;}
4158- with_readline=no
4159- fi
4160- fi
41614161
41624162
41634163#
@@ -22955,8 +22955,8 @@ with_pam) ;;
2295522955with_ldap) ;;
2295622956with_bonjour) ;;
2295722957with_openssl) ;;
22958- with_libedit_preferred) ;;
2295922958with_readline) ;;
22959+ with_libedit_preferred) ;;
2296022960with_zlib) ;;
2296122961
2296222962 with_gnu_ld) ;;