Skip to content

Commit f3760c0

Browse files
author
jan.nijtmans
committed
Re-generate "configure". Update rules.vc
1 parent e48a9c4 commit f3760c0

File tree

2 files changed

+32
-18
lines changed

2 files changed

+32
-18
lines changed

‎configure‎

Lines changed: 28 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2774,16 +2774,16 @@ printf "%s\n" "$as_me: WARNING: --with-tcl argument should refer to directory co
27742774
`ls -d /usr/pkg/lib 2>/dev/null` \
27752775
`ls -d /usr/lib 2>/dev/null` \
27762776
`ls -d /usr/lib64 2>/dev/null` \
2777+
`ls -d /usr/lib/tcl9.1 2>/dev/null` \
27772778
`ls -d /usr/lib/tcl9.0 2>/dev/null` \
2778-
`ls -d /usr/lib/tcl8.7 2>/dev/null` \
27792779
`ls -d /usr/lib/tcl8.6 2>/dev/null` \
27802780
`ls -d /usr/lib/tcl8.5 2>/dev/null` \
2781+
`ls -d /usr/local/lib/tcl9.1 2>/dev/null` \
27812782
`ls -d /usr/local/lib/tcl9.0 2>/dev/null` \
2782-
`ls -d /usr/local/lib/tcl8.7 2>/dev/null` \
27832783
`ls -d /usr/local/lib/tcl8.6 2>/dev/null` \
27842784
`ls -d /usr/local/lib/tcl8.5 2>/dev/null` \
2785+
`ls -d /usr/local/lib/tcl/tcl9.1 2>/dev/null` \
27852786
`ls -d /usr/local/lib/tcl/tcl9.0 2>/dev/null` \
2786-
`ls -d /usr/local/lib/tcl/tcl8.7 2>/dev/null` \
27872787
`ls -d /usr/local/lib/tcl/tcl8.6 2>/dev/null` \
27882788
`ls -d /usr/local/lib/tcl/tcl8.5 2>/dev/null` \
27892789
; do
@@ -7199,11 +7199,15 @@ fi
71997199
CC_SEARCH_FLAGS=""
72007200
LD_SEARCH_FLAGS=""
72017201
;;
7202-
CYGWIN_*)
7202+
CYGWIN_*|MINGW32_*|MINGW64_*|MSYS_*)
72037203
SHLIB_CFLAGS=""
72047204
SHLIB_LD='${CC} -shared'
72057205
SHLIB_SUFFIX=".dll"
7206-
SHLIB_LD_LIBS="${SHLIB_LD_LIBS} -Wl,--out-implib,\$@.a"
7206+
if test "${TEA_PLATFORM}" = "unix" -a "${TCL_MAJOR_VERSION}" -gt 8 -a x"${with_tcl8}" = x; then
7207+
SHLIB_LD_LIBS="${SHLIB_LD_LIBS} -Wl,--out-implib,\$(patsubst cyg%.dll,lib%.dll.a,\$@)"
7208+
else
7209+
SHLIB_LD_LIBS="${SHLIB_LD_LIBS} -Wl,--out-implib,\$@.a"
7210+
fi
72077211
EXEEXT=".exe"
72087212
do64bit_ok=yes
72097213
CC_SEARCH_FLAGS=""
@@ -9280,8 +9284,17 @@ rm -rf conftest*
92809284
# substituted. (@@@ Might not be necessary anymore)
92819285
#--------------------------------------------------------------------
92829286

