ncurses 5.9 - patch 20131110

[ncurses.git] / configure.in

diff --git a/configure.in b/configure.in
index 1e59dc8c98e3b9e9dda91912afa2dacefad17812..46a280f26850616cba04019fba94f63ad7ac1f7e 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -28,14 +28,14 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
-dnl $Id: configure.in,v 1.573 2013/08/03 22:59:09 tom Exp $
+dnl $Id: configure.in,v 1.574 2013/09/07 17:54:05 Alexey.Pavlov Exp $
 dnl Process this file with autoconf to produce a configure script.
 dnl
 dnl See http://invisible-island.net/autoconf/ for additional information.
 dnl
 dnl ---------------------------------------------------------------------------
 AC_PREREQ(2.52.20030208)
-AC_REVISION($Revision: 1.573 $)
+AC_REVISION($Revision: 1.574 $)
 AC_INIT(ncurses/base/lib_initscr.c)
 AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
 
@@ -1181,7 +1181,17 @@ if test "x$with_reentrant" = xyes ; then
                CF_ADD_LIB(pthread,TEST_LIBS)
                CF_ADD_LIB(pthread,TEST_LIBS2)
        else
-               LIB_SUFFIX="t${LIB_SUFFIX}"
+               # when not using weak symbols but with_reentrant,
+               # add 't' to the library suffix on all platforms
+               # except cygwin, where we only do that if ALSO
+               # compiling with full thread support.
+               case "$host" in
+               *cygwin* | *msys*)
+                       if test "$with_pthread" = "yes" ; then
+                               LIB_SUFFIX="t${LIB_SUFFIX}"
+                       fi ;;
+               * ) LIB_SUFFIX="t${LIB_SUFFIX}" ;;
+               esac
        fi
        AC_DEFINE(USE_REENTRANT,1,[Define to 1 to use experimental reentrant feature])
        CF_NCURSES_ABI_6
@@ -1798,8 +1808,8 @@ fi
 
 if test "$DFT_LWR_MODEL" = shared ; then
        case $cf_cv_system_name in #(vi
-       cygwin*)
-               # "lib" files have ".dll.a" suffix, "cyg" files have ".dll"
+       cygwin*|msys*)
+               # "lib" files have ".dll.a" suffix, "cyg"or "msys-" files have ".dll"
                TINFO_SUFFIX=.dll
                ;;
        esac