@@ -6940,11 +6940,15 @@ fi
6940
6940
CC_SEARCH_FLAGS=" "
6941
6941
LD_SEARCH_FLAGS=" "
6942
6942
;;
6943
- CYGWIN_* )
6943
+ CYGWIN_* |MINGW32_ * |MINGW64_ * |MSYS_ * )
6944
6944
SHLIB_CFLAGS=" "
6945
6945
SHLIB_LD=' ${CC} -shared'
6946
6946
SHLIB_SUFFIX=" .dll"
6947
- SHLIB_LD_LIBS=" ${SHLIB_LD_LIBS} -Wl,--out-implib,\$ @.a"
6947
+ if test " ${TEA_PLATFORM} " = " unix" -a " ${TCL_MAJOR_VERSION} " -gt 8 -a x" ${with_tcl8} " = x; then
6948
+ SHLIB_LD_LIBS=" ${SHLIB_LD_LIBS} -Wl,--out-implib,\$ (patsubst cyg%.dll,lib%.dll.a,\$ @)"
6949
+ else
6950
+ SHLIB_LD_LIBS=" ${SHLIB_LD_LIBS} -Wl,--out-implib,\$ @.a"
6951
+ fi
6948
6952
EXEEXT=" .exe"
6949
6953
do64bit_ok=yes
6950
6954
CC_SEARCH_FLAGS=" "
@@ -8997,8 +9001,17 @@ rm -rf conftest*
8997
9001
# substituted. (@@@ Might not be necessary anymore)
8998
9002
# --------------------------------------------------------------------
8999
9003
9000
- PACKAGE_LIB_PREFIX8=" ${PACKAGE_LIB_PREFIX} "
9001
- PACKAGE_LIB_PREFIX9=" ${PACKAGE_LIB_PREFIX} tcl9"
9004
+ if test " $TEA_PLATFORM " = " unix" ; then
9005
+ PACKAGE_LIB_PREFIX8=" lib"
9006
+ if test " $EXEEXT " = " .exe" -a " $SHARED_BUILD " ! = " 0" ; then
9007
+ PACKAGE_LIB_PREFIX9=" cygtcl9"
9008
+ else
9009
+ PACKAGE_LIB_PREFIX9=" libtcl9"
9010
+ fi
9011
+ else
9012
+ PACKAGE_LIB_PREFIX8=" "
9013
+ PACKAGE_LIB_PREFIX9=" tcl9"
9014
+ fi
9002
9015
if test " ${TCL_MAJOR_VERSION} " -gt 8 -a x" ${with_tcl8} " = x; then
9003
9016
PACKAGE_LIB_PREFIX=" ${PACKAGE_LIB_PREFIX9} "
9004
9017
else
@@ -9053,20 +9066,20 @@ printf "%s\n" "#define TK_MAJOR_VERSION 8" >>confdefs.h
9053
9066
if test x" ${TK_BIN_DIR} " ! = x ; then
9054
9067
SHLIB_LD_LIBS=" ${SHLIB_LD_LIBS} ${TK_STUB_LIB_SPEC} "
9055
9068
fi
9056
- eval eval " PKG_LIB_FILE8=lib ${PACKAGE_LIB_PREFIX8}${PACKAGE_NAME}${SHARED_LIB_SUFFIX} "
9057
- eval eval " PKG_LIB_FILE9=lib ${PACKAGE_LIB_PREFIX9}${PACKAGE_NAME}${SHARED_LIB_SUFFIX} "
9058
- eval eval " PKG_LIB_FILE=lib ${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${SHARED_LIB_SUFFIX} "
9069
+ eval eval " PKG_LIB_FILE8=${PACKAGE_LIB_PREFIX8}${PACKAGE_NAME}${SHARED_LIB_SUFFIX} "
9070
+ eval eval " PKG_LIB_FILE9=${PACKAGE_LIB_PREFIX9}${PACKAGE_NAME}${SHARED_LIB_SUFFIX} "
9071
+ eval eval " PKG_LIB_FILE=${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${SHARED_LIB_SUFFIX} "
9059
9072
RANLIB=:
9060
9073
else
9061
- eval eval " PKG_LIB_FILE8=lib ${PACKAGE_LIB_PREFIX8}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX} "
9062
- eval eval " PKG_LIB_FILE9=lib ${PACKAGE_LIB_PREFIX9}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX} "
9063
- eval eval " PKG_LIB_FILE=lib ${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX} "
9074
+ eval eval " PKG_LIB_FILE8=${PACKAGE_LIB_PREFIX8}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX} "
9075
+ eval eval " PKG_LIB_FILE9=${PACKAGE_LIB_PREFIX9}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX} "
9076
+ eval eval " PKG_LIB_FILE=${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX} "
9064
9077
fi
9065
9078
# Some packages build their own stubs libraries
9066
9079
if test " ${TCL_MAJOR_VERSION} " -gt 8 -a x" ${with_tcl8} " = x; then
9067
- eval eval " PKG_STUB_LIB_FILE=lib ${PACKAGE_LIB_PREFIX8}${PACKAGE_NAME} stub.a"
9080
+ eval eval " PKG_STUB_LIB_FILE=${PACKAGE_LIB_PREFIX8}${PACKAGE_NAME} stub.a"
9068
9081
else
9069
- eval eval " PKG_STUB_LIB_FILE=lib ${PACKAGE_LIB_PREFIX8}${PACKAGE_NAME} stub${UNSHARED_LIB_SUFFIX} "
9082
+ eval eval " PKG_STUB_LIB_FILE=${PACKAGE_LIB_PREFIX8}${PACKAGE_NAME} stub${UNSHARED_LIB_SUFFIX} "
9070
9083
fi
9071
9084
fi
9072
9085
0 commit comments