9283-
PACKAGE_LIB_PREFIX8="${PACKAGE_LIB_PREFIX}"
9284-
PACKAGE_LIB_PREFIX9="${PACKAGE_LIB_PREFIX}tcl9"
9287+
if test "$TEA_PLATFORM" = "unix"; then
9288+
PACKAGE_LIB_PREFIX8="lib"
9289+
if test "$EXEEXT" = ".exe" -a "$SHARED_BUILD" != "0"; then
9290+
PACKAGE_LIB_PREFIX9="cygtcl9"
9291+
else
9292+
PACKAGE_LIB_PREFIX9="libtcl9"
9293+
fi
9294+
else
9295+
PACKAGE_LIB_PREFIX8=""
9296+
PACKAGE_LIB_PREFIX9="tcl9"
9297+
fi
92859298
if test "${TCL_MAJOR_VERSION}" -gt 8 -a x"${with_tcl8}" = x; then
92869299
PACKAGE_LIB_PREFIX="${PACKAGE_LIB_PREFIX9}"
92879300
else
@@ -9336,20 +9349,20 @@ printf "%s\n" "#define TK_MAJOR_VERSION 8" >>confdefs.h
93369349
if test x"${TK_BIN_DIR}" != x ; then
93379350
SHLIB_LD_LIBS="${SHLIB_LD_LIBS} ${TK_STUB_LIB_SPEC}"
93389351
fi
9339-
eval eval "PKG_LIB_FILE8=lib${PACKAGE_LIB_PREFIX8}${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"
9340-
eval eval "PKG_LIB_FILE9=lib${PACKAGE_LIB_PREFIX9}${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"
9341-
eval eval "PKG_LIB_FILE=lib${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"
9352+
eval eval "PKG_LIB_FILE8=${PACKAGE_LIB_PREFIX8}${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"
9353+
eval eval "PKG_LIB_FILE9=${PACKAGE_LIB_PREFIX9}${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"
9354+
eval eval "PKG_LIB_FILE=${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"
93429355
RANLIB=:
93439356
else
9344-
eval eval "PKG_LIB_FILE8=lib${PACKAGE_LIB_PREFIX8}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
9345-
eval eval "PKG_LIB_FILE9=lib${PACKAGE_LIB_PREFIX9}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
9346-
eval eval "PKG_LIB_FILE=lib${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
9357+
eval eval "PKG_LIB_FILE8=${PACKAGE_LIB_PREFIX8}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
9358+
eval eval "PKG_LIB_FILE9=${PACKAGE_LIB_PREFIX9}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
9359+
eval eval "PKG_LIB_FILE=${PACKAGE_LIB_PREFIX}${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
93479360
fi
93489361
# Some packages build their own stubs libraries
93499362
if test "${TCL_MAJOR_VERSION}" -gt 8 -a x"${with_tcl8}" = x; then
9350-
eval eval "PKG_STUB_LIB_FILE=lib${PACKAGE_LIB_PREFIX8}${PACKAGE_NAME}stub.a"
9363+
eval eval "PKG_STUB_LIB_FILE=${PACKAGE_LIB_PREFIX8}${PACKAGE_NAME}stub.a"
93519364
else
9352-
eval eval "PKG_STUB_LIB_FILE=lib${PACKAGE_LIB_PREFIX8}${PACKAGE_NAME}stub${UNSHARED_LIB_SUFFIX}"
9365+
eval eval "PKG_STUB_LIB_FILE=${PACKAGE_LIB_PREFIX8}${PACKAGE_NAME}stub${UNSHARED_LIB_SUFFIX}"
93539366
fi
93549367
fi
93559368

‎win/rules.vc‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ _RULES_VC = 1
2424
# For modifications that are not backward-compatible, you *must* change
2525
# the major version.
2626
RULES_VERSION_MAJOR = 1
27-
RULES_VERSION_MINOR = 13
27+
RULES_VERSION_MINOR = 14
2828

2929
# The PROJECT macro must be defined by parent makefile.
3030
!if "$(PROJECT)" == ""
@@ -697,7 +697,7 @@ LINKERFLAGS = $(LINKERFLAGS) -ltcg
697697
&& [nmakehlp -V "$(_TCL_H)" "define TCL_MAJOR_VERSION" >> versions.vc]
698698
!endif
699699
!if [echo TCL_MINOR_VERSION = \>> versions.vc] \
700-
&& [nmakehlp -V "$(_TCL_H)" TCL_MINOR_VERSION >> versions.vc]
700+
&& [nmakehlp -V "$(_TCL_H)" "define TCL_MINOR_VERSION" >> versions.vc]
701701
!endif
702702
!if [echo TCL_RELEASE_SERIAL = \>> versions.vc] \
703703
&& [nmakehlp -V "$(_TCL_H)" TCL_RELEASE_SERIAL >> versions.vc]
@@ -1297,7 +1297,8 @@ tklibs = "$(TKSTUBLIB)" "$(TKIMPLIB)"
12971297

12981298
# Various output paths
12991299
PRJIMPLIB = $(OUT_DIR)\$(PROJECT)$(VERSION)$(SUFX).lib
1300-
PRJLIBNAME8 = $(PROJECT)$(VERSION)$(SUFX).$(EXT)
1300+
# Even when building against Tcl 9, PRJLIBNAME8 must have "t"
1301+
PRJLIBNAME8 = $(PROJECT)$(VERSION)t$(SUFX:t=).$(EXT)
13011302
# Even when building against Tcl 8, PRJLIBNAME9 must not have "t"
13021303
PRJLIBNAME9 = tcl9$(PROJECT)$(VERSION)$(SUFX:t=).$(EXT)
13031304
!if $(TCL_MAJOR_VERSION) == 8 || "$(TCL_BUILD_FOR)" == "8"

0 commit comments

Comments
 (0)