diff options
| author | dkf <donal.k.fellows@manchester.ac.uk> | 2012-03-08 09:01:11 (GMT) |
|---|---|---|
| committer | dkf <donal.k.fellows@manchester.ac.uk> | 2012-03-08 09:01:11 (GMT) |
| commit | 6540c1e7abc493b3684a2b1312717329494b96b1 (patch) | |
| tree | d7b16f89e6ba2e4f47876aff16fbbf8ae0c19786 /unix | |
| parent | e3a722221577f7aaeaa942bb59bbe67306b61229 (diff) | |
| parent | 4b85ca90cba7edb9a10caead17ffa8d407e1e2b3 (diff) | |
| download | tcl-6540c1e7abc493b3684a2b1312717329494b96b1.zip tcl-6540c1e7abc493b3684a2b1312717329494b96b1.tar.gz tcl-6540c1e7abc493b3684a2b1312717329494b96b1.tar.bz2 | |
merge from trunk
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/Makefile.in | 9 | ||||
| -rwxr-xr-x | unix/configure | 3 | ||||
| -rw-r--r-- | unix/tcl.m4 | 3 |
3 files changed, 11 insertions, 4 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in index 154f1b9..0a22a58 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -829,8 +829,8 @@ install-libraries: libraries do \ $(INSTALL_DATA) $$i "$(SCRIPT_INSTALL_DIR)"/http1.0; \ done; - @echo "Installing package http 2.8.3 as a Tcl Module"; - @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.6/http-2.8.3.tm; + @echo "Installing package http 2.8.4 as a Tcl Module"; + @$(INSTALL_DATA) $(TOP_DIR)/library/http/http.tcl "$(SCRIPT_INSTALL_DIR)"/../tcl8/8.6/http-2.8.4.tm; @echo "Installing package opt0.4 files to $(SCRIPT_INSTALL_DIR)/opt0.4/"; @for i in $(TOP_DIR)/library/opt/*.tcl ; \ do \ @@ -990,6 +990,7 @@ COMPILEHDR=$(GENERIC_DIR)/tclCompile.h FSHDR=$(GENERIC_DIR)/tclFileSystem.h IOHDR=$(GENERIC_DIR)/tclIO.h MATHHDRS=$(GENERIC_DIR)/tommath.h $(GENERIC_DIR)/tclTomMath.h +PARSEHDR=$(GENERIC_DIR)/tclParse.h NREHDR=$(GENERIC_DIR)/tclInt.h regcomp.o: $(REGHDRS) $(GENERIC_DIR)/regcomp.c $(GENERIC_DIR)/regc_lex.c \ @@ -1186,7 +1187,7 @@ tclOOMethod.o: $(GENERIC_DIR)/tclOOMethod.c tclOOStubInit.o: $(GENERIC_DIR)/tclOOStubInit.c $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclOOStubInit.c -tclParse.o: $(GENERIC_DIR)/tclParse.c +tclParse.o: $(GENERIC_DIR)/tclParse.c $(PARSEHDR) $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclParse.c tclPanic.o: $(GENERIC_DIR)/tclPanic.c @@ -1258,7 +1259,7 @@ tclStubInit.o: $(GENERIC_DIR)/tclStubInit.c tclTrace.o: $(GENERIC_DIR)/tclTrace.c $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclTrace.c -tclUtil.o: $(GENERIC_DIR)/tclUtil.c +tclUtil.o: $(GENERIC_DIR)/tclUtil.c $(PARSEHDR) $(CC) -c $(CC_SWITCHES) $(GENERIC_DIR)/tclUtil.c tclUtf.o: $(GENERIC_DIR)/tclUtf.c $(GENERIC_DIR)/tclUniData.c diff --git a/unix/configure b/unix/configure index 72d704d..72d5d73 100755 --- a/unix/configure +++ b/unix/configure @@ -7061,6 +7061,9 @@ fi DL_LIBS="-ldl" CC_SEARCH_FLAGS="" LD_SEARCH_FLAGS="" + TCL_NEEDS_EXP_FILE=1 + TCL_EXPORT_FILE_SUFFIX='${VERSION}\$\{DBGX\}.dll.a' + TCL_SHLIB_LD_EXTRAS='-Wl,--out-implib,$@.a' ;; dgux*) SHLIB_CFLAGS="-K PIC" diff --git a/unix/tcl.m4 b/unix/tcl.m4 index 2f7cb16..39f8ca1 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -1228,6 +1228,9 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ DL_LIBS="-ldl" CC_SEARCH_FLAGS="" LD_SEARCH_FLAGS="" + TCL_NEEDS_EXP_FILE=1 + TCL_EXPORT_FILE_SUFFIX='${VERSION}\$\{DBGX\}.dll.a' + TCL_SHLIB_LD_EXTRAS='-Wl,--out-implib,$[@].a' ;; dgux*) SHLIB_CFLAGS="-K PIC" |