diff options
author | Kevin B Kenny <kennykb@acm.org> | 2004-08-18 19:58:56 (GMT) |
---|---|---|
committer | Kevin B Kenny <kennykb@acm.org> | 2004-08-18 19:58:56 (GMT) |
commit | fab56e2415bbbc5e2355f500b28d26c5e907ef29 (patch) | |
tree | 0bfbd9e68acb81b08b317b956ce8ac4cca0824cd /unix | |
parent | dcdb6368302f0bb38e0d11e8c2d346b684507b07 (diff) | |
download | tcl-fab56e2415bbbc5e2355f500b28d26c5e907ef29.zip tcl-fab56e2415bbbc5e2355f500b28d26c5e907ef29.tar.gz tcl-fab56e2415bbbc5e2355f500b28d26c5e907ef29.tar.bz2 |
TIP #173 and #209 implementation - see ChangeLog for details
Diffstat (limited to 'unix')
-rw-r--r-- | unix/Makefile.in | 20 | ||||
-rwxr-xr-x | unix/configure | 3 | ||||
-rw-r--r-- | unix/tcl.m4 | 2 |
3 files changed, 20 insertions, 5 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in index 1e24d6e..6273cf7 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -5,7 +5,7 @@ # "autoconf" program (constructs like "@foo@" will get replaced in the # actual Makefile. # -# RCS: @(#) $Id: Makefile.in,v 1.142 2004/07/30 08:31:21 das Exp $ +# RCS: @(#) $Id: Makefile.in,v 1.143 2004/08/18 19:59:09 kennykb Exp $ VERSION = @TCL_VERSION@ MAJOR_VERSION = @TCL_MAJOR_VERSION@ @@ -528,7 +528,7 @@ ro-test: tcltest # This target can be used to run tclsh from the build directory # via `make shell SCRIPT=/tmp/foo.tcl` shell: tclsh - @@LD_LIBRARY_PATH_VAR@=`pwd`:${@LD_LIBRARY_PATH_VAR@}; export @LD_LIBRARY_PATH_VAR@; \ + @LD_LIBRARY_PATH_VAR@=`pwd`:${@LD_LIBRARY_PATH_VAR@}; export @LD_LIBRARY_PATH_VAR@; \ TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ ./tclsh $(SCRIPT) @@ -629,7 +629,7 @@ install-binaries: binaries @INSTALL_STUB_LIB@ ; \ fi -install-libraries: libraries +install-libraries: libraries install-tzdata install-msgs @for i in $(INCLUDE_INSTALL_DIR) $(SCRIPT_INSTALL_DIR); \ do \ if [ ! -d $$i ] ; then \ @@ -692,6 +692,20 @@ install-libraries: libraries $(INSTALL_DATA) $$i $(SCRIPT_INSTALL_DIR)/encoding; \ done; +install-tzdata: + @echo "Installing time zone data" + @@LD_LIBRARY_PATH_VAR@=`pwd`:${@LD_LIBRARY_PATH_VAR@}; export @LD_LIBRARY_PATH_VAR@; \ + TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ + ./tclsh $(TOOL_DIR)/installData.tcl \ + $(TOP_DIR)/library/tzdata $(SCRIPT_INSTALL_DIR)/tzdata + +install-msgs: + @echo "Installing message catalogs" + @@LD_LIBRARY_PATH_VAR@=`pwd`:${@LD_LIBRARY_PATH_VAR@}; export @LD_LIBRARY_PATH_VAR@; \ + TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \ + ./tclsh $(TOOL_DIR)/installData.tcl \ + $(TOP_DIR)/library/msgs $(SCRIPT_INSTALL_DIR)/msgs + install-doc: doc @if test ! -x $(UNIX_DIR)/mkLinks; then \ chmod +x $(UNIX_DIR)/mkLinks; \ diff --git a/unix/configure b/unix/configure index 29bfcb9..1cd1c0f 100755 --- a/unix/configure +++ b/unix/configure @@ -10238,7 +10238,8 @@ fi -for ac_func in gmtime_r localtime_r + +for ac_func in gmtime_r localtime_r mktime do as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` echo "$as_me:$LINENO: checking for $ac_func" >&5 diff --git a/unix/tcl.m4 b/unix/tcl.m4 index 8ad4867..d7a4f8b 100644 --- a/unix/tcl.m4 +++ b/unix/tcl.m4 @@ -2209,7 +2209,7 @@ AC_DEFUN(SC_TIME_HANDLER, [ AC_HEADER_TIME AC_STRUCT_TIMEZONE - AC_CHECK_FUNCS(gmtime_r localtime_r) + AC_CHECK_FUNCS(gmtime_r localtime_r mktime) AC_MSG_CHECKING([tm_tzadj in struct tm]) AC_CACHE_VAL(tcl_cv_member_tm_tzadj, |