Skip to content

Commit b8a89da

Browse files
committed
Suppress readline usage in mingw in configure.
1 parent 5406955 commit b8a89da

File tree

2 files changed

+26
-5
lines changed

2 files changed

+26
-5
lines changed

configure

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2980,8 +2980,8 @@ else
29802980

29812981
fi;
29822982

2983-
if test "$enable_thread_safety" = yes -o
2984-
test "$enable_thread_safety_force" = yes; then
2983+
if test "$enable_thread_safety" = yes -o \
2984+
"$enable_thread_safety_force" = yes; then
29852985
enable_thread_safety="yes" # for 'force'
29862986

29872987
cat >>confdefs.h <<\_ACEOF
@@ -3409,6 +3409,17 @@ else
34093409

34103410
fi;
34113411

3412+
# readline on MinGW has problems with backslashes in psql and other bugs.
3413+
# This is particularly a problem with non-US code pages.
3414+
# Therefore disable its use until we understand the cause. 2004-07-20
3415+
case $host_os in mingw*)
3416+
if test "$with_readline" = yes; then
3417+
{ echo "$as_me:$LINENO: WARNING: *** Readline does not work on MinGW --- disabling" >&5
3418+
echo "$as_me: WARNING: *** Readline does not work on MinGW --- disabling" >&2;}
3419+
with_readline=no
3420+
fi;;
3421+
esac
3422+
34123423

34133424
#
34143425
# Zlib

configure.in

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
dnl Process this file with autoconf to produce a configure script.
2-
dnl $PostgreSQL: pgsql/configure.in,v 1.368 2004/07/17 18:53:56 petere Exp $
2+
dnl $PostgreSQL: pgsql/configure.in,v 1.369 2004/07/20 20:37:13 momjian Exp $
33
dnl
44
dnl Developers, please strive to achieve this order:
55
dnl
@@ -360,8 +360,8 @@ IFS=$ac_save_IFS
360360
AC_MSG_CHECKING([allow thread-safe client libraries])
361361
PGAC_ARG_BOOL(enable, thread-safety, no, [ --enable-thread-safety make client libraries thread-safe])
362362
PGAC_ARG_BOOL(enable, thread-safety-force, no, [ --enable-thread-safety-force force thread-safety in spite of thread test failure])
363-
if test "$enable_thread_safety" = yes -o
364-
test "$enable_thread_safety_force" = yes; then
363+
if test "$enable_thread_safety" = yes -o \
364+
"$enable_thread_safety_force" = yes; then
365365
enable_thread_safety="yes" # for 'force'
366366
AC_DEFINE([ENABLE_THREAD_SAFETY], 1,
367367
[Define to 1 to build client libraries as thread-safe code. (--enable-thread-safety)])
@@ -480,6 +480,16 @@ AC_SUBST(with_openssl)
480480
#
481481
PGAC_ARG_BOOL(with, readline, yes,
482482
[ --without-readline do not use Readline])
483+
# readline on MinGW has problems with backslashes in psql and other bugs.
484+
# This is particularly a problem with non-US code pages.
485+
# Therefore disable its use until we understand the cause. 2004-07-20
486+
case $host_os in mingw*)
487+
if test "$with_readline" = yes; then
488+
AC_MSG_WARN([*** Readline does not work on MinGW --- disabling])
489+
with_readline=no
490+
fi;;
491+
esac
492+
483493

484494
#
485495
# Zlib

0 commit comments

Comments
 (0)