diff options
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/configure b/configure index 9372e37f368..a69e586813b 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) ;; |