diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-12-02 20:15:45 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-12-02 20:15:45 (GMT) |
| commit | d468d7d09254c80b383af546b4f669684b92d366 (patch) | |
| tree | 61547dfc3ee7f353315a39d238fc3335ebcc4056 | |
| parent | ee2b3bf1f8dde21c17795d277a8b708b8a29b8c0 (diff) | |
| parent | c8f65d7cc015b7740935d3491ee4dd92805ae47f (diff) | |
| download | tk-d468d7d09254c80b383af546b4f669684b92d366.zip tk-d468d7d09254c80b383af546b4f669684b92d366.tar.gz tk-d468d7d09254c80b383af546b4f669684b92d366.tar.bz2 | |
sync tcl.m4 and ruls.vc with Tcl
| -rwxr-xr-x | unix/configure | 8 | ||||
| -rw-r--r-- | unix/tcl.m4 | 8 | ||||
| -rwxr-xr-x | win/configure | 8 | ||||
| -rw-r--r-- | win/rules.vc | 13 | ||||
| -rw-r--r-- | win/tcl.m4 | 8 |
5 files changed, 0 insertions, 45 deletions
diff --git a/unix/configure b/unix/configure index 43e9d1a..a6fee9e 100755 --- a/unix/configure +++ b/unix/configure @@ -4492,14 +4492,6 @@ if test "${enable_shared+set}" = set; then else tcl_ok=yes fi; - - if test "${enable_shared+set}" = set; then - enableval="$enable_shared" - tcl_ok=$enableval - else - tcl_ok=yes - fi - if test "$tcl_ok" = "yes" ; then echo "$as_me:$LINENO: result: shared" >&5 echo "${ECHO_T}shared" >&6 diff --git a/unix/tcl.m4 b/unix/tcl.m4 index b01901b..4219003 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -534,14 +534,6 @@ AC_DEFUN([SC_ENABLE_SHARED], [ AC_HELP_STRING([--enable-shared], [build and link with shared libraries (default: on)]), [tcl_ok=$enableval], [tcl_ok=yes]) - - if test "${enable_shared+set}" = set; then - enableval="$enable_shared" - tcl_ok=$enableval - else - tcl_ok=yes - fi - if test "$tcl_ok" = "yes" ; then AC_MSG_RESULT([shared]) SHARED_BUILD=1 diff --git a/win/configure b/win/configure index 4af36d6..07870f4 100755 --- a/win/configure +++ b/win/configure @@ -3090,14 +3090,6 @@ if test "${enable_shared+set}" = set; then else tcl_ok=yes fi; - - if test "${enable_shared+set}" = set; then - enableval="$enable_shared" - tcl_ok=$enableval - else - tcl_ok=yes - fi - if test "$tcl_ok" = "yes" ; then echo "$as_me:$LINENO: result: shared" >&5 echo "${ECHO_T}shared" >&6 diff --git a/win/rules.vc b/win/rules.vc index a4c94ff..753df14 100644 --- a/win/rules.vc +++ b/win/rules.vc @@ -193,19 +193,6 @@ COMPILERFLAGS = $(COMPILERFLAGS) -QIA64_Bx LINKER_TESTFLAGS = /DLL /NOENTRY /OUT:nmhlp-out.txt
!endif
-!if "$(MACHINE)" == "IX86"
-### test for -align:4096, when align:512 will do.
-!if [nmakehlp -l -opt:nowin98 $(LINKER_TESTFLAGS)]
-!message *** Linker has 'Win98 alignment problem'
-ALIGN98_HACK = 1
-!else
-!message *** Linker does not have 'Win98 alignment problem'
-ALIGN98_HACK = 0
-!endif
-!else
-ALIGN98_HACK = 0
-!endif
-
LINKERFLAGS =
!if [nmakehlp -l -ltcg $(LINKER_TESTFLAGS)]
@@ -364,14 +364,6 @@ AC_DEFUN([SC_ENABLE_SHARED], [ AC_ARG_ENABLE(shared, [ --enable-shared build and link with shared libraries (default: on)], [tcl_ok=$enableval], [tcl_ok=yes]) - - if test "${enable_shared+set}" = set; then - enableval="$enable_shared" - tcl_ok=$enableval - else - tcl_ok=yes - fi - if test "$tcl_ok" = "yes" ; then AC_MSG_RESULT([shared]) SHARED_BUILD=1 |