@@ -892,8 +892,8 @@ Optional Packages:
892
892
--with-ldap build with LDAP support
893
893
--with-bonjour build with Bonjour support
894
894
--with-openssl build with OpenSSL support
895
+ --without-readline do not use GNU Readline nor BSD Libedit for editing
895
896
--with-libedit-preferred prefer BSD Libedit over GNU Readline
896
- --without-readline do not use GNU Readline / BSD Libedit line editing
897
897
--without-zlib do not use Zlib
898
898
--with-gnu-ld assume the C compiler uses GNU ld [default=no]
899
899
@@ -4087,15 +4087,15 @@ echo "${ECHO_T}$with_openssl" >&6
4087
4087
4088
4088
4089
4089
#
4090
- #Prefer libedit
4090
+ #Readline
4091
4091
#
4092
4092
4093
4093
4094
4094
4095
4095
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 "
4099
4099
4100
4100
case $withval in
4101
4101
yes)
@@ -4105,29 +4105,39 @@ if test "${with_libedit_preferred+set}" = set; then
4105
4105
:
4106
4106
;;
4107
4107
*)
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;}
4110
4110
{ (exit 1); exit 1; }; }
4111
4111
;;
4112
4112
esac
4113
4113
4114
4114
else
4115
- with_libedit_preferred=no
4115
+ with_readline=yes
4116
4116
4117
4117
fi;
4118
4118
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
4119
4129
4120
4130
4121
4131
#
4122
- #Readline
4132
+ #Prefer libedit
4123
4133
#
4124
4134
4125
4135
4126
4136
4127
4137
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 "
4131
4141
4132
4142
case $withval in
4133
4143
yes)
@@ -4137,27 +4147,17 @@ if test "${with_readline+set}" = set; then
4137
4147
:
4138
4148
;;
4139
4149
*)
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;}
4142
4152
{ (exit 1); exit 1; }; }
4143
4153
;;
4144
4154
esac
4145
4155
4146
4156
else
4147
- with_readline=yes
4157
+ with_libedit_preferred=no
4148
4158
4149
4159
fi;
4150
4160
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
4161
4161
4162
4162
4163
4163
#
@@ -22955,8 +22955,8 @@ with_pam) ;;
22955
22955
with_ldap) ;;
22956
22956
with_bonjour) ;;
22957
22957
with_openssl) ;;
22958
- with_libedit_preferred) ;;
22959
22958
with_readline) ;;
22959
+ with_libedit_preferred) ;;
22960
22960
with_zlib) ;;
22961
22961
22962
22962
with_gnu_ld) ;;