diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-08-04 19:06:56 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2023-08-04 19:06:56 (GMT) |
| commit | fa96cac29f10b30e6fb499800598cc35ba2a19d3 (patch) | |
| tree | 0786f1348044b9dee6e871de4d2399f36f596c91 /unix | |
| parent | b8117727ea202b0bdb4566ec994df5a4faaf93d8 (diff) | |
| parent | aeaba6971a969d6e628e5fd35f4cfca4fb2c683b (diff) | |
| download | tcl-fa96cac29f10b30e6fb499800598cc35ba2a19d3.zip tcl-fa96cac29f10b30e6fb499800598cc35ba2a19d3.tar.gz tcl-fa96cac29f10b30e6fb499800598cc35ba2a19d3.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'unix')
| -rwxr-xr-x | unix/configure | 5 | ||||
| -rwxr-xr-x | unix/installManPage | 9 | ||||
| -rw-r--r-- | unix/tcl.m4 | 5 |
3 files changed, 7 insertions, 12 deletions
diff --git a/unix/configure b/unix/configure index 426954a..eb63649 100755 --- a/unix/configure +++ b/unix/configure @@ -5773,9 +5773,6 @@ fi DL_LIBS="-ldl" CC_SEARCH_FLAGS="" LD_SEARCH_FLAGS="" - TCL_NEEDS_EXP_FILE=1 - TCL_EXPORT_FILE_SUFFIX='${VERSION}.dll.a' - SHLIB_LD_LIBS="${SHLIB_LD_LIBS} -Wl,--out-implib,\$@.a" { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for Cygwin version of gcc" >&5 printf %s "checking for Cygwin version of gcc... " >&6; } if test ${ac_cv_cygwin+y} @@ -7161,7 +7158,7 @@ then : if test "${SHLIB_SUFFIX}" = ".dll" then : - INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(BIN_INSTALL_DIR)/$(LIB_FILE)";if test -f $(LIB_FILE).a; then $(INSTALL_DATA) $(LIB_FILE).a "$(LIB_INSTALL_DIR)"; fi;' + INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(BIN_INSTALL_DIR)/$(LIB_FILE)"' DLL_INSTALL_DIR="\$(BIN_INSTALL_DIR)" else $as_nop diff --git a/unix/installManPage b/unix/installManPage index 86f9860..3d5fa7b 100755 --- a/unix/installManPage +++ b/unix/installManPage @@ -5,13 +5,14 @@ ### Gzip=: -SymOrLoc="" +Sym="" +Loc="" Gz="" Suffix="" while true; do case $1 in - -s | --symlinks ) SymOrLoc="-s " ;; + -s | --symlinks ) Sym="-s " ;; -z | --compress ) Gzip=$2; shift ;; -e | --extension ) Gz=$2; shift ;; -x | --suffix ) Suffix=$2; shift ;; @@ -47,7 +48,7 @@ if test -d "$Dir" ; then : ; else echo "target directory must exist" exit 1 fi -test -z "$SymOrLoc" && SymOrLoc="$Dir/" +test -z "$Sym" && Loc="$Dir/" ######################################################################## ### Extract Target Names from Manual Page @@ -132,7 +133,7 @@ for Target in $Names; do chmod 644 "$Dir/$First" $Gzip "$Dir/$First" else - ln $SymOrLoc"$First$Gz" "$Dir/$Target$Gz" + ln $Sym"$Loc$First$Gz" "$Dir/$Target$Gz" fi done diff --git a/unix/tcl.m4 b/unix/tcl.m4 index ecfec69..68048f4 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -1087,9 +1087,6 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ DL_LIBS="-ldl" CC_SEARCH_FLAGS="" LD_SEARCH_FLAGS="" - TCL_NEEDS_EXP_FILE=1 - TCL_EXPORT_FILE_SUFFIX='${VERSION}.dll.a' - SHLIB_LD_LIBS="${SHLIB_LD_LIBS} -Wl,--out-implib,\$[@].a" AC_CACHE_CHECK(for Cygwin version of gcc, ac_cv_cygwin, AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ @@ -1805,7 +1802,7 @@ dnl # preprocessing tests use only CPPFLAGS. LIB_SUFFIX=${SHARED_LIB_SUFFIX} MAKE_LIB='${SHLIB_LD} -o [$]@ ${OBJS} ${LDFLAGS} ${SHLIB_LD_LIBS} ${TCL_SHLIB_LD_EXTRAS} ${TK_SHLIB_LD_EXTRAS} ${LD_SEARCH_FLAGS}' AS_IF([test "${SHLIB_SUFFIX}" = ".dll"], [ - INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(BIN_INSTALL_DIR)/$(LIB_FILE)";if test -f $(LIB_FILE).a; then $(INSTALL_DATA) $(LIB_FILE).a "$(LIB_INSTALL_DIR)"; fi;' + INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(BIN_INSTALL_DIR)/$(LIB_FILE)"' DLL_INSTALL_DIR="\$(BIN_INSTALL_DIR)" ], [ INSTALL_LIB='$(INSTALL_LIBRARY) $(LIB_FILE) "$(LIB_INSTALL_DIR)/$(LIB_FILE)"' |