Skip to content

Commit 6a0c593

Browse files
author
jan.nijtmans
committed
Re-generate "configure"
1 parent 7b66599 commit 6a0c593

File tree

1 file changed

+25
-12
lines changed

1 file changed

+25
-12
lines changed

configure

Lines changed: 25 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6940,11 +6940,15 @@ fi
69406940
CC_SEARCH_FLAGS=""
69416941
LD_SEARCH_FLAGS=""
69426942
;;
6943-
CYGWIN_*)
6943+
CYGWIN_*|MINGW32_*|MINGW64_*|MSYS_*)
69446944
SHLIB_CFLAGS=""
69456945
SHLIB_LD='${CC} -shared'
69466946
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
69486952
EXEEXT=".exe"
69496953
do64bit_ok=yes
69506954
CC_SEARCH_FLAGS=""
@@ -8997,8 +9001,17 @@ rm -rf conftest*
89979001
# substituted. (@@@ Might not be necessary anymore)
89989002
#--------------------------------------------------------------------
89999003

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
90029015
if test "${TCL_MAJOR_VERSION}" -gt 8 -a x"${with_tcl8}" = x; then
90039016
PACKAGE_LIB_PREFIX="${PACKAGE_LIB_PREFIX9}"
90049017
else
@@ -9053,20 +9066,20 @@ printf "%s\n" "#define TK_MAJOR_VERSION 8" >>confdefs.h
90539066
if test x"${TK_BIN_DIR}" != x ; then
90549067
SHLIB_LD_LIBS="${SHLIB_LD_LIBS} ${TK_STUB_LIB_SPEC}"
90559068
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}"
90599072
RANLIB=:
90609073
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}"
90649077
fi
90659078
# Some packages build their own stubs libraries
90669079
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"
90689081
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}"
90709083
fi
90719084
fi
90729085

0 commit comments

Comments
 (0)