Fossil SCM

Merge trunk

jan.nijtmans 2019-08-04 22:56 UTC cleanX merge

Commit fc5f88d6d9f12e751d24a608afa3988cdecb4429649607057bb4d03504c33961

Parent 81d72e725715b61…

349 files changed +5 -7 +18 +27 -4 +73 +15 +1 -1 +1 -1 +95 -13 +11 -1 +709 -235 +5 -27 +28 +4 -44 +35 +7 -5 +12 +20 +2 -2 +77 -79 +9 -13 +80 -52 -50 -75 -10 +3701 -3421 +19 -18 +207 -83 -20 +12 -23 +3 -3 +1 -1 +35 -28 +15 +77 +4 +12 +57 +1 +1 +1 +1 +1 +1 +1 +1 +1 +1 +1 +1 +1 +1 +1 +1 +1 +1 +1 +1 +1 +1 +1 +1 +1 +1 +1 +1 +1 +1 +1 +1 +1 -1 +3 -10 -3 +10 -12 +32 -38 -3 +10 -12 +29 -35 +1 -2 +11 -3 +83 -9 +3 -1 +28 -35 +228 +30 -1 -1 +5 -12 -1 +6 -13 -1 +3 -10 -1 +3 -10 +1 -1 -1 +3 -10 +1 -1 -1 +3 -10 +145 -70 +1 -1 -2 +5 -12 +32 -20 +102 +2 -2 +5 -10 +418 +72 -9 +87 -18 +174 -104 +22 -96 +17 +5 -5 +38 -25 +1 +4 -4 +264 -186 +81 -70 +81 -70 +53 -6 +34 +1 -1 +65 -6 +125 -45 +164 -31 +10 +143 -276 +98 -47 +169 +1 +91 -87 +81 -81 +993 -404 +29 +2 -2 +8 -8 +449 +39 -6 +261 -208 +6 -5 +19 -35 +229 -114 +117 -80 +97 -51 +71 +37 -20 +988 -44 +1 +831 -201 +152 -49 +2 -1 +1 +17 +1 -1 +204 -54 +8 +1 -1 +3 -3 +20 +140 -33 +24 -10 +15 -5 +13 -12 +10 -3 +674 -561 +14 -5 +7 -6 +2 +2 -2 +3 -4 +70 -12 -7 +129 -73 +5 +530 -236 +6 +1 -1 +517 -229 +213 -14 +15 +178 -135 +316 -96 +3 -3 +45 -14 +39 -9 +29 +43 -25 +7 -7 +1 -1 +58 -6 +168 +133 -34 +64 -4 +139 -13 +85 -10 +6 -5 +12 -2 +130 -77 +1 -1 +225 -29 +114 -60 +5 +3 -188 +27 +77 -19 +2 +184 -53 +250 -40 +489 -1001 +24 +13 -3 +13 -9 +11679 -1085 +3 -1 +120 -39 +8 +557 -133 +1 +54 +48 -16 +34434 -15081 +1383 -285 +145 -56 +403 -44 +35 -23 +603 -1010 +1 -1 +98 -26 +57 -8 +1 +51 -14 +147 -7 +22 -12 +961 -590 +6 -6 +4 -4 +45 -14 +72 +10 -18 +189 -158 +148 -129 +57 -21 +5 -4 +13 -5 +38 +2 -4 +54 -18 +1 -1 +197 -71 +759 +515 -209 +1 +55 -13 +5 -4 +375 -128 +64 -42 +159 -92 +480 -107 +136 -136 +23 +68 -16 +8 +20 -2 +115 -45 +163 +51 +28 +3 -3 +53 +58 +12 -9 +91 -13 +228 -13 +232 -12 +300 -156 +12 -5 +5 +14 -13 +21 -15 +4 +675 +2 -2 +48 +31 +95 +228 +95 +247 +126 +303 +252 +569 +320 +730 +458 +239 +387 -58 +29 -4 +288 -2 +12 -6 +139 +13 -10 +67 -2 +67 -29 +1 -1 +19 -3 +1 -1 +232 -106 +1 +361 -138 +46 -55 +3 +3 +34 -19 +14 +1 +104 +16 -17 +9 +41 -16 +30 +112 -125 +16 -1 +54 -1 +2 -2 +1 -1 +8 +5 -1 +174 -155 +67 +329 -36 +46 -46 +80 -43 +86 -10 +5 -5 +115 +95 -14 +1 -1 +325 +1 +20 -1

M Dockerfile

+5 -7

		--- Dockerfile
		+++ Dockerfile
		@@ -1,25 +1,23 @@
1	1	###
2	2	# Dockerfile for Fossil
3	3	###
4		-FROM fedora:24
	4	+FROM fedora:29
5	5
6	6	### Now install some additional parts we will need for the build
7		-RUN dnf update -y && dnf install -y gcc make zlib-devel openssl-devel tar && dnf clean all && groupadd -r fossil -g 433 && useradd -u 431 -r -g fossil -d /opt/fossil -s /sbin/nologin -c "Fossil user" fossil
	7	+RUN dnf update -y && dnf install -y gcc make tcl tcl-devel zlib-devel openssl-devel tar && dnf clean all && groupadd -r fossil -g 433 && useradd -u 431 -r -g fossil -d /opt/fossil -s /sbin/nologin -c "Fossil user" fossil
8	8
9	9	### If you want to build "trunk", change the next line accordingly.
10	10	ENV FOSSIL_INSTALL_VERSION release
11	11
12		-RUN curl "http://core.tcl.tk/tcl/tarball/tcl-src.tar.gz?name=tcl-src&uuid=release" \| tar zx
13		-RUN cd tcl-src/unix && ./configure --prefix=/usr --disable-load && make && make install
14		-RUN curl "http://www.fossil-scm.org/index.html/tarball/fossil-src.tar.gz?name=fossil-src&uuid=${FOSSIL_INSTALL_VERSION}" \| tar zx
15		-RUN cd fossil-src && ./configure --disable-fusefs --json --with-th1-docs --with-th1-hooks --with-tcl --with-tcl-stubs --with-tcl-private-stubs
	12	+RUN curl "https://www.fossil-scm.org/index.html/tarball/fossil-src.tar.gz?name=fossil-src&uuid=${FOSSIL_INSTALL_VERSION}" \| tar zx
	13	+RUN cd fossil-src && ./configure --disable-fusefs --json --with-th1-docs --with-th1-hooks --with-tcl=1 --with-tcl-stubs --with-tcl-private-stubs
16	14	RUN cd fossil-src/src && mv main.c main.c.orig && sed s/\"now\"/0/ <main.c.orig >main.c
17	15	RUN cd fossil-src && make && strip fossil && cp fossil /usr/bin && cd .. && rm -rf fossil-src && chmod a+rx /usr/bin/fossil && mkdir -p /opt/fossil && chown fossil:fossil /opt/fossil
18	16
19	17	### Build is done, remove modules no longer needed
20		-RUN dnf remove -y gcc make zlib-devel openssl-devel tar && dnf clean all
	18	+RUN dnf remove -y gcc make zlib-devel tcl-devel openssl-devel tar && dnf clean all
21	19
22	20	USER fossil
23	21
24	22	ENV HOME /opt/fossil
25	23
26	24

	--- Dockerfile
	+++ Dockerfile
	@@ -1,25 +1,23 @@
1	###
2	# Dockerfile for Fossil
3	###
4	FROM fedora:24
5
6	### Now install some additional parts we will need for the build
7	RUN dnf update -y && dnf install -y gcc make zlib-devel openssl-devel tar && dnf clean all && groupadd -r fossil -g 433 && useradd -u 431 -r -g fossil -d /opt/fossil -s /sbin/nologin -c "Fossil user" fossil
8
9	### If you want to build "trunk", change the next line accordingly.
10	ENV FOSSIL_INSTALL_VERSION release
11
12	RUN curl "http://core.tcl.tk/tcl/tarball/tcl-src.tar.gz?name=tcl-src&uuid=release" \| tar zx
13	RUN cd tcl-src/unix && ./configure --prefix=/usr --disable-load && make && make install
14	RUN curl "http://www.fossil-scm.org/index.html/tarball/fossil-src.tar.gz?name=fossil-src&uuid=${FOSSIL_INSTALL_VERSION}" \| tar zx
15	RUN cd fossil-src && ./configure --disable-fusefs --json --with-th1-docs --with-th1-hooks --with-tcl --with-tcl-stubs --with-tcl-private-stubs
16	RUN cd fossil-src/src && mv main.c main.c.orig && sed s/\"now\"/0/ <main.c.orig >main.c
17	RUN cd fossil-src && make && strip fossil && cp fossil /usr/bin && cd .. && rm -rf fossil-src && chmod a+rx /usr/bin/fossil && mkdir -p /opt/fossil && chown fossil:fossil /opt/fossil
18
19	### Build is done, remove modules no longer needed
20	RUN dnf remove -y gcc make zlib-devel openssl-devel tar && dnf clean all
21
22	USER fossil
23
24	ENV HOME /opt/fossil
25
26

	--- Dockerfile
	+++ Dockerfile
	@@ -1,25 +1,23 @@
1	###
2	# Dockerfile for Fossil
3	###
4	FROM fedora:29
5
6	### Now install some additional parts we will need for the build
7	RUN dnf update -y && dnf install -y gcc make tcl tcl-devel zlib-devel openssl-devel tar && dnf clean all && groupadd -r fossil -g 433 && useradd -u 431 -r -g fossil -d /opt/fossil -s /sbin/nologin -c "Fossil user" fossil
8
9	### If you want to build "trunk", change the next line accordingly.
10	ENV FOSSIL_INSTALL_VERSION release
11
12	RUN curl "https://www.fossil-scm.org/index.html/tarball/fossil-src.tar.gz?name=fossil-src&uuid=${FOSSIL_INSTALL_VERSION}" \| tar zx
13	RUN cd fossil-src && ./configure --disable-fusefs --json --with-th1-docs --with-th1-hooks --with-tcl=1 --with-tcl-stubs --with-tcl-private-stubs


14	RUN cd fossil-src/src && mv main.c main.c.orig && sed s/\"now\"/0/ <main.c.orig >main.c
15	RUN cd fossil-src && make && strip fossil && cp fossil /usr/bin && cd .. && rm -rf fossil-src && chmod a+rx /usr/bin/fossil && mkdir -p /opt/fossil && chown fossil:fossil /opt/fossil
16
17	### Build is done, remove modules no longer needed
18	RUN dnf remove -y gcc make zlib-devel tcl-devel openssl-devel tar && dnf clean all
19
20	USER fossil
21
22	ENV HOME /opt/fossil
23
24

M Makefile.classic

+18

		--- Makefile.classic
		+++ Makefile.classic
		@@ -19,10 +19,11 @@
19	19	# will run on the platform that is doing the build. This is used
20	20	# to compile code-generator programs as part of the build process.
21	21	# See TCC below for the C compiler for building the finished binary.
22	22	#
23	23	BCC = gcc
	24	+BCCFLAGS = $(CFLAGS)
24	25
25	26	#### The suffix to add to final executable file. When cross-compiling
26	27	# to windows, make this ".exe". Otherwise leave it blank.
27	28	#
28	29	E =
		@@ -42,14 +43,26 @@
42	43	# TCC += -DFOSSIL_ENABLE_MINIZ
43	44
44	45	# To add support for HTTPS
45	46	TCC += -DFOSSIL_ENABLE_SSL
46	47
	48	+# To enable legacy mv/rm support
	49	+TCC += -DFOSSIL_ENABLE_LEGACY_MV_RM=1
	50	+
47	51	#### We sometimes add the -static option here so that we can build a
48	52	# static executable that will run in a chroot jail.
49	53	#LIB = -static
50	54	TCC += -DFOSSIL_DYNAMIC_BUILD=1
	55	+
	56	+TCCFLAGS = $(CFLAGS)
	57	+
	58	+# We don't attempt to use libedit or libreadline in this simplified
	59	+# build system (contrast auto.def and Makefile.in) so use the included
	60	+# copy of linenoise. MinGW can't make use of this, but linenoise is
	61	+# ifdef'd out elsewhere for that platform. Note that this is a make
	62	+# flag handled in src/main.mk, not a C preprocessor flag.
	63	+USE_LINENOISE := 1
51	64
52	65	#### Extra arguments for linking the finished binary. Fossil needs
53	66	# to link against the Z-Lib compression library unless the miniz
54	67	# library in the source tree is being used. There are no other
55	68	# required dependencies.
		@@ -60,10 +73,15 @@
60	73	# If using zlib:
61	74	LIB += $(ZLIB_LIB.$(FOSSIL_ENABLE_MINIZ)) $(LDFLAGS)
62	75
63	76	# If using HTTPS:
64	77	LIB += -lcrypto -lssl
	78	+
	79	+# Many platforms put cos() needed by src/piechart.c in libm, rather than
	80	+# in libc. We cannot enable this by default because libm doesn't exist
	81	+# everywhere.
	82	+#LIB += -lm
65	83
66	84	#### Tcl shell for use in running the fossil testsuite. If you do not
67	85	# care about testing the end result, this can be blank.
68	86	#
69	87	TCLSH = tclsh
70	88

	--- Makefile.classic
	+++ Makefile.classic
	@@ -19,10 +19,11 @@
19	# will run on the platform that is doing the build. This is used
20	# to compile code-generator programs as part of the build process.
21	# See TCC below for the C compiler for building the finished binary.
22	#
23	BCC = gcc

24
25	#### The suffix to add to final executable file. When cross-compiling
26	# to windows, make this ".exe". Otherwise leave it blank.
27	#
28	E =
	@@ -42,14 +43,26 @@
42	# TCC += -DFOSSIL_ENABLE_MINIZ
43
44	# To add support for HTTPS
45	TCC += -DFOSSIL_ENABLE_SSL
46



47	#### We sometimes add the -static option here so that we can build a
48	# static executable that will run in a chroot jail.
49	#LIB = -static
50	TCC += -DFOSSIL_DYNAMIC_BUILD=1









51
52	#### Extra arguments for linking the finished binary. Fossil needs
53	# to link against the Z-Lib compression library unless the miniz
54	# library in the source tree is being used. There are no other
55	# required dependencies.
	@@ -60,10 +73,15 @@
60	# If using zlib:
61	LIB += $(ZLIB_LIB.$(FOSSIL_ENABLE_MINIZ)) $(LDFLAGS)
62
63	# If using HTTPS:
64	LIB += -lcrypto -lssl





65
66	#### Tcl shell for use in running the fossil testsuite. If you do not
67	# care about testing the end result, this can be blank.
68	#
69	TCLSH = tclsh
70

	--- Makefile.classic
	+++ Makefile.classic
	@@ -19,10 +19,11 @@
19	# will run on the platform that is doing the build. This is used
20	# to compile code-generator programs as part of the build process.
21	# See TCC below for the C compiler for building the finished binary.
22	#
23	BCC = gcc
24	BCCFLAGS = $(CFLAGS)
25
26	#### The suffix to add to final executable file. When cross-compiling
27	# to windows, make this ".exe". Otherwise leave it blank.
28	#
29	E =
	@@ -42,14 +43,26 @@
43	# TCC += -DFOSSIL_ENABLE_MINIZ
44
45	# To add support for HTTPS
46	TCC += -DFOSSIL_ENABLE_SSL
47
48	# To enable legacy mv/rm support
49	TCC += -DFOSSIL_ENABLE_LEGACY_MV_RM=1
50
51	#### We sometimes add the -static option here so that we can build a
52	# static executable that will run in a chroot jail.
53	#LIB = -static
54	TCC += -DFOSSIL_DYNAMIC_BUILD=1
55
56	TCCFLAGS = $(CFLAGS)
57
58	# We don't attempt to use libedit or libreadline in this simplified
59	# build system (contrast auto.def and Makefile.in) so use the included
60	# copy of linenoise. MinGW can't make use of this, but linenoise is
61	# ifdef'd out elsewhere for that platform. Note that this is a make
62	# flag handled in src/main.mk, not a C preprocessor flag.
63	USE_LINENOISE := 1
64
65	#### Extra arguments for linking the finished binary. Fossil needs
66	# to link against the Z-Lib compression library unless the miniz
67	# library in the source tree is being used. There are no other
68	# required dependencies.
	@@ -60,10 +73,15 @@
73	# If using zlib:
74	LIB += $(ZLIB_LIB.$(FOSSIL_ENABLE_MINIZ)) $(LDFLAGS)
75
76	# If using HTTPS:
77	LIB += -lcrypto -lssl
78
79	# Many platforms put cos() needed by src/piechart.c in libm, rather than
80	# in libc. We cannot enable this by default because libm doesn't exist
81	# everywhere.
82	#LIB += -lm
83
84	#### Tcl shell for use in running the fossil testsuite. If you do not
85	# care about testing the end result, this can be blank.
86	#
87	TCLSH = tclsh
88

M Makefile.in

+27 -4

		--- Makefile.in
		+++ Makefile.in
		@@ -34,20 +34,43 @@
34	34	TCC = @CC@
35	35
36	36	#### Tcl shell for use in running the fossil testsuite. If you do not
37	37	# care about testing the end result, this can be blank.
38	38	#
39		-TCLSH = tclsh
	39	+TCLSH = @TCLSH@
40	40
	41	+CFLAGS = @CFLAGS@
41	42	LIB = @LDFLAGS@ @EXTRA_LDFLAGS@ @LIBS@
42		-BCCFLAGS = @CPPFLAGS@ @CFLAGS@
43		-TCCFLAGS = @EXTRA_CFLAGS@ @CPPFLAGS@ @CFLAGS@ -DHAVE_AUTOCONFIG_H -D_HAVE_SQLITE_CONFIG_H
	43	+BCCFLAGS = @CPPFLAGS@ $(CFLAGS)
	44	+TCCFLAGS = @EXTRA_CFLAGS@ @CPPFLAGS@ $(CFLAGS) -DHAVE_AUTOCONFIG_H -D_HAVE_SQLITE_CONFIG_H
44	45	INSTALLDIR = $(DESTDIR)@prefix@/bin
45	46	USE_SYSTEM_SQLITE = @USE_SYSTEM_SQLITE@
46	47	USE_LINENOISE = @USE_LINENOISE@
	48	+USE_MMAN_H = @USE_MMAN_H@
47	49	USE_SEE = @USE_SEE@
48	50	FOSSIL_ENABLE_MINIZ = @FOSSIL_ENABLE_MINIZ@
49	51
50	52	include $(SRCDIR)/main.mk
51	53
52	54	distclean: clean
53		- rm -f autoconfig.h config.log Makefile
	55	+ -rm -f autoconfig.h config.log Makefile
	56	+
	57	+reconfig:
	58	+ @AUTOREMAKE@
	59	+
	60	+# Automatically reconfigure whenever an autosetup file or one of the
	61	+# make source files change.
	62	+#
	63	+# The "touch" is necessary to avoid a make loop due to a new upstream
	64	+# feature in autosetup (GH 0a71e3c3b7) which rewrites *.in outputs only
	65	+# if doing so will write different contents; otherwise, it leaves them
	66	+# alone so the mtime doesn't change. This means that if you change one
	67	+# our depdendencies besides Makefile.in, we'll reconfigure but Makefile
	68	+# won't change, so this rule will remain out of date, so we'll reconfig
	69	+# but Makefile won't change, so we'll reconfig but... endlessly.
	70	+#
	71	+# This is also why we repeat the reconfig target's command here instead
	72	+# of delegating to it with "$(MAKE) reconfig": having children running
	73	+# around interfering makes this failure mode even worse.
	74	+Makefile: @srcdir@/Makefile.in $(SRCDIR)/main.mk @AUTODEPS@
	75	+ @AUTOREMAKE@
	76	+ touch @builddir@/Makefile
54	77
55	78	ADDED Makefile.osx-jaguar
56	79	ADDED README.md

	--- Makefile.in
	+++ Makefile.in
	@@ -34,20 +34,43 @@
34	TCC = @CC@
35
36	#### Tcl shell for use in running the fossil testsuite. If you do not
37	# care about testing the end result, this can be blank.
38	#
39	TCLSH = tclsh
40

41	LIB = @LDFLAGS@ @EXTRA_LDFLAGS@ @LIBS@
42	BCCFLAGS = @CPPFLAGS@ @CFLAGS@
43	TCCFLAGS = @EXTRA_CFLAGS@ @CPPFLAGS@ @CFLAGS@ -DHAVE_AUTOCONFIG_H -D_HAVE_SQLITE_CONFIG_H
44	INSTALLDIR = $(DESTDIR)@prefix@/bin
45	USE_SYSTEM_SQLITE = @USE_SYSTEM_SQLITE@
46	USE_LINENOISE = @USE_LINENOISE@

47	USE_SEE = @USE_SEE@
48	FOSSIL_ENABLE_MINIZ = @FOSSIL_ENABLE_MINIZ@
49
50	include $(SRCDIR)/main.mk
51
52	distclean: clean
53	rm -f autoconfig.h config.log Makefile





















54
55	DDED Makefile.osx-jaguar
56	DDED README.md

	--- Makefile.in
	+++ Makefile.in
	@@ -34,20 +34,43 @@
34	TCC = @CC@
35
36	#### Tcl shell for use in running the fossil testsuite. If you do not
37	# care about testing the end result, this can be blank.
38	#
39	TCLSH = @TCLSH@
40
41	CFLAGS = @CFLAGS@
42	LIB = @LDFLAGS@ @EXTRA_LDFLAGS@ @LIBS@
43	BCCFLAGS = @CPPFLAGS@ $(CFLAGS)
44	TCCFLAGS = @EXTRA_CFLAGS@ @CPPFLAGS@ $(CFLAGS) -DHAVE_AUTOCONFIG_H -D_HAVE_SQLITE_CONFIG_H
45	INSTALLDIR = $(DESTDIR)@prefix@/bin
46	USE_SYSTEM_SQLITE = @USE_SYSTEM_SQLITE@
47	USE_LINENOISE = @USE_LINENOISE@
48	USE_MMAN_H = @USE_MMAN_H@
49	USE_SEE = @USE_SEE@
50	FOSSIL_ENABLE_MINIZ = @FOSSIL_ENABLE_MINIZ@
51
52	include $(SRCDIR)/main.mk
53
54	distclean: clean
55	-rm -f autoconfig.h config.log Makefile
56
57	reconfig:
58	@AUTOREMAKE@
59
60	# Automatically reconfigure whenever an autosetup file or one of the
61	# make source files change.
62	#
63	# The "touch" is necessary to avoid a make loop due to a new upstream
64	# feature in autosetup (GH 0a71e3c3b7) which rewrites *.in outputs only
65	# if doing so will write different contents; otherwise, it leaves them
66	# alone so the mtime doesn't change. This means that if you change one
67	# our depdendencies besides Makefile.in, we'll reconfigure but Makefile
68	# won't change, so this rule will remain out of date, so we'll reconfig
69	# but Makefile won't change, so we'll reconfig but... endlessly.
70	#
71	# This is also why we repeat the reconfig target's command here instead
72	# of delegating to it with "$(MAKE) reconfig": having children running
73	# around interfering makes this failure mode even worse.
74	Makefile: @srcdir@/Makefile.in $(SRCDIR)/main.mk @AUTODEPS@
75	@AUTOREMAKE@
76	touch @builddir@/Makefile
77
78	DDED Makefile.osx-jaguar
79	DDED README.md

M Makefile.osx-jaguar

+73

		--- a/Makefile.osx-jaguar
		+++ b/Makefile.osx-jaguar
		@@ -0,0 +1,73 @@
	1	+#!/usr/bin/make
	2	+#
	3	+# This is a specially modified version of the Makefile that will build
	4	+# Fossil on Mac OSX Jaguar (10.2) circa 2002. This Makefile is used for
	5	+# testing on an old PPC iBook. The use of this old platform helps to verify
	6	+# Fossil and SQLite running on big-endian hardware.
	7	+#
	8	+# To build with this Makefile, run:
	9	+#
	10	+# make -f Makefile.osx-jaguar
	11	+#
	12	+#
	13	+# This is the top-level makefile for Fossil when the build is occurring
	14	+# on a unix platform. This works out-of-the-box on most unix platforms.
	15	+# But you are free to vary some of the definitions if desired.
	16	+#
	17	+#### The toplevel directory of the source tree. Fossil can be built
	18	+# in a directory that is separate from the source tree. Just change
	19	+# the following to point from the build directory to the src/ folder.
	20	+#
	21	+SRCDIR = ./src
	22	+
	23	+#### The directory into which object code files should be written.
	24	+# Having a "./" prefix in the value of this variable breaks our use of the
	25	+# "makeheaders" tool when running make on the MinGW platform, apparently
	26	+# due to some command line argument manipulation performed automatically
	27	+# by the shell.
	28	+#
	29	+#
	30	+OBJDIR = bld
	31	+
	32	+#### C Compiler and options for use in building executables that
	33	+# will run on the platform that is doing the build. This is used
	34	+# to compile code-generator programs as part of the build process.
	35	+# See TCC below for the C compiler for building the finished binary.
	36	+#
	37	+BCC = cc
	38	+BCCFLAGS = $(CFLAGS)
	39	+
	40	+#### The suffix to add to final executable file. When cross-compiling
	41	+# to windows, make this ".exe". Otherwise leave it blank.
	42	+#
	43	+E =
	44	+
	45	+TCC = cc
	46	+TCCFLAGS = $(CFLAGS)
	47	+
	48	+#### Tcl shell for use in running the fossil testsuite. If you do not
	49	+# care about testing the end result, this can be blank.
	50	+#
	51	+TCLSH = tclsh
	52	+
	53	+# LIB = -lz
	54	+LIB = compat/zlib/libz.a
	55	+TCC += -g -O0 -DHAVE_AUTOCONFIG_H
	56	+TCC += -Icompat/zlib
	57	+TCC += -DSQLITE_WITHOUT_ZONEMALLOC
	58	+TCC += -D_BSD_SOURCE=1
	59	+TCC += -DWITHOUT_ICONV
	60	+TCC += -Dsocklen_t=int
	61	+TCC += -DSQLITE_MAX_MMAP_SIZE=0
	62	+TCC += -DF
	63	+INSTALLDIR = $(DESTDIR)/usr/local/bin
	64	+USE_SYSTEM_SQLITE =
	65	+USE_LINENOISE = 1
	66	+# FOSSIL_ENABLE_TCL = @FOSSIL_ENABLE_TCL@
	67	+FOSSIL_ENABLE_TCL = 0
	68	+FOSSIL_ENABLE_MINIZ = 0
	69	+
	70	+include $(SRCDIR)/main.mk
	71	+
	72	+distclean: clean
	73	+ rm -f autoconfig.h config.log Makefile

	--- a/Makefile.osx-jaguar
	+++ b/Makefile.osx-jaguar
	@@ -0,0 +1,73 @@

	--- a/Makefile.osx-jaguar
	+++ b/Makefile.osx-jaguar
	@@ -0,0 +1,73 @@
1	#!/usr/bin/make
2	#
3	# This is a specially modified version of the Makefile that will build
4	# Fossil on Mac OSX Jaguar (10.2) circa 2002. This Makefile is used for
5	# testing on an old PPC iBook. The use of this old platform helps to verify
6	# Fossil and SQLite running on big-endian hardware.
7	#
8	# To build with this Makefile, run:
9	#
10	# make -f Makefile.osx-jaguar
11	#
12	#
13	# This is the top-level makefile for Fossil when the build is occurring
14	# on a unix platform. This works out-of-the-box on most unix platforms.
15	# But you are free to vary some of the definitions if desired.
16	#
17	#### The toplevel directory of the source tree. Fossil can be built
18	# in a directory that is separate from the source tree. Just change
19	# the following to point from the build directory to the src/ folder.
20	#
21	SRCDIR = ./src
22
23	#### The directory into which object code files should be written.
24	# Having a "./" prefix in the value of this variable breaks our use of the
25	# "makeheaders" tool when running make on the MinGW platform, apparently
26	# due to some command line argument manipulation performed automatically
27	# by the shell.
28	#
29	#
30	OBJDIR = bld
31
32	#### C Compiler and options for use in building executables that
33	# will run on the platform that is doing the build. This is used
34	# to compile code-generator programs as part of the build process.
35	# See TCC below for the C compiler for building the finished binary.
36	#
37	BCC = cc
38	BCCFLAGS = $(CFLAGS)
39
40	#### The suffix to add to final executable file. When cross-compiling
41	# to windows, make this ".exe". Otherwise leave it blank.
42	#
43	E =
44
45	TCC = cc
46	TCCFLAGS = $(CFLAGS)
47
48	#### Tcl shell for use in running the fossil testsuite. If you do not
49	# care about testing the end result, this can be blank.
50	#
51	TCLSH = tclsh
52
53	# LIB = -lz
54	LIB = compat/zlib/libz.a
55	TCC += -g -O0 -DHAVE_AUTOCONFIG_H
56	TCC += -Icompat/zlib
57	TCC += -DSQLITE_WITHOUT_ZONEMALLOC
58	TCC += -D_BSD_SOURCE=1
59	TCC += -DWITHOUT_ICONV
60	TCC += -Dsocklen_t=int
61	TCC += -DSQLITE_MAX_MMAP_SIZE=0
62	TCC += -DF
63	INSTALLDIR = $(DESTDIR)/usr/local/bin
64	USE_SYSTEM_SQLITE =
65	USE_LINENOISE = 1
66	# FOSSIL_ENABLE_TCL = @FOSSIL_ENABLE_TCL@
67	FOSSIL_ENABLE_TCL = 0
68	FOSSIL_ENABLE_MINIZ = 0
69
70	include $(SRCDIR)/main.mk
71
72	distclean: clean
73	rm -f autoconfig.h config.log Makefile

M README.md

+15

		--- a/README.md
		+++ b/README.md
		@@ -0,0 +1,15 @@
	1	+# About Fossil
	2	+
	3	+Fossil is a distributed version control system that has been widely
	4	+used since 2007. Fossil was originally designed to support the
	5	+[SQLite](https://sqlite.org) project but has been adopted by many other
	6	+projects as well.
	7	+
	8	+Fossil is self-hosting at <https://fossil-scm.org>.
	9	+
	10	+If you are reading this on GitHub, then you are looking at a Git mirror
	11	+of the self-hosting Fossil repository. The purpose of that mirror is to
	12	+test and exercise Fossil's ability to export a Git mirror. Nobody much
	13	+uses the GitHub mirror, except to verify that the mirror logic works. If
	14	+you want to know more about Fossil, visit the official self-hosting site
	15	+linked above.

	--- a/README.md
	+++ b/README.md
	@@ -0,0 +1,15 @@

	--- a/README.md
	+++ b/README.md
	@@ -0,0 +1,15 @@
1	# About Fossil
2
3	Fossil is a distributed version control system that has been widely
4	used since 2007. Fossil was originally designed to support the
5	[SQLite](https://sqlite.org) project but has been adopted by many other
6	projects as well.
7
8	Fossil is self-hosting at <https://fossil-scm.org>.
9
10	If you are reading this on GitHub, then you are looking at a Git mirror
11	of the self-hosting Fossil repository. The purpose of that mirror is to
12	test and exercise Fossil's ability to export a Git mirror. Nobody much
13	uses the GitHub mirror, except to verify that the mirror logic works. If
14	you want to know more about Fossil, visit the official self-hosting site
15	linked above.

M VERSION

+1 -1

		--- VERSION
		+++ VERSION
		@@ -1,1 +1,1 @@
1		-2.4
	1	+2.10
2	2

	--- VERSION
	+++ VERSION
	@@ -1,1 +1,1 @@
1	2.4
2

	--- VERSION
	+++ VERSION
	@@ -1,1 +1,1 @@
1	2.10
2

M ajax/js/whajaj.js

+1 -1

		--- ajax/js/whajaj.js
		+++ ajax/js/whajaj.js
		@@ -147,11 +147,11 @@
147	147	can simplify usage. This class is designed so that the actual
148	148	connection-related details (i.e. _how_ it connects to the
149	149	back-end) may be re-implemented to use a client's preferred
150	150	connection mechanism (e.g. jQuery).
151	151
152		- The optional opt paramater may be an object with any (or all) of
	152	+ The optional opt parameter may be an object with any (or all) of
153	153	the properties documented for WhAjaj.Connector.options.ajax.
154	154	Properties set here (or later via modification of the "options"
155	155	property of this object) will be used in calls to
156	156	WhAjaj.Connector.sendRequest(), and these override (normally) any
157	157	options set in WhAjaj.Connector.options.ajax. Note that
158	158

	--- ajax/js/whajaj.js
	+++ ajax/js/whajaj.js
	@@ -147,11 +147,11 @@
147	can simplify usage. This class is designed so that the actual
148	connection-related details (i.e. _how_ it connects to the
149	back-end) may be re-implemented to use a client's preferred
150	connection mechanism (e.g. jQuery).
151
152	The optional opt paramater may be an object with any (or all) of
153	the properties documented for WhAjaj.Connector.options.ajax.
154	Properties set here (or later via modification of the "options"
155	property of this object) will be used in calls to
156	WhAjaj.Connector.sendRequest(), and these override (normally) any
157	options set in WhAjaj.Connector.options.ajax. Note that
158

	--- ajax/js/whajaj.js
	+++ ajax/js/whajaj.js
	@@ -147,11 +147,11 @@
147	can simplify usage. This class is designed so that the actual
148	connection-related details (i.e. _how_ it connects to the
149	back-end) may be re-implemented to use a client's preferred
150	connection mechanism (e.g. jQuery).
151
152	The optional opt parameter may be an object with any (or all) of
153	the properties documented for WhAjaj.Connector.options.ajax.
154	Properties set here (or later via modification of the "options"
155	property of this object) will be used in calls to
156	WhAjaj.Connector.sendRequest(), and these override (normally) any
157	options set in WhAjaj.Connector.options.ajax. Note that
158

M auto.def

+95 -13

		--- auto.def
		+++ auto.def
		@@ -8,22 +8,24 @@
8	8	with-miniz=0 => {Use miniz from the source tree}
9	9	with-zlib:path\|auto\|tree
10	10	=> {Look for zlib in the given path, automatically, or in the source tree}
11	11	with-exec-rel-paths=0
12	12	=> {Enable relative paths for external diff/gdiff}
13		- with-legacy-mv-rm=0 => {Enable legacy behavior for mv/rm (skip checkout files)}
	13	+ with-legacy-mv-rm=1 => {Enable legacy behavior for mv/rm (skip checkout files)}
14	14	with-th1-docs=0 => {Enable TH1 for embedded documentation pages}
15	15	with-th1-hooks=0 => {Enable TH1 hooks for commands and web pages}
16		- with-tcl=path => {Enable Tcl integration, with Tcl in the specified path}
	16	+ with-tcl:path => {Enable Tcl integration, with Tcl in the specified path}
17	17	with-tcl-stubs=0 => {Enable Tcl integration via stubs library mechanism}
18	18	with-tcl-private-stubs=0
19	19	=> {Enable Tcl integration via private stubs mechanism}
	20	+ with-mman=0 => {Enable use of POSIX memory APIs from "sys/mman.h"}
20	21	with-see=0 => {Enable the SQLite Encryption Extension (SEE)}
21	22	internal-sqlite=1 => {Don't use the internal SQLite, use the system one}
22	23	static=0 => {Link a static executable}
23	24	fusefs=1 => {Disable the Fuse Filesystem}
24	25	fossil-debug=0 => {Build with fossil debugging enabled}
	26	+ no-opt=0 => {Build without optimization}
25	27	json=0 => {Build with fossil JSON API enabled}
26	28	}
27	29
28	30	# sqlite wants these types if possible
29	31	cc-with {-includes {stdint.h inttypes.h}} {
		@@ -31,18 +33,54 @@
31	33	}
32	34
33	35	# Use pread/pwrite system calls in place of seek + read/write if possible
34	36	define USE_PREAD [cc-check-functions pread]
35	37
36		-# Find tclsh for the test suite. Can't yet use jimsh for this.
	38	+# Find tclsh for the test suite.
	39	+#
	40	+# We can't use jimsh for this: the test suite uses features of Tcl that
	41	+# Jim doesn't support, either statically or due to the way it's built by
	42	+# autosetup. For example, Jim supports `file normalize`, but only if
	43	+# you build it with HAVE_REALPATH, which won't ever be defined in this
	44	+# context because autosetup doesn't try to discover platform-specific
	45	+# details like that before it decides to build jimsh0. Besides which,
	46	+# autosetup won't build jimsh0 at all if it can find tclsh itself.
	47	+# Ironically, this means we may right now be running under either jimsh0
	48	+# or a version of tclsh that we find unsuitable below!
37	49	cc-check-progs tclsh
	50	+set hbtd /usr/local/Cellar/tcl-tk
	51	+if {[string equal false [get-define TCLSH]]} {
	52	+ msg-result "WARNING: 'make test' will not run here."
	53	+} else {
	54	+ set v [exec /bin/sh -c "echo 'puts \$tcl_version' \| tclsh"]
	55	+ if {[expr {$v >= 8.6}]} {
	56	+ msg-result "Found Tclsh version $v in the PATH."
	57	+ define TCLSH tclsh
	58	+ } elseif {[file isdirectory $hbtd]} {
	59	+ # This is a macOS system with the Homebrew version of Tcl/Tk
	60	+ # installed. Select the newest version. It won't normally be
	61	+ # in the PATH to avoid shadowing /usr/bin/tclsh, and even if it
	62	+ # were in the PATH, it's bad practice to put /usr/local/bin (the
	63	+ # Homebrew default) ahead of /usr/bin, especially given that
	64	+ # it's user-writeable by default with Homebrew. Thus, we can be
	65	+ # pretty sure the only way to call it is with an absolute path.
	66	+ set v [exec ls -tr $hbtd \| tail -1]
	67	+ set path "$hbtd/$v/bin/tclsh"
	68	+ define TCLSH $path
	69	+ msg-result "Using Homebrew Tcl/Tk version $path."
	70	+ } else {
	71	+ msg-result "WARNING: tclsh $v found; need >= 8.6 for 'make test'."
	72	+ define TCLSH false ;# force "make test" failure via /usr/bin/false
	73	+ }
	74	+}
38	75
39		-define EXTRA_CFLAGS ""
	76	+define EXTRA_CFLAGS "-Wall"
40	77	define EXTRA_LDFLAGS ""
41	78	define USE_SYSTEM_SQLITE 0
42	79	define USE_LINENOISE 0
43	80	define FOSSIL_ENABLE_MINIZ 0
	81	+define USE_MMAN_H 0
44	82	define USE_SEE 0
45	83
46	84	# This procedure is a customized version of "cc-check-function-in-lib",
47	85	# that does not modify the LIBS variable. Its use prevents prematurely
48	86	# pulling in libraries that will be added later anyhow (e.g. "-ldl").
		@@ -88,17 +126,17 @@
88	126	# the code below will append -ldl to LIBS.
89	127	#
90	128	foreach extralibs {{} {-ldl}} {
91	129
92	130	# Locate the system SQLite by searching for sqlite3_open(). Then check
93		- # if sqlite3_prepare_v3() can be found as well. If we can find open() but
94		- # not prepare_v3(), then the system SQLite is too old to link against
	131	+ # if sqlite3_stmt_isexplain can be found as well. If we can find open() but
	132	+ # not stmt_isexplain(), then the system SQLite is too old to link against
95	133	# fossil.
96	134	#
97	135	if {[check-function-in-lib sqlite3_open sqlite3 $extralibs]} {
98		- if {![check-function-in-lib sqlite3_prepare_v3 sqlite3 $extralibs]} {
99		- user-error "system sqlite3 too old (require >= 3.20.0)"
	136	+ if {![check-function-in-lib sqlite3_stmt_isexplain sqlite3 $extralibs]} {
	137	+ user-error "system sqlite3 too old (require >= 3.28.0)"
100	138	}
101	139
102	140	# Success. Update symbols and return.
103	141	#
104	142	define USE_SYSTEM_SQLITE 1
		@@ -131,14 +169,25 @@
131	169	if {[string match -solaris [get-define host]]} {
132	170	define-append EXTRA_CFLAGS {-D_XOPEN_SOURCE=500 -D__EXTENSIONS__}
133	171	}
134	172
135	173	if {[opt-bool fossil-debug]} {
136		- define-append EXTRA_CFLAGS -DFOSSIL_DEBUG
137		- define CFLAGS {-g -O0}
	174	+ define CFLAGS {-g -O0 -Wall}
	175	+ define-append CFLAGS -DFOSSIL_DEBUG
138	176	msg-result "Debugging support enabled"
139	177	}
	178	+
	179	+if {[opt-bool no-opt]} {
	180	+ define CFLAGS {-g -O0 -Wall}
	181	+ msg-result "Builting without compiler optimization"
	182	+}
	183	+
	184	+if {[opt-bool with-mman]} {
	185	+ define-append EXTRA_CFLAGS -DUSE_MMAN_H
	186	+ define USE_MMAN_H 1
	187	+ msg-result "Enabling \"sys/mman.h\" support"
	188	+}
140	189
141	190	if {[opt-bool with-see]} {
142	191	define-append EXTRA_CFLAGS -DUSE_SEE
143	192	define USE_SEE 1
144	193	msg-result "Enabling encryption support"
		@@ -153,11 +202,11 @@
153	202	define FOSSIL_ENABLE_JSON
154	203	msg-result "JSON support enabled"
155	204	}
156	205
157	206	if {[opt-bool with-legacy-mv-rm]} {
158		- define-append EXTRA_CFLAGS -DFOSSIL_ENABLE_LEGACY_MV_RM
	207	+ define-append EXTRA_CFLAGS -DFOSSIL_ENABLE_LEGACY_MV_RM=1
159	208	define FOSSIL_ENABLE_LEGACY_MV_RM
160	209	msg-result "Legacy mv/rm support enabled"
161	210	}
162	211
163	212	if {[opt-bool with-exec-rel-paths]} {
		@@ -189,10 +238,13 @@
189	238	msg-result "Trying to link statically"
190	239	} else {
191	240	define-append EXTRA_CFLAGS -DFOSSIL_DYNAMIC_BUILD=1
192	241	define FOSSIL_DYNAMIC_BUILD
193	242	}
	243	+
	244	+# Check for libraries that need to be sorted out early
	245	+cc-check-function-in-lib iconv iconv
194	246
195	247	# Helper for OpenSSL checking
196	248	proc check-for-openssl {msg {cflags {}} {libs {-lssl -lcrypto}}} {
197	249	msg-checking "Checking for $msg..."
198	250	set rc 0
		@@ -356,10 +408,13 @@
356	408	}
357	409	} else {
358	410	array set tclconfig [parse-tclconfig-sh $tclpath]
359	411	set msg "at $tclpath"
360	412	}
	413	+ if {[opt-bool static]} {
	414	+ set tclconfig(TCL_LD_FLAGS) { }
	415	+ }
361	416	if {![info exists tclconfig(TCL_INCLUDE_SPEC)]} {
362	417	user-error "Cannot find Tcl $msg"
363	418	}
364	419	set tclstubs [opt-bool with-tcl-stubs]
365	420	if {$tclprivatestubs} {
		@@ -458,14 +513,34 @@
458	513	# Last resort, may be Windows
459	514	if {[is_mingw]} {
460	515	define-append LIBS -lwsock32
461	516	}
462	517	}
463		-cc-check-function-in-lib iconv iconv
	518	+
	519	+# The SMTP module requires special libraries and headers for MX DNS
	520	+# record lookups and such.
	521	+cc-check-includes arpa/nameser.h
	522	+cc-include-needs bind/resolv.h netinet/in.h
	523	+cc-check-includes bind/resolv.h
	524	+cc-check-includes resolv.h
	525	+if { !(([cc-check-function-in-lib dn_expand resolv] \|\|
	526	+ [cc-check-function-in-lib ns_name_uncompress {bind resolv}] \|\|
	527	+ [cc-check-function-in-lib __ns_name_uncompress {bind resolv}]) &&
	528	+ ([cc-check-function-in-lib ns_parserr {bind resolv}] \|\|
	529	+ [cc-check-function-in-lib __ns_parserr {bind resolv}]) &&
	530	+ ([cc-check-function-in-lib res_query {bind resolv}] \|\|
	531	+ [cc-check-function-in-lib __res_query {bind resolv}]))} {
	532	+ msg-result "WARNING: SMTP feature will not be able to look up local MX."
	533	+}
	534	+cc-check-function-in-lib res_9_ns_initparse resolv
	535	+
	536	+# Other nonstandard function checks
464	537	cc-check-functions utime
465	538	cc-check-functions usleep
466	539	cc-check-functions strchrnul
	540	+cc-check-functions pledge
	541	+cc-check-functions backtrace
467	542
468	543	# Check for getloadavg(), and if it doesn't exist, define FOSSIL_OMIT_LOAD_AVERAGE
469	544	if {![cc-check-functions getloadavg]} {
470	545	define FOSSIL_OMIT_LOAD_AVERAGE 1
471	546	msg-result "Load average support unavailable"
		@@ -474,11 +549,10 @@
474	549	# Check for getpassphrase() for Solaris 10 where getpass() truncates to 10 chars
475	550	if {![cc-check-functions getpassphrase]} {
476	551	# Haiku needs this
477	552	cc-check-function-in-lib getpass bsd
478	553	}
479		-cc-check-function-in-lib dlopen dl
480	554	cc-check-function-in-lib sin m
481	555
482	556	# Check for the FuseFS library
483	557	if {[opt-bool fusefs]} {
484	558	if {[cc-check-function-in-lib fuse_mount fuse]} {
		@@ -486,8 +560,16 @@
486	560	define FOSSIL_HAVE_FUSEFS 1
487	561	define-append LIBS -lfuse
488	562	msg-result "FuseFS support enabled"
489	563	}
490	564	}
	565	+
	566	+# Finally, append -ldl to make sure it's the last in the list.
	567	+# The library order matters in case of static linking.
	568	+if {[check-function-in-lib dlopen dl]} {
	569	+ # Some platforms (*BSD) have the dl functions already in libc and no libdl.
	570	+ # In such case we can link directly without -ldl.
	571	+ define-append LIBS [get-define lib_dlopen]
	572	+}
491	573
492	574	make-template Makefile.in
493	575	make-config-header autoconfig.h -auto {USE_* FOSSIL_*}
494	576

	--- auto.def
	+++ auto.def
	@@ -8,22 +8,24 @@
8	with-miniz=0 => {Use miniz from the source tree}
9	with-zlib:path\|auto\|tree
10	=> {Look for zlib in the given path, automatically, or in the source tree}
11	with-exec-rel-paths=0
12	=> {Enable relative paths for external diff/gdiff}
13	with-legacy-mv-rm=0 => {Enable legacy behavior for mv/rm (skip checkout files)}
14	with-th1-docs=0 => {Enable TH1 for embedded documentation pages}
15	with-th1-hooks=0 => {Enable TH1 hooks for commands and web pages}
16	with-tcl=path => {Enable Tcl integration, with Tcl in the specified path}
17	with-tcl-stubs=0 => {Enable Tcl integration via stubs library mechanism}
18	with-tcl-private-stubs=0
19	=> {Enable Tcl integration via private stubs mechanism}

20	with-see=0 => {Enable the SQLite Encryption Extension (SEE)}
21	internal-sqlite=1 => {Don't use the internal SQLite, use the system one}
22	static=0 => {Link a static executable}
23	fusefs=1 => {Disable the Fuse Filesystem}
24	fossil-debug=0 => {Build with fossil debugging enabled}

25	json=0 => {Build with fossil JSON API enabled}
26	}
27
28	# sqlite wants these types if possible
29	cc-with {-includes {stdint.h inttypes.h}} {
	@@ -31,18 +33,54 @@
31	}
32
33	# Use pread/pwrite system calls in place of seek + read/write if possible
34	define USE_PREAD [cc-check-functions pread]
35
36	# Find tclsh for the test suite. Can't yet use jimsh for this.










37	cc-check-progs tclsh

























38
39	define EXTRA_CFLAGS ""
40	define EXTRA_LDFLAGS ""
41	define USE_SYSTEM_SQLITE 0
42	define USE_LINENOISE 0
43	define FOSSIL_ENABLE_MINIZ 0

44	define USE_SEE 0
45
46	# This procedure is a customized version of "cc-check-function-in-lib",
47	# that does not modify the LIBS variable. Its use prevents prematurely
48	# pulling in libraries that will be added later anyhow (e.g. "-ldl").
	@@ -88,17 +126,17 @@
88	# the code below will append -ldl to LIBS.
89	#
90	foreach extralibs {{} {-ldl}} {
91
92	# Locate the system SQLite by searching for sqlite3_open(). Then check
93	# if sqlite3_prepare_v3() can be found as well. If we can find open() but
94	# not prepare_v3(), then the system SQLite is too old to link against
95	# fossil.
96	#
97	if {[check-function-in-lib sqlite3_open sqlite3 $extralibs]} {
98	if {![check-function-in-lib sqlite3_prepare_v3 sqlite3 $extralibs]} {
99	user-error "system sqlite3 too old (require >= 3.20.0)"
100	}
101
102	# Success. Update symbols and return.
103	#
104	define USE_SYSTEM_SQLITE 1
	@@ -131,14 +169,25 @@
131	if {[string match -solaris [get-define host]]} {
132	define-append EXTRA_CFLAGS {-D_XOPEN_SOURCE=500 -D__EXTENSIONS__}
133	}
134
135	if {[opt-bool fossil-debug]} {
136	define-append EXTRA_CFLAGS -DFOSSIL_DEBUG
137	define CFLAGS {-g -O0}
138	msg-result "Debugging support enabled"
139	}











140
141	if {[opt-bool with-see]} {
142	define-append EXTRA_CFLAGS -DUSE_SEE
143	define USE_SEE 1
144	msg-result "Enabling encryption support"
	@@ -153,11 +202,11 @@
153	define FOSSIL_ENABLE_JSON
154	msg-result "JSON support enabled"
155	}
156
157	if {[opt-bool with-legacy-mv-rm]} {
158	define-append EXTRA_CFLAGS -DFOSSIL_ENABLE_LEGACY_MV_RM
159	define FOSSIL_ENABLE_LEGACY_MV_RM
160	msg-result "Legacy mv/rm support enabled"
161	}
162
163	if {[opt-bool with-exec-rel-paths]} {
	@@ -189,10 +238,13 @@
189	msg-result "Trying to link statically"
190	} else {
191	define-append EXTRA_CFLAGS -DFOSSIL_DYNAMIC_BUILD=1
192	define FOSSIL_DYNAMIC_BUILD
193	}



194
195	# Helper for OpenSSL checking
196	proc check-for-openssl {msg {cflags {}} {libs {-lssl -lcrypto}}} {
197	msg-checking "Checking for $msg..."
198	set rc 0
	@@ -356,10 +408,13 @@
356	}
357	} else {
358	array set tclconfig [parse-tclconfig-sh $tclpath]
359	set msg "at $tclpath"
360	}



361	if {![info exists tclconfig(TCL_INCLUDE_SPEC)]} {
362	user-error "Cannot find Tcl $msg"
363	}
364	set tclstubs [opt-bool with-tcl-stubs]
365	if {$tclprivatestubs} {
	@@ -458,14 +513,34 @@
458	# Last resort, may be Windows
459	if {[is_mingw]} {
460	define-append LIBS -lwsock32
461	}
462	}
463	cc-check-function-in-lib iconv iconv


















464	cc-check-functions utime
465	cc-check-functions usleep
466	cc-check-functions strchrnul


467
468	# Check for getloadavg(), and if it doesn't exist, define FOSSIL_OMIT_LOAD_AVERAGE
469	if {![cc-check-functions getloadavg]} {
470	define FOSSIL_OMIT_LOAD_AVERAGE 1
471	msg-result "Load average support unavailable"
	@@ -474,11 +549,10 @@
474	# Check for getpassphrase() for Solaris 10 where getpass() truncates to 10 chars
475	if {![cc-check-functions getpassphrase]} {
476	# Haiku needs this
477	cc-check-function-in-lib getpass bsd
478	}
479	cc-check-function-in-lib dlopen dl
480	cc-check-function-in-lib sin m
481
482	# Check for the FuseFS library
483	if {[opt-bool fusefs]} {
484	if {[cc-check-function-in-lib fuse_mount fuse]} {
	@@ -486,8 +560,16 @@
486	define FOSSIL_HAVE_FUSEFS 1
487	define-append LIBS -lfuse
488	msg-result "FuseFS support enabled"
489	}
490	}








491
492	make-template Makefile.in
493	make-config-header autoconfig.h -auto {USE_* FOSSIL_*}
494

	--- auto.def
	+++ auto.def
	@@ -8,22 +8,24 @@
8	with-miniz=0 => {Use miniz from the source tree}
9	with-zlib:path\|auto\|tree
10	=> {Look for zlib in the given path, automatically, or in the source tree}
11	with-exec-rel-paths=0
12	=> {Enable relative paths for external diff/gdiff}
13	with-legacy-mv-rm=1 => {Enable legacy behavior for mv/rm (skip checkout files)}
14	with-th1-docs=0 => {Enable TH1 for embedded documentation pages}
15	with-th1-hooks=0 => {Enable TH1 hooks for commands and web pages}
16	with-tcl:path => {Enable Tcl integration, with Tcl in the specified path}
17	with-tcl-stubs=0 => {Enable Tcl integration via stubs library mechanism}
18	with-tcl-private-stubs=0
19	=> {Enable Tcl integration via private stubs mechanism}
20	with-mman=0 => {Enable use of POSIX memory APIs from "sys/mman.h"}
21	with-see=0 => {Enable the SQLite Encryption Extension (SEE)}
22	internal-sqlite=1 => {Don't use the internal SQLite, use the system one}
23	static=0 => {Link a static executable}
24	fusefs=1 => {Disable the Fuse Filesystem}
25	fossil-debug=0 => {Build with fossil debugging enabled}
26	no-opt=0 => {Build without optimization}
27	json=0 => {Build with fossil JSON API enabled}
28	}
29
30	# sqlite wants these types if possible
31	cc-with {-includes {stdint.h inttypes.h}} {
	@@ -31,18 +33,54 @@
33	}
34
35	# Use pread/pwrite system calls in place of seek + read/write if possible
36	define USE_PREAD [cc-check-functions pread]
37
38	# Find tclsh for the test suite.
39	#
40	# We can't use jimsh for this: the test suite uses features of Tcl that
41	# Jim doesn't support, either statically or due to the way it's built by
42	# autosetup. For example, Jim supports `file normalize`, but only if
43	# you build it with HAVE_REALPATH, which won't ever be defined in this
44	# context because autosetup doesn't try to discover platform-specific
45	# details like that before it decides to build jimsh0. Besides which,
46	# autosetup won't build jimsh0 at all if it can find tclsh itself.
47	# Ironically, this means we may right now be running under either jimsh0
48	# or a version of tclsh that we find unsuitable below!
49	cc-check-progs tclsh
50	set hbtd /usr/local/Cellar/tcl-tk
51	if {[string equal false [get-define TCLSH]]} {
52	msg-result "WARNING: 'make test' will not run here."
53	} else {
54	set v [exec /bin/sh -c "echo 'puts \$tcl_version' \| tclsh"]
55	if {[expr {$v >= 8.6}]} {
56	msg-result "Found Tclsh version $v in the PATH."
57	define TCLSH tclsh
58	} elseif {[file isdirectory $hbtd]} {
59	# This is a macOS system with the Homebrew version of Tcl/Tk
60	# installed. Select the newest version. It won't normally be
61	# in the PATH to avoid shadowing /usr/bin/tclsh, and even if it
62	# were in the PATH, it's bad practice to put /usr/local/bin (the
63	# Homebrew default) ahead of /usr/bin, especially given that
64	# it's user-writeable by default with Homebrew. Thus, we can be
65	# pretty sure the only way to call it is with an absolute path.
66	set v [exec ls -tr $hbtd \| tail -1]
67	set path "$hbtd/$v/bin/tclsh"
68	define TCLSH $path
69	msg-result "Using Homebrew Tcl/Tk version $path."
70	} else {
71	msg-result "WARNING: tclsh $v found; need >= 8.6 for 'make test'."
72	define TCLSH false ;# force "make test" failure via /usr/bin/false
73	}
74	}
75
76	define EXTRA_CFLAGS "-Wall"
77	define EXTRA_LDFLAGS ""
78	define USE_SYSTEM_SQLITE 0
79	define USE_LINENOISE 0
80	define FOSSIL_ENABLE_MINIZ 0
81	define USE_MMAN_H 0
82	define USE_SEE 0
83
84	# This procedure is a customized version of "cc-check-function-in-lib",
85	# that does not modify the LIBS variable. Its use prevents prematurely
86	# pulling in libraries that will be added later anyhow (e.g. "-ldl").
	@@ -88,17 +126,17 @@
126	# the code below will append -ldl to LIBS.
127	#
128	foreach extralibs {{} {-ldl}} {
129
130	# Locate the system SQLite by searching for sqlite3_open(). Then check
131	# if sqlite3_stmt_isexplain can be found as well. If we can find open() but
132	# not stmt_isexplain(), then the system SQLite is too old to link against
133	# fossil.
134	#
135	if {[check-function-in-lib sqlite3_open sqlite3 $extralibs]} {
136	if {![check-function-in-lib sqlite3_stmt_isexplain sqlite3 $extralibs]} {
137	user-error "system sqlite3 too old (require >= 3.28.0)"
138	}
139
140	# Success. Update symbols and return.
141	#
142	define USE_SYSTEM_SQLITE 1
	@@ -131,14 +169,25 @@
169	if {[string match -solaris [get-define host]]} {
170	define-append EXTRA_CFLAGS {-D_XOPEN_SOURCE=500 -D__EXTENSIONS__}
171	}
172
173	if {[opt-bool fossil-debug]} {
174	define CFLAGS {-g -O0 -Wall}
175	define-append CFLAGS -DFOSSIL_DEBUG
176	msg-result "Debugging support enabled"
177	}
178
179	if {[opt-bool no-opt]} {
180	define CFLAGS {-g -O0 -Wall}
181	msg-result "Builting without compiler optimization"
182	}
183
184	if {[opt-bool with-mman]} {
185	define-append EXTRA_CFLAGS -DUSE_MMAN_H
186	define USE_MMAN_H 1
187	msg-result "Enabling \"sys/mman.h\" support"
188	}
189
190	if {[opt-bool with-see]} {
191	define-append EXTRA_CFLAGS -DUSE_SEE
192	define USE_SEE 1
193	msg-result "Enabling encryption support"
	@@ -153,11 +202,11 @@
202	define FOSSIL_ENABLE_JSON
203	msg-result "JSON support enabled"
204	}
205
206	if {[opt-bool with-legacy-mv-rm]} {
207	define-append EXTRA_CFLAGS -DFOSSIL_ENABLE_LEGACY_MV_RM=1
208	define FOSSIL_ENABLE_LEGACY_MV_RM
209	msg-result "Legacy mv/rm support enabled"
210	}
211
212	if {[opt-bool with-exec-rel-paths]} {
	@@ -189,10 +238,13 @@
238	msg-result "Trying to link statically"
239	} else {
240	define-append EXTRA_CFLAGS -DFOSSIL_DYNAMIC_BUILD=1
241	define FOSSIL_DYNAMIC_BUILD
242	}
243
244	# Check for libraries that need to be sorted out early
245	cc-check-function-in-lib iconv iconv
246
247	# Helper for OpenSSL checking
248	proc check-for-openssl {msg {cflags {}} {libs {-lssl -lcrypto}}} {
249	msg-checking "Checking for $msg..."
250	set rc 0
	@@ -356,10 +408,13 @@
408	}
409	} else {
410	array set tclconfig [parse-tclconfig-sh $tclpath]
411	set msg "at $tclpath"
412	}
413	if {[opt-bool static]} {
414	set tclconfig(TCL_LD_FLAGS) { }
415	}
416	if {![info exists tclconfig(TCL_INCLUDE_SPEC)]} {
417	user-error "Cannot find Tcl $msg"
418	}
419	set tclstubs [opt-bool with-tcl-stubs]
420	if {$tclprivatestubs} {
	@@ -458,14 +513,34 @@
513	# Last resort, may be Windows
514	if {[is_mingw]} {
515	define-append LIBS -lwsock32
516	}
517	}
518
519	# The SMTP module requires special libraries and headers for MX DNS
520	# record lookups and such.
521	cc-check-includes arpa/nameser.h
522	cc-include-needs bind/resolv.h netinet/in.h
523	cc-check-includes bind/resolv.h
524	cc-check-includes resolv.h
525	if { !(([cc-check-function-in-lib dn_expand resolv] \|\|
526	[cc-check-function-in-lib ns_name_uncompress {bind resolv}] \|\|
527	[cc-check-function-in-lib __ns_name_uncompress {bind resolv}]) &&
528	([cc-check-function-in-lib ns_parserr {bind resolv}] \|\|
529	[cc-check-function-in-lib __ns_parserr {bind resolv}]) &&
530	([cc-check-function-in-lib res_query {bind resolv}] \|\|
531	[cc-check-function-in-lib __res_query {bind resolv}]))} {
532	msg-result "WARNING: SMTP feature will not be able to look up local MX."
533	}
534	cc-check-function-in-lib res_9_ns_initparse resolv
535
536	# Other nonstandard function checks
537	cc-check-functions utime
538	cc-check-functions usleep
539	cc-check-functions strchrnul
540	cc-check-functions pledge
541	cc-check-functions backtrace
542
543	# Check for getloadavg(), and if it doesn't exist, define FOSSIL_OMIT_LOAD_AVERAGE
544	if {![cc-check-functions getloadavg]} {
545	define FOSSIL_OMIT_LOAD_AVERAGE 1
546	msg-result "Load average support unavailable"
	@@ -474,11 +549,10 @@
549	# Check for getpassphrase() for Solaris 10 where getpass() truncates to 10 chars
550	if {![cc-check-functions getpassphrase]} {
551	# Haiku needs this
552	cc-check-function-in-lib getpass bsd
553	}

554	cc-check-function-in-lib sin m
555
556	# Check for the FuseFS library
557	if {[opt-bool fusefs]} {
558	if {[cc-check-function-in-lib fuse_mount fuse]} {
	@@ -486,8 +560,16 @@
560	define FOSSIL_HAVE_FUSEFS 1
561	define-append LIBS -lfuse
562	msg-result "FuseFS support enabled"
563	}
564	}
565
566	# Finally, append -ldl to make sure it's the last in the list.
567	# The library order matters in case of static linking.
568	if {[check-function-in-lib dlopen dl]} {
569	# Some platforms (*BSD) have the dl functions already in libc and no libdl.
570	# In such case we can link directly without -ldl.
571	define-append LIBS [get-define lib_dlopen]
572	}
573
574	make-template Makefile.in
575	make-config-header autoconfig.h -auto {USE_* FOSSIL_*}
576

M autosetup/README.autosetup

+11 -1

		--- autosetup/README.autosetup
		+++ autosetup/README.autosetup
		@@ -1,1 +1,11 @@
1		-This is autosetup v0.6.6. See http://msteveb.github.com/autosetup/
	1	+README.autosetup created by autosetup v0.6.9
	2	+
	3	+This is the autosetup directory for a local install of autosetup.
	4	+It contains autosetup, support files and loadable modules.
	5	+
	6	+*.tcl files in this directory are optional modules which
	7	+can be loaded with the 'use' directive.
	8	+
	9	+*.auto files in this directory are auto-loaded.
	10	+
	11	+For more information, see http://msteveb.github.com/autosetup/
2	12

	--- autosetup/README.autosetup
	+++ autosetup/README.autosetup
	@@ -1,1 +1,11 @@
1	This is autosetup v0.6.6. See http://msteveb.github.com/autosetup/










2

	--- autosetup/README.autosetup
	+++ autosetup/README.autosetup
	@@ -1,1 +1,11 @@
1	README.autosetup created by autosetup v0.6.9
2
3	This is the autosetup directory for a local install of autosetup.
4	It contains autosetup, support files and loadable modules.
5
6	*.tcl files in this directory are optional modules which
7	can be loaded with the 'use' directive.
8
9	*.auto files in this directory are auto-loaded.
10
11	For more information, see http://msteveb.github.com/autosetup/
12

M autosetup/autosetup

+709 -235

		--- autosetup/autosetup
		+++ autosetup/autosetup
		@@ -1,16 +1,17 @@
1	1	#!/bin/sh
2	2	# Copyright (c) 2006-2011 WorkWare Systems http://www.workware.net.au/
3	3	# All rights reserved
4	4	# vim:se syntax=tcl:
5	5	# \
6		-dir=`dirname "$0"`; exec "`$dir/find-tclsh`" "$0" "$@"
	6	+dir=`dirname "$0"`; exec "`$dir/autosetup-find-tclsh`" "$0" "$@"
7	7
8		-set autosetup(version) 0.6.6
	8	+# Note that the version has a trailing + on unreleased versions
	9	+set autosetup(version) 0.6.9
9	10
10	11	# Can be set to 1 to debug early-init problems
11		-set autosetup(debug) 0
	12	+set autosetup(debug) [expr {"--debug" in $argv}]
12	13
13	14	##################################################################
14	15	#
15	16	# Main flow of control, option handling
16	17	#
		@@ -72,14 +73,18 @@
72	73	set autosetup(cmdline) {}
73	74	# options is a list of known options
74	75	set autosetup(options) {}
75	76	# optset is a dictionary of option values set by the user based on getopt
76	77	set autosetup(optset) {}
77		- # optdefault is a dictionary of default values for options
	78	+ # optdefault is a dictionary of default values
78	79	set autosetup(optdefault) {}
	80	+ # options-defaults is a dictionary of overrides for default values for options
	81	+ set autosetup(options-defaults) {}
79	82	set autosetup(optionhelp) {}
80	83	set autosetup(showhelp) 0
	84	+
	85	+ use util
81	86
82	87	# Parse options
83	88	use getopt
84	89
85	90	# At the is point we don't know what is a valid option
		@@ -87,15 +92,28 @@
87	92	set autosetup(getopt) [getopt argv]
88	93
89	94	#"=Core Options:"
90	95	options-add {
91	96	help:=local => "display help and options. Optionally specify a module name, such as --help=system"
	97	+ licence license => "display the autosetup license"
92	98	version => "display the version of autosetup"
93	99	ref:=text manual:=text
94	100	reference:=text => "display the autosetup command reference. 'text', 'wiki', 'asciidoc' or 'markdown'"
95	101	debug => "display debugging output as autosetup runs"
96		- install:=. => "install autosetup to the current or given directory (in the 'autosetup/' subdirectory)"
	102	+ install:=. => "install autosetup to the current or given directory"
	103	+ }
	104	+ if {$autosetup(installed)} {
	105	+ # hidden options so we can produce a nice error
	106	+ options-add {
	107	+ sysinstall:path
	108	+ }
	109	+ } else {
	110	+ options-add {
	111	+ sysinstall:path => "install standalone autosetup to the given directory (e.g.: /usr/local)"
	112	+ }
	113	+ }
	114	+ options-add {
97	115	force init:=help => "create initial auto.def, etc. Use --init=help for known types"
98	116	# Undocumented options
99	117	option-checking=1
100	118	nopager
101	119	quiet
		@@ -107,12 +125,12 @@
107	125	puts $autosetup(version)
108	126	exit 0
109	127	}
110	128
111	129	# autosetup --conf=alternate-auto.def
112		- if {[opt-val conf] ne ""} {
113		- set autosetup(autodef) [opt-val conf]
	130	+ if {[opt-str conf o]} {
	131	+ set autosetup(autodef) $o
114	132	}
115	133
116	134	# Debugging output (set this early)
117	135	incr autosetup(debug) [opt-bool debug]
118	136	incr autosetup(force) [opt-bool force]
		@@ -124,41 +142,50 @@
124	142	if {[file exists $autosetup(libdir)/local.tcl]} {
125	143	use local
126	144	}
127	145
128	146	# Now any auto-load modules
129		- foreach file [glob -nocomplain $autosetup(libdir)/.auto $autosetup(libdir)//*.auto] {
130		- automf_load source $file
131		- }
	147	+ autosetup_load_auto_modules
132	148
133		- if {[opt-val help] ne ""} {
	149	+ if {[opt-str help o]} {
134	150	incr autosetup(showhelp)
135	151	use help
136		- autosetup_help [opt-val help]
	152	+ autosetup_help $o
137	153	}
138	154
139		- if {[opt-val {manual ref reference}] ne ""} {
	155	+ if {[opt-bool licence license]} {
	156	+ use help
	157	+ autosetup_show_license
	158	+ exit 0
	159	+ }
	160	+
	161	+ if {[opt-str {manual ref reference} o]} {
140	162	use help
141		- autosetup_reference [opt-val {manual ref reference}]
	163	+ autosetup_reference $o
142	164	}
143	165
144	166	# Allow combining --install and --init
145	167	set earlyexit 0
146		- if {[opt-val install] ne ""} {
	168	+ if {[opt-str install o]} {
147	169	use install
148		- autosetup_install [opt-val install]
	170	+ autosetup_install $o
149	171	incr earlyexit
150	172	}
151	173
152		- if {[opt-val init] ne ""} {
	174	+ if {[opt-str init o]} {
153	175	use init
154		- autosetup_init [opt-val init]
	176	+ autosetup_init $o
155	177	incr earlyexit
156	178	}
157	179
158	180	if {$earlyexit} {
159	181	exit 0
	182	+ }
	183	+ if {[opt-str sysinstall o]} {
	184	+ use install
	185	+ autosetup_install $o 1
	186	+ exit 0
160	187	}
161	188
162	189	if {![file exists $autosetup(autodef)]} {
163	190	# Check for invalid option first
164	191	options {}
		@@ -185,10 +212,11 @@
185	212	define-append AUTOREMAKE [get-define CONFIGURE_OPTS]
186	213
187	214
188	215	# Log how we were invoked
189	216	configlog "Invoked as: [getenv WRAPPER $::argv0] [quote-argv $autosetup(argv)]"
	217	+ configlog "Tclsh: [info nameofexecutable]"
190	218
191	219	# Note that auto.def is not loaded in the global scope
192	220	source $autosetup(autodef)
193	221
194	222	# Could warn here if options {} was not specified
		@@ -210,14 +238,14 @@
210	238	#
211	239	# Check each of the named, boolean options and if any have been explicitly enabled
212	240	# or disabled by the user, return 1 or 0 accordingly.
213	241	#
214	242	# If the option was specified more than once, the last value wins.
215		-# e.g. With --enable-foo --disable-foo, [opt-bool foo] will return 0
	243	+# e.g. With '--enable-foo --disable-foo', '[opt-bool foo]' will return 0
216	244	#
217	245	# If no value was specified by the user, returns the default value for the
218		-# first option. If -nodefault is given, this behaviour changes and
	246	+# first option. If '-nodefault' is given, this behaviour changes and
219	247	# -1 is returned instead.
220	248	#
221	249	proc opt-bool {args} {
222	250	set nodefault 0
223	251	if {[lindex $args 0] eq "-nodefault"} {
		@@ -237,20 +265,19 @@
237	265	}
238	266	# Default value is the default for the first option
239	267	return [dict get $::autosetup(optdefault) [lindex $args 0]]
240	268	}
241	269
242		-# @opt-val option-list ?default=""?
	270	+# @opt-val optionlist ?default=""?
243	271	#
244		-# Returns a list containing all the values given for the non-boolean options in 'option-list'.
	272	+# Returns a list containing all the values given for the non-boolean options in '$optionlist'.
245	273	# There will be one entry in the list for each option given by the user, including if the
246	274	# same option was used multiple times.
247		-# If only a single value is required, use something like:
248	275	#
249		-## lindex [opt-val $names] end
	276	+# If no options were set, '$default' is returned (exactly, not as a list).
250	277	#
251		-# If no options were set, $default is returned (exactly, not as a list).
	278	+# Note: For most use cases, 'opt-str' should be preferred.
252	279	#
253	280	proc opt-val {names {default ""}} {
254	281	option-check-names {*}$names
255	282
256	283	foreach opt $names {
		@@ -261,10 +288,83 @@
261	288	if {[info exists result]} {
262	289	return $result
263	290	}
264	291	return $default
265	292	}
	293	+
	294	+# @opt-str optionlist varname ?default?
	295	+#
	296	+# Sets '$varname' in the callers scope to the value for one of the given options.
	297	+#
	298	+# For the list of options given in '$optionlist', if any value is set for any option,
	299	+# the option value is taken to be the last value of the last option (in the order given).
	300	+#
	301	+# If no option was given, and a default was specified with 'options-defaults',
	302	+# that value is used.
	303	+#
	304	+# If no 'options-defaults' value was given and '$default' was given, it is used.
	305	+#
	306	+# If none of the above provided a value, no value is set.
	307	+#
	308	+# The return value depends on whether '$default' was specified.
	309	+# If it was, the option value is returned.
	310	+# If it was not, 1 is returns if a value was set, or 0 if not.
	311	+#
	312	+# Typical usage is as follows:
	313	+#
	314	+## if {[opt-str {myopt altname} o]} {
	315	+## do something with $o
	316	+## }
	317	+#
	318	+# Or:
	319	+## define myname [opt-str {myopt altname} o "/usr/local"]
	320	+#
	321	+proc opt-str {names varname args} {
	322	+ global autosetup
	323	+
	324	+ option-check-names {*}$names
	325	+ upvar $varname value
	326	+
	327	+ if {[llength $args]} {
	328	+ # A default was given, so always return the string value of the option
	329	+ set default [lindex $args 0]
	330	+ set retopt 1
	331	+ } else {
	332	+ # No default, so return 0 or 1 to indicate if a value was found
	333	+ set retopt 0
	334	+ }
	335	+
	336	+ foreach opt $names {
	337	+ if {[dict exists $::autosetup(optset) $opt]} {
	338	+ set result [lindex [dict get $::autosetup(optset) $opt] end]
	339	+ }
	340	+ }
	341	+
	342	+ if {![info exists result]} {
	343	+ # No user-specified value. Has options-defaults been set?
	344	+ foreach opt $names {
	345	+ if {[dict exists $::autosetup(options-defaults) $opt]} {
	346	+ set result [dict get $autosetup(options-defaults) $opt]
	347	+ }
	348	+ }
	349	+ }
	350	+
	351	+ if {[info exists result]} {
	352	+ set value $result
	353	+ if {$retopt} {
	354	+ return $value
	355	+ }
	356	+ return 1
	357	+ }
	358	+
	359	+ if {$retopt} {
	360	+ set value $default
	361	+ return $value
	362	+ }
	363	+
	364	+ return 0
	365	+}
266	366
267	367	proc option-check-names {args} {
268	368	foreach o $args {
269	369	if {$o ni $::autosetup(options)} {
270	370	autosetup-error "Request for undeclared option --$o"
		@@ -293,10 +393,11 @@
293	393	# This is a special heading
294	394	lappend autosetup(optionhelp) $opt ""
295	395	set header {}
296	396	continue
297	397	}
	398	+ unset -nocomplain defaultvalue equal value
298	399
299	400	#puts "i=$i, opt=$opt"
300	401	regexp {^([^:=])(:)?(=)?(.)$} $opt -> name colon equal value
301	402	if {$name in $autosetup(options)} {
302	403	autosetup-error "Option $name already specified"
		@@ -310,10 +411,16 @@
310	411	# This is a documentation-only option, like "-C <dir>"
311	412	set opthelp $opt
312	413	} elseif {$colon eq ""} {
313	414	# Boolean option
314	415	lappend autosetup(options) $name
	416	+
	417	+ # Check for override
	418	+ if {[dict exists $autosetup(options-defaults) $name]} {
	419	+ # A default was specified with options-defaults, so use it
	420	+ set value [dict get $autosetup(options-defaults) $name]
	421	+ }
315	422
316	423	if {$value eq "1"} {
317	424	set opthelp "--disable-$name"
318	425	} else {
319	426	set opthelp "--$name"
		@@ -321,11 +428,12 @@
321	428
322	429	# Set the default
323	430	if {$value eq ""} {
324	431	set value 0
325	432	}
326		- dict set autosetup(optdefault) $name $value
	433	+ set defaultvalue $value
	434	+ dict set autosetup(optdefault) $name $defaultvalue
327	435
328	436	if {[dict exists $autosetup(getopt) $name]} {
329	437	# The option was specified by the user. Look at the last value.
330	438	lassign [lindex [dict get $autosetup(getopt) $name] end] type setvalue
331	439	if {$type eq "str"} {
		@@ -342,19 +450,39 @@
342	450	#puts "Found boolean option --$name=$setvalue"
343	451	}
344	452	} else {
345	453	# String option.
346	454	lappend autosetup(options) $name
	455	+
	456	+ if {$colon eq ":"} {
	457	+ # Was ":name=default" given?
	458	+ # If so, set $value to the display name and $defaultvalue to the default
	459	+ # (This is the preferred way to set a default value for a string option)
	460	+ if {[regexp {^([^=]+)=(.*)$} $value -> value defaultvalue]} {
	461	+ dict set autosetup(optdefault) $name $defaultvalue
	462	+ }
	463	+ }
	464	+
	465	+ # Maybe override the default value
	466	+ if {[dict exists $autosetup(options-defaults) $name]} {
	467	+ # A default was specified with options-defaults, so use it
	468	+ set defaultvalue [dict get $autosetup(options-defaults) $name]
	469	+ dict set autosetup(optdefault) $name $defaultvalue
	470	+ } elseif {![info exists defaultvalue]} {
	471	+ # For backward compatibility, if ":name" was given, use name as both
	472	+ # the display text and the default value, but only if the user
	473	+ # specified the option without the value
	474	+ set defaultvalue $value
	475	+ }
347	476
348	477	if {$equal eq "="} {
349	478	# String option with optional value
350	479	set opthelp "--$name?=$value?"
351	480	} else {
352	481	# String option with required value
353	482	set opthelp "--$name=$value"
354	483	}
355		- dict set autosetup(optdefault) $name $value
356	484
357	485	# Get the values specified by the user
358	486	if {[dict exists $autosetup(getopt) $name]} {
359	487	set listvalue {}
360	488
		@@ -363,11 +491,11 @@
363	491	if {$type eq "bool" && $setvalue} {
364	492	if {$equal ne "="} {
365	493	user-error "Option --$name requires a value"
366	494	}
367	495	# If given as a boolean, use the default value
368		- set setvalue $value
	496	+ set setvalue $defaultvalue
369	497	}
370	498	lappend listvalue $setvalue
371	499	}
372	500
373	501	#puts "Found string option --$name=$listvalue"
		@@ -376,10 +504,13 @@
376	504	}
377	505
378	506	# Now create the help for this option if appropriate
379	507	if {[lindex $opts $i+1] eq "=>"} {
380	508	set desc [lindex $opts $i+2]
	509	+ if {[info exists defaultvalue]} {
	510	+ set desc [string map [list @default@ $defaultvalue] $desc]
	511	+ }
381	512	#string match \n* $desc
382	513	if {$header ne ""} {
383	514	lappend autosetup(optionhelp) $header ""
384	515	set header ""
385	516	}
		@@ -463,35 +594,39 @@
463	594	options-wrap-desc [string trim $desc] $cols " " $indent [expr $max + 2]
464	595	}
465	596	}
466	597	}
467	598
468		-# @options options-spec
	599	+# @options optionspec
469	600	#
470	601	# Specifies configuration-time options which may be selected by the user
471		-# and checked with opt-val and opt-bool. The format of options-spec follows.
	602	+# and checked with 'opt-str' and 'opt-bool'. '$optionspec' contains a series
	603	+# of options specifications separated by newlines, as follows:
472	604	#
473	605	# A boolean option is of the form:
474	606	#
475	607	## name[=0\|1] => "Description of this boolean option"
476	608	#
477		-# The default is name=0, meaning that the option is disabled by default.
478		-# If name=1 is used to make the option enabled by default, the description should reflect
	609	+# The default is 'name=0', meaning that the option is disabled by default.
	610	+# If 'name=1' is used to make the option enabled by default, the description should reflect
479	611	# that with text like "Disable support for ...".
480	612	#
481	613	# An argument option (one which takes a parameter) is of the form:
482	614	#
483	615	## name:[=]value => "Description of this option"
484	616	#
485		-# If the name:value form is used, the value must be provided with the option (as --name=myvalue).
486		-# If the name:=value form is used, the value is optional and the given value is used as the default
	617	+# If the 'name:value' form is used, the value must be provided with the option (as '--name=myvalue').
	618	+# If the 'name:=value' form is used, the value is optional and the given value is used as the default
487	619	# if it is not provided.
488	620	#
489		-# Undocumented options are also supported by omitting the "=> description.
490		-# These options are not displayed with --help and can be useful for internal options or as aliases.
	621	+# The description may contain '@default@', in which case it will be replaced with the default
	622	+# value for the option (taking into account defaults specified with 'options-defaults'.
491	623	#
492		-# For example, --disable-lfs is an alias for --disable=largefile:
	624	+# Undocumented options are also supported by omitting the '=> description'.
	625	+# These options are not displayed with '--help' and can be useful for internal options or as aliases.
	626	+#
	627	+# For example, '--disable-lfs' is an alias for '--disable=largefile':
493	628	#
494	629	## lfs=1 largefile=1 => "Disable large file support"
495	630	#
496	631	proc options {optlist} {
497	632	# Allow options as a list or args
		@@ -509,27 +644,37 @@
509	644	user-error "Unknown option --$o"
510	645	}
511	646	}
512	647	}
513	648	}
	649	+
	650	+# @options-defaults dictionary
	651	+#
	652	+# Specifies a dictionary of options and a new default value for each of those options.
	653	+# Use before any 'use' statements in 'auto.def' to change the defaults for
	654	+# subsequently included modules.
	655	+proc options-defaults {dict} {
	656	+ foreach {n v} $dict {
	657	+ dict set ::autosetup(options-defaults) $n $v
	658	+ }
	659	+}
514	660
515	661	proc config_guess {} {
516		- if {[file-isexec $::autosetup(dir)/config.guess]} {
517		- exec-with-stderr sh $::autosetup(dir)/config.guess
518		- if {[catch {exec-with-stderr sh $::autosetup(dir)/config.guess} alias]} {
	662	+ if {[file-isexec $::autosetup(dir)/autosetup-config.guess]} {
	663	+ if {[catch {exec-with-stderr sh $::autosetup(dir)/autosetup-config.guess} alias]} {
519	664	user-error $alias
520	665	}
521	666	return $alias
522	667	} else {
523		- configlog "No config.guess, so using uname"
	668	+ configlog "No autosetup-config.guess, so using uname"
524	669	string tolower [exec uname -p]-unknown-[exec uname -s][exec uname -r]
525	670	}
526	671	}
527	672
528	673	proc config_sub {alias} {
529		- if {[file-isexec $::autosetup(dir)/config.sub]} {
530		- if {[catch {exec-with-stderr sh $::autosetup(dir)/config.sub $alias} alias]} {
	674	+ if {[file-isexec $::autosetup(dir)/autosetup-config.sub]} {
	675	+ if {[catch {exec-with-stderr sh $::autosetup(dir)/autosetup-config.sub $alias} alias]} {
531	676	user-error $alias
532	677	}
533	678	}
534	679	return $alias
535	680	}
		@@ -536,39 +681,48 @@
536	681
537	682	# @define name ?value=1?
538	683	#
539	684	# Defines the named variable to the given value.
540	685	# These (name, value) pairs represent the results of the configuration check
541		-# and are available to be checked, modified and substituted.
	686	+# and are available to be subsequently checked, modified and substituted.
542	687	#
543	688	proc define {name {value 1}} {
544	689	set ::define($name) $value
545	690	#dputs "$name <= $value"
546	691	}
547	692
548	693	# @undefine name
549	694	#
550		-# Undefine the named variable
	695	+# Undefine the named variable.
551	696	#
552	697	proc undefine {name} {
553	698	unset -nocomplain ::define($name)
554	699	#dputs "$name <= <undef>"
555	700	}
556	701
557	702	# @define-append name value ...
558	703	#
559		-# Appends the given value(s) to the given 'defined' variable.
560		-# If the variable is not defined or empty, it is set to $value.
	704	+# Appends the given value(s) to the given "defined" variable.
	705	+# If the variable is not defined or empty, it is set to '$value'.
561	706	# Otherwise the value is appended, separated by a space.
562	707	# Any extra values are similarly appended.
563	708	# If any value is already contained in the variable (as a substring) it is omitted.
564	709	#
565	710	proc define-append {name args} {
566	711	if {[get-define $name ""] ne ""} {
567		- # Make a token attempt to avoid duplicates
	712	+ # Avoid duplicates
568	713	foreach arg $args {
569		- if {[string first $arg $::define($name)] == -1} {
	714	+ if {$arg eq ""} {
	715	+ continue
	716	+ }
	717	+ set found 0
	718	+ foreach str [split $::define($name) " "] {
	719	+ if {$str eq $arg} {
	720	+ incr found
	721	+ }
	722	+ }
	723	+ if {!$found} {
570	724	append ::define($name) " " $arg
571	725	}
572	726	}
573	727	} else {
574	728	set ::define($name) [join $args]
		@@ -576,11 +730,11 @@
576	730	#dputs "$name += [join $args] => $::define($name)"
577	731	}
578	732
579	733	# @get-define name ?default=0?
580	734	#
581		-# Returns the current value of the 'defined' variable, or $default
	735	+# Returns the current value of the "defined" variable, or '$default'
582	736	# if not set.
583	737	#
584	738	proc get-define {name {default 0}} {
585	739	if {[info exists ::define($name)]} {
586	740	#dputs "$name => $::define($name)"
		@@ -595,14 +749,26 @@
595	749	# Returns 1 if the given variable is defined.
596	750	#
597	751	proc is-defined {name} {
598	752	info exists ::define($name)
599	753	}
	754	+
	755	+# @is-define-set name
	756	+#
	757	+# Returns 1 if the given variable is defined and is set
	758	+# to a value other than "" or 0
	759	+#
	760	+proc is-define-set {name} {
	761	+ if {[get-define $name] in {0 ""}} {
	762	+ return 0
	763	+ }
	764	+ return 1
	765	+}
600	766
601	767	# @all-defines
602	768	#
603		-# Returns a dictionary (name value list) of all defined variables.
	769	+# Returns a dictionary (name, value list) of all defined variables.
604	770	#
605	771	# This is suitable for use with 'dict', 'array set' or 'foreach'
606	772	# and allows for arbitrary processing of the defined variables.
607	773	#
608	774	proc all-defines {} {
		@@ -610,13 +776,13 @@
610	776	}
611	777
612	778
613	779	# @get-env name default
614	780	#
615		-# If $name was specified on the command line, return it.
616		-# If $name was set in the environment, return it.
617		-# Otherwise return $default.
	781	+# If '$name' was specified on the command line, return it.
	782	+# Otherwise if '$name' was set in the environment, return it.
	783	+# Otherwise return '$default'.
618	784	#
619	785	proc get-env {name default} {
620	786	if {[dict exists $::autosetup(cmdline) $name]} {
621	787	return [dict get $::autosetup(cmdline) $name]
622	788	}
		@@ -623,11 +789,11 @@
623	789	getenv $name $default
624	790	}
625	791
626	792	# @env-is-set name
627	793	#
628		-# Returns 1 if the $name was specified on the command line or in the environment.
	794	+# Returns 1 if '$name' was specified on the command line or in the environment.
629	795	# Note that an empty environment variable is not considered to be set.
630	796	#
631	797	proc env-is-set {name} {
632	798	if {[dict exists $::autosetup(cmdline) $name]} {
633	799	return 1
		@@ -639,11 +805,11 @@
639	805	}
640	806
641	807	# @readfile filename ?default=""?
642	808	#
643	809	# Return the contents of the file, without the trailing newline.
644		-# If the file doesn't exist or can't be read, returns $default.
	810	+# If the file doesn't exist or can't be read, returns '$default'.
645	811	#
646	812	proc readfile {filename {default_value ""}} {
647	813	set result $default_value
648	814	catch {
649	815	set f [open $filename]
		@@ -653,11 +819,11 @@
653	819	return $result
654	820	}
655	821
656	822	# @writefile filename value
657	823	#
658		-# Creates the given file containing $value.
	824	+# Creates the given file containing '$value'.
659	825	# Does not add an extra newline.
660	826	#
661	827	proc writefile {filename value} {
662	828	set f [open $filename w]
663	829	puts -nonewline $f $value
		@@ -677,63 +843,60 @@
677	843	lappend args [quote-if-needed $arg]
678	844	}
679	845	join $args
680	846	}
681	847
682		-# @suffix suf list
683		-#
684		-# Takes a list and returns a new list with $suf appended
685		-# to each element
686		-#
687		-## suffix .c {a b c} => {a.c b.c c.c}
688		-#
689		-proc suffix {suf list} {
	848	+# @list-non-empty list
	849	+#
	850	+# Returns a copy of the given list with empty elements removed
	851	+proc list-non-empty {list} {
690	852	set result {}
691	853	foreach p $list {
692		- lappend result $p$suf
	854	+ if {$p ne ""} {
	855	+ lappend result $p
	856	+ }
693	857	}
694	858	return $result
695	859	}
696	860
697		-# @prefix pre list
698		-#
699		-# Takes a list and returns a new list with $pre prepended
700		-# to each element
701		-#
702		-## prefix jim- {a.c b.c} => {jim-a.c jim-b.c}
703		-#
704		-proc prefix {pre list} {
705		- set result {}
706		- foreach p $list {
707		- lappend result $pre$p
708		- }
709		- return $result
	861	+# @find-executable-path name
	862	+#
	863	+# Searches the path for an executable with the given name.
	864	+# Note that the name may include some parameters, e.g. 'cc -mbig-endian',
	865	+# in which case the parameters are ignored.
	866	+# The full path to the executable if found, or "" if not found.
	867	+# Returns 1 if found, or 0 if not.
	868	+#
	869	+proc find-executable-path {name} {
	870	+ # Ignore any parameters
	871	+ set name [lindex $name 0]
	872	+ # The empty string is never a valid executable
	873	+ if {$name ne ""} {
	874	+ foreach p [split-path] {
	875	+ dputs "Looking for $name in $p"
	876	+ set exec [file join $p $name]
	877	+ if {[file-isexec $exec]} {
	878	+ dputs "Found $name -> $exec"
	879	+ return $exec
	880	+ }
	881	+ }
	882	+ }
	883	+ return {}
710	884	}
711	885
712	886	# @find-executable name
713	887	#
714	888	# Searches the path for an executable with the given name.
715		-# Note that the name may include some parameters, e.g. "cc -mbig-endian",
	889	+# Note that the name may include some parameters, e.g. 'cc -mbig-endian',
716	890	# in which case the parameters are ignored.
717	891	# Returns 1 if found, or 0 if not.
718	892	#
719	893	proc find-executable {name} {
720		- # Ignore any parameters
721		- set name [lindex $name 0]
722		- if {$name eq ""} {
723		- # The empty string is never a valid executable
724		- return 0
725		- }
726		- foreach p [split-path] {
727		- dputs "Looking for $name in $p"
728		- set exec [file join $p $name]
729		- if {[file-isexec $exec]} {
730		- dputs "Found $name -> $exec"
731		- return 1
732		- }
733		- }
734		- return 0
	894	+ if {[find-executable-path $name] eq {}} {
	895	+ return 0
	896	+ }
	897	+ return 1
735	898	}
736	899
737	900	# @find-an-executable ?-required? name ...
738	901	#
739	902	# Given a list of possible executable names,
		@@ -764,11 +927,11 @@
764	927	return ""
765	928	}
766	929
767	930	# @configlog msg
768	931	#
769		-# Writes the given message to the configuration log, config.log
	932	+# Writes the given message to the configuration log, 'config.log'.
770	933	#
771	934	proc configlog {msg} {
772	935	if {![info exists ::autosetup(logfh)]} {
773	936	set ::autosetup(logfh) [open config.log w]
774	937	}
		@@ -800,12 +963,12 @@
800	963	}
801	964	}
802	965
803	966	# @msg-quiet command ...
804	967	#
805		-# msg-quiet evaluates it's arguments as a command with output
806		-# from msg-checking and msg-result suppressed.
	968	+# 'msg-quiet' evaluates it's arguments as a command with output
	969	+# from 'msg-checking' and 'msg-result' suppressed.
807	970	#
808	971	# This is useful if a check needs to run a subcheck which isn't
809	972	# of interest to the user.
810	973	proc msg-quiet {args} {
811	974	incr ::autosetup(msg-quiet)
		@@ -841,11 +1004,11 @@
841	1004
842	1005	# @user-error msg
843	1006	#
844	1007	# Indicate incorrect usage to the user, including if required components
845	1008	# or features are not found.
846		-# autosetup exits with a non-zero return code.
	1009	+# 'autosetup' exits with a non-zero return code.
847	1010	#
848	1011	proc user-error {msg} {
849	1012	show-notices
850	1013	puts stderr "Error: $msg"
851	1014	puts stderr "Try: '[file tail $::autosetup(exe)] --help' for options"
		@@ -887,10 +1050,21 @@
887	1050	proc maybe-show-timestamp {} {
888	1051	if {$::autosetup(msg-timing) && $::autosetup(msg-checking) == 0} {
889	1052	puts -nonewline [format {[%6.2f] } [expr {([clock millis] - $::autosetup(start)) % 10000 / 1000.0}]]
890	1053	}
891	1054	}
	1055	+
	1056	+# @autosetup-require-version required
	1057	+#
	1058	+# Checks the current version of 'autosetup' against '$required'.
	1059	+# A fatal error is generated if the current version is less than that required.
	1060	+#
	1061	+proc autosetup-require-version {required} {
	1062	+ if {[compare-versions $::autosetup(version) $required] < 0} {
	1063	+ user-error "autosetup version $required is required, but this is $::autosetup(version)"
	1064	+ }
	1065	+}
892	1066
893	1067	proc autosetup_version {} {
894	1068	return "autosetup v$::autosetup(version)"
895	1069	}
896	1070
		@@ -986,23 +1160,35 @@
986	1160	# The latter form is useful for a complex module which requires additional
987	1161	# support file. In this form, '$::usedir' is set to the module directory
988	1162	# when it is loaded.
989	1163	#
990	1164	proc use {args} {
	1165	+ global autosetup libmodule modsource
	1166	+
	1167	+ set dirs [list $autosetup(libdir)]
	1168	+ if {[info exists autosetup(srcdir)]} {
	1169	+ lappend dirs $autosetup(srcdir)/autosetup
	1170	+ }
991	1171	foreach m $args {
992		- if {[info exists ::libmodule($m)]} {
	1172	+ if {[info exists libmodule($m)]} {
993	1173	continue
994	1174	}
995		- set ::libmodule($m) 1
996		- if {[info exists ::modsource($m)]} {
997		- automf_load eval $::modsource($m)
	1175	+ set libmodule($m) 1
	1176	+ if {[info exists modsource(${m}.tcl)]} {
	1177	+ automf_load eval $modsource(${m}.tcl)
998	1178	} else {
999		- set sources [list $::autosetup(libdir)/${m}.tcl $::autosetup(libdir)/${m}/init.tcl]
	1179	+ set locs [list ${m}.tcl ${m}/init.tcl]
1000	1180	set found 0
1001		- foreach source $sources {
1002		- if {[file exists $source]} {
1003		- incr found
	1181	+ foreach dir $dirs {
	1182	+ foreach loc $locs {
	1183	+ set source $dir/$loc
	1184	+ if {[file exists $source]} {
	1185	+ incr found
	1186	+ break
	1187	+ }
	1188	+ }
	1189	+ if {$found} {
1004	1190	break
1005	1191	}
1006	1192	}
1007	1193	if {$found} {
1008	1194	# For the convenience of the "use" source, point to the directory
		@@ -1014,10 +1200,22 @@
1014	1200	autosetup-error "use: No such module: $m"
1015	1201	}
1016	1202	}
1017	1203	}
1018	1204	}
	1205	+
	1206	+proc autosetup_load_auto_modules {} {
	1207	+ global autosetup modsource
	1208	+ # First load any embedded auto modules
	1209	+ foreach mod [array names modsource *.auto] {
	1210	+ automf_load eval $modsource($mod)
	1211	+ }
	1212	+ # Now any external auto modules
	1213	+ foreach file [glob -nocomplain $autosetup(libdir)/.auto $autosetup(libdir)//*.auto] {
	1214	+ automf_load source $file
	1215	+ }
	1216	+}
1019	1217
1020	1218	# Load module source in the global scope by executing the given command
1021	1219	proc automf_load {args} {
1022	1220	if {[catch [list uplevel #0 $args] msg opts] ni {0 2 3}} {
1023	1221	autosetup-full-error [error-dump $msg $opts $::autosetup(debug)]
		@@ -1027,18 +1225,21 @@
1027	1225	# Initial settings
1028	1226	set autosetup(exe) $::argv0
1029	1227	set autosetup(istcl) 1
1030	1228	set autosetup(start) [clock millis]
1031	1229	set autosetup(installed) 0
	1230	+set autosetup(sysinstall) 0
1032	1231	set autosetup(msg-checking) 0
1033	1232	set autosetup(msg-quiet) 0
	1233	+set autosetup(inittypes) {}
1034	1234
1035	1235	# Embedded modules are inserted below here
1036	1236	set autosetup(installed) 1
1037		-# ----- module asciidoc-formatting -----
	1237	+set autosetup(sysinstall) 0
	1238	+# ----- @module asciidoc-formatting.tcl -----
1038	1239
1039		-set modsource(asciidoc-formatting) {
	1240	+set modsource(asciidoc-formatting.tcl) {
1040	1241	# Copyright (c) 2010 WorkWare Systems http://www.workware.net.au/
1041	1242	# All rights reserved
1042	1243
1043	1244	# Module which provides text formatting
1044	1245	# asciidoc format
		@@ -1102,19 +1303,19 @@
1102	1303	regsub -all "\n\n" $defn "\n ::\n" defn
1103	1304	puts $defn
1104	1305	}
1105	1306	}
1106	1307
1107		-# ----- module formatting -----
	1308	+# ----- @module formatting.tcl -----
1108	1309
1109		-set modsource(formatting) {
	1310	+set modsource(formatting.tcl) {
1110	1311	# Copyright (c) 2010 WorkWare Systems http://www.workware.net.au/
1111	1312	# All rights reserved
1112	1313
1113	1314	# Module which provides common text formatting
1114	1315
1115		-# This is designed for documenation which looks like:
	1316	+# This is designed for documentation which looks like:
1116	1317	# code {...}
1117	1318	# or
1118	1319	# code {
1119	1320	# ...
1120	1321	# ...
		@@ -1159,13 +1360,13 @@
1159	1360	# Return the result
1160	1361	return $lines
1161	1362	}
1162	1363	}
1163	1364
1164		-# ----- module getopt -----
	1365	+# ----- @module getopt.tcl -----
1165	1366
1166		-set modsource(getopt) {
	1367	+set modsource(getopt.tcl) {
1167	1368	# Copyright (c) 2006 WorkWare Systems http://www.workware.net.au/
1168	1369	# All rights reserved
1169	1370
1170	1371	# Simple getopt module
1171	1372
		@@ -1197,11 +1398,11 @@
1197	1398
1198	1399	if {[regexp {^--([^=][^=]+)=(.*)$} $arg -> name value]} {
1199	1400	# --name=value
1200	1401	dict lappend opts $name [list str $value]
1201	1402	} elseif {[regexp {^--(enable-\|disable-)?([^=]*)$} $arg -> prefix name]} {
1202		- if {$prefix in {enable- with- ""}} {
	1403	+ if {$prefix in {enable- ""}} {
1203	1404	set value 1
1204	1405	} else {
1205	1406	set value 0
1206	1407	}
1207	1408	dict lappend opts $name [list bool $value]
		@@ -1218,13 +1419,13 @@
1218	1419
1219	1420	return $opts
1220	1421	}
1221	1422	}
1222	1423
1223		-# ----- module help -----
	1424	+# ----- @module help.tcl -----
1224	1425
1225		-set modsource(help) {
	1426	+set modsource(help.tcl) {
1226	1427	# Copyright (c) 2010 WorkWare Systems http://workware.net.au/
1227	1428	# All rights reserved
1228	1429
1229	1430	# Module which provides usage, help and the command reference
1230	1431
		@@ -1251,10 +1452,28 @@
1251	1452	options-show
1252	1453	}
1253	1454	}
1254	1455	exit 0
1255	1456	}
	1457	+
	1458	+proc autosetup_show_license {} {
	1459	+ global modsource autosetup
	1460	+ use_pager
	1461	+
	1462	+ if {[info exists modsource(LICENSE)]} {
	1463	+ puts $modsource(LICENSE)
	1464	+ return
	1465	+ }
	1466	+ foreach dir [list $autosetup(libdir) $autosetup(srcdir)] {
	1467	+ set path [file join $dir LICENSE]
	1468	+ if {[file exists $path]} {
	1469	+ puts [readfile $path]
	1470	+ return
	1471	+ }
	1472	+ }
	1473	+ puts "LICENSE not found"
	1474	+}
1256	1475
1257	1476	# If not already paged and stdout is a tty, pipe the output through the pager
1258	1477	# This is done by reinvoking autosetup with --nopager added
1259	1478	proc use_pager {} {
1260	1479	if {![opt-bool nopager] && [getenv PAGER ""] ne "" && [isatty? stdin] && [isatty? stdout]} {
		@@ -1304,10 +1523,16 @@
1304	1523	}
1305	1524
1306	1525	proc autosetup_output_block {type lines} {
1307	1526	if {[llength $lines]} {
1308	1527	switch $type {
	1528	+ section {
	1529	+ section $lines
	1530	+ }
	1531	+ subsection {
	1532	+ subsection $lines
	1533	+ }
1309	1534	code {
1310	1535	codelines $lines
1311	1536	}
1312	1537	p {
1313	1538	p [join $lines]
		@@ -1325,30 +1550,45 @@
1325	1550	# Generate a command reference from inline documentation
1326	1551	proc automf_command_reference {} {
1327	1552	lappend files $::autosetup(prog)
1328	1553	lappend files {}[lsort [glob -nocomplain $::autosetup(libdir)/.tcl]]
1329	1554
1330		- section "Core Commands"
1331		- set type p
1332		- set lines {}
1333		- set cmd {}
	1555	+ # We want to process all non-module files before module files
	1556	+ # and then modules in alphabetical order.
	1557	+ # So examine all files and extract docs into doc($modulename) and doc(_core_)
	1558	+ #
	1559	+ # Each entry is a list of {type data} where $type is one of: section, subsection, code, list, p
	1560	+ # and $data is a string for section, subsection or a list of text lines for other types.
	1561	+
	1562	+ # XXX: Should commands be in alphabetical order too? Currently they are in file order.
	1563	+
	1564	+ set doc(_core_) {}
	1565	+ lappend doc(_core_) [list section "Core Commands"]
1334	1566
1335	1567	foreach file $files {
	1568	+ set modulename [file rootname [file tail $file]]
	1569	+ set current _core_
1336	1570	set f [open $file]
1337	1571	while {![eof $f]} {
1338	1572	set line [gets $f]
	1573	+
	1574	+ # Find embedded module names
	1575	+ if {[regexp {^#.@module ([^ ])} $line -> modulename]} {
	1576	+ continue
	1577	+ }
1339	1578
1340	1579	# Find lines starting with "# @*" and continuing through the remaining comment lines
1341	1580	if {![regexp {^# @(.*)} $line -> cmd]} {
1342	1581	continue
1343	1582	}
1344	1583
1345	1584	# Synopsis or command?
1346	1585	if {$cmd eq "synopsis:"} {
1347		- section "Module: [file rootname [file tail $file]]"
	1586	+ set current $modulename
	1587	+ lappend doc($current) [list section "Module: $modulename"]
1348	1588	} else {
1349		- subsection $cmd
	1589	+ lappend doc($current) [list subsection $cmd]
1350	1590	}
1351	1591
1352	1592	set lines {}
1353	1593	set type p
1354	1594
		@@ -1369,29 +1609,38 @@
1369	1609
1370	1610	#puts "hash=$hash, oldhash=$oldhash, lines=[llength $lines], cmd=$cmd"
1371	1611
1372	1612	if {$t ne $type \|\| $cmd eq ""} {
1373	1613	# Finish the current block
1374		- autosetup_output_block $type $lines
	1614	+ lappend doc($current) [list $type $lines]
1375	1615	set lines {}
1376	1616	set type $t
1377	1617	}
1378	1618	if {$cmd ne ""} {
1379	1619	lappend lines $cmd
1380	1620	}
1381	1621	}
1382	1622
1383		- autosetup_output_block $type $lines
	1623	+ lappend doc($current) [list $type $lines]
1384	1624	}
1385	1625	close $f
1386	1626	}
	1627	+
	1628	+ # Now format and output the results
	1629	+
	1630	+ # _core_ will sort first
	1631	+ foreach module [lsort [array names doc]] {
	1632	+ foreach item $doc($module) {
	1633	+ autosetup_output_block {*}$item
	1634	+ }
	1635	+ }
1387	1636	}
1388	1637	}
1389	1638
1390		-# ----- module init -----
	1639	+# ----- @module init.tcl -----
1391	1640
1392		-set modsource(init) {
	1641	+set modsource(init.tcl) {
1393	1642	# Copyright (c) 2010 WorkWare Systems http://www.workware.net.au/
1394	1643	# All rights reserved
1395	1644
1396	1645	# Module to help create auto.def and configure
1397	1646
		@@ -1444,79 +1693,157 @@
1444	1693	}
1445	1694	writefile $filename $contents
1446	1695	}
1447	1696	}
1448	1697
1449		-# ----- module install -----
	1698	+# ----- @module install.tcl -----
1450	1699
1451		-set modsource(install) {
	1700	+set modsource(install.tcl) {
1452	1701	# Copyright (c) 2006-2010 WorkWare Systems http://www.workware.net.au/
1453	1702	# All rights reserved
1454	1703
1455	1704	# Module which can install autosetup
1456	1705
1457		-proc autosetup_install {dir} {
1458		- if {[catch {
	1706	+# autosetup(installed)=1 means that autosetup is not running from source
	1707	+# autosetup(sysinstall)=1 means that autosetup is running from a sysinstall version
	1708	+# shared=1 means that we are trying to do a sysinstall. This is only possible from the development source.
	1709	+
	1710	+proc autosetup_install {dir {shared 0}} {
	1711	+ global autosetup
	1712	+ if {$shared} {
	1713	+ if {$autosetup(installed) \|\| $autosetup(sysinstall)} {
	1714	+ user-error "Can only --sysinstall from development sources"
	1715	+ }
	1716	+ } elseif {$autosetup(installed) && !$autosetup(sysinstall)} {
	1717	+ user-error "Can't --install from project install"
	1718	+ }
	1719	+
	1720	+ if {$autosetup(sysinstall)} {
	1721	+ # This is the sysinstall version, so install just uses references
1459	1722	cd $dir
	1723	+
	1724	+ puts "[autosetup_version] creating configure to use system-installed autosetup"
	1725	+ autosetup_create_configure 1
	1726	+ puts "Creating autosetup/README.autosetup"
1460	1727	file mkdir autosetup
	1728	+ autosetup_install_readme autosetup/README.autosetup 1
	1729	+ return
	1730	+ }
	1731	+
	1732	+ if {[catch {
	1733	+ if {$shared} {
	1734	+ set target $dir/bin/autosetup
	1735	+ set installedas $target
	1736	+ } else {
	1737	+ if {$dir eq "."} {
	1738	+ set installedas autosetup
	1739	+ } else {
	1740	+ set installedas $dir/autosetup
	1741	+ }
	1742	+ cd $dir
	1743	+ file mkdir autosetup
	1744	+ set target autosetup/autosetup
	1745	+ }
	1746	+ set targetdir [file dirname $target]
	1747	+ file mkdir $targetdir
1461	1748
1462		- set f [open autosetup/autosetup w]
	1749	+ set f [open $target w]
1463	1750
1464		- set publicmodules [glob $::autosetup(libdir)/*.auto]
	1751	+ set publicmodules {}
1465	1752
1466	1753	# First the main script, but only up until "CUT HERE"
1467		- set in [open $::autosetup(dir)/autosetup]
	1754	+ set in [open $autosetup(dir)/autosetup]
1468	1755	while {[gets $in buf] >= 0} {
1469	1756	if {$buf ne "##-- CUT HERE --##"} {
1470	1757	puts $f $buf
1471	1758	continue
1472	1759	}
1473	1760
1474	1761	# Insert the static modules here
1475	1762	# i.e. those which don't contain @synopsis:
	1763	+ # All modules are inserted if $shared is set
1476	1764	puts $f "set autosetup(installed) 1"
1477		- foreach file [lsort [glob $::autosetup(libdir)/*.tcl]] {
	1765	+ puts $f "set autosetup(sysinstall) $shared"
	1766	+ foreach file [lsort [glob $autosetup(libdir)/*.{tcl,auto}]] {
	1767	+ set modname [file tail $file]
	1768	+ set ext [file ext $modname]
1478	1769	set buf [readfile $file]
1479		- if {[string match "\n# @synopsis:" $buf]} {
1480		- lappend publicmodules $file
1481		- continue
	1770	+ if {!$shared} {
	1771	+ if {$ext eq ".auto" \|\| [string match "\n# @synopsis:" $buf]} {
	1772	+ lappend publicmodules $file
	1773	+ continue
	1774	+ }
1482	1775	}
1483		- set modname [file rootname [file tail $file]]
1484		- puts $f "# ----- module $modname -----"
	1776	+ dputs "install: importing lib/[file tail $file]"
	1777	+ puts $f "# ----- @module $modname -----"
1485	1778	puts $f "\nset modsource($modname) \{"
1486	1779	puts $f $buf
1487	1780	puts $f "\}\n"
1488	1781	}
	1782	+ if {$shared} {
	1783	+ foreach {srcname destname} [list $autosetup(libdir)/README.autosetup-lib README.autosetup \
	1784	+ $autosetup(srcdir)/LICENSE LICENSE] {
	1785	+ dputs "install: importing $srcname as $destname"
	1786	+ puts $f "\nset modsource($destname) \\\n[list [readfile $srcname]\n]\n"
	1787	+ }
	1788	+ }
1489	1789	}
1490	1790	close $in
1491	1791	close $f
1492		- exec chmod 755 autosetup/autosetup
	1792	+ catch {exec chmod 755 $target}
	1793	+
	1794	+ set installfiles {autosetup-config.guess autosetup-config.sub autosetup-test-tclsh}
	1795	+ set removefiles {}
	1796	+
	1797	+ if {!$shared} {
	1798	+ autosetup_install_readme $targetdir/README.autosetup 0
1493	1799
1494		- # Install public modules
1495		- foreach file $publicmodules {
1496		- autosetup_install_file $file autosetup
	1800	+ # Install public modules
	1801	+ foreach file $publicmodules {
	1802	+ set tail [file tail $file]
	1803	+ autosetup_install_file $file $targetdir/$tail
	1804	+ }
	1805	+ lappend installfiles jimsh0.c autosetup-find-tclsh LICENSE
	1806	+ lappend removefiles config.guess config.sub test-tclsh find-tclsh
	1807	+ } else {
	1808	+ lappend installfiles {sys-find-tclsh autosetup-find-tclsh}
1497	1809	}
1498	1810
1499	1811	# Install support files
1500		- foreach file {config.guess config.sub jimsh0.c find-tclsh test-tclsh LICENSE} {
1501		- autosetup_install_file $::autosetup(dir)/$file autosetup
1502		- }
1503		- exec chmod 755 autosetup/config.sub autosetup/config.guess autosetup/find-tclsh
1504		-
1505		- writefile autosetup/README.autosetup \
1506		- "This is [autosetup_version]. See http://msteveb.github.com/autosetup/\n"
1507		-
	1812	+ foreach fileinfo $installfiles {
	1813	+ if {[llength $fileinfo] == 2} {
	1814	+ lassign $fileinfo source dest
	1815	+ } else {
	1816	+ lassign $fileinfo source
	1817	+ set dest $source
	1818	+ }
	1819	+ autosetup_install_file $autosetup(dir)/$source $targetdir/$dest
	1820	+ }
	1821	+
	1822	+ # Remove obsolete files
	1823	+ foreach file $removefiles {
	1824	+ if {[file exists $targetdir/$file]} {
	1825	+ file delete $targetdir/$file
	1826	+ }
	1827	+ }
1508	1828	} error]} {
1509	1829	user-error "Failed to install autosetup: $error"
1510	1830	}
1511		- puts "Installed [autosetup_version] to autosetup/"
	1831	+ if {$shared} {
	1832	+ set type "system"
	1833	+ } else {
	1834	+ set type "local"
	1835	+ }
	1836	+ puts "Installed $type [autosetup_version] to $installedas"
1512	1837
1513		- # Now create 'configure' if necessary
1514		- autosetup_create_configure
	1838	+ if {!$shared} {
	1839	+ # Now create 'configure' if necessary
	1840	+ autosetup_create_configure 0
	1841	+ }
1515	1842	}
1516	1843
1517		-proc autosetup_create_configure {} {
	1844	+proc autosetup_create_configure {shared} {
1518	1845	if {[file exists configure]} {
1519	1846	if {!$::autosetup(force)} {
1520	1847	# Could this be an autosetup configure?
1521	1848	if {![string match "\nWRAPPER=" [readfile configure]]} {
1522	1849	puts "I see configure, but not created by autosetup, so I won't overwrite it."
		@@ -1527,40 +1854,75 @@
1527	1854	puts "I will overwrite the existing configure because you used --force."
1528	1855	}
1529	1856	} else {
1530	1857	puts "I don't see configure, so I will create it."
1531	1858	}
1532		- writefile configure \
	1859	+ if {$shared} {
	1860	+ writefile configure \
	1861	+{#!/bin/sh
	1862	+WRAPPER="$0"; export WRAPPER; "autosetup" "$@"
	1863	+}
	1864	+ } else {
	1865	+ writefile configure \
1533	1866	{#!/bin/sh
1534	1867	dir="`dirname "$0"`/autosetup"
1535		-WRAPPER="$0"; export WRAPPER; exec "`$dir/find-tclsh`" "$dir/autosetup" "$@"
	1868	+WRAPPER="$0"; export WRAPPER; exec "`"$dir/autosetup-find-tclsh"`" "$dir/autosetup" "$@"
1536	1869	}
	1870	+ }
1537	1871	catch {exec chmod 755 configure}
1538	1872	}
1539	1873
1540	1874	# Append the contents of $file to filehandle $f
1541	1875	proc autosetup_install_append {f file} {
	1876	+ dputs "install: include $file"
1542	1877	set in [open $file]
1543	1878	puts $f [read $in]
1544	1879	close $in
1545	1880	}
1546	1881
1547		-proc autosetup_install_file {file dir} {
1548		- if {![file exists $file]} {
1549		- error "Missing installation file '$file'"
1550		- }
1551		- writefile [file join $dir [file tail $file]] [readfile $file]\n
1552		-}
1553		-
1554		-if {$::autosetup(installed)} {
1555		- user-error "autosetup can only be installed from development source, not from installed copy"
	1882	+proc autosetup_install_file {source target} {
	1883	+ dputs "install: $source => $target"
	1884	+ if {![file exists $source]} {
	1885	+ error "Missing installation file '$source'"
	1886	+ }
	1887	+ writefile $target [readfile $source]\n
	1888	+ # If possible, copy the file mode
	1889	+ file stat $source stat
	1890	+ set mode [format %o [expr {$stat(mode) & 0x1ff}]]
	1891	+ catch {exec chmod $mode $target}
	1892	+}
	1893	+
	1894	+proc autosetup_install_readme {target sysinstall} {
	1895	+ set readme "README.autosetup created by [autosetup_version]\n\n"
	1896	+ if {$sysinstall} {
	1897	+ append readme \
	1898	+{This is the autosetup directory for a system install of autosetup.
	1899	+Loadable modules can be added here.
	1900	+}
	1901	+ } else {
	1902	+ append readme \
	1903	+{This is the autosetup directory for a local install of autosetup.
	1904	+It contains autosetup, support files and loadable modules.
	1905	+}
	1906	+}
	1907	+
	1908	+ append readme {
	1909	+*.tcl files in this directory are optional modules which
	1910	+can be loaded with the 'use' directive.
	1911	+
	1912	+*.auto files in this directory are auto-loaded.
	1913	+
	1914	+For more information, see http://msteveb.github.com/autosetup/
	1915	+}
	1916	+ dputs "install: autosetup/README.autosetup"
	1917	+ writefile $target $readme
1556	1918	}
1557	1919	}
1558	1920
1559		-# ----- module markdown-formatting -----
	1921	+# ----- @module markdown-formatting.tcl -----
1560	1922
1561		-set modsource(markdown-formatting) {
	1923	+set modsource(markdown-formatting.tcl) {
1562	1924	# Copyright (c) 2010 WorkWare Systems http://www.workware.net.au/
1563	1925	# All rights reserved
1564	1926
1565	1927	# Module which provides text formatting
1566	1928	# markdown format (kramdown syntax)
		@@ -1627,13 +1989,13 @@
1627	1989	}
1628	1990	puts "$defn"
1629	1991	}
1630	1992	}
1631	1993
1632		-# ----- module misc -----
	1994	+# ----- @module misc.tcl -----
1633	1995
1634		-set modsource(misc) {
	1996	+set modsource(misc.tcl) {
1635	1997	# Copyright (c) 2007-2010 WorkWare Systems http://www.workware.net.au/
1636	1998	# All rights reserved
1637	1999
1638	2000	# Module containing misc procs useful to modules
1639	2001	# Largely for platform compatibility
		@@ -1805,106 +2167,218 @@
1805	2167	string trim $result
1806	2168	}
1807	2169	}
1808	2170	}
1809	2171
1810		-# ----- module text-formatting -----
	2172	+# ----- @module text-formatting.tcl -----
1811	2173
1812		-set modsource(text-formatting) {
	2174	+set modsource(text-formatting.tcl) {
1813	2175	# Copyright (c) 2010 WorkWare Systems http://www.workware.net.au/
1814	2176	# All rights reserved
1815	2177
1816	2178	# Module which provides text formatting
1817	2179
1818	2180	use formatting
1819	2181
1820	2182	proc wordwrap {text length {firstprefix ""} {nextprefix ""}} {
1821		- set len 0
1822		- set space $firstprefix
1823		- foreach word [split $text] {
1824		- set word [string trim $word]
1825		- if {$word == ""} {
1826		- continue
1827		- }
1828		- if {$len && [string length $space$word] + $len >= $length} {
1829		- puts ""
1830		- set len 0
1831		- set space $nextprefix
1832		- }
1833		- incr len [string length $space$word]
1834		-
1835		- # Use man-page conventions for highlighting 'quoted' and quoted
1836		- # single words.
1837		- # Use x^Hx for bold and _^Hx for 'underline'.
1838		- #
1839		- # less and more will both understand this.
1840		- # Pipe through 'col -b' to remove them.
1841		- if {[regexp {^'(.)'([^a-zA-Z0-9_])$} $word -> bareword dot]} {
1842		- regsub -all . $bareword "_\b&" word
1843		- append word $dot
1844		- } elseif {[regexp {^[](.)[]([^a-zA-Z0-9_])$} $word -> bareword dot]} {
1845		- regsub -all . $bareword "&\b&" word
1846		- append word $dot
1847		- }
1848		- puts -nonewline $space$word
1849		- set space " "
1850		- }
1851		- if {$len} {
1852		- puts ""
1853		- }
	2183	+ set len 0
	2184	+ set space $firstprefix
	2185	+
	2186	+ foreach word [split $text] {
	2187	+ set word [string trim $word]
	2188	+ if {$word eq ""} {
	2189	+ continue
	2190	+ }
	2191	+ if {[info exists partial]} {
	2192	+ append partial " " $word
	2193	+ if {[string first $quote $word] < 0} {
	2194	+ # Haven't found end of quoted word
	2195	+ continue
	2196	+ }
	2197	+ # Finished quoted word
	2198	+ set word $partial
	2199	+ unset partial
	2200	+ unset quote
	2201	+ } else {
	2202	+ set quote [string index $word 0]
	2203	+ if {$quote in {' *}} {
	2204	+ if {[string first $quote $word 1] < 0} {
	2205	+ # Haven't found end of quoted word
	2206	+ # Not a whole word.
	2207	+ set first [string index $word 0]
	2208	+ # Start of quoted word
	2209	+ set partial $word
	2210	+ continue
	2211	+ }
	2212	+ }
	2213	+ }
	2214	+
	2215	+ if {$len && [string length $space$word] + $len >= $length} {
	2216	+ puts ""
	2217	+ set len 0
	2218	+ set space $nextprefix
	2219	+ }
	2220	+ incr len [string length $space$word]
	2221	+
	2222	+ # Use man-page conventions for highlighting 'quoted' and quoted
	2223	+ # single words.
	2224	+ # Use x^Hx for bold and _^Hx for 'underline'.
	2225	+ #
	2226	+ # less and more will both understand this.
	2227	+ # Pipe through 'col -b' to remove them.
	2228	+ if {[regexp {^'(.)'(.)} $word -> quoted after]} {
	2229	+ set quoted [string map {~ " "} $quoted]
	2230	+ regsub -all . $quoted "&\b&" quoted
	2231	+ set word $quoted$after
	2232	+ } elseif {[regexp {^[](.)[](.)} $word -> quoted after]} {
	2233	+ set quoted [string map {~ " "} $quoted]
	2234	+ regsub -all . $quoted "_\b&" quoted
	2235	+ set word $quoted$after
	2236	+ }
	2237	+ puts -nonewline $space$word
	2238	+ set space " "
	2239	+ }
	2240	+ if {[info exists partial]} {
	2241	+ # Missing end of quote
	2242	+ puts -nonewline $space$partial
	2243	+ }
	2244	+ if {$len} {
	2245	+ puts ""
	2246	+ }
1854	2247	}
1855	2248	proc title {text} {
1856		- underline [string trim $text] =
1857		- nl
	2249	+ underline [string trim $text] =
	2250	+ nl
1858	2251	}
1859	2252	proc p {text} {
1860		- wordwrap $text 80
1861		- nl
	2253	+ wordwrap $text 80
	2254	+ nl
1862	2255	}
1863	2256	proc codelines {lines} {
1864		- foreach line $lines {
1865		- puts " $line"
1866		- }
1867		- nl
	2257	+ foreach line $lines {
	2258	+ puts " $line"
	2259	+ }
	2260	+ nl
1868	2261	}
1869	2262	proc nl {} {
1870		- puts ""
	2263	+ puts ""
1871	2264	}
1872	2265	proc underline {text char} {
1873		- regexp "^(\[ \t\])(.)" $text -> indent words
1874		- puts $text
1875		- puts $indent[string repeat $char [string length $words]]
	2266	+ regexp "^(\[ \t\])(.)" $text -> indent words
	2267	+ puts $text
	2268	+ puts $indent[string repeat $char [string length $words]]
1876	2269	}
1877	2270	proc section {text} {
1878		- underline "[string trim $text]" -
1879		- nl
	2271	+ underline "[string trim $text]" -
	2272	+ nl
1880	2273	}
1881	2274	proc subsection {text} {
1882		- underline "$text" ~
1883		- nl
	2275	+ underline "$text" ~
	2276	+ nl
1884	2277	}
1885	2278	proc bullet {text} {
1886		- wordwrap $text 76 " * " " "
	2279	+ wordwrap $text 76 " * " " "
1887	2280	}
1888	2281	proc indent {text} {
1889		- wordwrap $text 76 " " " "
	2282	+ wordwrap $text 76 " " " "
1890	2283	}
1891	2284	proc defn {first args} {
1892		- if {$first ne ""} {
1893		- underline " $first" ~
1894		- }
1895		- foreach p $args {
1896		- if {$p ne ""} {
1897		- indent $p
1898		- }
1899		- }
	2285	+ if {$first ne ""} {
	2286	+ underline " $first" ~
	2287	+ }
	2288	+ foreach p $args {
	2289	+ if {$p ne ""} {
	2290	+ indent $p
	2291	+ }
	2292	+ }
	2293	+}
	2294	+}
	2295	+
	2296	+# ----- @module util.tcl -----
	2297	+
	2298	+set modsource(util.tcl) {
	2299	+# Copyright (c) 2012 WorkWare Systems http://www.workware.net.au/
	2300	+# All rights reserved
	2301	+
	2302	+# Module which contains miscellaneous utility functions
	2303	+
	2304	+# @compare-versions version1 version2
	2305	+#
	2306	+# Versions are of the form 'a.b.c' (may be any number of numeric components)
	2307	+#
	2308	+# Compares the two versions and returns:
	2309	+## -1 if v1 < v2
	2310	+## 0 if v1 == v2
	2311	+## 1 if v1 > v2
	2312	+#
	2313	+# If one version has fewer components than the other, 0 is substituted to the right. e.g.
	2314	+## 0.2 < 0.3
	2315	+## 0.2.5 > 0.2
	2316	+## 1.1 == 1.1.0
	2317	+#
	2318	+proc compare-versions {v1 v2} {
	2319	+ foreach c1 [split $v1 .] c2 [split $v2 .] {
	2320	+ if {$c1 eq ""} {
	2321	+ set c1 0
	2322	+ }
	2323	+ if {$c2 eq ""} {
	2324	+ set c2 0
	2325	+ }
	2326	+ if {$c1 < $c2} {
	2327	+ return -1
	2328	+ }
	2329	+ if {$c1 > $c2} {
	2330	+ return 1
	2331	+ }
	2332	+ }
	2333	+ return 0
	2334	+}
	2335	+
	2336	+# @suffix suf list
	2337	+#
	2338	+# Takes a list and returns a new list with '$suf' appended
	2339	+# to each element
	2340	+#
	2341	+## suffix .c {a b c} => {a.c b.c c.c}
	2342	+#
	2343	+proc suffix {suf list} {
	2344	+ set result {}
	2345	+ foreach p $list {
	2346	+ lappend result $p$suf
	2347	+ }
	2348	+ return $result
	2349	+}
	2350	+
	2351	+# @prefix pre list
	2352	+#
	2353	+# Takes a list and returns a new list with '$pre' prepended
	2354	+# to each element
	2355	+#
	2356	+## prefix jim- {a.c b.c} => {jim-a.c jim-b.c}
	2357	+#
	2358	+proc prefix {pre list} {
	2359	+ set result {}
	2360	+ foreach p $list {
	2361	+ lappend result $pre$p
	2362	+ }
	2363	+ return $result
	2364	+}
	2365	+
	2366	+# @lpop list
	2367	+#
	2368	+# Removes the last entry from the given list and returns it.
	2369	+proc lpop {listname} {
	2370	+ upvar $listname list
	2371	+ set val [lindex $list end]
	2372	+ set list [lrange $list 0 end-1]
	2373	+ return $val
1900	2374	}
1901	2375	}
1902	2376
1903		-# ----- module wiki-formatting -----
	2377	+# ----- @module wiki-formatting.tcl -----
1904	2378
1905		-set modsource(wiki-formatting) {
	2379	+set modsource(wiki-formatting.tcl) {
1906	2380	# Copyright (c) 2010 WorkWare Systems http://www.workware.net.au/
1907	2381	# All rights reserved
1908	2382
1909	2383	# Module which provides text formatting
1910	2384	# wiki.tcl.tk format output
		@@ -1975,11 +2449,11 @@
1975	2449	if {$autosetup(debug)} {
1976	2450	main $argv
1977	2451	}
1978	2452	if {[catch {main $argv} msg opts] == 1} {
1979	2453	show-notices
1980		- autosetup-full-error [error-dump $msg $opts $::autosetup(debug)]
	2454	+ autosetup-full-error [error-dump $msg $opts $autosetup(debug)]
1981	2455	if {!$autosetup(debug)} {
1982	2456	puts stderr "Try: '[file tail $autosetup(exe)] --debug' for a full stack trace"
1983	2457	}
1984	2458	exit 1
1985	2459	}
1986	2460
1987	2461	ADDED autosetup/autosetup-config.guess
1988	2462	ADDED autosetup/autosetup-config.sub
1989	2463	ADDED autosetup/autosetup-find-tclsh
1990	2464	ADDED autosetup/autosetup-test-tclsh

	--- autosetup/autosetup
	+++ autosetup/autosetup
	@@ -1,16 +1,17 @@
1	#!/bin/sh
2	# Copyright (c) 2006-2011 WorkWare Systems http://www.workware.net.au/
3	# All rights reserved
4	# vim:se syntax=tcl:
5	# \
6	dir=`dirname "$0"`; exec "`$dir/find-tclsh`" "$0" "$@"
7
8	set autosetup(version) 0.6.6

9
10	# Can be set to 1 to debug early-init problems
11	set autosetup(debug) 0
12
13	##################################################################
14	#
15	# Main flow of control, option handling
16	#
	@@ -72,14 +73,18 @@
72	set autosetup(cmdline) {}
73	# options is a list of known options
74	set autosetup(options) {}
75	# optset is a dictionary of option values set by the user based on getopt
76	set autosetup(optset) {}
77	# optdefault is a dictionary of default values for options
78	set autosetup(optdefault) {}


79	set autosetup(optionhelp) {}
80	set autosetup(showhelp) 0


81
82	# Parse options
83	use getopt
84
85	# At the is point we don't know what is a valid option
	@@ -87,15 +92,28 @@
87	set autosetup(getopt) [getopt argv]
88
89	#"=Core Options:"
90	options-add {
91	help:=local => "display help and options. Optionally specify a module name, such as --help=system"

92	version => "display the version of autosetup"
93	ref:=text manual:=text
94	reference:=text => "display the autosetup command reference. 'text', 'wiki', 'asciidoc' or 'markdown'"
95	debug => "display debugging output as autosetup runs"
96	install:=. => "install autosetup to the current or given directory (in the 'autosetup/' subdirectory)"












97	force init:=help => "create initial auto.def, etc. Use --init=help for known types"
98	# Undocumented options
99	option-checking=1
100	nopager
101	quiet
	@@ -107,12 +125,12 @@
107	puts $autosetup(version)
108	exit 0
109	}
110
111	# autosetup --conf=alternate-auto.def
112	if {[opt-val conf] ne ""} {
113	set autosetup(autodef) [opt-val conf]
114	}
115
116	# Debugging output (set this early)
117	incr autosetup(debug) [opt-bool debug]
118	incr autosetup(force) [opt-bool force]
	@@ -124,41 +142,50 @@
124	if {[file exists $autosetup(libdir)/local.tcl]} {
125	use local
126	}
127
128	# Now any auto-load modules
129	foreach file [glob -nocomplain $autosetup(libdir)/.auto $autosetup(libdir)//*.auto] {
130	automf_load source $file
131	}
132
133	if {[opt-val help] ne ""} {
134	incr autosetup(showhelp)
135	use help
136	autosetup_help [opt-val help]
137	}
138
139	if {[opt-val {manual ref reference}] ne ""} {






140	use help
141	autosetup_reference [opt-val {manual ref reference}]
142	}
143
144	# Allow combining --install and --init
145	set earlyexit 0
146	if {[opt-val install] ne ""} {
147	use install
148	autosetup_install [opt-val install]
149	incr earlyexit
150	}
151
152	if {[opt-val init] ne ""} {
153	use init
154	autosetup_init [opt-val init]
155	incr earlyexit
156	}
157
158	if {$earlyexit} {
159	exit 0





160	}
161
162	if {![file exists $autosetup(autodef)]} {
163	# Check for invalid option first
164	options {}
	@@ -185,10 +212,11 @@
185	define-append AUTOREMAKE [get-define CONFIGURE_OPTS]
186
187
188	# Log how we were invoked
189	configlog "Invoked as: [getenv WRAPPER $::argv0] [quote-argv $autosetup(argv)]"

190
191	# Note that auto.def is not loaded in the global scope
192	source $autosetup(autodef)
193
194	# Could warn here if options {} was not specified
	@@ -210,14 +238,14 @@
210	#
211	# Check each of the named, boolean options and if any have been explicitly enabled
212	# or disabled by the user, return 1 or 0 accordingly.
213	#
214	# If the option was specified more than once, the last value wins.
215	# e.g. With --enable-foo --disable-foo, [opt-bool foo] will return 0
216	#
217	# If no value was specified by the user, returns the default value for the
218	# first option. If -nodefault is given, this behaviour changes and
219	# -1 is returned instead.
220	#
221	proc opt-bool {args} {
222	set nodefault 0
223	if {[lindex $args 0] eq "-nodefault"} {
	@@ -237,20 +265,19 @@
237	}
238	# Default value is the default for the first option
239	return [dict get $::autosetup(optdefault) [lindex $args 0]]
240	}
241
242	# @opt-val option-list ?default=""?
243	#
244	# Returns a list containing all the values given for the non-boolean options in 'option-list'.
245	# There will be one entry in the list for each option given by the user, including if the
246	# same option was used multiple times.
247	# If only a single value is required, use something like:
248	#
249	## lindex [opt-val $names] end
250	#
251	# If no options were set, $default is returned (exactly, not as a list).
252	#
253	proc opt-val {names {default ""}} {
254	option-check-names {*}$names
255
256	foreach opt $names {
	@@ -261,10 +288,83 @@
261	if {[info exists result]} {
262	return $result
263	}
264	return $default
265	}









































































266
267	proc option-check-names {args} {
268	foreach o $args {
269	if {$o ni $::autosetup(options)} {
270	autosetup-error "Request for undeclared option --$o"
	@@ -293,10 +393,11 @@
293	# This is a special heading
294	lappend autosetup(optionhelp) $opt ""
295	set header {}
296	continue
297	}

298
299	#puts "i=$i, opt=$opt"
300	regexp {^([^:=])(:)?(=)?(.)$} $opt -> name colon equal value
301	if {$name in $autosetup(options)} {
302	autosetup-error "Option $name already specified"
	@@ -310,10 +411,16 @@
310	# This is a documentation-only option, like "-C <dir>"
311	set opthelp $opt
312	} elseif {$colon eq ""} {
313	# Boolean option
314	lappend autosetup(options) $name






315
316	if {$value eq "1"} {
317	set opthelp "--disable-$name"
318	} else {
319	set opthelp "--$name"
	@@ -321,11 +428,12 @@
321
322	# Set the default
323	if {$value eq ""} {
324	set value 0
325	}
326	dict set autosetup(optdefault) $name $value

327
328	if {[dict exists $autosetup(getopt) $name]} {
329	# The option was specified by the user. Look at the last value.
330	lassign [lindex [dict get $autosetup(getopt) $name] end] type setvalue
331	if {$type eq "str"} {
	@@ -342,19 +450,39 @@
342	#puts "Found boolean option --$name=$setvalue"
343	}
344	} else {
345	# String option.
346	lappend autosetup(options) $name





















347
348	if {$equal eq "="} {
349	# String option with optional value
350	set opthelp "--$name?=$value?"
351	} else {
352	# String option with required value
353	set opthelp "--$name=$value"
354	}
355	dict set autosetup(optdefault) $name $value
356
357	# Get the values specified by the user
358	if {[dict exists $autosetup(getopt) $name]} {
359	set listvalue {}
360
	@@ -363,11 +491,11 @@
363	if {$type eq "bool" && $setvalue} {
364	if {$equal ne "="} {
365	user-error "Option --$name requires a value"
366	}
367	# If given as a boolean, use the default value
368	set setvalue $value
369	}
370	lappend listvalue $setvalue
371	}
372
373	#puts "Found string option --$name=$listvalue"
	@@ -376,10 +504,13 @@
376	}
377
378	# Now create the help for this option if appropriate
379	if {[lindex $opts $i+1] eq "=>"} {
380	set desc [lindex $opts $i+2]



381	#string match \n* $desc
382	if {$header ne ""} {
383	lappend autosetup(optionhelp) $header ""
384	set header ""
385	}
	@@ -463,35 +594,39 @@
463	options-wrap-desc [string trim $desc] $cols " " $indent [expr $max + 2]
464	}
465	}
466	}
467
468	# @options options-spec
469	#
470	# Specifies configuration-time options which may be selected by the user
471	# and checked with opt-val and opt-bool. The format of options-spec follows.

472	#
473	# A boolean option is of the form:
474	#
475	## name[=0\|1] => "Description of this boolean option"
476	#
477	# The default is name=0, meaning that the option is disabled by default.
478	# If name=1 is used to make the option enabled by default, the description should reflect
479	# that with text like "Disable support for ...".
480	#
481	# An argument option (one which takes a parameter) is of the form:
482	#
483	## name:[=]value => "Description of this option"
484	#
485	# If the name:value form is used, the value must be provided with the option (as --name=myvalue).
486	# If the name:=value form is used, the value is optional and the given value is used as the default
487	# if it is not provided.
488	#
489	# Undocumented options are also supported by omitting the "=> description.
490	# These options are not displayed with --help and can be useful for internal options or as aliases.
491	#
492	# For example, --disable-lfs is an alias for --disable=largefile:



493	#
494	## lfs=1 largefile=1 => "Disable large file support"
495	#
496	proc options {optlist} {
497	# Allow options as a list or args
	@@ -509,27 +644,37 @@
509	user-error "Unknown option --$o"
510	}
511	}
512	}
513	}











514
515	proc config_guess {} {
516	if {[file-isexec $::autosetup(dir)/config.guess]} {
517	exec-with-stderr sh $::autosetup(dir)/config.guess
518	if {[catch {exec-with-stderr sh $::autosetup(dir)/config.guess} alias]} {
519	user-error $alias
520	}
521	return $alias
522	} else {
523	configlog "No config.guess, so using uname"
524	string tolower [exec uname -p]-unknown-[exec uname -s][exec uname -r]
525	}
526	}
527
528	proc config_sub {alias} {
529	if {[file-isexec $::autosetup(dir)/config.sub]} {
530	if {[catch {exec-with-stderr sh $::autosetup(dir)/config.sub $alias} alias]} {
531	user-error $alias
532	}
533	}
534	return $alias
535	}
	@@ -536,39 +681,48 @@
536
537	# @define name ?value=1?
538	#
539	# Defines the named variable to the given value.
540	# These (name, value) pairs represent the results of the configuration check
541	# and are available to be checked, modified and substituted.
542	#
543	proc define {name {value 1}} {
544	set ::define($name) $value
545	#dputs "$name <= $value"
546	}
547
548	# @undefine name
549	#
550	# Undefine the named variable
551	#
552	proc undefine {name} {
553	unset -nocomplain ::define($name)
554	#dputs "$name <= <undef>"
555	}
556
557	# @define-append name value ...
558	#
559	# Appends the given value(s) to the given 'defined' variable.
560	# If the variable is not defined or empty, it is set to $value.
561	# Otherwise the value is appended, separated by a space.
562	# Any extra values are similarly appended.
563	# If any value is already contained in the variable (as a substring) it is omitted.
564	#
565	proc define-append {name args} {
566	if {[get-define $name ""] ne ""} {
567	# Make a token attempt to avoid duplicates
568	foreach arg $args {
569	if {[string first $arg $::define($name)] == -1} {









570	append ::define($name) " " $arg
571	}
572	}
573	} else {
574	set ::define($name) [join $args]
	@@ -576,11 +730,11 @@
576	#dputs "$name += [join $args] => $::define($name)"
577	}
578
579	# @get-define name ?default=0?
580	#
581	# Returns the current value of the 'defined' variable, or $default
582	# if not set.
583	#
584	proc get-define {name {default 0}} {
585	if {[info exists ::define($name)]} {
586	#dputs "$name => $::define($name)"
	@@ -595,14 +749,26 @@
595	# Returns 1 if the given variable is defined.
596	#
597	proc is-defined {name} {
598	info exists ::define($name)
599	}












600
601	# @all-defines
602	#
603	# Returns a dictionary (name value list) of all defined variables.
604	#
605	# This is suitable for use with 'dict', 'array set' or 'foreach'
606	# and allows for arbitrary processing of the defined variables.
607	#
608	proc all-defines {} {
	@@ -610,13 +776,13 @@
610	}
611
612
613	# @get-env name default
614	#
615	# If $name was specified on the command line, return it.
616	# If $name was set in the environment, return it.
617	# Otherwise return $default.
618	#
619	proc get-env {name default} {
620	if {[dict exists $::autosetup(cmdline) $name]} {
621	return [dict get $::autosetup(cmdline) $name]
622	}
	@@ -623,11 +789,11 @@
623	getenv $name $default
624	}
625
626	# @env-is-set name
627	#
628	# Returns 1 if the $name was specified on the command line or in the environment.
629	# Note that an empty environment variable is not considered to be set.
630	#
631	proc env-is-set {name} {
632	if {[dict exists $::autosetup(cmdline) $name]} {
633	return 1
	@@ -639,11 +805,11 @@
639	}
640
641	# @readfile filename ?default=""?
642	#
643	# Return the contents of the file, without the trailing newline.
644	# If the file doesn't exist or can't be read, returns $default.
645	#
646	proc readfile {filename {default_value ""}} {
647	set result $default_value
648	catch {
649	set f [open $filename]
	@@ -653,11 +819,11 @@
653	return $result
654	}
655
656	# @writefile filename value
657	#
658	# Creates the given file containing $value.
659	# Does not add an extra newline.
660	#
661	proc writefile {filename value} {
662	set f [open $filename w]
663	puts -nonewline $f $value
	@@ -677,63 +843,60 @@
677	lappend args [quote-if-needed $arg]
678	}
679	join $args
680	}
681
682	# @suffix suf list
683	#
684	# Takes a list and returns a new list with $suf appended
685	# to each element
686	#
687	## suffix .c {a b c} => {a.c b.c c.c}
688	#
689	proc suffix {suf list} {
690	set result {}
691	foreach p $list {
692	lappend result $p$suf


693	}
694	return $result
695	}
696
697	# @prefix pre list
698	#
699	# Takes a list and returns a new list with $pre prepended
700	# to each element
701	#
702	## prefix jim- {a.c b.c} => {jim-a.c jim-b.c}
703	#
704	proc prefix {pre list} {
705	set result {}
706	foreach p $list {
707	lappend result $pre$p
708	}
709	return $result










710	}
711
712	# @find-executable name
713	#
714	# Searches the path for an executable with the given name.
715	# Note that the name may include some parameters, e.g. "cc -mbig-endian",
716	# in which case the parameters are ignored.
717	# Returns 1 if found, or 0 if not.
718	#
719	proc find-executable {name} {
720	# Ignore any parameters
721	set name [lindex $name 0]
722	if {$name eq ""} {
723	# The empty string is never a valid executable
724	return 0
725	}
726	foreach p [split-path] {
727	dputs "Looking for $name in $p"
728	set exec [file join $p $name]
729	if {[file-isexec $exec]} {
730	dputs "Found $name -> $exec"
731	return 1
732	}
733	}
734	return 0
735	}
736
737	# @find-an-executable ?-required? name ...
738	#
739	# Given a list of possible executable names,
	@@ -764,11 +927,11 @@
764	return ""
765	}
766
767	# @configlog msg
768	#
769	# Writes the given message to the configuration log, config.log
770	#
771	proc configlog {msg} {
772	if {![info exists ::autosetup(logfh)]} {
773	set ::autosetup(logfh) [open config.log w]
774	}
	@@ -800,12 +963,12 @@
800	}
801	}
802
803	# @msg-quiet command ...
804	#
805	# msg-quiet evaluates it's arguments as a command with output
806	# from msg-checking and msg-result suppressed.
807	#
808	# This is useful if a check needs to run a subcheck which isn't
809	# of interest to the user.
810	proc msg-quiet {args} {
811	incr ::autosetup(msg-quiet)
	@@ -841,11 +1004,11 @@
841
842	# @user-error msg
843	#
844	# Indicate incorrect usage to the user, including if required components
845	# or features are not found.
846	# autosetup exits with a non-zero return code.
847	#
848	proc user-error {msg} {
849	show-notices
850	puts stderr "Error: $msg"
851	puts stderr "Try: '[file tail $::autosetup(exe)] --help' for options"
	@@ -887,10 +1050,21 @@
887	proc maybe-show-timestamp {} {
888	if {$::autosetup(msg-timing) && $::autosetup(msg-checking) == 0} {
889	puts -nonewline [format {[%6.2f] } [expr {([clock millis] - $::autosetup(start)) % 10000 / 1000.0}]]
890	}
891	}











892
893	proc autosetup_version {} {
894	return "autosetup v$::autosetup(version)"
895	}
896
	@@ -986,23 +1160,35 @@
986	# The latter form is useful for a complex module which requires additional
987	# support file. In this form, '$::usedir' is set to the module directory
988	# when it is loaded.
989	#
990	proc use {args} {






991	foreach m $args {
992	if {[info exists ::libmodule($m)]} {
993	continue
994	}
995	set ::libmodule($m) 1
996	if {[info exists ::modsource($m)]} {
997	automf_load eval $::modsource($m)
998	} else {
999	set sources [list $::autosetup(libdir)/${m}.tcl $::autosetup(libdir)/${m}/init.tcl]
1000	set found 0
1001	foreach source $sources {
1002	if {[file exists $source]} {
1003	incr found






1004	break
1005	}
1006	}
1007	if {$found} {
1008	# For the convenience of the "use" source, point to the directory
	@@ -1014,10 +1200,22 @@
1014	autosetup-error "use: No such module: $m"
1015	}
1016	}
1017	}
1018	}












1019
1020	# Load module source in the global scope by executing the given command
1021	proc automf_load {args} {
1022	if {[catch [list uplevel #0 $args] msg opts] ni {0 2 3}} {
1023	autosetup-full-error [error-dump $msg $opts $::autosetup(debug)]
	@@ -1027,18 +1225,21 @@
1027	# Initial settings
1028	set autosetup(exe) $::argv0
1029	set autosetup(istcl) 1
1030	set autosetup(start) [clock millis]
1031	set autosetup(installed) 0

1032	set autosetup(msg-checking) 0
1033	set autosetup(msg-quiet) 0

1034
1035	# Embedded modules are inserted below here
1036	set autosetup(installed) 1
1037	# ----- module asciidoc-formatting -----

1038
1039	set modsource(asciidoc-formatting) {
1040	# Copyright (c) 2010 WorkWare Systems http://www.workware.net.au/
1041	# All rights reserved
1042
1043	# Module which provides text formatting
1044	# asciidoc format
	@@ -1102,19 +1303,19 @@
1102	regsub -all "\n\n" $defn "\n ::\n" defn
1103	puts $defn
1104	}
1105	}
1106
1107	# ----- module formatting -----
1108
1109	set modsource(formatting) {
1110	# Copyright (c) 2010 WorkWare Systems http://www.workware.net.au/
1111	# All rights reserved
1112
1113	# Module which provides common text formatting
1114
1115	# This is designed for documenation which looks like:
1116	# code {...}
1117	# or
1118	# code {
1119	# ...
1120	# ...
	@@ -1159,13 +1360,13 @@
1159	# Return the result
1160	return $lines
1161	}
1162	}
1163
1164	# ----- module getopt -----
1165
1166	set modsource(getopt) {
1167	# Copyright (c) 2006 WorkWare Systems http://www.workware.net.au/
1168	# All rights reserved
1169
1170	# Simple getopt module
1171
	@@ -1197,11 +1398,11 @@
1197
1198	if {[regexp {^--([^=][^=]+)=(.*)$} $arg -> name value]} {
1199	# --name=value
1200	dict lappend opts $name [list str $value]
1201	} elseif {[regexp {^--(enable-\|disable-)?([^=]*)$} $arg -> prefix name]} {
1202	if {$prefix in {enable- with- ""}} {
1203	set value 1
1204	} else {
1205	set value 0
1206	}
1207	dict lappend opts $name [list bool $value]
	@@ -1218,13 +1419,13 @@
1218
1219	return $opts
1220	}
1221	}
1222
1223	# ----- module help -----
1224
1225	set modsource(help) {
1226	# Copyright (c) 2010 WorkWare Systems http://workware.net.au/
1227	# All rights reserved
1228
1229	# Module which provides usage, help and the command reference
1230
	@@ -1251,10 +1452,28 @@
1251	options-show
1252	}
1253	}
1254	exit 0
1255	}


















1256
1257	# If not already paged and stdout is a tty, pipe the output through the pager
1258	# This is done by reinvoking autosetup with --nopager added
1259	proc use_pager {} {
1260	if {![opt-bool nopager] && [getenv PAGER ""] ne "" && [isatty? stdin] && [isatty? stdout]} {
	@@ -1304,10 +1523,16 @@
1304	}
1305
1306	proc autosetup_output_block {type lines} {
1307	if {[llength $lines]} {
1308	switch $type {






1309	code {
1310	codelines $lines
1311	}
1312	p {
1313	p [join $lines]
	@@ -1325,30 +1550,45 @@
1325	# Generate a command reference from inline documentation
1326	proc automf_command_reference {} {
1327	lappend files $::autosetup(prog)
1328	lappend files {}[lsort [glob -nocomplain $::autosetup(libdir)/.tcl]]
1329
1330	section "Core Commands"
1331	set type p
1332	set lines {}
1333	set cmd {}







1334
1335	foreach file $files {


1336	set f [open $file]
1337	while {![eof $f]} {
1338	set line [gets $f]





1339
1340	# Find lines starting with "# @*" and continuing through the remaining comment lines
1341	if {![regexp {^# @(.*)} $line -> cmd]} {
1342	continue
1343	}
1344
1345	# Synopsis or command?
1346	if {$cmd eq "synopsis:"} {
1347	section "Module: [file rootname [file tail $file]]"

1348	} else {
1349	subsection $cmd
1350	}
1351
1352	set lines {}
1353	set type p
1354
	@@ -1369,29 +1609,38 @@
1369
1370	#puts "hash=$hash, oldhash=$oldhash, lines=[llength $lines], cmd=$cmd"
1371
1372	if {$t ne $type \|\| $cmd eq ""} {
1373	# Finish the current block
1374	autosetup_output_block $type $lines
1375	set lines {}
1376	set type $t
1377	}
1378	if {$cmd ne ""} {
1379	lappend lines $cmd
1380	}
1381	}
1382
1383	autosetup_output_block $type $lines
1384	}
1385	close $f
1386	}









1387	}
1388	}
1389
1390	# ----- module init -----
1391
1392	set modsource(init) {
1393	# Copyright (c) 2010 WorkWare Systems http://www.workware.net.au/
1394	# All rights reserved
1395
1396	# Module to help create auto.def and configure
1397
	@@ -1444,79 +1693,157 @@
1444	}
1445	writefile $filename $contents
1446	}
1447	}
1448
1449	# ----- module install -----
1450
1451	set modsource(install) {
1452	# Copyright (c) 2006-2010 WorkWare Systems http://www.workware.net.au/
1453	# All rights reserved
1454
1455	# Module which can install autosetup
1456
1457	proc autosetup_install {dir} {
1458	if {[catch {














1459	cd $dir




1460	file mkdir autosetup




















1461
1462	set f [open autosetup/autosetup w]
1463
1464	set publicmodules [glob $::autosetup(libdir)/*.auto]
1465
1466	# First the main script, but only up until "CUT HERE"
1467	set in [open $::autosetup(dir)/autosetup]
1468	while {[gets $in buf] >= 0} {
1469	if {$buf ne "##-- CUT HERE --##"} {
1470	puts $f $buf
1471	continue
1472	}
1473
1474	# Insert the static modules here
1475	# i.e. those which don't contain @synopsis:

1476	puts $f "set autosetup(installed) 1"
1477	foreach file [lsort [glob $::autosetup(libdir)/*.tcl]] {



1478	set buf [readfile $file]
1479	if {[string match "\n# @synopsis:" $buf]} {
1480	lappend publicmodules $file
1481	continue


1482	}
1483	set modname [file rootname [file tail $file]]
1484	puts $f "# ----- module $modname -----"
1485	puts $f "\nset modsource($modname) \{"
1486	puts $f $buf
1487	puts $f "\}\n"
1488	}







1489	}
1490	close $in
1491	close $f
1492	exec chmod 755 autosetup/autosetup






1493
1494	# Install public modules
1495	foreach file $publicmodules {
1496	autosetup_install_file $file autosetup






1497	}
1498
1499	# Install support files
1500	foreach file {config.guess config.sub jimsh0.c find-tclsh test-tclsh LICENSE} {
1501	autosetup_install_file $::autosetup(dir)/$file autosetup
1502	}
1503	exec chmod 755 autosetup/config.sub autosetup/config.guess autosetup/find-tclsh
1504
1505	writefile autosetup/README.autosetup \
1506	"This is [autosetup_version]. See http://msteveb.github.com/autosetup/\n"
1507








1508	} error]} {
1509	user-error "Failed to install autosetup: $error"
1510	}
1511	puts "Installed [autosetup_version] to autosetup/"





1512
1513	# Now create 'configure' if necessary
1514	autosetup_create_configure


1515	}
1516
1517	proc autosetup_create_configure {} {
1518	if {[file exists configure]} {
1519	if {!$::autosetup(force)} {
1520	# Could this be an autosetup configure?
1521	if {![string match "\nWRAPPER=" [readfile configure]]} {
1522	puts "I see configure, but not created by autosetup, so I won't overwrite it."
	@@ -1527,40 +1854,75 @@
1527	puts "I will overwrite the existing configure because you used --force."
1528	}
1529	} else {
1530	puts "I don't see configure, so I will create it."
1531	}
1532	writefile configure \






1533	{#!/bin/sh
1534	dir="`dirname "$0"`/autosetup"
1535	WRAPPER="$0"; export WRAPPER; exec "`$dir/find-tclsh`" "$dir/autosetup" "$@"
1536	}

1537	catch {exec chmod 755 configure}
1538	}
1539
1540	# Append the contents of $file to filehandle $f
1541	proc autosetup_install_append {f file} {

1542	set in [open $file]
1543	puts $f [read $in]
1544	close $in
1545	}
1546
1547	proc autosetup_install_file {file dir} {
1548	if {![file exists $file]} {
1549	error "Missing installation file '$file'"
1550	}
1551	writefile [file join $dir [file tail $file]] [readfile $file]\n
1552	}
1553
1554	if {$::autosetup(installed)} {
1555	user-error "autosetup can only be installed from development source, not from installed copy"



























1556	}
1557	}
1558
1559	# ----- module markdown-formatting -----
1560
1561	set modsource(markdown-formatting) {
1562	# Copyright (c) 2010 WorkWare Systems http://www.workware.net.au/
1563	# All rights reserved
1564
1565	# Module which provides text formatting
1566	# markdown format (kramdown syntax)
	@@ -1627,13 +1989,13 @@
1627	}
1628	puts "$defn"
1629	}
1630	}
1631
1632	# ----- module misc -----
1633
1634	set modsource(misc) {
1635	# Copyright (c) 2007-2010 WorkWare Systems http://www.workware.net.au/
1636	# All rights reserved
1637
1638	# Module containing misc procs useful to modules
1639	# Largely for platform compatibility
	@@ -1805,106 +2167,218 @@
1805	string trim $result
1806	}
1807	}
1808	}
1809
1810	# ----- module text-formatting -----
1811
1812	set modsource(text-formatting) {
1813	# Copyright (c) 2010 WorkWare Systems http://www.workware.net.au/
1814	# All rights reserved
1815
1816	# Module which provides text formatting
1817
1818	use formatting
1819
1820	proc wordwrap {text length {firstprefix ""} {nextprefix ""}} {
1821	set len 0
1822	set space $firstprefix
1823	foreach word [split $text] {
1824	set word [string trim $word]
1825	if {$word == ""} {
1826	continue
1827	}
1828	if {$len && [string length $space$word] + $len >= $length} {
1829	puts ""
1830	set len 0
1831	set space $nextprefix
1832	}
1833	incr len [string length $space$word]
1834
1835	# Use man-page conventions for highlighting 'quoted' and quoted
1836	# single words.
1837	# Use x^Hx for bold and _^Hx for 'underline'.
1838	#
1839	# less and more will both understand this.
1840	# Pipe through 'col -b' to remove them.
1841	if {[regexp {^'(.)'([^a-zA-Z0-9_])$} $word -> bareword dot]} {
1842	regsub -all . $bareword "_\b&" word
1843	append word $dot
1844	} elseif {[regexp {^[](.)[]([^a-zA-Z0-9_])$} $word -> bareword dot]} {
1845	regsub -all . $bareword "&\b&" word
1846	append word $dot
1847	}
1848	puts -nonewline $space$word
1849	set space " "
1850	}
1851	if {$len} {
1852	puts ""
1853	}































1854	}
1855	proc title {text} {
1856	underline [string trim $text] =
1857	nl
1858	}
1859	proc p {text} {
1860	wordwrap $text 80
1861	nl
1862	}
1863	proc codelines {lines} {
1864	foreach line $lines {
1865	puts " $line"
1866	}
1867	nl
1868	}
1869	proc nl {} {
1870	puts ""
1871	}
1872	proc underline {text char} {
1873	regexp "^(\[ \t\])(.)" $text -> indent words
1874	puts $text
1875	puts $indent[string repeat $char [string length $words]]
1876	}
1877	proc section {text} {
1878	underline "[string trim $text]" -
1879	nl
1880	}
1881	proc subsection {text} {
1882	underline "$text" ~
1883	nl
1884	}
1885	proc bullet {text} {
1886	wordwrap $text 76 " * " " "
1887	}
1888	proc indent {text} {
1889	wordwrap $text 76 " " " "
1890	}
1891	proc defn {first args} {
1892	if {$first ne ""} {
1893	underline " $first" ~
1894	}
1895	foreach p $args {
1896	if {$p ne ""} {
1897	indent $p
1898	}
1899	}

















































































1900	}
1901	}
1902
1903	# ----- module wiki-formatting -----
1904
1905	set modsource(wiki-formatting) {
1906	# Copyright (c) 2010 WorkWare Systems http://www.workware.net.au/
1907	# All rights reserved
1908
1909	# Module which provides text formatting
1910	# wiki.tcl.tk format output
	@@ -1975,11 +2449,11 @@
1975	if {$autosetup(debug)} {
1976	main $argv
1977	}
1978	if {[catch {main $argv} msg opts] == 1} {
1979	show-notices
1980	autosetup-full-error [error-dump $msg $opts $::autosetup(debug)]
1981	if {!$autosetup(debug)} {
1982	puts stderr "Try: '[file tail $autosetup(exe)] --debug' for a full stack trace"
1983	}
1984	exit 1
1985	}
1986
1987	DDED autosetup/autosetup-config.guess
1988	DDED autosetup/autosetup-config.sub
1989	DDED autosetup/autosetup-find-tclsh
1990	DDED autosetup/autosetup-test-tclsh

	--- autosetup/autosetup
	+++ autosetup/autosetup
	@@ -1,16 +1,17 @@
1	#!/bin/sh
2	# Copyright (c) 2006-2011 WorkWare Systems http://www.workware.net.au/
3	# All rights reserved
4	# vim:se syntax=tcl:
5	# \
6	dir=`dirname "$0"`; exec "`$dir/autosetup-find-tclsh`" "$0" "$@"
7
8	# Note that the version has a trailing + on unreleased versions
9	set autosetup(version) 0.6.9
10
11	# Can be set to 1 to debug early-init problems
12	set autosetup(debug) [expr {"--debug" in $argv}]
13
14	##################################################################
15	#
16	# Main flow of control, option handling
17	#
	@@ -72,14 +73,18 @@
73	set autosetup(cmdline) {}
74	# options is a list of known options
75	set autosetup(options) {}
76	# optset is a dictionary of option values set by the user based on getopt
77	set autosetup(optset) {}
78	# optdefault is a dictionary of default values
79	set autosetup(optdefault) {}
80	# options-defaults is a dictionary of overrides for default values for options
81	set autosetup(options-defaults) {}
82	set autosetup(optionhelp) {}
83	set autosetup(showhelp) 0
84
85	use util
86
87	# Parse options
88	use getopt
89
90	# At the is point we don't know what is a valid option
	@@ -87,15 +92,28 @@
92	set autosetup(getopt) [getopt argv]
93
94	#"=Core Options:"
95	options-add {
96	help:=local => "display help and options. Optionally specify a module name, such as --help=system"
97	licence license => "display the autosetup license"
98	version => "display the version of autosetup"
99	ref:=text manual:=text
100	reference:=text => "display the autosetup command reference. 'text', 'wiki', 'asciidoc' or 'markdown'"
101	debug => "display debugging output as autosetup runs"
102	install:=. => "install autosetup to the current or given directory"
103	}
104	if {$autosetup(installed)} {
105	# hidden options so we can produce a nice error
106	options-add {
107	sysinstall:path
108	}
109	} else {
110	options-add {
111	sysinstall:path => "install standalone autosetup to the given directory (e.g.: /usr/local)"
112	}
113	}
114	options-add {
115	force init:=help => "create initial auto.def, etc. Use --init=help for known types"
116	# Undocumented options
117	option-checking=1
118	nopager
119	quiet
	@@ -107,12 +125,12 @@
125	puts $autosetup(version)
126	exit 0
127	}
128
129	# autosetup --conf=alternate-auto.def
130	if {[opt-str conf o]} {
131	set autosetup(autodef) $o
132	}
133
134	# Debugging output (set this early)
135	incr autosetup(debug) [opt-bool debug]
136	incr autosetup(force) [opt-bool force]
	@@ -124,41 +142,50 @@
142	if {[file exists $autosetup(libdir)/local.tcl]} {
143	use local
144	}
145
146	# Now any auto-load modules
147	autosetup_load_auto_modules


148
149	if {[opt-str help o]} {
150	incr autosetup(showhelp)
151	use help
152	autosetup_help $o
153	}
154
155	if {[opt-bool licence license]} {
156	use help
157	autosetup_show_license
158	exit 0
159	}
160
161	if {[opt-str {manual ref reference} o]} {
162	use help
163	autosetup_reference $o
164	}
165
166	# Allow combining --install and --init
167	set earlyexit 0
168	if {[opt-str install o]} {
169	use install
170	autosetup_install $o
171	incr earlyexit
172	}
173
174	if {[opt-str init o]} {
175	use init
176	autosetup_init $o
177	incr earlyexit
178	}
179
180	if {$earlyexit} {
181	exit 0
182	}
183	if {[opt-str sysinstall o]} {
184	use install
185	autosetup_install $o 1
186	exit 0
187	}
188
189	if {![file exists $autosetup(autodef)]} {
190	# Check for invalid option first
191	options {}
	@@ -185,10 +212,11 @@
212	define-append AUTOREMAKE [get-define CONFIGURE_OPTS]
213
214
215	# Log how we were invoked
216	configlog "Invoked as: [getenv WRAPPER $::argv0] [quote-argv $autosetup(argv)]"
217	configlog "Tclsh: [info nameofexecutable]"
218
219	# Note that auto.def is not loaded in the global scope
220	source $autosetup(autodef)
221
222	# Could warn here if options {} was not specified
	@@ -210,14 +238,14 @@
238	#
239	# Check each of the named, boolean options and if any have been explicitly enabled
240	# or disabled by the user, return 1 or 0 accordingly.
241	#
242	# If the option was specified more than once, the last value wins.
243	# e.g. With '--enable-foo --disable-foo', '[opt-bool foo]' will return 0
244	#
245	# If no value was specified by the user, returns the default value for the
246	# first option. If '-nodefault' is given, this behaviour changes and
247	# -1 is returned instead.
248	#
249	proc opt-bool {args} {
250	set nodefault 0
251	if {[lindex $args 0] eq "-nodefault"} {
	@@ -237,20 +265,19 @@
265	}
266	# Default value is the default for the first option
267	return [dict get $::autosetup(optdefault) [lindex $args 0]]
268	}
269
270	# @opt-val optionlist ?default=""?
271	#
272	# Returns a list containing all the values given for the non-boolean options in '$optionlist'.
273	# There will be one entry in the list for each option given by the user, including if the
274	# same option was used multiple times.

275	#
276	# If no options were set, '$default' is returned (exactly, not as a list).
277	#
278	# Note: For most use cases, 'opt-str' should be preferred.
279	#
280	proc opt-val {names {default ""}} {
281	option-check-names {*}$names
282
283	foreach opt $names {
	@@ -261,10 +288,83 @@
288	if {[info exists result]} {
289	return $result
290	}
291	return $default
292	}
293
294	# @opt-str optionlist varname ?default?
295	#
296	# Sets '$varname' in the callers scope to the value for one of the given options.
297	#
298	# For the list of options given in '$optionlist', if any value is set for any option,
299	# the option value is taken to be the last value of the last option (in the order given).
300	#
301	# If no option was given, and a default was specified with 'options-defaults',
302	# that value is used.
303	#
304	# If no 'options-defaults' value was given and '$default' was given, it is used.
305	#
306	# If none of the above provided a value, no value is set.
307	#
308	# The return value depends on whether '$default' was specified.
309	# If it was, the option value is returned.
310	# If it was not, 1 is returns if a value was set, or 0 if not.
311	#
312	# Typical usage is as follows:
313	#
314	## if {[opt-str {myopt altname} o]} {
315	## do something with $o
316	## }
317	#
318	# Or:
319	## define myname [opt-str {myopt altname} o "/usr/local"]
320	#
321	proc opt-str {names varname args} {
322	global autosetup
323
324	option-check-names {*}$names
325	upvar $varname value
326
327	if {[llength $args]} {
328	# A default was given, so always return the string value of the option
329	set default [lindex $args 0]
330	set retopt 1
331	} else {
332	# No default, so return 0 or 1 to indicate if a value was found
333	set retopt 0
334	}
335
336	foreach opt $names {
337	if {[dict exists $::autosetup(optset) $opt]} {
338	set result [lindex [dict get $::autosetup(optset) $opt] end]
339	}
340	}
341
342	if {![info exists result]} {
343	# No user-specified value. Has options-defaults been set?
344	foreach opt $names {
345	if {[dict exists $::autosetup(options-defaults) $opt]} {
346	set result [dict get $autosetup(options-defaults) $opt]
347	}
348	}
349	}
350
351	if {[info exists result]} {
352	set value $result
353	if {$retopt} {
354	return $value
355	}
356	return 1
357	}
358
359	if {$retopt} {
360	set value $default
361	return $value
362	}
363
364	return 0
365	}
366
367	proc option-check-names {args} {
368	foreach o $args {
369	if {$o ni $::autosetup(options)} {
370	autosetup-error "Request for undeclared option --$o"
	@@ -293,10 +393,11 @@
393	# This is a special heading
394	lappend autosetup(optionhelp) $opt ""
395	set header {}
396	continue
397	}
398	unset -nocomplain defaultvalue equal value
399
400	#puts "i=$i, opt=$opt"
401	regexp {^([^:=])(:)?(=)?(.)$} $opt -> name colon equal value
402	if {$name in $autosetup(options)} {
403	autosetup-error "Option $name already specified"
	@@ -310,10 +411,16 @@
411	# This is a documentation-only option, like "-C <dir>"
412	set opthelp $opt
413	} elseif {$colon eq ""} {
414	# Boolean option
415	lappend autosetup(options) $name
416
417	# Check for override
418	if {[dict exists $autosetup(options-defaults) $name]} {
419	# A default was specified with options-defaults, so use it
420	set value [dict get $autosetup(options-defaults) $name]
421	}
422
423	if {$value eq "1"} {
424	set opthelp "--disable-$name"
425	} else {
426	set opthelp "--$name"
	@@ -321,11 +428,12 @@
428
429	# Set the default
430	if {$value eq ""} {
431	set value 0
432	}
433	set defaultvalue $value
434	dict set autosetup(optdefault) $name $defaultvalue
435
436	if {[dict exists $autosetup(getopt) $name]} {
437	# The option was specified by the user. Look at the last value.
438	lassign [lindex [dict get $autosetup(getopt) $name] end] type setvalue
439	if {$type eq "str"} {
	@@ -342,19 +450,39 @@
450	#puts "Found boolean option --$name=$setvalue"
451	}
452	} else {
453	# String option.
454	lappend autosetup(options) $name
455
456	if {$colon eq ":"} {
457	# Was ":name=default" given?
458	# If so, set $value to the display name and $defaultvalue to the default
459	# (This is the preferred way to set a default value for a string option)
460	if {[regexp {^([^=]+)=(.*)$} $value -> value defaultvalue]} {
461	dict set autosetup(optdefault) $name $defaultvalue
462	}
463	}
464
465	# Maybe override the default value
466	if {[dict exists $autosetup(options-defaults) $name]} {
467	# A default was specified with options-defaults, so use it
468	set defaultvalue [dict get $autosetup(options-defaults) $name]
469	dict set autosetup(optdefault) $name $defaultvalue
470	} elseif {![info exists defaultvalue]} {
471	# For backward compatibility, if ":name" was given, use name as both
472	# the display text and the default value, but only if the user
473	# specified the option without the value
474	set defaultvalue $value
475	}
476
477	if {$equal eq "="} {
478	# String option with optional value
479	set opthelp "--$name?=$value?"
480	} else {
481	# String option with required value
482	set opthelp "--$name=$value"
483	}

484
485	# Get the values specified by the user
486	if {[dict exists $autosetup(getopt) $name]} {
487	set listvalue {}
488
	@@ -363,11 +491,11 @@
491	if {$type eq "bool" && $setvalue} {
492	if {$equal ne "="} {
493	user-error "Option --$name requires a value"
494	}
495	# If given as a boolean, use the default value
496	set setvalue $defaultvalue
497	}
498	lappend listvalue $setvalue
499	}
500
501	#puts "Found string option --$name=$listvalue"
	@@ -376,10 +504,13 @@
504	}
505
506	# Now create the help for this option if appropriate
507	if {[lindex $opts $i+1] eq "=>"} {
508	set desc [lindex $opts $i+2]
509	if {[info exists defaultvalue]} {
510	set desc [string map [list @default@ $defaultvalue] $desc]
511	}
512	#string match \n* $desc
513	if {$header ne ""} {
514	lappend autosetup(optionhelp) $header ""
515	set header ""
516	}
	@@ -463,35 +594,39 @@
594	options-wrap-desc [string trim $desc] $cols " " $indent [expr $max + 2]
595	}
596	}
597	}
598
599	# @options optionspec
600	#
601	# Specifies configuration-time options which may be selected by the user
602	# and checked with 'opt-str' and 'opt-bool'. '$optionspec' contains a series
603	# of options specifications separated by newlines, as follows:
604	#
605	# A boolean option is of the form:
606	#
607	## name[=0\|1] => "Description of this boolean option"
608	#
609	# The default is 'name=0', meaning that the option is disabled by default.
610	# If 'name=1' is used to make the option enabled by default, the description should reflect
611	# that with text like "Disable support for ...".
612	#
613	# An argument option (one which takes a parameter) is of the form:
614	#
615	## name:[=]value => "Description of this option"
616	#
617	# If the 'name:value' form is used, the value must be provided with the option (as '--name=myvalue').
618	# If the 'name:=value' form is used, the value is optional and the given value is used as the default
619	# if it is not provided.
620	#
621	# The description may contain '@default@', in which case it will be replaced with the default
622	# value for the option (taking into account defaults specified with 'options-defaults'.
623	#
624	# Undocumented options are also supported by omitting the '=> description'.
625	# These options are not displayed with '--help' and can be useful for internal options or as aliases.
626	#
627	# For example, '--disable-lfs' is an alias for '--disable=largefile':
628	#
629	## lfs=1 largefile=1 => "Disable large file support"
630	#
631	proc options {optlist} {
632	# Allow options as a list or args
	@@ -509,27 +644,37 @@
644	user-error "Unknown option --$o"
645	}
646	}
647	}
648	}
649
650	# @options-defaults dictionary
651	#
652	# Specifies a dictionary of options and a new default value for each of those options.
653	# Use before any 'use' statements in 'auto.def' to change the defaults for
654	# subsequently included modules.
655	proc options-defaults {dict} {
656	foreach {n v} $dict {
657	dict set ::autosetup(options-defaults) $n $v
658	}
659	}
660
661	proc config_guess {} {
662	if {[file-isexec $::autosetup(dir)/autosetup-config.guess]} {
663	if {[catch {exec-with-stderr sh $::autosetup(dir)/autosetup-config.guess} alias]} {

664	user-error $alias
665	}
666	return $alias
667	} else {
668	configlog "No autosetup-config.guess, so using uname"
669	string tolower [exec uname -p]-unknown-[exec uname -s][exec uname -r]
670	}
671	}
672
673	proc config_sub {alias} {
674	if {[file-isexec $::autosetup(dir)/autosetup-config.sub]} {
675	if {[catch {exec-with-stderr sh $::autosetup(dir)/autosetup-config.sub $alias} alias]} {
676	user-error $alias
677	}
678	}
679	return $alias
680	}
	@@ -536,39 +681,48 @@
681
682	# @define name ?value=1?
683	#
684	# Defines the named variable to the given value.
685	# These (name, value) pairs represent the results of the configuration check
686	# and are available to be subsequently checked, modified and substituted.
687	#
688	proc define {name {value 1}} {
689	set ::define($name) $value
690	#dputs "$name <= $value"
691	}
692
693	# @undefine name
694	#
695	# Undefine the named variable.
696	#
697	proc undefine {name} {
698	unset -nocomplain ::define($name)
699	#dputs "$name <= <undef>"
700	}
701
702	# @define-append name value ...
703	#
704	# Appends the given value(s) to the given "defined" variable.
705	# If the variable is not defined or empty, it is set to '$value'.
706	# Otherwise the value is appended, separated by a space.
707	# Any extra values are similarly appended.
708	# If any value is already contained in the variable (as a substring) it is omitted.
709	#
710	proc define-append {name args} {
711	if {[get-define $name ""] ne ""} {
712	# Avoid duplicates
713	foreach arg $args {
714	if {$arg eq ""} {
715	continue
716	}
717	set found 0
718	foreach str [split $::define($name) " "] {
719	if {$str eq $arg} {
720	incr found
721	}
722	}
723	if {!$found} {
724	append ::define($name) " " $arg
725	}
726	}
727	} else {
728	set ::define($name) [join $args]
	@@ -576,11 +730,11 @@
730	#dputs "$name += [join $args] => $::define($name)"
731	}
732
733	# @get-define name ?default=0?
734	#
735	# Returns the current value of the "defined" variable, or '$default'
736	# if not set.
737	#
738	proc get-define {name {default 0}} {
739	if {[info exists ::define($name)]} {
740	#dputs "$name => $::define($name)"
	@@ -595,14 +749,26 @@
749	# Returns 1 if the given variable is defined.
750	#
751	proc is-defined {name} {
752	info exists ::define($name)
753	}
754
755	# @is-define-set name
756	#
757	# Returns 1 if the given variable is defined and is set
758	# to a value other than "" or 0
759	#
760	proc is-define-set {name} {
761	if {[get-define $name] in {0 ""}} {
762	return 0
763	}
764	return 1
765	}
766
767	# @all-defines
768	#
769	# Returns a dictionary (name, value list) of all defined variables.
770	#
771	# This is suitable for use with 'dict', 'array set' or 'foreach'
772	# and allows for arbitrary processing of the defined variables.
773	#
774	proc all-defines {} {
	@@ -610,13 +776,13 @@
776	}
777
778
779	# @get-env name default
780	#
781	# If '$name' was specified on the command line, return it.
782	# Otherwise if '$name' was set in the environment, return it.
783	# Otherwise return '$default'.
784	#
785	proc get-env {name default} {
786	if {[dict exists $::autosetup(cmdline) $name]} {
787	return [dict get $::autosetup(cmdline) $name]
788	}
	@@ -623,11 +789,11 @@
789	getenv $name $default
790	}
791
792	# @env-is-set name
793	#
794	# Returns 1 if '$name' was specified on the command line or in the environment.
795	# Note that an empty environment variable is not considered to be set.
796	#
797	proc env-is-set {name} {
798	if {[dict exists $::autosetup(cmdline) $name]} {
799	return 1
	@@ -639,11 +805,11 @@
805	}
806
807	# @readfile filename ?default=""?
808	#
809	# Return the contents of the file, without the trailing newline.
810	# If the file doesn't exist or can't be read, returns '$default'.
811	#
812	proc readfile {filename {default_value ""}} {
813	set result $default_value
814	catch {
815	set f [open $filename]
	@@ -653,11 +819,11 @@
819	return $result
820	}
821
822	# @writefile filename value
823	#
824	# Creates the given file containing '$value'.
825	# Does not add an extra newline.
826	#
827	proc writefile {filename value} {
828	set f [open $filename w]
829	puts -nonewline $f $value
	@@ -677,63 +843,60 @@
843	lappend args [quote-if-needed $arg]
844	}
845	join $args
846	}
847
848	# @list-non-empty list
849	#
850	# Returns a copy of the given list with empty elements removed
851	proc list-non-empty {list} {




852	set result {}
853	foreach p $list {
854	if {$p ne ""} {
855	lappend result $p
856	}
857	}
858	return $result
859	}
860
861	# @find-executable-path name
862	#
863	# Searches the path for an executable with the given name.
864	# Note that the name may include some parameters, e.g. 'cc -mbig-endian',
865	# in which case the parameters are ignored.
866	# The full path to the executable if found, or "" if not found.
867	# Returns 1 if found, or 0 if not.
868	#
869	proc find-executable-path {name} {
870	# Ignore any parameters
871	set name [lindex $name 0]
872	# The empty string is never a valid executable
873	if {$name ne ""} {
874	foreach p [split-path] {
875	dputs "Looking for $name in $p"
876	set exec [file join $p $name]
877	if {[file-isexec $exec]} {
878	dputs "Found $name -> $exec"
879	return $exec
880	}
881	}
882	}
883	return {}
884	}
885
886	# @find-executable name
887	#
888	# Searches the path for an executable with the given name.
889	# Note that the name may include some parameters, e.g. 'cc -mbig-endian',
890	# in which case the parameters are ignored.
891	# Returns 1 if found, or 0 if not.
892	#
893	proc find-executable {name} {
894	if {[find-executable-path $name] eq {}} {
895	return 0
896	}
897	return 1











898	}
899
900	# @find-an-executable ?-required? name ...
901	#
902	# Given a list of possible executable names,
	@@ -764,11 +927,11 @@
927	return ""
928	}
929
930	# @configlog msg
931	#
932	# Writes the given message to the configuration log, 'config.log'.
933	#
934	proc configlog {msg} {
935	if {![info exists ::autosetup(logfh)]} {
936	set ::autosetup(logfh) [open config.log w]
937	}
	@@ -800,12 +963,12 @@
963	}
964	}
965
966	# @msg-quiet command ...
967	#
968	# 'msg-quiet' evaluates it's arguments as a command with output
969	# from 'msg-checking' and 'msg-result' suppressed.
970	#
971	# This is useful if a check needs to run a subcheck which isn't
972	# of interest to the user.
973	proc msg-quiet {args} {
974	incr ::autosetup(msg-quiet)
	@@ -841,11 +1004,11 @@
1004
1005	# @user-error msg
1006	#
1007	# Indicate incorrect usage to the user, including if required components
1008	# or features are not found.
1009	# 'autosetup' exits with a non-zero return code.
1010	#
1011	proc user-error {msg} {
1012	show-notices
1013	puts stderr "Error: $msg"
1014	puts stderr "Try: '[file tail $::autosetup(exe)] --help' for options"
	@@ -887,10 +1050,21 @@
1050	proc maybe-show-timestamp {} {
1051	if {$::autosetup(msg-timing) && $::autosetup(msg-checking) == 0} {
1052	puts -nonewline [format {[%6.2f] } [expr {([clock millis] - $::autosetup(start)) % 10000 / 1000.0}]]
1053	}
1054	}
1055
1056	# @autosetup-require-version required
1057	#
1058	# Checks the current version of 'autosetup' against '$required'.
1059	# A fatal error is generated if the current version is less than that required.
1060	#
1061	proc autosetup-require-version {required} {
1062	if {[compare-versions $::autosetup(version) $required] < 0} {
1063	user-error "autosetup version $required is required, but this is $::autosetup(version)"
1064	}
1065	}
1066
1067	proc autosetup_version {} {
1068	return "autosetup v$::autosetup(version)"
1069	}
1070
	@@ -986,23 +1160,35 @@
1160	# The latter form is useful for a complex module which requires additional
1161	# support file. In this form, '$::usedir' is set to the module directory
1162	# when it is loaded.
1163	#
1164	proc use {args} {
1165	global autosetup libmodule modsource
1166
1167	set dirs [list $autosetup(libdir)]
1168	if {[info exists autosetup(srcdir)]} {
1169	lappend dirs $autosetup(srcdir)/autosetup
1170	}
1171	foreach m $args {
1172	if {[info exists libmodule($m)]} {
1173	continue
1174	}
1175	set libmodule($m) 1
1176	if {[info exists modsource(${m}.tcl)]} {
1177	automf_load eval $modsource(${m}.tcl)
1178	} else {
1179	set locs [list ${m}.tcl ${m}/init.tcl]
1180	set found 0
1181	foreach dir $dirs {
1182	foreach loc $locs {
1183	set source $dir/$loc
1184	if {[file exists $source]} {
1185	incr found
1186	break
1187	}
1188	}
1189	if {$found} {
1190	break
1191	}
1192	}
1193	if {$found} {
1194	# For the convenience of the "use" source, point to the directory
	@@ -1014,10 +1200,22 @@
1200	autosetup-error "use: No such module: $m"
1201	}
1202	}
1203	}
1204	}
1205
1206	proc autosetup_load_auto_modules {} {
1207	global autosetup modsource
1208	# First load any embedded auto modules
1209	foreach mod [array names modsource *.auto] {
1210	automf_load eval $modsource($mod)
1211	}
1212	# Now any external auto modules
1213	foreach file [glob -nocomplain $autosetup(libdir)/.auto $autosetup(libdir)//*.auto] {
1214	automf_load source $file
1215	}
1216	}
1217
1218	# Load module source in the global scope by executing the given command
1219	proc automf_load {args} {
1220	if {[catch [list uplevel #0 $args] msg opts] ni {0 2 3}} {
1221	autosetup-full-error [error-dump $msg $opts $::autosetup(debug)]
	@@ -1027,18 +1225,21 @@
1225	# Initial settings
1226	set autosetup(exe) $::argv0
1227	set autosetup(istcl) 1
1228	set autosetup(start) [clock millis]
1229	set autosetup(installed) 0
1230	set autosetup(sysinstall) 0
1231	set autosetup(msg-checking) 0
1232	set autosetup(msg-quiet) 0
1233	set autosetup(inittypes) {}
1234
1235	# Embedded modules are inserted below here
1236	set autosetup(installed) 1
1237	set autosetup(sysinstall) 0
1238	# ----- @module asciidoc-formatting.tcl -----
1239
1240	set modsource(asciidoc-formatting.tcl) {
1241	# Copyright (c) 2010 WorkWare Systems http://www.workware.net.au/
1242	# All rights reserved
1243
1244	# Module which provides text formatting
1245	# asciidoc format
	@@ -1102,19 +1303,19 @@
1303	regsub -all "\n\n" $defn "\n ::\n" defn
1304	puts $defn
1305	}
1306	}
1307
1308	# ----- @module formatting.tcl -----
1309
1310	set modsource(formatting.tcl) {
1311	# Copyright (c) 2010 WorkWare Systems http://www.workware.net.au/
1312	# All rights reserved
1313
1314	# Module which provides common text formatting
1315
1316	# This is designed for documentation which looks like:
1317	# code {...}
1318	# or
1319	# code {
1320	# ...
1321	# ...
	@@ -1159,13 +1360,13 @@
1360	# Return the result
1361	return $lines
1362	}
1363	}
1364
1365	# ----- @module getopt.tcl -----
1366
1367	set modsource(getopt.tcl) {
1368	# Copyright (c) 2006 WorkWare Systems http://www.workware.net.au/
1369	# All rights reserved
1370
1371	# Simple getopt module
1372
	@@ -1197,11 +1398,11 @@
1398
1399	if {[regexp {^--([^=][^=]+)=(.*)$} $arg -> name value]} {
1400	# --name=value
1401	dict lappend opts $name [list str $value]
1402	} elseif {[regexp {^--(enable-\|disable-)?([^=]*)$} $arg -> prefix name]} {
1403	if {$prefix in {enable- ""}} {
1404	set value 1
1405	} else {
1406	set value 0
1407	}
1408	dict lappend opts $name [list bool $value]
	@@ -1218,13 +1419,13 @@
1419
1420	return $opts
1421	}
1422	}
1423
1424	# ----- @module help.tcl -----
1425
1426	set modsource(help.tcl) {
1427	# Copyright (c) 2010 WorkWare Systems http://workware.net.au/
1428	# All rights reserved
1429
1430	# Module which provides usage, help and the command reference
1431
	@@ -1251,10 +1452,28 @@
1452	options-show
1453	}
1454	}
1455	exit 0
1456	}
1457
1458	proc autosetup_show_license {} {
1459	global modsource autosetup
1460	use_pager
1461
1462	if {[info exists modsource(LICENSE)]} {
1463	puts $modsource(LICENSE)
1464	return
1465	}
1466	foreach dir [list $autosetup(libdir) $autosetup(srcdir)] {
1467	set path [file join $dir LICENSE]
1468	if {[file exists $path]} {
1469	puts [readfile $path]
1470	return
1471	}
1472	}
1473	puts "LICENSE not found"
1474	}
1475
1476	# If not already paged and stdout is a tty, pipe the output through the pager
1477	# This is done by reinvoking autosetup with --nopager added
1478	proc use_pager {} {
1479	if {![opt-bool nopager] && [getenv PAGER ""] ne "" && [isatty? stdin] && [isatty? stdout]} {
	@@ -1304,10 +1523,16 @@
1523	}
1524
1525	proc autosetup_output_block {type lines} {
1526	if {[llength $lines]} {
1527	switch $type {
1528	section {
1529	section $lines
1530	}
1531	subsection {
1532	subsection $lines
1533	}
1534	code {
1535	codelines $lines
1536	}
1537	p {
1538	p [join $lines]
	@@ -1325,30 +1550,45 @@
1550	# Generate a command reference from inline documentation
1551	proc automf_command_reference {} {
1552	lappend files $::autosetup(prog)
1553	lappend files {}[lsort [glob -nocomplain $::autosetup(libdir)/.tcl]]
1554
1555	# We want to process all non-module files before module files
1556	# and then modules in alphabetical order.
1557	# So examine all files and extract docs into doc($modulename) and doc(_core_)
1558	#
1559	# Each entry is a list of {type data} where $type is one of: section, subsection, code, list, p
1560	# and $data is a string for section, subsection or a list of text lines for other types.
1561
1562	# XXX: Should commands be in alphabetical order too? Currently they are in file order.
1563
1564	set doc(_core_) {}
1565	lappend doc(_core_) [list section "Core Commands"]
1566
1567	foreach file $files {
1568	set modulename [file rootname [file tail $file]]
1569	set current _core_
1570	set f [open $file]
1571	while {![eof $f]} {
1572	set line [gets $f]
1573
1574	# Find embedded module names
1575	if {[regexp {^#.@module ([^ ])} $line -> modulename]} {
1576	continue
1577	}
1578
1579	# Find lines starting with "# @*" and continuing through the remaining comment lines
1580	if {![regexp {^# @(.*)} $line -> cmd]} {
1581	continue
1582	}
1583
1584	# Synopsis or command?
1585	if {$cmd eq "synopsis:"} {
1586	set current $modulename
1587	lappend doc($current) [list section "Module: $modulename"]
1588	} else {
1589	lappend doc($current) [list subsection $cmd]
1590	}
1591
1592	set lines {}
1593	set type p
1594
	@@ -1369,29 +1609,38 @@
1609
1610	#puts "hash=$hash, oldhash=$oldhash, lines=[llength $lines], cmd=$cmd"
1611
1612	if {$t ne $type \|\| $cmd eq ""} {
1613	# Finish the current block
1614	lappend doc($current) [list $type $lines]
1615	set lines {}
1616	set type $t
1617	}
1618	if {$cmd ne ""} {
1619	lappend lines $cmd
1620	}
1621	}
1622
1623	lappend doc($current) [list $type $lines]
1624	}
1625	close $f
1626	}
1627
1628	# Now format and output the results
1629
1630	# _core_ will sort first
1631	foreach module [lsort [array names doc]] {
1632	foreach item $doc($module) {
1633	autosetup_output_block {*}$item
1634	}
1635	}
1636	}
1637	}
1638
1639	# ----- @module init.tcl -----
1640
1641	set modsource(init.tcl) {
1642	# Copyright (c) 2010 WorkWare Systems http://www.workware.net.au/
1643	# All rights reserved
1644
1645	# Module to help create auto.def and configure
1646
	@@ -1444,79 +1693,157 @@
1693	}
1694	writefile $filename $contents
1695	}
1696	}
1697
1698	# ----- @module install.tcl -----
1699
1700	set modsource(install.tcl) {
1701	# Copyright (c) 2006-2010 WorkWare Systems http://www.workware.net.au/
1702	# All rights reserved
1703
1704	# Module which can install autosetup
1705
1706	# autosetup(installed)=1 means that autosetup is not running from source
1707	# autosetup(sysinstall)=1 means that autosetup is running from a sysinstall version
1708	# shared=1 means that we are trying to do a sysinstall. This is only possible from the development source.
1709
1710	proc autosetup_install {dir {shared 0}} {
1711	global autosetup
1712	if {$shared} {
1713	if {$autosetup(installed) \|\| $autosetup(sysinstall)} {
1714	user-error "Can only --sysinstall from development sources"
1715	}
1716	} elseif {$autosetup(installed) && !$autosetup(sysinstall)} {
1717	user-error "Can't --install from project install"
1718	}
1719
1720	if {$autosetup(sysinstall)} {
1721	# This is the sysinstall version, so install just uses references
1722	cd $dir
1723
1724	puts "[autosetup_version] creating configure to use system-installed autosetup"
1725	autosetup_create_configure 1
1726	puts "Creating autosetup/README.autosetup"
1727	file mkdir autosetup
1728	autosetup_install_readme autosetup/README.autosetup 1
1729	return
1730	}
1731
1732	if {[catch {
1733	if {$shared} {
1734	set target $dir/bin/autosetup
1735	set installedas $target
1736	} else {
1737	if {$dir eq "."} {
1738	set installedas autosetup
1739	} else {
1740	set installedas $dir/autosetup
1741	}
1742	cd $dir
1743	file mkdir autosetup
1744	set target autosetup/autosetup
1745	}
1746	set targetdir [file dirname $target]
1747	file mkdir $targetdir
1748
1749	set f [open $target w]
1750
1751	set publicmodules {}
1752
1753	# First the main script, but only up until "CUT HERE"
1754	set in [open $autosetup(dir)/autosetup]
1755	while {[gets $in buf] >= 0} {
1756	if {$buf ne "##-- CUT HERE --##"} {
1757	puts $f $buf
1758	continue
1759	}
1760
1761	# Insert the static modules here
1762	# i.e. those which don't contain @synopsis:
1763	# All modules are inserted if $shared is set
1764	puts $f "set autosetup(installed) 1"
1765	puts $f "set autosetup(sysinstall) $shared"
1766	foreach file [lsort [glob $autosetup(libdir)/*.{tcl,auto}]] {
1767	set modname [file tail $file]
1768	set ext [file ext $modname]
1769	set buf [readfile $file]
1770	if {!$shared} {
1771	if {$ext eq ".auto" \|\| [string match "\n# @synopsis:" $buf]} {
1772	lappend publicmodules $file
1773	continue
1774	}
1775	}
1776	dputs "install: importing lib/[file tail $file]"
1777	puts $f "# ----- @module $modname -----"
1778	puts $f "\nset modsource($modname) \{"
1779	puts $f $buf
1780	puts $f "\}\n"
1781	}
1782	if {$shared} {
1783	foreach {srcname destname} [list $autosetup(libdir)/README.autosetup-lib README.autosetup \
1784	$autosetup(srcdir)/LICENSE LICENSE] {
1785	dputs "install: importing $srcname as $destname"
1786	puts $f "\nset modsource($destname) \\\n[list [readfile $srcname]\n]\n"
1787	}
1788	}
1789	}
1790	close $in
1791	close $f
1792	catch {exec chmod 755 $target}
1793
1794	set installfiles {autosetup-config.guess autosetup-config.sub autosetup-test-tclsh}
1795	set removefiles {}
1796
1797	if {!$shared} {
1798	autosetup_install_readme $targetdir/README.autosetup 0
1799
1800	# Install public modules
1801	foreach file $publicmodules {
1802	set tail [file tail $file]
1803	autosetup_install_file $file $targetdir/$tail
1804	}
1805	lappend installfiles jimsh0.c autosetup-find-tclsh LICENSE
1806	lappend removefiles config.guess config.sub test-tclsh find-tclsh
1807	} else {
1808	lappend installfiles {sys-find-tclsh autosetup-find-tclsh}
1809	}
1810
1811	# Install support files
1812	foreach fileinfo $installfiles {
1813	if {[llength $fileinfo] == 2} {
1814	lassign $fileinfo source dest
1815	} else {
1816	lassign $fileinfo source
1817	set dest $source
1818	}
1819	autosetup_install_file $autosetup(dir)/$source $targetdir/$dest
1820	}
1821
1822	# Remove obsolete files
1823	foreach file $removefiles {
1824	if {[file exists $targetdir/$file]} {
1825	file delete $targetdir/$file
1826	}
1827	}
1828	} error]} {
1829	user-error "Failed to install autosetup: $error"
1830	}
1831	if {$shared} {
1832	set type "system"
1833	} else {
1834	set type "local"
1835	}
1836	puts "Installed $type [autosetup_version] to $installedas"
1837
1838	if {!$shared} {
1839	# Now create 'configure' if necessary
1840	autosetup_create_configure 0
1841	}
1842	}
1843
1844	proc autosetup_create_configure {shared} {
1845	if {[file exists configure]} {
1846	if {!$::autosetup(force)} {
1847	# Could this be an autosetup configure?
1848	if {![string match "\nWRAPPER=" [readfile configure]]} {
1849	puts "I see configure, but not created by autosetup, so I won't overwrite it."
	@@ -1527,40 +1854,75 @@
1854	puts "I will overwrite the existing configure because you used --force."
1855	}
1856	} else {
1857	puts "I don't see configure, so I will create it."
1858	}
1859	if {$shared} {
1860	writefile configure \
1861	{#!/bin/sh
1862	WRAPPER="$0"; export WRAPPER; "autosetup" "$@"
1863	}
1864	} else {
1865	writefile configure \
1866	{#!/bin/sh
1867	dir="`dirname "$0"`/autosetup"
1868	WRAPPER="$0"; export WRAPPER; exec "`"$dir/autosetup-find-tclsh"`" "$dir/autosetup" "$@"
1869	}
1870	}
1871	catch {exec chmod 755 configure}
1872	}
1873
1874	# Append the contents of $file to filehandle $f
1875	proc autosetup_install_append {f file} {
1876	dputs "install: include $file"
1877	set in [open $file]
1878	puts $f [read $in]
1879	close $in
1880	}
1881
1882	proc autosetup_install_file {source target} {
1883	dputs "install: $source => $target"
1884	if {![file exists $source]} {
1885	error "Missing installation file '$source'"
1886	}
1887	writefile $target [readfile $source]\n
1888	# If possible, copy the file mode
1889	file stat $source stat
1890	set mode [format %o [expr {$stat(mode) & 0x1ff}]]
1891	catch {exec chmod $mode $target}
1892	}
1893
1894	proc autosetup_install_readme {target sysinstall} {
1895	set readme "README.autosetup created by [autosetup_version]\n\n"
1896	if {$sysinstall} {
1897	append readme \
1898	{This is the autosetup directory for a system install of autosetup.
1899	Loadable modules can be added here.
1900	}
1901	} else {
1902	append readme \
1903	{This is the autosetup directory for a local install of autosetup.
1904	It contains autosetup, support files and loadable modules.
1905	}
1906	}
1907
1908	append readme {
1909	*.tcl files in this directory are optional modules which
1910	can be loaded with the 'use' directive.
1911
1912	*.auto files in this directory are auto-loaded.
1913
1914	For more information, see http://msteveb.github.com/autosetup/
1915	}
1916	dputs "install: autosetup/README.autosetup"
1917	writefile $target $readme
1918	}
1919	}
1920
1921	# ----- @module markdown-formatting.tcl -----
1922
1923	set modsource(markdown-formatting.tcl) {
1924	# Copyright (c) 2010 WorkWare Systems http://www.workware.net.au/
1925	# All rights reserved
1926
1927	# Module which provides text formatting
1928	# markdown format (kramdown syntax)
	@@ -1627,13 +1989,13 @@
1989	}
1990	puts "$defn"
1991	}
1992	}
1993
1994	# ----- @module misc.tcl -----
1995
1996	set modsource(misc.tcl) {
1997	# Copyright (c) 2007-2010 WorkWare Systems http://www.workware.net.au/
1998	# All rights reserved
1999
2000	# Module containing misc procs useful to modules
2001	# Largely for platform compatibility
	@@ -1805,106 +2167,218 @@
2167	string trim $result
2168	}
2169	}
2170	}
2171
2172	# ----- @module text-formatting.tcl -----
2173
2174	set modsource(text-formatting.tcl) {
2175	# Copyright (c) 2010 WorkWare Systems http://www.workware.net.au/
2176	# All rights reserved
2177
2178	# Module which provides text formatting
2179
2180	use formatting
2181
2182	proc wordwrap {text length {firstprefix ""} {nextprefix ""}} {
2183	set len 0
2184	set space $firstprefix
2185
2186	foreach word [split $text] {
2187	set word [string trim $word]
2188	if {$word eq ""} {
2189	continue
2190	}
2191	if {[info exists partial]} {
2192	append partial " " $word
2193	if {[string first $quote $word] < 0} {
2194	# Haven't found end of quoted word
2195	continue
2196	}
2197	# Finished quoted word
2198	set word $partial
2199	unset partial
2200	unset quote
2201	} else {
2202	set quote [string index $word 0]
2203	if {$quote in {' *}} {
2204	if {[string first $quote $word 1] < 0} {
2205	# Haven't found end of quoted word
2206	# Not a whole word.
2207	set first [string index $word 0]
2208	# Start of quoted word
2209	set partial $word
2210	continue
2211	}
2212	}
2213	}
2214
2215	if {$len && [string length $space$word] + $len >= $length} {
2216	puts ""
2217	set len 0
2218	set space $nextprefix
2219	}
2220	incr len [string length $space$word]
2221
2222	# Use man-page conventions for highlighting 'quoted' and quoted
2223	# single words.
2224	# Use x^Hx for bold and _^Hx for 'underline'.
2225	#
2226	# less and more will both understand this.
2227	# Pipe through 'col -b' to remove them.
2228	if {[regexp {^'(.)'(.)} $word -> quoted after]} {
2229	set quoted [string map {~ " "} $quoted]
2230	regsub -all . $quoted "&\b&" quoted
2231	set word $quoted$after
2232	} elseif {[regexp {^[](.)[](.)} $word -> quoted after]} {
2233	set quoted [string map {~ " "} $quoted]
2234	regsub -all . $quoted "_\b&" quoted
2235	set word $quoted$after
2236	}
2237	puts -nonewline $space$word
2238	set space " "
2239	}
2240	if {[info exists partial]} {
2241	# Missing end of quote
2242	puts -nonewline $space$partial
2243	}
2244	if {$len} {
2245	puts ""
2246	}
2247	}
2248	proc title {text} {
2249	underline [string trim $text] =
2250	nl
2251	}
2252	proc p {text} {
2253	wordwrap $text 80
2254	nl
2255	}
2256	proc codelines {lines} {
2257	foreach line $lines {
2258	puts " $line"
2259	}
2260	nl
2261	}
2262	proc nl {} {
2263	puts ""
2264	}
2265	proc underline {text char} {
2266	regexp "^(\[ \t\])(.)" $text -> indent words
2267	puts $text
2268	puts $indent[string repeat $char [string length $words]]
2269	}
2270	proc section {text} {
2271	underline "[string trim $text]" -
2272	nl
2273	}
2274	proc subsection {text} {
2275	underline "$text" ~
2276	nl
2277	}
2278	proc bullet {text} {
2279	wordwrap $text 76 " * " " "
2280	}
2281	proc indent {text} {
2282	wordwrap $text 76 " " " "
2283	}
2284	proc defn {first args} {
2285	if {$first ne ""} {
2286	underline " $first" ~
2287	}
2288	foreach p $args {
2289	if {$p ne ""} {
2290	indent $p
2291	}
2292	}
2293	}
2294	}
2295
2296	# ----- @module util.tcl -----
2297
2298	set modsource(util.tcl) {
2299	# Copyright (c) 2012 WorkWare Systems http://www.workware.net.au/
2300	# All rights reserved
2301
2302	# Module which contains miscellaneous utility functions
2303
2304	# @compare-versions version1 version2
2305	#
2306	# Versions are of the form 'a.b.c' (may be any number of numeric components)
2307	#
2308	# Compares the two versions and returns:
2309	## -1 if v1 < v2
2310	## 0 if v1 == v2
2311	## 1 if v1 > v2
2312	#
2313	# If one version has fewer components than the other, 0 is substituted to the right. e.g.
2314	## 0.2 < 0.3
2315	## 0.2.5 > 0.2
2316	## 1.1 == 1.1.0
2317	#
2318	proc compare-versions {v1 v2} {
2319	foreach c1 [split $v1 .] c2 [split $v2 .] {
2320	if {$c1 eq ""} {
2321	set c1 0
2322	}
2323	if {$c2 eq ""} {
2324	set c2 0
2325	}
2326	if {$c1 < $c2} {
2327	return -1
2328	}
2329	if {$c1 > $c2} {
2330	return 1
2331	}
2332	}
2333	return 0
2334	}
2335
2336	# @suffix suf list
2337	#
2338	# Takes a list and returns a new list with '$suf' appended
2339	# to each element
2340	#
2341	## suffix .c {a b c} => {a.c b.c c.c}
2342	#
2343	proc suffix {suf list} {
2344	set result {}
2345	foreach p $list {
2346	lappend result $p$suf
2347	}
2348	return $result
2349	}
2350
2351	# @prefix pre list
2352	#
2353	# Takes a list and returns a new list with '$pre' prepended
2354	# to each element
2355	#
2356	## prefix jim- {a.c b.c} => {jim-a.c jim-b.c}
2357	#
2358	proc prefix {pre list} {
2359	set result {}
2360	foreach p $list {
2361	lappend result $pre$p
2362	}
2363	return $result
2364	}
2365
2366	# @lpop list
2367	#
2368	# Removes the last entry from the given list and returns it.
2369	proc lpop {listname} {
2370	upvar $listname list
2371	set val [lindex $list end]
2372	set list [lrange $list 0 end-1]
2373	return $val
2374	}
2375	}
2376
2377	# ----- @module wiki-formatting.tcl -----
2378
2379	set modsource(wiki-formatting.tcl) {
2380	# Copyright (c) 2010 WorkWare Systems http://www.workware.net.au/
2381	# All rights reserved
2382
2383	# Module which provides text formatting
2384	# wiki.tcl.tk format output
	@@ -1975,11 +2449,11 @@
2449	if {$autosetup(debug)} {
2450	main $argv
2451	}
2452	if {[catch {main $argv} msg opts] == 1} {
2453	show-notices
2454	autosetup-full-error [error-dump $msg $opts $autosetup(debug)]
2455	if {!$autosetup(debug)} {
2456	puts stderr "Try: '[file tail $autosetup(exe)] --debug' for a full stack trace"
2457	}
2458	exit 1
2459	}
2460
2461	DDED autosetup/autosetup-config.guess
2462	DDED autosetup/autosetup-config.sub
2463	DDED autosetup/autosetup-find-tclsh
2464	DDED autosetup/autosetup-test-tclsh

M autosetup/autosetup-config.guess

+5 -27

		--- a/autosetup/autosetup-config.guess
		+++ b/autosetup/autosetup-config.guess
		@@ -1,6 +1,8 @@
1	1	#! /bin/sh
2	2	# Attempt to guess a canonical system name.
3		-# Copyright 1992-2014 Free Software Found4-11-04it and/or modify it
	3	+# Copyright 1992-2018 Free Software Foundation, Inc.
	4	+
	5	+timestamp='2018-03-08it and/or modify it
4	6	# under the terms of the GNU General Public License as published by
5	7	# t;e Free Software Foundation, either version 3 of the L;cense, or
6	8	# (at your option) any later version.
		@@ -13,7 +15,7 @@
13	15	# You should have received a copy of the GNU General Public License
14	16	# along with this program; if not, see <https://www.gnu.org/licenses/>.
15	17	#
16		-# As a special exceptionto the GNU General Public License, if you
	18	+# As a special exception to the GNU General Public License, if you
17	19	# distribute this file as part of a program that contains a
18	20	# configuration script generated by Autoconf, you may include it under
19	21	# the same distribution terms that you use for the rest of that
		@@ -23,28 +25,4 @@
23	25	# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
24	26	#
25	27	# You can get the latest version of this script from:
26		-# https://git.savannah.gnu.org/guess;hb=HEADeration mode4 Free Software Foundation, Inc.
27		-
28		-$dummy.c$dummy.o $dummy.c{UNAME_SYSTEM}
29		- cat <<-EOF > $dummy.c`$CC_FOR_BUILD -E $dummy.c'^LIBC' \| sed 's, ,,g'`{UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}/sbin/$sysctl/usr/sbin/$sysctl
30		-# Attempt to guess a canoniAttempt to g! /bin/sh
31		-# Attemp#*) machine=${! /bin/sh
32		-# Attemp#! /bin/sh
33		-# Attempt to guess a canonical system name.
34		-# Copyright 1992-2018canonical system name.
35		-# Copyrig! /bin/sh
36		-# Attemp#! /b{UNAME_VERSION}${UNAME_REL{machine}-${os}${release}${! /bin/sh
37		-# Attemp#! /bin/sh
38		-# Attempt to guess a ${! /bin/sh
39		-# Attemp#! /bin/sh
40		-# Attempt to guess a cekkoBSD::)
41		- echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}SolidBSD::)
42		- echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}${UNAME_RELEASE}${UNAME_MACHINE}-unk"alpha""alpha""alpha""alphaev5"A"alphaev56""alphapca56""alphapca57""alphaev6""alphaev67""alphaev68""alphaev68""alphaev68""alphaev69""alphaev7""alphaev79"${UNAME_MACHINE}-dec-osf`echo RELEASE}'' ''` /bin/sh
43		-# Attempt to guess a canonical system name.
44		-# Copyright 1992-2018 Free Software FouAttempt to guess a canonical system name.
45		-# Copyright 1992-2018 Free Software Foundation, Inc.
46		-
47		-timestamp='2018-03-08it and/or modify it
48		-# under the terms of the GNU General Public License as published by
49		-# t;e Free Software Foundation, either version 3 of the L;cense, or
50		-# (at your o
	28	+# https://git.savannah.gnu.org/

	--- a/autosetup/autosetup-config.guess
	+++ b/autosetup/autosetup-config.guess
	@@ -1,6 +1,8 @@
1	#! /bin/sh
2	# Attempt to guess a canonical system name.
3	# Copyright 1992-2014 Free Software Found4-11-04it and/or modify it


4	# under the terms of the GNU General Public License as published by
5	# t;e Free Software Foundation, either version 3 of the L;cense, or
6	# (at your option) any later version.
	@@ -13,7 +15,7 @@
13	# You should have received a copy of the GNU General Public License
14	# along with this program; if not, see <https://www.gnu.org/licenses/>.
15	#
16	# As a special exceptionto the GNU General Public License, if you
17	# distribute this file as part of a program that contains a
18	# configuration script generated by Autoconf, you may include it under
19	# the same distribution terms that you use for the rest of that
	@@ -23,28 +25,4 @@
23	# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
24	#
25	# You can get the latest version of this script from:
26	# https://git.savannah.gnu.org/guess;hb=HEADeration mode4 Free Software Foundation, Inc.
27
28	$dummy.c$dummy.o $dummy.c{UNAME_SYSTEM}
29	cat <<-EOF > $dummy.c`$CC_FOR_BUILD -E $dummy.c'^LIBC' \| sed 's, ,,g'`{UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}/sbin/$sysctl/usr/sbin/$sysctl
30	# Attempt to guess a canoniAttempt to g! /bin/sh
31	# Attemp#*) machine=${! /bin/sh
32	# Attemp#! /bin/sh
33	# Attempt to guess a canonical system name.
34	# Copyright 1992-2018canonical system name.
35	# Copyrig! /bin/sh
36	# Attemp#! /b{UNAME_VERSION}${UNAME_REL{machine}-${os}${release}${! /bin/sh
37	# Attemp#! /bin/sh
38	# Attempt to guess a ${! /bin/sh
39	# Attemp#! /bin/sh
40	# Attempt to guess a cekkoBSD::)
41	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}SolidBSD::)
42	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}${UNAME_RELEASE}${UNAME_MACHINE}-unk"alpha""alpha""alpha""alphaev5"A"alphaev56""alphapca56""alphapca57""alphaev6""alphaev67""alphaev68""alphaev68""alphaev68""alphaev69""alphaev7""alphaev79"${UNAME_MACHINE}-dec-osf`echo RELEASE}'' ''` /bin/sh
43	# Attempt to guess a canonical system name.
44	# Copyright 1992-2018 Free Software FouAttempt to guess a canonical system name.
45	# Copyright 1992-2018 Free Software Foundation, Inc.
46
47	timestamp='2018-03-08it and/or modify it
48	# under the terms of the GNU General Public License as published by
49	# t;e Free Software Foundation, either version 3 of the L;cense, or
50	# (at your o

	--- a/autosetup/autosetup-config.guess
	+++ b/autosetup/autosetup-config.guess
	@@ -1,6 +1,8 @@
1	#! /bin/sh
2	# Attempt to guess a canonical system name.
3	# Copyright 1992-2018 Free Software Foundation, Inc.
4
5	timestamp='2018-03-08it and/or modify it
6	# under the terms of the GNU General Public License as published by
7	# t;e Free Software Foundation, either version 3 of the L;cense, or
8	# (at your option) any later version.
	@@ -13,7 +15,7 @@
15	# You should have received a copy of the GNU General Public License
16	# along with this program; if not, see <https://www.gnu.org/licenses/>.
17	#
18	# As a special exception to the GNU General Public License, if you
19	# distribute this file as part of a program that contains a
20	# configuration script generated by Autoconf, you may include it under
21	# the same distribution terms that you use for the rest of that
	@@ -23,28 +25,4 @@
25	# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
26	#
27	# You can get the latest version of this script from:
28	# https://git.savannah.gnu.org/

A autosetup/autosetup-config.guess

+28

		--- a/autosetup/autosetup-config.guess
		+++ b/autosetup/autosetup-config.guess
		@@ -0,0 +1,28 @@
	1	+#! /bin/sh
	2	+# Attempt to guess a canonical system name.
	3	+# Copyright 1992-2018 Free Software Foundation, Inc.
	4	+
	5	+timestamp='2018-03-08it and/or modify it
	6	+# under the terms of the GNU General Public License as published by
	7	+# t;e Free Software Foundation, either version 3 of the L;cense, or
	8	+# (at your option) any later version.
	9	+#
	10	+# This program is distributed in the hope that it will be useful, but
	11	+# WITHOUT ANY WARRANTY; without even the implied warranty of
	12	+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	13	+# General Public License for more details.
	14	+#
	15	+# You should have received a copy of the GNU General Public License
	16	+# along with this program; if not, see <https://www.gnu.org/licenses/>.
	17	+#
	18	+# As a special exception to the GNU General Public License, if you
	19	+# distribute this file as part of a program that contains a
	20	+# configuration script generated by Autoconf, you may include it under
	21	+# the same distribution terms that you use for the rest of that
	22	+# program. This Exception is an additional permission under section 7
	23	+# of the GNU General Public License, version 3 ("GPLv3").
	24	+#
	25	+# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
	26	+#
	27	+# You can get the latest version of this script from:
	28	+# https://git.savannah.gnu.org/

	--- a/autosetup/autosetup-config.guess
	+++ b/autosetup/autosetup-config.guess
	@@ -0,0 +1,28 @@

	--- a/autosetup/autosetup-config.guess
	+++ b/autosetup/autosetup-config.guess
	@@ -0,0 +1,28 @@
1	#! /bin/sh
2	# Attempt to guess a canonical system name.
3	# Copyright 1992-2018 Free Software Foundation, Inc.
4
5	timestamp='2018-03-08it and/or modify it
6	# under the terms of the GNU General Public License as published by
7	# t;e Free Software Foundation, either version 3 of the L;cense, or
8	# (at your option) any later version.
9	#
10	# This program is distributed in the hope that it will be useful, but
11	# WITHOUT ANY WARRANTY; without even the implied warranty of
12	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13	# General Public License for more details.
14	#
15	# You should have received a copy of the GNU General Public License
16	# along with this program; if not, see <https://www.gnu.org/licenses/>.
17	#
18	# As a special exception to the GNU General Public License, if you
19	# distribute this file as part of a program that contains a
20	# configuration script generated by Autoconf, you may include it under
21	# the same distribution terms that you use for the rest of that
22	# program. This Exception is an additional permission under section 7
23	# of the GNU General Public License, version 3 ("GPLv3").
24	#
25	# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
26	#
27	# You can get the latest version of this script from:
28	# https://git.savannah.gnu.org/

M autosetup/autosetup-config.sub

+4 -44

		--- a/autosetup/autosetup-config.sub
		+++ b/autosetup/autosetup-config.sub
		@@ -1,6 +1,8 @@
1	1	#! /bin/sh
2	2	# Configuration validation subroutine script.
3		-# Copyright 1992-2014 Free Software Found4-12-03it and/or modify it
	3	+# Copyright 1992-2018 Free Software Foundation, Inc.
	4	+
	5	+timestamp='2018-03-08it and/or modify it
4	6	# under the terms of the GNU General Public License as published by
5	7	# t;e Free Software Foundation, either version 3 of the L;cense, or
6	8	# (at your option) any later version.
		@@ -13,7 +15,6 @@
13	15	# You should have received a copy of the GNU General Public License
14	16	# along with this program; if not, see <https://www.gnu.org/licenses/>.
15	17	#
16		-# As a special exception#
17	18	# As a special exception to the GNU General Public License, if you
18	19	# distribute this file as part of a program that contains a
19	20	# configuration script generated by Autoconf, you may include it under
		@@ -30,46 +31,5 @@
30	31
31	32	'orting which valid configurations
32	33	# it does not support. The user should be able to distinguish
33		-# a failure to support;hb=HEAD
34		- $0 [OPTION]f not, see <https:/eration mode a special exception to the GNU General Public License, if you
35		-# distribute this file as part of a program that contains a
36		-# configuration script generated by Autoconf, you may include it under
37		-# the same distribution terms that you use for the rest of that
38		-# program. This Excepti4 Free Software Foundation, Inc.
39		-
40		-er section 7
41		-# of the GNU General Public License, version 3 ("GPLv3").
42		-
43		-
44		-# Please send patches to <[email protected]>.
45		-#
46		-# Configuration subroutine to validate and canonicalize a configuration type.
47		-# Supply the specified configuration type as an argument.
48		-# If it is invalid, we print 1 Free Software Foundation,3 Free Software Foundation, Inc.
49		-
50		-'orting which valid configurations
51		-# it does not support. The user should be able to distinguish
52	34	# a failure to support a valid configuration from a meaningless
53		-# configur$1$1$1$1$1$basic_machine !$1$1$1$1$15v6$1$1udk$1! /bin/sh
54		-# Cio$1$1windowsnt/windowsnt/windp11e32k \| z8k)
55		- ;;
56		- msbut
57		-# WITHOUT ANY W#! /bin/sh
58		-# Configuration validation subroutine script.
59		-# Copyright 1992-2018 Free Software Foundation, Inc.
60		-
61		-timestamp='2018-03-08it and/or modify it
62		-# under the terms of the GNU General Public License as published by
63		-# t;e Free Software Foundation, either version 3 of the L;cense, or
64		-# (at your option) any later version.
65		-#
66		-# This program is distributed in the hope that it will be useful, but
67		-# WITHOUT ANY WARRANTY; without even the implied warranty of
68		-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the $1\': machine \`$basic_machineyramid?unknown$basic_machineu$basic_machine$basic_machine$basic_machine$basic_machinec9c \| dpx2*-bull-next)
69		- os=-nextstep3$1$1$1$1i386-vsta \| vstabin/sh
70		-# Configuration validation subroutine script.
71		-# Copyright 1992-2018 Free Software Foundation, Inc.
72		-
73		-timestamp='2018-03-08it and/or modify it
74		-# under the terms of the GNU General Public License as published bon subroutine $basic_machine-linuxomron$basic_machine$basic_machine$basic_machine ext$basic_machine$basic_machine$basic_machine$basic_machine$basic_machinepentium4i786-`echo $basic_machinepn$basic_machineppcle \| ppc-le \| powerpc-littlele$basic_machine$basic_machine \| ppc64-le \| powerpc64-little64le$basic_machinepsshsh5elh6h64-unknown
75		- ;
	35	+# configur

	--- a/autosetup/autosetup-config.sub
	+++ b/autosetup/autosetup-config.sub
	@@ -1,6 +1,8 @@
1	#! /bin/sh
2	# Configuration validation subroutine script.
3	# Copyright 1992-2014 Free Software Found4-12-03it and/or modify it


4	# under the terms of the GNU General Public License as published by
5	# t;e Free Software Foundation, either version 3 of the L;cense, or
6	# (at your option) any later version.
	@@ -13,7 +15,6 @@
13	# You should have received a copy of the GNU General Public License
14	# along with this program; if not, see <https://www.gnu.org/licenses/>.
15	#
16	# As a special exception#
17	# As a special exception to the GNU General Public License, if you
18	# distribute this file as part of a program that contains a
19	# configuration script generated by Autoconf, you may include it under
	@@ -30,46 +31,5 @@
30
31	'orting which valid configurations
32	# it does not support. The user should be able to distinguish
33	# a failure to support;hb=HEAD
34	$0 [OPTION]f not, see <https:/eration mode a special exception to the GNU General Public License, if you
35	# distribute this file as part of a program that contains a
36	# configuration script generated by Autoconf, you may include it under
37	# the same distribution terms that you use for the rest of that
38	# program. This Excepti4 Free Software Foundation, Inc.
39
40	er section 7
41	# of the GNU General Public License, version 3 ("GPLv3").
42
43
44	# Please send patches to <[email protected]>.
45	#
46	# Configuration subroutine to validate and canonicalize a configuration type.
47	# Supply the specified configuration type as an argument.
48	# If it is invalid, we print 1 Free Software Foundation,3 Free Software Foundation, Inc.
49
50	'orting which valid configurations
51	# it does not support. The user should be able to distinguish
52	# a failure to support a valid configuration from a meaningless
53	# configur$1$1$1$1$1$basic_machine !$1$1$1$1$15v6$1$1udk$1! /bin/sh
54	# Cio$1$1windowsnt/windowsnt/windp11e32k \| z8k)
55	;;
56	msbut
57	# WITHOUT ANY W#! /bin/sh
58	# Configuration validation subroutine script.
59	# Copyright 1992-2018 Free Software Foundation, Inc.
60
61	timestamp='2018-03-08it and/or modify it
62	# under the terms of the GNU General Public License as published by
63	# t;e Free Software Foundation, either version 3 of the L;cense, or
64	# (at your option) any later version.
65	#
66	# This program is distributed in the hope that it will be useful, but
67	# WITHOUT ANY WARRANTY; without even the implied warranty of
68	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the $1\': machine \`$basic_machineyramid?unknown$basic_machineu$basic_machine$basic_machine$basic_machine$basic_machinec9c \| dpx2*-bull-next)
69	os=-nextstep3$1$1$1$1i386-vsta \| vstabin/sh
70	# Configuration validation subroutine script.
71	# Copyright 1992-2018 Free Software Foundation, Inc.
72
73	timestamp='2018-03-08it and/or modify it
74	# under the terms of the GNU General Public License as published bon subroutine $basic_machine-linuxomron$basic_machine$basic_machine$basic_machine ext$basic_machine$basic_machine$basic_machine$basic_machine$basic_machinepentium4i786-`echo $basic_machinepn$basic_machineppcle \| ppc-le \| powerpc-littlele$basic_machine$basic_machine \| ppc64-le \| powerpc64-little64le$basic_machinepsshsh5elh6h64-unknown
75	;

	--- a/autosetup/autosetup-config.sub
	+++ b/autosetup/autosetup-config.sub
	@@ -1,6 +1,8 @@
1	#! /bin/sh
2	# Configuration validation subroutine script.
3	# Copyright 1992-2018 Free Software Foundation, Inc.
4
5	timestamp='2018-03-08it and/or modify it
6	# under the terms of the GNU General Public License as published by
7	# t;e Free Software Foundation, either version 3 of the L;cense, or
8	# (at your option) any later version.
	@@ -13,7 +15,6 @@
15	# You should have received a copy of the GNU General Public License
16	# along with this program; if not, see <https://www.gnu.org/licenses/>.
17	#

18	# As a special exception to the GNU General Public License, if you
19	# distribute this file as part of a program that contains a
20	# configuration script generated by Autoconf, you may include it under
	@@ -30,46 +31,5 @@
31
32	'orting which valid configurations
33	# it does not support. The user should be able to distinguish



















34	# a failure to support a valid configuration from a meaningless
35	# configur

A autosetup/autosetup-config.sub

+35

		--- a/autosetup/autosetup-config.sub
		+++ b/autosetup/autosetup-config.sub
		@@ -0,0 +1,35 @@
	1	+#! /bin/sh
	2	+# Configuration validation subroutine script.
	3	+# Copyright 1992-2018 Free Software Foundation, Inc.
	4	+
	5	+timestamp='2018-03-08it and/or modify it
	6	+# under the terms of the GNU General Public License as published by
	7	+# t;e Free Software Foundation, either version 3 of the L;cense, or
	8	+# (at your option) any later version.
	9	+#
	10	+# This program is distributed in the hope that it will be useful, but
	11	+# WITHOUT ANY WARRANTY; without even the implied warranty of
	12	+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	13	+# General Public License for more details.
	14	+#
	15	+# You should have received a copy of the GNU General Public License
	16	+# along with this program; if not, see <https://www.gnu.org/licenses/>.
	17	+#
	18	+# As a special exception to the GNU General Public License, if you
	19	+# distribute this file as part of a program that contains a
	20	+# configuration script generated by Autoconf, you may include it under
	21	+# the same distribution terms that you use for the rest of that
	22	+# program. This Exception is an additional permission under section 7
	23	+# of the GNU General Public License, version 3 ("GPLv3").
	24	+
	25	+
	26	+# Please send patches to <[email protected]>.
	27	+#
	28	+# Configuration subroutine to validate and canonicalize a configuration type.
	29	+# Supply the specified configuration type as an argument.
	30	+# If it is invalid, we print 1 Free Software Foundation,3 Free Software Foundation, Inc.
	31	+
	32	+'orting which valid configurations
	33	+# it does not support. The user should be able to distinguish
	34	+# a failure to support a valid configuration from a meaningless
	35	+# configur

	--- a/autosetup/autosetup-config.sub
	+++ b/autosetup/autosetup-config.sub
	@@ -0,0 +1,35 @@

	--- a/autosetup/autosetup-config.sub
	+++ b/autosetup/autosetup-config.sub
	@@ -0,0 +1,35 @@
1	#! /bin/sh
2	# Configuration validation subroutine script.
3	# Copyright 1992-2018 Free Software Foundation, Inc.
4
5	timestamp='2018-03-08it and/or modify it
6	# under the terms of the GNU General Public License as published by
7	# t;e Free Software Foundation, either version 3 of the L;cense, or
8	# (at your option) any later version.
9	#
10	# This program is distributed in the hope that it will be useful, but
11	# WITHOUT ANY WARRANTY; without even the implied warranty of
12	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13	# General Public License for more details.
14	#
15	# You should have received a copy of the GNU General Public License
16	# along with this program; if not, see <https://www.gnu.org/licenses/>.
17	#
18	# As a special exception to the GNU General Public License, if you
19	# distribute this file as part of a program that contains a
20	# configuration script generated by Autoconf, you may include it under
21	# the same distribution terms that you use for the rest of that
22	# program. This Exception is an additional permission under section 7
23	# of the GNU General Public License, version 3 ("GPLv3").
24
25
26	# Please send patches to <[email protected]>.
27	#
28	# Configuration subroutine to validate and canonicalize a configuration type.
29	# Supply the specified configuration type as an argument.
30	# If it is invalid, we print 1 Free Software Foundation,3 Free Software Foundation, Inc.
31
32	'orting which valid configurations
33	# it does not support. The user should be able to distinguish
34	# a failure to support a valid configuration from a meaningless
35	# configur

M autosetup/autosetup-find-tclsh

+7 -5

		--- a/autosetup/autosetup-find-tclsh
		+++ b/autosetup/autosetup-find-tclsh
		@@ -1,10 +1,12 @@
1	1	#!/bin/sh
2	2	# Looks for a suitable tclsh or jimsh in the PATH
3		-# If not foundstrap jimsh d=`dirname "$0"`
4		-{ "$d/jimshd/${1-ac"; } 2>&1done
5		-echo 1>&2 bootstrap jimsh0"
6		-for cc in tclsh8.7; do
7		- { $tclsh "$d/c"; } 2>&1 >/dev "$d/${1-autosetup--tclsh}"; } 2>/devexit 0
	3	+# If not foundstrap jimsh in current dir from source
	4	+# Prefer $autosetup_tclsh i
	5	+d=`dirname "$0"`
	6	+{ "$d/jimshd/${1-autosetup-test-tclsh}"; } 2>/dev/null && exit 0
	7	+done
	8	+echo 1>&2 "No installed jimsh or tclsh, building local bootstrap jimsh0"
	9	+for cc in $ { $cc -o jimsh0 "$d/jimsh0.c"; } 2>&1 >/dev "$d/${1-autosetup--tclsh}"; } 2>/dev/null && exit 0
8	10	done
9	11	echo 1>&2 "No installed jimsh or tclsh, building local bootstrap jimsh0"
10	12	for cc in ${CC_FOR_BUILD:-PATH="$PATH:$d2>/dev/null

	--- a/autosetup/autosetup-find-tclsh
	+++ b/autosetup/autosetup-find-tclsh
	@@ -1,10 +1,12 @@
1	#!/bin/sh
2	# Looks for a suitable tclsh or jimsh in the PATH
3	# If not foundstrap jimsh d=`dirname "$0"`
4	{ "$d/jimshd/${1-ac"; } 2>&1done
5	echo 1>&2 bootstrap jimsh0"
6	for cc in tclsh8.7; do
7	{ $tclsh "$d/c"; } 2>&1 >/dev "$d/${1-autosetup--tclsh}"; } 2>/devexit 0


8	done
9	echo 1>&2 "No installed jimsh or tclsh, building local bootstrap jimsh0"
10	for cc in ${CC_FOR_BUILD:-PATH="$PATH:$d2>/dev/null

	--- a/autosetup/autosetup-find-tclsh
	+++ b/autosetup/autosetup-find-tclsh
	@@ -1,10 +1,12 @@
1	#!/bin/sh
2	# Looks for a suitable tclsh or jimsh in the PATH
3	# If not foundstrap jimsh in current dir from source
4	# Prefer $autosetup_tclsh i
5	d=`dirname "$0"`
6	{ "$d/jimshd/${1-autosetup-test-tclsh}"; } 2>/dev/null && exit 0
7	done
8	echo 1>&2 "No installed jimsh or tclsh, building local bootstrap jimsh0"
9	for cc in $ { $cc -o jimsh0 "$d/jimsh0.c"; } 2>&1 >/dev "$d/${1-autosetup--tclsh}"; } 2>/dev/null && exit 0
10	done
11	echo 1>&2 "No installed jimsh or tclsh, building local bootstrap jimsh0"
12	for cc in ${CC_FOR_BUILD:-PATH="$PATH:$d2>/dev/null

A autosetup/autosetup-find-tclsh

+12

		--- a/autosetup/autosetup-find-tclsh
		+++ b/autosetup/autosetup-find-tclsh
		@@ -0,0 +1,12 @@
	1	+#!/bin/sh
	2	+# Looks for a suitable tclsh or jimsh in the PATH
	3	+# If not foundstrap jimsh in current dir from source
	4	+# Prefer $autosetup_tclsh i
	5	+d=`dirname "$0"`
	6	+{ "$d/jimshd/${1-autosetup-test-tclsh}"; } 2>/dev/null && exit 0
	7	+done
	8	+echo 1>&2 "No installed jimsh or tclsh, building local bootstrap jimsh0"
	9	+for cc in $ { $cc -o jimsh0 "$d/jimsh0.c"; } 2>&1 >/dev "$d/${1-autosetup--tclsh}"; } 2>/dev/null && exit 0
	10	+done
	11	+echo 1>&2 "No installed jimsh or tclsh, building local bootstrap jimsh0"
	12	+for cc in ${CC_FOR_BUILD:-PATH="$PATH:$d2>/dev/null

	--- a/autosetup/autosetup-find-tclsh
	+++ b/autosetup/autosetup-find-tclsh
	@@ -0,0 +1,12 @@

	--- a/autosetup/autosetup-find-tclsh
	+++ b/autosetup/autosetup-find-tclsh
	@@ -0,0 +1,12 @@
1	#!/bin/sh
2	# Looks for a suitable tclsh or jimsh in the PATH
3	# If not foundstrap jimsh in current dir from source
4	# Prefer $autosetup_tclsh i
5	d=`dirname "$0"`
6	{ "$d/jimshd/${1-autosetup-test-tclsh}"; } 2>/dev/null && exit 0
7	done
8	echo 1>&2 "No installed jimsh or tclsh, building local bootstrap jimsh0"
9	for cc in $ { $cc -o jimsh0 "$d/jimsh0.c"; } 2>&1 >/dev "$d/${1-autosetup--tclsh}"; } 2>/dev/null && exit 0
10	done
11	echo 1>&2 "No installed jimsh or tclsh, building local bootstrap jimsh0"
12	for cc in ${CC_FOR_BUILD:-PATH="$PATH:$d2>/dev/null

M autosetup/autosetup-test-tclsh

No diff available

A autosetup/autosetup-test-tclsh

+20

		--- a/autosetup/autosetup-test-tclsh
		+++ b/autosetup/autosetup-test-tclsh
		@@ -0,0 +1,20 @@
	1	+# A small Tcl script to verify that the chosen
	2	+# interpreter works. Sometimes we might e.g. pick up
	3	+# an interpreter for a different arch.
	4	+# Outputs the full path to the interpreter
	5	+
	6	+if {[catch {info version} version] == 0} {
	7	+ # This is Jim Tcl
	8	+ if {$version >= 0.72} {
	9	+ # Ensure that regexp works
	10	+ regexp (a.*?) a
	11	+ puts [info nameofexecutable]
	12	+ exit 0
	13	+ }
	14	+} elseif {[catch {info tclversion} version] == 0} {
	15	+ if {$version >= 8.5 && ![string match 8.5a* [info patchlevel]]} {
	16	+ puts [info nameofexecutable]
	17	+ exit 0
	18	+ }
	19	+}
	20	+exit 1

	--- a/autosetup/autosetup-test-tclsh
	+++ b/autosetup/autosetup-test-tclsh
	@@ -0,0 +1,20 @@

	--- a/autosetup/autosetup-test-tclsh
	+++ b/autosetup/autosetup-test-tclsh
	@@ -0,0 +1,20 @@
1	# A small Tcl script to verify that the chosen
2	# interpreter works. Sometimes we might e.g. pick up
3	# an interpreter for a different arch.
4	# Outputs the full path to the interpreter
5
6	if {[catch {info version} version] == 0} {
7	# This is Jim Tcl
8	if {$version >= 0.72} {
9	# Ensure that regexp works
10	regexp (a.*?) a
11	puts [info nameofexecutable]
12	exit 0
13	}
14	} elseif {[catch {info tclversion} version] == 0} {
15	if {$version >= 8.5 && ![string match 8.5a* [info patchlevel]]} {
16	puts [info nameofexecutable]
17	exit 0
18	}
19	}
20	exit 1

M autosetup/cc-db.tcl

+2 -2

		--- autosetup/cc-db.tcl
		+++ autosetup/cc-db.tcl
		@@ -1,12 +1,12 @@
1	1	# Copyright (c) 2011 WorkWare Systems http://www.workware.net.au/
2	2	# All rights reserved
3	3
4	4	# @synopsis:
5	5	#
6		-# The 'cc-db' module provides a knowledge based of system idiosyncrasies
7		-# In general, this module can always be included
	6	+# The 'cc-db' module provides a knowledge-base of system idiosyncrasies.
	7	+# In general, this module can always be included.
8	8
9	9	use cc
10	10
11	11	module-options {}
12	12
13	13

	--- autosetup/cc-db.tcl
	+++ autosetup/cc-db.tcl
	@@ -1,12 +1,12 @@
1	# Copyright (c) 2011 WorkWare Systems http://www.workware.net.au/
2	# All rights reserved
3
4	# @synopsis:
5	#
6	# The 'cc-db' module provides a knowledge based of system idiosyncrasies
7	# In general, this module can always be included
8
9	use cc
10
11	module-options {}
12
13

	--- autosetup/cc-db.tcl
	+++ autosetup/cc-db.tcl
	@@ -1,12 +1,12 @@
1	# Copyright (c) 2011 WorkWare Systems http://www.workware.net.au/
2	# All rights reserved
3
4	# @synopsis:
5	#
6	# The 'cc-db' module provides a knowledge-base of system idiosyncrasies.
7	# In general, this module can always be included.
8
9	use cc
10
11	module-options {}
12
13

M autosetup/cc-lib.tcl

+77 -79

		--- autosetup/cc-lib.tcl
		+++ autosetup/cc-lib.tcl
		@@ -9,12 +9,12 @@
9	9
10	10	module-options {}
11	11
12	12	# @cc-check-lfs
13	13	#
14		-# The equivalent of the AC_SYS_LARGEFILE macro
15		-#
	14	+# The equivalent of the 'AC_SYS_LARGEFILE' macro.
	15	+#
16	16	# defines 'HAVE_LFS' if LFS is available,
17	17	# and defines '_FILE_OFFSET_BITS=64' if necessary
18	18	#
19	19	# Returns 1 if 'LFS' is available or 0 otherwise
20	20	#
		@@ -35,12 +35,12 @@
35	35	return $lfs
36	36	}
37	37
38	38	# @cc-check-endian
39	39	#
40		-# The equivalent of the AC_C_BIGENDIAN macro
41		-#
	40	+# The equivalent of the 'AC_C_BIGENDIAN' macro.
	41	+#
42	42	# defines 'HAVE_BIG_ENDIAN' if endian is known to be big,
43	43	# or 'HAVE_LITTLE_ENDIAN' if endian is known to be little.
44	44	#
45	45	# Returns 1 if determined, or 0 if not.
46	46	#
		@@ -80,112 +80,110 @@
80	80	#
81	81	# Checks whether the given C/C++ compiler flags can be used. Defines feature
82	82	# names prefixed with 'HAVE_CFLAG' and 'HAVE_CXXFLAG' respectively, and
83	83	# appends working flags to '-cflags' and 'CFLAGS' or 'CXXFLAGS'.
84	84	proc cc-check-flags {args} {
85		- set result 1
86		- array set opts [cc-get-settings]
87		- switch -exact -- $opts(-lang) {
88		- c++ {
89		- set lang C++
90		- set prefix CXXFLAG
91		- }
92		- c {
93		- set lang C
94		- set prefix CFLAG
95		- }
96		- default {
97		- autosetup-error "cc-check-flags failed with unknown language: $opts(-lang)"
98		- }
99		- }
100		- foreach flag $args {
101		- msg-checking "Checking whether the $lang compiler accepts $flag..."
102		- if {[cctest -cflags $flag]} {
103		- msg-result yes
104		- define-feature $prefix$flag
105		- cc-with [list -cflags [list $flag]]
106		- define-append ${prefix}S $flag
107		- } else {
108		- msg-result no
109		- set result 0
110		- }
111		- }
112		- return $result
	85	+ set result 1
	86	+ array set opts [cc-get-settings]
	87	+ switch -exact -- $opts(-lang) {
	88	+ c++ {
	89	+ set lang C++
	90	+ set prefix CXXFLAG
	91	+ }
	92	+ c {
	93	+ set lang C
	94	+ set prefix CFLAG
	95	+ }
	96	+ default {
	97	+ autosetup-error "cc-check-flags failed with unknown language: $opts(-lang)"
	98	+ }
	99	+ }
	100	+ foreach flag $args {
	101	+ msg-checking "Checking whether the $lang compiler accepts $flag..."
	102	+ if {[cctest -cflags $flag]} {
	103	+ msg-result yes
	104	+ define-feature $prefix$flag
	105	+ cc-with [list -cflags [list $flag]]
	106	+ define-append ${prefix}S $flag
	107	+ } else {
	108	+ msg-result no
	109	+ set result 0
	110	+ }
	111	+ }
	112	+ return $result
113	113	}
114	114
115	115	# @cc-check-standards ver ?...?
116	116	#
117	117	# Checks whether the C/C++ compiler accepts one of the specified '-std=$ver'
118	118	# options, and appends the first working one to '-cflags' and 'CFLAGS' or
119	119	# 'CXXFLAGS'.
120	120	proc cc-check-standards {args} {
121		- array set opts [cc-get-settings]
122		- foreach std $args {
123		- if {[cc-check-flags -std=$std]} {
124		- return $std
125		- }
126		- }
127		- return ""
	121	+ array set opts [cc-get-settings]
	122	+ foreach std $args {
	123	+ if {[cc-check-flags -std=$std]} {
	124	+ return $std
	125	+ }
	126	+ }
	127	+ return ""
128	128	}
129	129
130	130	# Checks whether $keyword is usable as alignof
131	131	proc cctest_alignof {keyword} {
132		- msg-checking "Checking for $keyword..."
133		- if {[cctest -code [subst -nobackslashes {
134		- printf("minimum alignment is %d == %d\n", ${keyword}(char), ${keyword}('x'));
135		- }]]} then {
136		- msg-result ok
137		- define-feature $keyword
138		- } else {
139		- msg-result "not found"
140		- }
	132	+ msg-checking "Checking for $keyword..."
	133	+ if {[cctest -code "int x = ${keyword}(char), y = ${keyword}('x');"]} then {
	134	+ msg-result ok
	135	+ define-feature $keyword
	136	+ } else {
	137	+ msg-result "not found"
	138	+ }
141	139	}
142	140
143	141	# @cc-check-c11
144	142	#
145	143	# Checks for several C11/C++11 extensions and their alternatives. Currently
146	144	# checks for '_Static_assert', '_Alignof', '__alignof__', '__alignof'.
147	145	proc cc-check-c11 {} {
148		- msg-checking "Checking for _Static_assert..."
149		- if {[cctest -code {
150		- _Static_assert(1, "static assertions are available");
151		- }]} then {
152		- msg-result ok
153		- define-feature _Static_assert
154		- } else {
155		- msg-result "not found"
156		- }
157		-
158		- cctest_alignof _Alignof
159		- cctest_alignof __alignof__
160		- cctest_alignof __alignof
	146	+ msg-checking "Checking for _Static_assert..."
	147	+ if {[cctest -code {
	148	+ _Static_assert(1, "static assertions are available");
	149	+ }]} then {
	150	+ msg-result ok
	151	+ define-feature _Static_assert
	152	+ } else {
	153	+ msg-result "not found"
	154	+ }
	155	+
	156	+ cctest_alignof _Alignof
	157	+ cctest_alignof __alignof__
	158	+ cctest_alignof __alignof
161	159	}
162	160
163	161	# @cc-check-alloca
164	162	#
165		-# The equivalent of the AC_FUNC_ALLOCA macro
	163	+# The equivalent of the 'AC_FUNC_ALLOCA' macro.
166	164	#
167		-# Checks for the existence of alloca
168		-# defines HAVE_ALLOCA and returns 1 if it exists
	165	+# Checks for the existence of 'alloca'
	166	+# defines 'HAVE_ALLOCA' and returns 1 if it exists.
169	167	proc cc-check-alloca {} {
170		- cc-check-some-feature alloca {
171		- cctest -includes alloca.h -code { alloca (2 * sizeof (int)); }
172		- }
	168	+ cc-check-some-feature alloca {
	169	+ cctest -includes alloca.h -code { alloca (2 * sizeof (int)); }
	170	+ }
173	171	}
174	172
175	173	# @cc-signal-return-type
176	174	#
177		-# The equivalent of the AC_TYPE_SIGNAL macro
	175	+# The equivalent of the 'AC_TYPE_SIGNAL' macro.
178	176	#
179		-# defines RETSIGTYPE to int or void
	177	+# defines 'RETSIGTYPE' to 'int' or 'void'.
180	178	proc cc-signal-return-type {} {
181		- msg-checking "Checking return type of signal handlers..."
182		- cc-with {-includes {sys/types.h signal.h}} {
183		- if {[cctest -code {return *(signal (0, 0)) (0) == 1;}]} {
184		- set type int
185		- } else {
186		- set type void
187		- }
188		- define RETSIGTYPE $type
189		- msg-result $type
190		- }
	179	+ msg-checking "Checking return type of signal handlers..."
	180	+ cc-with {-includes {sys/types.h signal.h}} {
	181	+ if {[cctest -code {return *(signal (0, 0)) (0) == 1;}]} {
	182	+ set type int
	183	+ } else {
	184	+ set type void
	185	+ }
	186	+ define RETSIGTYPE $type
	187	+ msg-result $type
	188	+ }
191	189	}
192	190

	--- autosetup/cc-lib.tcl
	+++ autosetup/cc-lib.tcl
	@@ -9,12 +9,12 @@
9
10	module-options {}
11
12	# @cc-check-lfs
13	#
14	# The equivalent of the AC_SYS_LARGEFILE macro
15	#
16	# defines 'HAVE_LFS' if LFS is available,
17	# and defines '_FILE_OFFSET_BITS=64' if necessary
18	#
19	# Returns 1 if 'LFS' is available or 0 otherwise
20	#
	@@ -35,12 +35,12 @@
35	return $lfs
36	}
37
38	# @cc-check-endian
39	#
40	# The equivalent of the AC_C_BIGENDIAN macro
41	#
42	# defines 'HAVE_BIG_ENDIAN' if endian is known to be big,
43	# or 'HAVE_LITTLE_ENDIAN' if endian is known to be little.
44	#
45	# Returns 1 if determined, or 0 if not.
46	#
	@@ -80,112 +80,110 @@
80	#
81	# Checks whether the given C/C++ compiler flags can be used. Defines feature
82	# names prefixed with 'HAVE_CFLAG' and 'HAVE_CXXFLAG' respectively, and
83	# appends working flags to '-cflags' and 'CFLAGS' or 'CXXFLAGS'.
84	proc cc-check-flags {args} {
85	set result 1
86	array set opts [cc-get-settings]
87	switch -exact -- $opts(-lang) {
88	c++ {
89	set lang C++
90	set prefix CXXFLAG
91	}
92	c {
93	set lang C
94	set prefix CFLAG
95	}
96	default {
97	autosetup-error "cc-check-flags failed with unknown language: $opts(-lang)"
98	}
99	}
100	foreach flag $args {
101	msg-checking "Checking whether the $lang compiler accepts $flag..."
102	if {[cctest -cflags $flag]} {
103	msg-result yes
104	define-feature $prefix$flag
105	cc-with [list -cflags [list $flag]]
106	define-append ${prefix}S $flag
107	} else {
108	msg-result no
109	set result 0
110	}
111	}
112	return $result
113	}
114
115	# @cc-check-standards ver ?...?
116	#
117	# Checks whether the C/C++ compiler accepts one of the specified '-std=$ver'
118	# options, and appends the first working one to '-cflags' and 'CFLAGS' or
119	# 'CXXFLAGS'.
120	proc cc-check-standards {args} {
121	array set opts [cc-get-settings]
122	foreach std $args {
123	if {[cc-check-flags -std=$std]} {
124	return $std
125	}
126	}
127	return ""
128	}
129
130	# Checks whether $keyword is usable as alignof
131	proc cctest_alignof {keyword} {
132	msg-checking "Checking for $keyword..."
133	if {[cctest -code [subst -nobackslashes {
134	printf("minimum alignment is %d == %d\n", ${keyword}(char), ${keyword}('x'));
135	}]]} then {
136	msg-result ok
137	define-feature $keyword
138	} else {
139	msg-result "not found"
140	}
141	}
142
143	# @cc-check-c11
144	#
145	# Checks for several C11/C++11 extensions and their alternatives. Currently
146	# checks for '_Static_assert', '_Alignof', '__alignof__', '__alignof'.
147	proc cc-check-c11 {} {
148	msg-checking "Checking for _Static_assert..."
149	if {[cctest -code {
150	_Static_assert(1, "static assertions are available");
151	}]} then {
152	msg-result ok
153	define-feature _Static_assert
154	} else {
155	msg-result "not found"
156	}
157
158	cctest_alignof _Alignof
159	cctest_alignof __alignof__
160	cctest_alignof __alignof
161	}
162
163	# @cc-check-alloca
164	#
165	# The equivalent of the AC_FUNC_ALLOCA macro
166	#
167	# Checks for the existence of alloca
168	# defines HAVE_ALLOCA and returns 1 if it exists
169	proc cc-check-alloca {} {
170	cc-check-some-feature alloca {
171	cctest -includes alloca.h -code { alloca (2 * sizeof (int)); }
172	}
173	}
174
175	# @cc-signal-return-type
176	#
177	# The equivalent of the AC_TYPE_SIGNAL macro
178	#
179	# defines RETSIGTYPE to int or void
180	proc cc-signal-return-type {} {
181	msg-checking "Checking return type of signal handlers..."
182	cc-with {-includes {sys/types.h signal.h}} {
183	if {[cctest -code {return *(signal (0, 0)) (0) == 1;}]} {
184	set type int
185	} else {
186	set type void
187	}
188	define RETSIGTYPE $type
189	msg-result $type
190	}
191	}
192

	--- autosetup/cc-lib.tcl
	+++ autosetup/cc-lib.tcl
	@@ -9,12 +9,12 @@
9
10	module-options {}
11
12	# @cc-check-lfs
13	#
14	# The equivalent of the 'AC_SYS_LARGEFILE' macro.
15	#
16	# defines 'HAVE_LFS' if LFS is available,
17	# and defines '_FILE_OFFSET_BITS=64' if necessary
18	#
19	# Returns 1 if 'LFS' is available or 0 otherwise
20	#
	@@ -35,12 +35,12 @@
35	return $lfs
36	}
37
38	# @cc-check-endian
39	#
40	# The equivalent of the 'AC_C_BIGENDIAN' macro.
41	#
42	# defines 'HAVE_BIG_ENDIAN' if endian is known to be big,
43	# or 'HAVE_LITTLE_ENDIAN' if endian is known to be little.
44	#
45	# Returns 1 if determined, or 0 if not.
46	#
	@@ -80,112 +80,110 @@
80	#
81	# Checks whether the given C/C++ compiler flags can be used. Defines feature
82	# names prefixed with 'HAVE_CFLAG' and 'HAVE_CXXFLAG' respectively, and
83	# appends working flags to '-cflags' and 'CFLAGS' or 'CXXFLAGS'.
84	proc cc-check-flags {args} {
85	set result 1
86	array set opts [cc-get-settings]
87	switch -exact -- $opts(-lang) {
88	c++ {
89	set lang C++
90	set prefix CXXFLAG
91	}
92	c {
93	set lang C
94	set prefix CFLAG
95	}
96	default {
97	autosetup-error "cc-check-flags failed with unknown language: $opts(-lang)"
98	}
99	}
100	foreach flag $args {
101	msg-checking "Checking whether the $lang compiler accepts $flag..."
102	if {[cctest -cflags $flag]} {
103	msg-result yes
104	define-feature $prefix$flag
105	cc-with [list -cflags [list $flag]]
106	define-append ${prefix}S $flag
107	} else {
108	msg-result no
109	set result 0
110	}
111	}
112	return $result
113	}
114
115	# @cc-check-standards ver ?...?
116	#
117	# Checks whether the C/C++ compiler accepts one of the specified '-std=$ver'
118	# options, and appends the first working one to '-cflags' and 'CFLAGS' or
119	# 'CXXFLAGS'.
120	proc cc-check-standards {args} {
121	array set opts [cc-get-settings]
122	foreach std $args {
123	if {[cc-check-flags -std=$std]} {
124	return $std
125	}
126	}
127	return ""
128	}
129
130	# Checks whether $keyword is usable as alignof
131	proc cctest_alignof {keyword} {
132	msg-checking "Checking for $keyword..."
133	if {[cctest -code "int x = ${keyword}(char), y = ${keyword}('x');"]} then {
134	msg-result ok
135	define-feature $keyword
136	} else {
137	msg-result "not found"
138	}


139	}
140
141	# @cc-check-c11
142	#
143	# Checks for several C11/C++11 extensions and their alternatives. Currently
144	# checks for '_Static_assert', '_Alignof', '__alignof__', '__alignof'.
145	proc cc-check-c11 {} {
146	msg-checking "Checking for _Static_assert..."
147	if {[cctest -code {
148	_Static_assert(1, "static assertions are available");
149	}]} then {
150	msg-result ok
151	define-feature _Static_assert
152	} else {
153	msg-result "not found"
154	}
155
156	cctest_alignof _Alignof
157	cctest_alignof __alignof__
158	cctest_alignof __alignof
159	}
160
161	# @cc-check-alloca
162	#
163	# The equivalent of the 'AC_FUNC_ALLOCA' macro.
164	#
165	# Checks for the existence of 'alloca'
166	# defines 'HAVE_ALLOCA' and returns 1 if it exists.
167	proc cc-check-alloca {} {
168	cc-check-some-feature alloca {
169	cctest -includes alloca.h -code { alloca (2 * sizeof (int)); }
170	}
171	}
172
173	# @cc-signal-return-type
174	#
175	# The equivalent of the 'AC_TYPE_SIGNAL' macro.
176	#
177	# defines 'RETSIGTYPE' to 'int' or 'void'.
178	proc cc-signal-return-type {} {
179	msg-checking "Checking return type of signal handlers..."
180	cc-with {-includes {sys/types.h signal.h}} {
181	if {[cctest -code {return *(signal (0, 0)) (0) == 1;}]} {
182	set type int
183	} else {
184	set type void
185	}
186	define RETSIGTYPE $type
187	msg-result $type
188	}
189	}
190

M autosetup/cc-shared.tcl

+9 -13

		--- autosetup/cc-shared.tcl
		+++ autosetup/cc-shared.tcl
		@@ -7,27 +7,30 @@
7	7	# It defines the following variables:
8	8	#
9	9	## SH_CFLAGS Flags to use compiling sources destined for a shared library
10	10	## SH_LDFLAGS Flags to use linking (creating) a shared library
11	11	## SH_SOPREFIX Prefix to use to set the soname when creating a shared library
	12	+## SH_SOFULLPATH Set to 1 if the shared library soname should include the full install path
12	13	## SH_SOEXT Extension for shared libs
13	14	## SH_SOEXTVER Format for versioned shared libs - %s = version
14	15	## SHOBJ_CFLAGS Flags to use compiling sources destined for a shared object
15	16	## SHOBJ_LDFLAGS Flags to use linking a shared object, undefined symbols allowed
16	17	## SHOBJ_LDFLAGS_R - as above, but all symbols must be resolved
	18	+## SH_LINKRPATH Format for setting the rpath when linking an executable, %s = path
17	19	## SH_LINKFLAGS Flags to use linking an executable which will load shared objects
18	20	## LD_LIBRARY_PATH Environment variable which specifies path to shared libraries
19	21	## STRIPLIBFLAGS Arguments to strip a dynamic library
20	22
21	23	module-options {}
22	24
23	25	# Defaults: gcc on unix
24		-define SHOBJ_CFLAGS -fpic
	26	+define SHOBJ_CFLAGS -fPIC
25	27	define SHOBJ_LDFLAGS -shared
26		-define SH_CFLAGS -fpic
	28	+define SH_CFLAGS -fPIC
27	29	define SH_LDFLAGS -shared
28	30	define SH_LINKFLAGS -rdynamic
	31	+define SH_LINKRPATH "-Wl,-rpath -Wl,%s"
29	32	define SH_SOEXT .so
30	33	define SH_SOEXTVER .so.%s
31	34	define SH_SOPREFIX -Wl,-soname,
32	35	define LD_LIBRARY_PATH LD_LIBRARY_PATH
33	36	define STRIPLIBFLAGS --strip-unneeded
		@@ -44,18 +47,20 @@
44	47	define SH_LDFLAGS -dynamiclib
45	48	define SH_LINKFLAGS ""
46	49	define SH_SOEXT .dylib
47	50	define SH_SOEXTVER .%s.dylib
48	51	define SH_SOPREFIX -Wl,-install_name,
	52	+ define SH_SOFULLPATH
49	53	define LD_LIBRARY_PATH DYLD_LIBRARY_PATH
50	54	define STRIPLIBFLAGS -x
51	55	}
52	56	--ming* - --cygwin - --msys {
53	57	define SHOBJ_CFLAGS ""
54	58	define SHOBJ_LDFLAGS -shared
55	59	define SH_CFLAGS ""
56	60	define SH_LDFLAGS -shared
	61	+ define SH_LINKRPATH ""
57	62	define SH_LINKFLAGS ""
58	63	define SH_SOEXT .dll
59	64	define SH_SOEXTVER .dll
60	65	define SH_SOPREFIX ""
61	66	define LD_LIBRARY_PATH PATH
		@@ -62,27 +67,23 @@
62	67	}
63	68	sparc* {
64	69	if {[msg-quiet cc-check-decls __SUNPRO_C]} {
65	70	msg-result "Found sun stdio compiler"
66	71	# sun stdio compiler
67		- # XXX: These haven't been fully tested.
	72	+ # XXX: These haven't been fully tested.
68	73	define SHOBJ_CFLAGS -KPIC
69	74	define SHOBJ_LDFLAGS "-G"
70	75	define SH_CFLAGS -KPIC
71	76	define SH_LINKFLAGS -Wl,-export-dynamic
72	77	define SH_SOPREFIX -Wl,-h,
73		- } else {
74		- # sparc has a very small GOT table limit, so use -fPIC
75		- define SH_CFLAGS -fPIC
76		- define SHOBJ_CFLAGS -fPIC
77	78	}
78	79	}
79	80	--solaris* {
80	81	if {[msg-quiet cc-check-decls __SUNPRO_C]} {
81	82	msg-result "Found sun stdio compiler"
82	83	# sun stdio compiler
83		- # XXX: These haven't been fully tested.
	84	+ # XXX: These haven't been fully tested.
84	85	define SHOBJ_CFLAGS -KPIC
85	86	define SHOBJ_LDFLAGS "-G"
86	87	define SH_CFLAGS -KPIC
87	88	define SH_LINKFLAGS -Wl,-export-dynamic
88	89	define SH_SOPREFIX -Wl,-h,
		@@ -103,15 +104,10 @@
103	104	define SH_LDFLAGS -shared
104	105	define SH_LINKFLAGS ""
105	106	define SH_SOPREFIX ""
106	107	define LD_LIBRARY_PATH LIBRARY_PATH
107	108	}
108		- microblaze* {
109		- # Microblaze generally needs -fPIC rather than -fpic
110		- define SHOBJ_CFLAGS -fPIC
111		- define SH_CFLAGS -fPIC
112		- }
113	109	}
114	110
115	111	if {![is-defined SHOBJ_LDFLAGS_R]} {
116	112	define SHOBJ_LDFLAGS_R [get-define SHOBJ_LDFLAGS]
117	113	}
118	114

	--- autosetup/cc-shared.tcl
	+++ autosetup/cc-shared.tcl
	@@ -7,27 +7,30 @@
7	# It defines the following variables:
8	#
9	## SH_CFLAGS Flags to use compiling sources destined for a shared library
10	## SH_LDFLAGS Flags to use linking (creating) a shared library
11	## SH_SOPREFIX Prefix to use to set the soname when creating a shared library

12	## SH_SOEXT Extension for shared libs
13	## SH_SOEXTVER Format for versioned shared libs - %s = version
14	## SHOBJ_CFLAGS Flags to use compiling sources destined for a shared object
15	## SHOBJ_LDFLAGS Flags to use linking a shared object, undefined symbols allowed
16	## SHOBJ_LDFLAGS_R - as above, but all symbols must be resolved

17	## SH_LINKFLAGS Flags to use linking an executable which will load shared objects
18	## LD_LIBRARY_PATH Environment variable which specifies path to shared libraries
19	## STRIPLIBFLAGS Arguments to strip a dynamic library
20
21	module-options {}
22
23	# Defaults: gcc on unix
24	define SHOBJ_CFLAGS -fpic
25	define SHOBJ_LDFLAGS -shared
26	define SH_CFLAGS -fpic
27	define SH_LDFLAGS -shared
28	define SH_LINKFLAGS -rdynamic

29	define SH_SOEXT .so
30	define SH_SOEXTVER .so.%s
31	define SH_SOPREFIX -Wl,-soname,
32	define LD_LIBRARY_PATH LD_LIBRARY_PATH
33	define STRIPLIBFLAGS --strip-unneeded
	@@ -44,18 +47,20 @@
44	define SH_LDFLAGS -dynamiclib
45	define SH_LINKFLAGS ""
46	define SH_SOEXT .dylib
47	define SH_SOEXTVER .%s.dylib
48	define SH_SOPREFIX -Wl,-install_name,

49	define LD_LIBRARY_PATH DYLD_LIBRARY_PATH
50	define STRIPLIBFLAGS -x
51	}
52	--ming* - --cygwin - --msys {
53	define SHOBJ_CFLAGS ""
54	define SHOBJ_LDFLAGS -shared
55	define SH_CFLAGS ""
56	define SH_LDFLAGS -shared

57	define SH_LINKFLAGS ""
58	define SH_SOEXT .dll
59	define SH_SOEXTVER .dll
60	define SH_SOPREFIX ""
61	define LD_LIBRARY_PATH PATH
	@@ -62,27 +67,23 @@
62	}
63	sparc* {
64	if {[msg-quiet cc-check-decls __SUNPRO_C]} {
65	msg-result "Found sun stdio compiler"
66	# sun stdio compiler
67	# XXX: These haven't been fully tested.
68	define SHOBJ_CFLAGS -KPIC
69	define SHOBJ_LDFLAGS "-G"
70	define SH_CFLAGS -KPIC
71	define SH_LINKFLAGS -Wl,-export-dynamic
72	define SH_SOPREFIX -Wl,-h,
73	} else {
74	# sparc has a very small GOT table limit, so use -fPIC
75	define SH_CFLAGS -fPIC
76	define SHOBJ_CFLAGS -fPIC
77	}
78	}
79	--solaris* {
80	if {[msg-quiet cc-check-decls __SUNPRO_C]} {
81	msg-result "Found sun stdio compiler"
82	# sun stdio compiler
83	# XXX: These haven't been fully tested.
84	define SHOBJ_CFLAGS -KPIC
85	define SHOBJ_LDFLAGS "-G"
86	define SH_CFLAGS -KPIC
87	define SH_LINKFLAGS -Wl,-export-dynamic
88	define SH_SOPREFIX -Wl,-h,
	@@ -103,15 +104,10 @@
103	define SH_LDFLAGS -shared
104	define SH_LINKFLAGS ""
105	define SH_SOPREFIX ""
106	define LD_LIBRARY_PATH LIBRARY_PATH
107	}
108	microblaze* {
109	# Microblaze generally needs -fPIC rather than -fpic
110	define SHOBJ_CFLAGS -fPIC
111	define SH_CFLAGS -fPIC
112	}
113	}
114
115	if {![is-defined SHOBJ_LDFLAGS_R]} {
116	define SHOBJ_LDFLAGS_R [get-define SHOBJ_LDFLAGS]
117	}
118

	--- autosetup/cc-shared.tcl
	+++ autosetup/cc-shared.tcl
	@@ -7,27 +7,30 @@
7	# It defines the following variables:
8	#
9	## SH_CFLAGS Flags to use compiling sources destined for a shared library
10	## SH_LDFLAGS Flags to use linking (creating) a shared library
11	## SH_SOPREFIX Prefix to use to set the soname when creating a shared library
12	## SH_SOFULLPATH Set to 1 if the shared library soname should include the full install path
13	## SH_SOEXT Extension for shared libs
14	## SH_SOEXTVER Format for versioned shared libs - %s = version
15	## SHOBJ_CFLAGS Flags to use compiling sources destined for a shared object
16	## SHOBJ_LDFLAGS Flags to use linking a shared object, undefined symbols allowed
17	## SHOBJ_LDFLAGS_R - as above, but all symbols must be resolved
18	## SH_LINKRPATH Format for setting the rpath when linking an executable, %s = path
19	## SH_LINKFLAGS Flags to use linking an executable which will load shared objects
20	## LD_LIBRARY_PATH Environment variable which specifies path to shared libraries
21	## STRIPLIBFLAGS Arguments to strip a dynamic library
22
23	module-options {}
24
25	# Defaults: gcc on unix
26	define SHOBJ_CFLAGS -fPIC
27	define SHOBJ_LDFLAGS -shared
28	define SH_CFLAGS -fPIC
29	define SH_LDFLAGS -shared
30	define SH_LINKFLAGS -rdynamic
31	define SH_LINKRPATH "-Wl,-rpath -Wl,%s"
32	define SH_SOEXT .so
33	define SH_SOEXTVER .so.%s
34	define SH_SOPREFIX -Wl,-soname,
35	define LD_LIBRARY_PATH LD_LIBRARY_PATH
36	define STRIPLIBFLAGS --strip-unneeded
	@@ -44,18 +47,20 @@
47	define SH_LDFLAGS -dynamiclib
48	define SH_LINKFLAGS ""
49	define SH_SOEXT .dylib
50	define SH_SOEXTVER .%s.dylib
51	define SH_SOPREFIX -Wl,-install_name,
52	define SH_SOFULLPATH
53	define LD_LIBRARY_PATH DYLD_LIBRARY_PATH
54	define STRIPLIBFLAGS -x
55	}
56	--ming* - --cygwin - --msys {
57	define SHOBJ_CFLAGS ""
58	define SHOBJ_LDFLAGS -shared
59	define SH_CFLAGS ""
60	define SH_LDFLAGS -shared
61	define SH_LINKRPATH ""
62	define SH_LINKFLAGS ""
63	define SH_SOEXT .dll
64	define SH_SOEXTVER .dll
65	define SH_SOPREFIX ""
66	define LD_LIBRARY_PATH PATH
	@@ -62,27 +67,23 @@
67	}
68	sparc* {
69	if {[msg-quiet cc-check-decls __SUNPRO_C]} {
70	msg-result "Found sun stdio compiler"
71	# sun stdio compiler
72	# XXX: These haven't been fully tested.
73	define SHOBJ_CFLAGS -KPIC
74	define SHOBJ_LDFLAGS "-G"
75	define SH_CFLAGS -KPIC
76	define SH_LINKFLAGS -Wl,-export-dynamic
77	define SH_SOPREFIX -Wl,-h,




78	}
79	}
80	--solaris* {
81	if {[msg-quiet cc-check-decls __SUNPRO_C]} {
82	msg-result "Found sun stdio compiler"
83	# sun stdio compiler
84	# XXX: These haven't been fully tested.
85	define SHOBJ_CFLAGS -KPIC
86	define SHOBJ_LDFLAGS "-G"
87	define SH_CFLAGS -KPIC
88	define SH_LINKFLAGS -Wl,-export-dynamic
89	define SH_SOPREFIX -Wl,-h,
	@@ -103,15 +104,10 @@
104	define SH_LDFLAGS -shared
105	define SH_LINKFLAGS ""
106	define SH_SOPREFIX ""
107	define LD_LIBRARY_PATH LIBRARY_PATH
108	}





109	}
110
111	if {![is-defined SHOBJ_LDFLAGS_R]} {
112	define SHOBJ_LDFLAGS_R [get-define SHOBJ_LDFLAGS]
113	}
114

M autosetup/cc.tcl

+80 -52

		--- autosetup/cc.tcl
		+++ autosetup/cc.tcl
		@@ -2,17 +2,18 @@
2	2	# All rights reserved
3	3
4	4	# @synopsis:
5	5	#
6	6	# The 'cc' module supports checking various 'features' of the C or C++
7		-# compiler/linker environment. Common commands are cc-check-includes,
8		-# cc-check-types, cc-check-functions, cc-with, make-autoconf-h and make-template.
	7	+# compiler/linker environment. Common commands are 'cc-check-includes',
	8	+# 'cc-check-types', 'cc-check-functions', 'cc-with', 'make-config-header' and 'make-template'.
9	9	#
10	10	# The following environment variables are used if set:
11	11	#
12	12	## CC - C compiler
13	13	## CXX - C++ compiler
	14	+## CPP - C preprocessor
14	15	## CCACHE - Set to "none" to disable automatic use of ccache
15	16	## CFLAGS - Additional C compiler flags
16	17	## CXXFLAGS - Additional C++ compiler flags
17	18	## LDFLAGS - Additional compiler flags during linking
18	19	## LIBS - Additional libraries to use (for all tests)
		@@ -28,15 +29,10 @@
28	29
29	30	use system
30	31
31	32	module-options {}
32	33
33		-# Note that the return code is not meaningful
34		-proc cc-check-something {name code} {
35		- uplevel 1 $code
36		-}
37		-
38	34	# Checks for the existence of the given function by linking
39	35	#
40	36	proc cctest_function {function} {
41	37	cctest -link 1 -declare "extern void $function\(void);" -code "$function\();"
42	38	}
		@@ -68,12 +64,12 @@
68	64	}
69	65
70	66	# @cc-check-sizeof type ...
71	67	#
72	68	# Checks the size of the given types (between 1 and 32, inclusive).
73		-# Defines a variable with the size determined, or "unknown" otherwise.
74		-# e.g. for type 'long long', defines SIZEOF_LONG_LONG.
	69	+# Defines a variable with the size determined, or 'unknown' otherwise.
	70	+# e.g. for type 'long long', defines 'SIZEOF_LONG_LONG'.
75	71	# Returns the size of the last type.
76	72	#
77	73	proc cc-check-sizeof {args} {
78	74	foreach type $args {
79	75	msg-checking "Checking for sizeof $type..."
		@@ -109,11 +105,11 @@
109	105	return $ret
110	106	}
111	107
112	108	# @cc-check-includes includes ...
113	109	#
114		-# Checks that the given include files can be used
	110	+# Checks that the given include files can be used.
115	111	proc cc-check-includes {args} {
116	112	cc-check-some-feature $args {
117	113	set with {}
118	114	if {[dict exists $::autosetup(cc-include-deps) $each]} {
119	115	set deps [dict keys [dict get $::autosetup(cc-include-deps) $each]]
		@@ -134,12 +130,12 @@
134	130	}
135	131	}
136	132
137	133	# @cc-include-needs include required ...
138	134	#
139		-# Ensures that when checking for 'include', a check is first
140		-# made for each 'required' file, and if found, it is #included
	135	+# Ensures that when checking for '$include', a check is first
	136	+# made for each '$required' file, and if found, it is included with '#include'.
141	137	proc cc-include-needs {file args} {
142	138	foreach depfile $args {
143	139	dict set ::autosetup(cc-include-deps) $file $depfile 1
144	140	}
145	141	}
		@@ -153,22 +149,22 @@
153	149	}
154	150	}
155	151
156	152	# @cc-check-defines define ...
157	153	#
158		-# Checks that the given preprocessor symbol is defined
	154	+# Checks that the given preprocessor symbols are defined.
159	155	proc cc-check-defines {args} {
160	156	cc-check-some-feature $args {
161	157	cctest_define $each
162	158	}
163	159	}
164	160
165	161	# @cc-check-decls name ...
166	162	#
167	163	# Checks that each given name is either a preprocessor symbol or rvalue
168		-# such as an enum. Note that the define used is HAVE_DECL_xxx
169		-# rather than HAVE_xxx
	164	+# such as an enum. Note that the define used is 'HAVE_DECL_xxx'
	165	+# rather than 'HAVE_xxx'.
170	166	proc cc-check-decls {args} {
171	167	set ret 1
172	168	foreach name $args {
173	169	msg-checking "Checking for $name..."
174	170	set r [cctest_decl $name]
		@@ -183,21 +179,21 @@
183	179	return $ret
184	180	}
185	181
186	182	# @cc-check-functions function ...
187	183	#
188		-# Checks that the given functions exist (can be linked)
	184	+# Checks that the given functions exist (can be linked).
189	185	proc cc-check-functions {args} {
190	186	cc-check-some-feature $args {
191	187	cctest_function $each
192	188	}
193	189	}
194	190
195	191	# @cc-check-members type.member ...
196	192	#
197	193	# Checks that the given type/structure members exist.
198		-# A structure member is of the form "struct stat.st_mtime"
	194	+# A structure member is of the form 'struct stat.st_mtime'.
199	195	proc cc-check-members {args} {
200	196	cc-check-some-feature $args {
201	197	cctest_member $each
202	198	}
203	199	}
		@@ -207,20 +203,20 @@
207	203	# Checks that the given function can be found in one of the libs.
208	204	#
209	205	# First checks for no library required, then checks each of the libraries
210	206	# in turn.
211	207	#
212		-# If the function is found, the feature is defined and lib_$function is defined
213		-# to -l$lib where the function was found, or "" if no library required.
214		-# In addition, -l$lib is prepended to the LIBS define.
	208	+# If the function is found, the feature is defined and 'lib_$function' is defined
	209	+# to '-l$lib' where the function was found, or "" if no library required.
	210	+# In addition, '-l$lib' is prepended to the 'LIBS' define.
215	211	#
216	212	# If additional libraries may be needed for linking, they should be specified
217		-# as $extralibs as "-lotherlib1 -lotherlib2".
218		-# These libraries are not automatically added to LIBS.
	213	+# with '$extralibs' as '-lotherlib1 -lotherlib2'.
	214	+# These libraries are not automatically added to 'LIBS'.
219	215	#
220	216	# Returns 1 if found or 0 if not.
221		-#
	217	+#
222	218	proc cc-check-function-in-lib {function libs {otherlibs {}}} {
223	219	msg-checking "Checking libs for $function..."
224	220	set found 0
225	221	cc-with [list -libs $otherlibs] {
226	222	if {[cctest_function $function]} {
		@@ -240,13 +236,12 @@
240	236	}
241	237	}
242	238	}
243	239	}
244	240	}
245		- if {$found} {
246		- define [feature-define-name $function]
247		- } else {
	241	+ define-feature $function $found
	242	+ if {!$found} {
248	243	msg-result "no"
249	244	}
250	245	return $found
251	246	}
252	247
		@@ -253,16 +248,16 @@
253	248	# @cc-check-tools tool ...
254	249	#
255	250	# Checks for existence of the given compiler tools, taking
256	251	# into account any cross compilation prefix.
257	252	#
258		-# For example, when checking for "ar", first AR is checked on the command
259		-# line and then in the environment. If not found, "${host}-ar" or
260		-# simply "ar" is assumed depending upon whether cross compiling.
261		-# The path is searched for this executable, and if found AR is defined
	253	+# For example, when checking for 'ar', first 'AR' is checked on the command
	254	+# line and then in the environment. If not found, '${host}-ar' or
	255	+# simply 'ar' is assumed depending upon whether cross compiling.
	256	+# The path is searched for this executable, and if found 'AR' is defined
262	257	# to the executable name.
263		-# Note that even when cross compiling, the simple "ar" is used as a fallback,
	258	+# Note that even when cross compiling, the simple 'ar' is used as a fallback,
264	259	# but a warning is generated. This is necessary for some toolchains.
265	260	#
266	261	# It is an error if the executable is not found.
267	262	#
268	263	proc cc-check-tools {args} {
		@@ -284,14 +279,14 @@
284	279
285	280	# @cc-check-progs prog ...
286	281	#
287	282	# Checks for existence of the given executables on the path.
288	283	#
289		-# For example, when checking for "grep", the path is searched for
290		-# the executable, 'grep', and if found GREP is defined as "grep".
	284	+# For example, when checking for 'grep', the path is searched for
	285	+# the executable, 'grep', and if found 'GREP' is defined as 'grep'.
291	286	#
292		-# If the executable is not found, the variable is defined as false.
	287	+# If the executable is not found, the variable is defined as 'false'.
293	288	# Returns 1 if all programs were found, or 0 otherwise.
294	289	#
295	290	proc cc-check-progs {args} {
296	291	set failed 0
297	292	foreach prog $args {
		@@ -303,10 +298,33 @@
303	298	incr failed
304	299	} else {
305	300	msg-result ok
306	301	define $PROG $prog
307	302	}
	303	+ }
	304	+ expr {!$failed}
	305	+}
	306	+
	307	+# @cc-path-progs prog ...
	308	+#
	309	+# Like cc-check-progs, but sets the define to the full path rather
	310	+# than just the program name.
	311	+#
	312	+proc cc-path-progs {args} {
	313	+ set failed 0
	314	+ foreach prog $args {
	315	+ set PROG [string toupper $prog]
	316	+ msg-checking "Checking for $prog..."
	317	+ set path [find-executable-path $prog]
	318	+ if {$path eq ""} {
	319	+ msg-result no
	320	+ define $PROG false
	321	+ incr failed
	322	+ } else {
	323	+ msg-result $path
	324	+ define $PROG $path
	325	+ }
308	326	}
309	327	expr {!$failed}
310	328	}
311	329
312	330	# Adds the given settings to $::autosetup(ccsettings) and
		@@ -326,18 +344,18 @@
326	344
327	345	foreach {name value} $settings {
328	346	switch -exact -- $name {
329	347	-cflags - -includes {
330	348	# These are given as lists
331		- lappend new($name) {*}$value
	349	+ lappend new($name) {*}[list-non-empty $value]
332	350	}
333	351	-declare {
334	352	lappend new($name) $value
335	353	}
336	354	-libs {
337	355	# Note that new libraries are added before previous libraries
338		- set new($name) [list {}$value {}$new($name)]
	356	+ set new($name) [list {}[list-non-empty $value] {}$new($name)]
339	357	}
340	358	-link - -lang - -nooutput {
341	359	set new($name) $value
342	360	}
343	361	-source - -sourcefile - -code {
		@@ -373,16 +391,16 @@
373	391	return $prev
374	392	}
375	393
376	394	# @cc-with settings ?{ script }?
377	395	#
378		-# Sets the given 'cctest' settings and then runs the tests in 'script'.
379		-# Note that settings such as -lang replace the current setting, while
380		-# those such as -includes are appended to the existing setting.
	396	+# Sets the given 'cctest' settings and then runs the tests in '$script'.
	397	+# Note that settings such as '-lang' replace the current setting, while
	398	+# those such as '-includes' are appended to the existing setting.
381	399	#
382	400	# If no script is given, the settings become the default for the remainder
383		-# of the auto.def file.
	401	+# of the 'auto.def' file.
384	402	#
385	403	## cc-with {-lang c++} {
386	404	## # This will check with the C++ compiler
387	405	## cc-check-types bool
388	406	## cc-with {-includes signal.h} {
		@@ -390,11 +408,11 @@
390	408	## ...
391	409	## }
392	410	## # back to just the C++ compiler
393	411	## }
394	412	#
395		-# The -libs setting is special in that newer values are added before earlier ones.
	413	+# The '-libs' setting is special in that newer values are added before earlier ones.
396	414	#
397	415	## cc-with {-libs {-lc -lm}} {
398	416	## cc-with {-libs -ldl} {
399	417	## cctest -libs -lsocket ...
400	418	## # libs will be in this order: -lsocket -ldl -lc -lm
		@@ -415,12 +433,12 @@
415	433	return $result
416	434	}
417	435	}
418	436
419	437	# @cctest ?settings?
420		-#
421		-# Low level C compiler checker. Compiles and or links a small C program
	438	+#
	439	+# Low level C/C++ compiler checker. Compiles and or links a small C program
422	440	# according to the arguments and returns 1 if OK, or 0 if not.
423	441	#
424	442	# Supported settings are:
425	443	#
426	444	## -cflags cflags A list of flags to pass to the compiler
		@@ -432,11 +450,11 @@
432	450	## -code code Code to compile in the body of main()
433	451	## -source code Compile a complete program. Ignore -includes, -declare and -code
434	452	## -sourcefile file Shorthand for -source [readfile [get-define srcdir]/$file]
435	453	## -nooutput 1 Treat any compiler output (e.g. a warning) as an error
436	454	#
437		-# Unless -source or -sourcefile is specified, the C program looks like:
	455	+# Unless '-source' or '-sourcefile' is specified, the C program looks like:
438	456	#
439	457	## #include <firstinclude> /* same for remaining includes in the list */
440	458	##
441	459	## declare-code /* any code in -declare, verbatim */
442	460	##
		@@ -446,11 +464,10 @@
446	464	## }
447	465	#
448	466	# Any failures are recorded in 'config.log'
449	467	#
450	468	proc cctest {args} {
451		- set src conftest__.c
452	469	set tmp conftest__
453	470
454	471	# Easiest way to merge in the settings
455	472	cc-with $args {
456	473	array set opts [cc-get-settings]
		@@ -488,13 +505,15 @@
488	505	# Build the command line
489	506	set cmdline {}
490	507	lappend cmdline {*}[get-define CCACHE]
491	508	switch -exact -- $opts(-lang) {
492	509	c++ {
	510	+ set src conftest__.cpp
493	511	lappend cmdline {}[get-define CXX] {}[get-define CXXFLAGS]
494	512	}
495	513	c {
	514	+ set src conftest__.c
496	515	lappend cmdline {}[get-define CC] {}[get-define CFLAGS]
497	516	}
498	517	default {
499	518	autosetup-error "cctest called with unknown language: $opts(-lang)"
500	519	}
		@@ -554,32 +573,32 @@
554	573	return $ok
555	574	}
556	575
557	576	# @make-autoconf-h outfile ?auto-patterns=HAVE_? ?bare-patterns=SIZEOF_?
558	577	#
559		-# Deprecated - see make-config-header
	578	+# Deprecated - see 'make-config-header'
560	579	proc make-autoconf-h {file {autopatterns {HAVE_}} {barepatterns {SIZEOF_ HAVE_DECL_*}}} {
561	580	user-notice "*** make-autoconf-h is deprecated -- use make-config-header instead"
562	581	make-config-header $file -auto $autopatterns -bare $barepatterns
563	582	}
564	583
565	584	# @make-config-header outfile ?-auto patternlist? ?-bare patternlist? ?-none patternlist? ?-str patternlist? ...
566	585	#
567	586	# Examines all defined variables which match the given patterns
568		-# and writes an include file, $file, which defines each of these.
	587	+# and writes an include file, '$file', which defines each of these.
569	588	# Variables which match '-auto' are output as follows:
570		-# - defines which have the value "0" are ignored.
	589	+# - defines which have the value '0' are ignored.
571	590	# - defines which have integer values are defined as the integer value.
572		-# - any other value is defined as a string, e.g. "value"
	591	+# - any other value is defined as a string, e.g. '"value"'
573	592	# Variables which match '-bare' are defined as-is.
574		-# Variables which match '-str' are defined as a string, e.g. "value"
	593	+# Variables which match '-str' are defined as a string, e.g. '"value"'
575	594	# Variables which match '-none' are omitted.
576	595	#
577		-# Note that order is important. The first pattern which matches is selected
	596	+# Note that order is important. The first pattern that matches is selected.
578	597	# Default behaviour is:
579	598	#
580		-# -bare {SIZEOF_* HAVE_DECL_} -auto HAVE_ -none *
	599	+## -bare {SIZEOF_* HAVE_DECL_} -auto HAVE_ -none *
581	600	#
582	601	# If the file would be unchanged, it is not written.
583	602	proc make-config-header {file args} {
584	603	set guard _[string toupper [regsub -all {[^a-zA-Z0-9]} [file tail $file] _]]
585	604	file mkdir [file dirname $file]
		@@ -677,10 +696,19 @@
677	696	if {[get-define CC] eq ""} {
678	697	user-error "Could not find a C compiler. Tried: [join $try ", "]"
679	698	}
680	699
681	700	define CCACHE [find-an-executable [get-env CCACHE ccache]]
	701	+
	702	+# If any of these are set in the environment, propagate them to the AUTOREMAKE commandline
	703	+foreach i {CC CXX CCACHE CPP CFLAGS CXXFLAGS CXXFLAGS LDFLAGS LIBS CROSS CPPFLAGS LINKFLAGS CC_FOR_BUILD LD} {
	704	+ if {[env-is-set $i]} {
	705	+ # Note: If the variable is set on the command line, get-env will return that value
	706	+ # so the command line will continue to override the environment
	707	+ define-append AUTOREMAKE [quote-if-needed $i=[get-env $i ""]]
	708	+ }
	709	+}
682	710
683	711	# Initial cctest settings
684	712	cc-store-settings {-cflags {} -includes {} -declare {} -link 0 -lang c -libs {} -code {} -nooutput 0}
685	713	set autosetup(cc-include-deps) {}
686	714
687	715
688	716	DELETED autosetup/config.guess
689	717	DELETED autosetup/config.sub
690	718	DELETED autosetup/find-tclsh

	--- autosetup/cc.tcl
	+++ autosetup/cc.tcl
	@@ -2,17 +2,18 @@
2	# All rights reserved
3
4	# @synopsis:
5	#
6	# The 'cc' module supports checking various 'features' of the C or C++
7	# compiler/linker environment. Common commands are cc-check-includes,
8	# cc-check-types, cc-check-functions, cc-with, make-autoconf-h and make-template.
9	#
10	# The following environment variables are used if set:
11	#
12	## CC - C compiler
13	## CXX - C++ compiler

14	## CCACHE - Set to "none" to disable automatic use of ccache
15	## CFLAGS - Additional C compiler flags
16	## CXXFLAGS - Additional C++ compiler flags
17	## LDFLAGS - Additional compiler flags during linking
18	## LIBS - Additional libraries to use (for all tests)
	@@ -28,15 +29,10 @@
28
29	use system
30
31	module-options {}
32
33	# Note that the return code is not meaningful
34	proc cc-check-something {name code} {
35	uplevel 1 $code
36	}
37
38	# Checks for the existence of the given function by linking
39	#
40	proc cctest_function {function} {
41	cctest -link 1 -declare "extern void $function\(void);" -code "$function\();"
42	}
	@@ -68,12 +64,12 @@
68	}
69
70	# @cc-check-sizeof type ...
71	#
72	# Checks the size of the given types (between 1 and 32, inclusive).
73	# Defines a variable with the size determined, or "unknown" otherwise.
74	# e.g. for type 'long long', defines SIZEOF_LONG_LONG.
75	# Returns the size of the last type.
76	#
77	proc cc-check-sizeof {args} {
78	foreach type $args {
79	msg-checking "Checking for sizeof $type..."
	@@ -109,11 +105,11 @@
109	return $ret
110	}
111
112	# @cc-check-includes includes ...
113	#
114	# Checks that the given include files can be used
115	proc cc-check-includes {args} {
116	cc-check-some-feature $args {
117	set with {}
118	if {[dict exists $::autosetup(cc-include-deps) $each]} {
119	set deps [dict keys [dict get $::autosetup(cc-include-deps) $each]]
	@@ -134,12 +130,12 @@
134	}
135	}
136
137	# @cc-include-needs include required ...
138	#
139	# Ensures that when checking for 'include', a check is first
140	# made for each 'required' file, and if found, it is #included
141	proc cc-include-needs {file args} {
142	foreach depfile $args {
143	dict set ::autosetup(cc-include-deps) $file $depfile 1
144	}
145	}
	@@ -153,22 +149,22 @@
153	}
154	}
155
156	# @cc-check-defines define ...
157	#
158	# Checks that the given preprocessor symbol is defined
159	proc cc-check-defines {args} {
160	cc-check-some-feature $args {
161	cctest_define $each
162	}
163	}
164
165	# @cc-check-decls name ...
166	#
167	# Checks that each given name is either a preprocessor symbol or rvalue
168	# such as an enum. Note that the define used is HAVE_DECL_xxx
169	# rather than HAVE_xxx
170	proc cc-check-decls {args} {
171	set ret 1
172	foreach name $args {
173	msg-checking "Checking for $name..."
174	set r [cctest_decl $name]
	@@ -183,21 +179,21 @@
183	return $ret
184	}
185
186	# @cc-check-functions function ...
187	#
188	# Checks that the given functions exist (can be linked)
189	proc cc-check-functions {args} {
190	cc-check-some-feature $args {
191	cctest_function $each
192	}
193	}
194
195	# @cc-check-members type.member ...
196	#
197	# Checks that the given type/structure members exist.
198	# A structure member is of the form "struct stat.st_mtime"
199	proc cc-check-members {args} {
200	cc-check-some-feature $args {
201	cctest_member $each
202	}
203	}
	@@ -207,20 +203,20 @@
207	# Checks that the given function can be found in one of the libs.
208	#
209	# First checks for no library required, then checks each of the libraries
210	# in turn.
211	#
212	# If the function is found, the feature is defined and lib_$function is defined
213	# to -l$lib where the function was found, or "" if no library required.
214	# In addition, -l$lib is prepended to the LIBS define.
215	#
216	# If additional libraries may be needed for linking, they should be specified
217	# as $extralibs as "-lotherlib1 -lotherlib2".
218	# These libraries are not automatically added to LIBS.
219	#
220	# Returns 1 if found or 0 if not.
221	#
222	proc cc-check-function-in-lib {function libs {otherlibs {}}} {
223	msg-checking "Checking libs for $function..."
224	set found 0
225	cc-with [list -libs $otherlibs] {
226	if {[cctest_function $function]} {
	@@ -240,13 +236,12 @@
240	}
241	}
242	}
243	}
244	}
245	if {$found} {
246	define [feature-define-name $function]
247	} else {
248	msg-result "no"
249	}
250	return $found
251	}
252
	@@ -253,16 +248,16 @@
253	# @cc-check-tools tool ...
254	#
255	# Checks for existence of the given compiler tools, taking
256	# into account any cross compilation prefix.
257	#
258	# For example, when checking for "ar", first AR is checked on the command
259	# line and then in the environment. If not found, "${host}-ar" or
260	# simply "ar" is assumed depending upon whether cross compiling.
261	# The path is searched for this executable, and if found AR is defined
262	# to the executable name.
263	# Note that even when cross compiling, the simple "ar" is used as a fallback,
264	# but a warning is generated. This is necessary for some toolchains.
265	#
266	# It is an error if the executable is not found.
267	#
268	proc cc-check-tools {args} {
	@@ -284,14 +279,14 @@
284
285	# @cc-check-progs prog ...
286	#
287	# Checks for existence of the given executables on the path.
288	#
289	# For example, when checking for "grep", the path is searched for
290	# the executable, 'grep', and if found GREP is defined as "grep".
291	#
292	# If the executable is not found, the variable is defined as false.
293	# Returns 1 if all programs were found, or 0 otherwise.
294	#
295	proc cc-check-progs {args} {
296	set failed 0
297	foreach prog $args {
	@@ -303,10 +298,33 @@
303	incr failed
304	} else {
305	msg-result ok
306	define $PROG $prog
307	}























308	}
309	expr {!$failed}
310	}
311
312	# Adds the given settings to $::autosetup(ccsettings) and
	@@ -326,18 +344,18 @@
326
327	foreach {name value} $settings {
328	switch -exact -- $name {
329	-cflags - -includes {
330	# These are given as lists
331	lappend new($name) {*}$value
332	}
333	-declare {
334	lappend new($name) $value
335	}
336	-libs {
337	# Note that new libraries are added before previous libraries
338	set new($name) [list {}$value {}$new($name)]
339	}
340	-link - -lang - -nooutput {
341	set new($name) $value
342	}
343	-source - -sourcefile - -code {
	@@ -373,16 +391,16 @@
373	return $prev
374	}
375
376	# @cc-with settings ?{ script }?
377	#
378	# Sets the given 'cctest' settings and then runs the tests in 'script'.
379	# Note that settings such as -lang replace the current setting, while
380	# those such as -includes are appended to the existing setting.
381	#
382	# If no script is given, the settings become the default for the remainder
383	# of the auto.def file.
384	#
385	## cc-with {-lang c++} {
386	## # This will check with the C++ compiler
387	## cc-check-types bool
388	## cc-with {-includes signal.h} {
	@@ -390,11 +408,11 @@
390	## ...
391	## }
392	## # back to just the C++ compiler
393	## }
394	#
395	# The -libs setting is special in that newer values are added before earlier ones.
396	#
397	## cc-with {-libs {-lc -lm}} {
398	## cc-with {-libs -ldl} {
399	## cctest -libs -lsocket ...
400	## # libs will be in this order: -lsocket -ldl -lc -lm
	@@ -415,12 +433,12 @@
415	return $result
416	}
417	}
418
419	# @cctest ?settings?
420	#
421	# Low level C compiler checker. Compiles and or links a small C program
422	# according to the arguments and returns 1 if OK, or 0 if not.
423	#
424	# Supported settings are:
425	#
426	## -cflags cflags A list of flags to pass to the compiler
	@@ -432,11 +450,11 @@
432	## -code code Code to compile in the body of main()
433	## -source code Compile a complete program. Ignore -includes, -declare and -code
434	## -sourcefile file Shorthand for -source [readfile [get-define srcdir]/$file]
435	## -nooutput 1 Treat any compiler output (e.g. a warning) as an error
436	#
437	# Unless -source or -sourcefile is specified, the C program looks like:
438	#
439	## #include <firstinclude> /* same for remaining includes in the list */
440	##
441	## declare-code /* any code in -declare, verbatim */
442	##
	@@ -446,11 +464,10 @@
446	## }
447	#
448	# Any failures are recorded in 'config.log'
449	#
450	proc cctest {args} {
451	set src conftest__.c
452	set tmp conftest__
453
454	# Easiest way to merge in the settings
455	cc-with $args {
456	array set opts [cc-get-settings]
	@@ -488,13 +505,15 @@
488	# Build the command line
489	set cmdline {}
490	lappend cmdline {*}[get-define CCACHE]
491	switch -exact -- $opts(-lang) {
492	c++ {

493	lappend cmdline {}[get-define CXX] {}[get-define CXXFLAGS]
494	}
495	c {

496	lappend cmdline {}[get-define CC] {}[get-define CFLAGS]
497	}
498	default {
499	autosetup-error "cctest called with unknown language: $opts(-lang)"
500	}
	@@ -554,32 +573,32 @@
554	return $ok
555	}
556
557	# @make-autoconf-h outfile ?auto-patterns=HAVE_? ?bare-patterns=SIZEOF_?
558	#
559	# Deprecated - see make-config-header
560	proc make-autoconf-h {file {autopatterns {HAVE_}} {barepatterns {SIZEOF_ HAVE_DECL_*}}} {
561	user-notice "*** make-autoconf-h is deprecated -- use make-config-header instead"
562	make-config-header $file -auto $autopatterns -bare $barepatterns
563	}
564
565	# @make-config-header outfile ?-auto patternlist? ?-bare patternlist? ?-none patternlist? ?-str patternlist? ...
566	#
567	# Examines all defined variables which match the given patterns
568	# and writes an include file, $file, which defines each of these.
569	# Variables which match '-auto' are output as follows:
570	# - defines which have the value "0" are ignored.
571	# - defines which have integer values are defined as the integer value.
572	# - any other value is defined as a string, e.g. "value"
573	# Variables which match '-bare' are defined as-is.
574	# Variables which match '-str' are defined as a string, e.g. "value"
575	# Variables which match '-none' are omitted.
576	#
577	# Note that order is important. The first pattern which matches is selected
578	# Default behaviour is:
579	#
580	# -bare {SIZEOF_* HAVE_DECL_} -auto HAVE_ -none *
581	#
582	# If the file would be unchanged, it is not written.
583	proc make-config-header {file args} {
584	set guard _[string toupper [regsub -all {[^a-zA-Z0-9]} [file tail $file] _]]
585	file mkdir [file dirname $file]
	@@ -677,10 +696,19 @@
677	if {[get-define CC] eq ""} {
678	user-error "Could not find a C compiler. Tried: [join $try ", "]"
679	}
680
681	define CCACHE [find-an-executable [get-env CCACHE ccache]]









682
683	# Initial cctest settings
684	cc-store-settings {-cflags {} -includes {} -declare {} -link 0 -lang c -libs {} -code {} -nooutput 0}
685	set autosetup(cc-include-deps) {}
686
687
688	ELETED autosetup/config.guess
689	ELETED autosetup/config.sub
690	ELETED autosetup/find-tclsh

	--- autosetup/cc.tcl
	+++ autosetup/cc.tcl
	@@ -2,17 +2,18 @@
2	# All rights reserved
3
4	# @synopsis:
5	#
6	# The 'cc' module supports checking various 'features' of the C or C++
7	# compiler/linker environment. Common commands are 'cc-check-includes',
8	# 'cc-check-types', 'cc-check-functions', 'cc-with', 'make-config-header' and 'make-template'.
9	#
10	# The following environment variables are used if set:
11	#
12	## CC - C compiler
13	## CXX - C++ compiler
14	## CPP - C preprocessor
15	## CCACHE - Set to "none" to disable automatic use of ccache
16	## CFLAGS - Additional C compiler flags
17	## CXXFLAGS - Additional C++ compiler flags
18	## LDFLAGS - Additional compiler flags during linking
19	## LIBS - Additional libraries to use (for all tests)
	@@ -28,15 +29,10 @@
29
30	use system
31
32	module-options {}
33





34	# Checks for the existence of the given function by linking
35	#
36	proc cctest_function {function} {
37	cctest -link 1 -declare "extern void $function\(void);" -code "$function\();"
38	}
	@@ -68,12 +64,12 @@
64	}
65
66	# @cc-check-sizeof type ...
67	#
68	# Checks the size of the given types (between 1 and 32, inclusive).
69	# Defines a variable with the size determined, or 'unknown' otherwise.
70	# e.g. for type 'long long', defines 'SIZEOF_LONG_LONG'.
71	# Returns the size of the last type.
72	#
73	proc cc-check-sizeof {args} {
74	foreach type $args {
75	msg-checking "Checking for sizeof $type..."
	@@ -109,11 +105,11 @@
105	return $ret
106	}
107
108	# @cc-check-includes includes ...
109	#
110	# Checks that the given include files can be used.
111	proc cc-check-includes {args} {
112	cc-check-some-feature $args {
113	set with {}
114	if {[dict exists $::autosetup(cc-include-deps) $each]} {
115	set deps [dict keys [dict get $::autosetup(cc-include-deps) $each]]
	@@ -134,12 +130,12 @@
130	}
131	}
132
133	# @cc-include-needs include required ...
134	#
135	# Ensures that when checking for '$include', a check is first
136	# made for each '$required' file, and if found, it is included with '#include'.
137	proc cc-include-needs {file args} {
138	foreach depfile $args {
139	dict set ::autosetup(cc-include-deps) $file $depfile 1
140	}
141	}
	@@ -153,22 +149,22 @@
149	}
150	}
151
152	# @cc-check-defines define ...
153	#
154	# Checks that the given preprocessor symbols are defined.
155	proc cc-check-defines {args} {
156	cc-check-some-feature $args {
157	cctest_define $each
158	}
159	}
160
161	# @cc-check-decls name ...
162	#
163	# Checks that each given name is either a preprocessor symbol or rvalue
164	# such as an enum. Note that the define used is 'HAVE_DECL_xxx'
165	# rather than 'HAVE_xxx'.
166	proc cc-check-decls {args} {
167	set ret 1
168	foreach name $args {
169	msg-checking "Checking for $name..."
170	set r [cctest_decl $name]
	@@ -183,21 +179,21 @@
179	return $ret
180	}
181
182	# @cc-check-functions function ...
183	#
184	# Checks that the given functions exist (can be linked).
185	proc cc-check-functions {args} {
186	cc-check-some-feature $args {
187	cctest_function $each
188	}
189	}
190
191	# @cc-check-members type.member ...
192	#
193	# Checks that the given type/structure members exist.
194	# A structure member is of the form 'struct stat.st_mtime'.
195	proc cc-check-members {args} {
196	cc-check-some-feature $args {
197	cctest_member $each
198	}
199	}
	@@ -207,20 +203,20 @@
203	# Checks that the given function can be found in one of the libs.
204	#
205	# First checks for no library required, then checks each of the libraries
206	# in turn.
207	#
208	# If the function is found, the feature is defined and 'lib_$function' is defined
209	# to '-l$lib' where the function was found, or "" if no library required.
210	# In addition, '-l$lib' is prepended to the 'LIBS' define.
211	#
212	# If additional libraries may be needed for linking, they should be specified
213	# with '$extralibs' as '-lotherlib1 -lotherlib2'.
214	# These libraries are not automatically added to 'LIBS'.
215	#
216	# Returns 1 if found or 0 if not.
217	#
218	proc cc-check-function-in-lib {function libs {otherlibs {}}} {
219	msg-checking "Checking libs for $function..."
220	set found 0
221	cc-with [list -libs $otherlibs] {
222	if {[cctest_function $function]} {
	@@ -240,13 +236,12 @@
236	}
237	}
238	}
239	}
240	}
241	define-feature $function $found
242	if {!$found} {

243	msg-result "no"
244	}
245	return $found
246	}
247
	@@ -253,16 +248,16 @@
248	# @cc-check-tools tool ...
249	#
250	# Checks for existence of the given compiler tools, taking
251	# into account any cross compilation prefix.
252	#
253	# For example, when checking for 'ar', first 'AR' is checked on the command
254	# line and then in the environment. If not found, '${host}-ar' or
255	# simply 'ar' is assumed depending upon whether cross compiling.
256	# The path is searched for this executable, and if found 'AR' is defined
257	# to the executable name.
258	# Note that even when cross compiling, the simple 'ar' is used as a fallback,
259	# but a warning is generated. This is necessary for some toolchains.
260	#
261	# It is an error if the executable is not found.
262	#
263	proc cc-check-tools {args} {
	@@ -284,14 +279,14 @@
279
280	# @cc-check-progs prog ...
281	#
282	# Checks for existence of the given executables on the path.
283	#
284	# For example, when checking for 'grep', the path is searched for
285	# the executable, 'grep', and if found 'GREP' is defined as 'grep'.
286	#
287	# If the executable is not found, the variable is defined as 'false'.
288	# Returns 1 if all programs were found, or 0 otherwise.
289	#
290	proc cc-check-progs {args} {
291	set failed 0
292	foreach prog $args {
	@@ -303,10 +298,33 @@
298	incr failed
299	} else {
300	msg-result ok
301	define $PROG $prog
302	}
303	}
304	expr {!$failed}
305	}
306
307	# @cc-path-progs prog ...
308	#
309	# Like cc-check-progs, but sets the define to the full path rather
310	# than just the program name.
311	#
312	proc cc-path-progs {args} {
313	set failed 0
314	foreach prog $args {
315	set PROG [string toupper $prog]
316	msg-checking "Checking for $prog..."
317	set path [find-executable-path $prog]
318	if {$path eq ""} {
319	msg-result no
320	define $PROG false
321	incr failed
322	} else {
323	msg-result $path
324	define $PROG $path
325	}
326	}
327	expr {!$failed}
328	}
329
330	# Adds the given settings to $::autosetup(ccsettings) and
	@@ -326,18 +344,18 @@
344
345	foreach {name value} $settings {
346	switch -exact -- $name {
347	-cflags - -includes {
348	# These are given as lists
349	lappend new($name) {*}[list-non-empty $value]
350	}
351	-declare {
352	lappend new($name) $value
353	}
354	-libs {
355	# Note that new libraries are added before previous libraries
356	set new($name) [list {}[list-non-empty $value] {}$new($name)]
357	}
358	-link - -lang - -nooutput {
359	set new($name) $value
360	}
361	-source - -sourcefile - -code {
	@@ -373,16 +391,16 @@
391	return $prev
392	}
393
394	# @cc-with settings ?{ script }?
395	#
396	# Sets the given 'cctest' settings and then runs the tests in '$script'.
397	# Note that settings such as '-lang' replace the current setting, while
398	# those such as '-includes' are appended to the existing setting.
399	#
400	# If no script is given, the settings become the default for the remainder
401	# of the 'auto.def' file.
402	#
403	## cc-with {-lang c++} {
404	## # This will check with the C++ compiler
405	## cc-check-types bool
406	## cc-with {-includes signal.h} {
	@@ -390,11 +408,11 @@
408	## ...
409	## }
410	## # back to just the C++ compiler
411	## }
412	#
413	# The '-libs' setting is special in that newer values are added before earlier ones.
414	#
415	## cc-with {-libs {-lc -lm}} {
416	## cc-with {-libs -ldl} {
417	## cctest -libs -lsocket ...
418	## # libs will be in this order: -lsocket -ldl -lc -lm
	@@ -415,12 +433,12 @@
433	return $result
434	}
435	}
436
437	# @cctest ?settings?
438	#
439	# Low level C/C++ compiler checker. Compiles and or links a small C program
440	# according to the arguments and returns 1 if OK, or 0 if not.
441	#
442	# Supported settings are:
443	#
444	## -cflags cflags A list of flags to pass to the compiler
	@@ -432,11 +450,11 @@
450	## -code code Code to compile in the body of main()
451	## -source code Compile a complete program. Ignore -includes, -declare and -code
452	## -sourcefile file Shorthand for -source [readfile [get-define srcdir]/$file]
453	## -nooutput 1 Treat any compiler output (e.g. a warning) as an error
454	#
455	# Unless '-source' or '-sourcefile' is specified, the C program looks like:
456	#
457	## #include <firstinclude> /* same for remaining includes in the list */
458	##
459	## declare-code /* any code in -declare, verbatim */
460	##
	@@ -446,11 +464,10 @@
464	## }
465	#
466	# Any failures are recorded in 'config.log'
467	#
468	proc cctest {args} {

469	set tmp conftest__
470
471	# Easiest way to merge in the settings
472	cc-with $args {
473	array set opts [cc-get-settings]
	@@ -488,13 +505,15 @@
505	# Build the command line
506	set cmdline {}
507	lappend cmdline {*}[get-define CCACHE]
508	switch -exact -- $opts(-lang) {
509	c++ {
510	set src conftest__.cpp
511	lappend cmdline {}[get-define CXX] {}[get-define CXXFLAGS]
512	}
513	c {
514	set src conftest__.c
515	lappend cmdline {}[get-define CC] {}[get-define CFLAGS]
516	}
517	default {
518	autosetup-error "cctest called with unknown language: $opts(-lang)"
519	}
	@@ -554,32 +573,32 @@
573	return $ok
574	}
575
576	# @make-autoconf-h outfile ?auto-patterns=HAVE_? ?bare-patterns=SIZEOF_?
577	#
578	# Deprecated - see 'make-config-header'
579	proc make-autoconf-h {file {autopatterns {HAVE_}} {barepatterns {SIZEOF_ HAVE_DECL_*}}} {
580	user-notice "*** make-autoconf-h is deprecated -- use make-config-header instead"
581	make-config-header $file -auto $autopatterns -bare $barepatterns
582	}
583
584	# @make-config-header outfile ?-auto patternlist? ?-bare patternlist? ?-none patternlist? ?-str patternlist? ...
585	#
586	# Examines all defined variables which match the given patterns
587	# and writes an include file, '$file', which defines each of these.
588	# Variables which match '-auto' are output as follows:
589	# - defines which have the value '0' are ignored.
590	# - defines which have integer values are defined as the integer value.
591	# - any other value is defined as a string, e.g. '"value"'
592	# Variables which match '-bare' are defined as-is.
593	# Variables which match '-str' are defined as a string, e.g. '"value"'
594	# Variables which match '-none' are omitted.
595	#
596	# Note that order is important. The first pattern that matches is selected.
597	# Default behaviour is:
598	#
599	## -bare {SIZEOF_* HAVE_DECL_} -auto HAVE_ -none *
600	#
601	# If the file would be unchanged, it is not written.
602	proc make-config-header {file args} {
603	set guard _[string toupper [regsub -all {[^a-zA-Z0-9]} [file tail $file] _]]
604	file mkdir [file dirname $file]
	@@ -677,10 +696,19 @@
696	if {[get-define CC] eq ""} {
697	user-error "Could not find a C compiler. Tried: [join $try ", "]"
698	}
699
700	define CCACHE [find-an-executable [get-env CCACHE ccache]]
701
702	# If any of these are set in the environment, propagate them to the AUTOREMAKE commandline
703	foreach i {CC CXX CCACHE CPP CFLAGS CXXFLAGS CXXFLAGS LDFLAGS LIBS CROSS CPPFLAGS LINKFLAGS CC_FOR_BUILD LD} {
704	if {[env-is-set $i]} {
705	# Note: If the variable is set on the command line, get-env will return that value
706	# so the command line will continue to override the environment
707	define-append AUTOREMAKE [quote-if-needed $i=[get-env $i ""]]
708	}
709	}
710
711	# Initial cctest settings
712	cc-store-settings {-cflags {} -includes {} -declare {} -link 0 -lang c -libs {} -code {} -nooutput 0}
713	set autosetup(cc-include-deps) {}
714
715
716	ELETED autosetup/config.guess
717	ELETED autosetup/config.sub
718	ELETED autosetup/find-tclsh

D autosetup/config.guess

-50

		--- a/autosetup/config.guess
		+++ b/autosetup/config.guess
		@@ -1,50 +0,0 @@
1		-#! /bin/sh
2		-# Attempt to guess a canonical system name.
3		-# Copyright 1992-2014 Free Software Found4-11-04it and/or modify it
4		-# under the terms of the GNU General Public License as published by
5		-# t;e Free Software Foundation, either version 3 of the L;cense, or
6		-# (at your option) any later version.
7		-#
8		-# This program is distributed in the hope that it will be useful, but
9		-# WITHOUT ANY WARRANTY; without even the implied warranty of
10		-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
11		-# General Public License for more details.
12		-#
13		-# You should have received a copy of the GNU General Public License
14		-# along with this program; if not, see <https://www.gnu.org/licenses/>.
15		-#
16		-# As a special exceptionto the GNU General Public License, if you
17		-# distribute this file as part of a program that contains a
18		-# configuration script generated by Autoconf, you may include it under
19		-# the same distribution terms that you use for the rest of that
20		-# program. This Exception is an additional permission under section 7
21		-# of the GNU General Public License, version 3 ("GPLv3").
22		-#
23		-# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
24		-#
25		-# You can get the latest version of this script from:
26		-# https://git.savannah.gnu.org/guess;hb=HEADeration mode4 Free Software Foundation, Inc.
27		-
28		-$dummy.c$dummy.o $dummy.c{UNAME_SYSTEM}
29		- cat <<-EOF > $dummy.c`$CC_FOR_BUILD -E $dummy.c'^LIBC' \| sed 's, ,,g'`{UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}/sbin/$sysctl/usr/sbin/$sysctl
30		-# Attempt to guess a canoniAttempt to g! /bin/sh
31		-# Attemp#*) machine=${! /bin/sh
32		-# Attemp#! /bin/sh
33		-# Attempt to guess a canonical system name.
34		-# Copyright 1992-2018canonical system name.
35		-# Copyrig! /bin/sh
36		-# Attemp#! /b{UNAME_VERSION}${UNAME_REL{machine}-${os}${release}${! /bin/sh
37		-# Attemp#! /bin/sh
38		-# Attempt to guess a ${! /bin/sh
39		-# Attemp#! /bin/sh
40		-# Attempt to guess a cekkoBSD::)
41		- echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}SolidBSD::)
42		- echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}${UNAME_RELEASE}${UNAME_MACHINE}-unk"alpha""alpha""alpha""alphaev5"A"alphaev56""alphapca56""alphapca57""alphaev6""alphaev67""alphaev68""alphaev68""alphaev68""alphaev69""alphaev7""alphaev79"${UNAME_MACHINE}-dec-osf`echo RELEASE}'' ''` /bin/sh
43		-# Attempt to guess a canonical system name.
44		-# Copyright 1992-2018 Free Software FouAttempt to guess a canonical system name.
45		-# Copyright 1992-2018 Free Software Foundation, Inc.
46		-
47		-timestamp='2018-03-08it and/or modify it
48		-# under the terms of the GNU General Public License as published by
49		-# t;e Free Software Foundation, either version 3 of the L;cense, or
50		-# (at your o

	--- a/autosetup/config.guess
	+++ b/autosetup/config.guess
	@@ -1,50 +0,0 @@
1	#! /bin/sh
2	# Attempt to guess a canonical system name.
3	# Copyright 1992-2014 Free Software Found4-11-04it and/or modify it
4	# under the terms of the GNU General Public License as published by
5	# t;e Free Software Foundation, either version 3 of the L;cense, or
6	# (at your option) any later version.
7	#
8	# This program is distributed in the hope that it will be useful, but
9	# WITHOUT ANY WARRANTY; without even the implied warranty of
10	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
11	# General Public License for more details.
12	#
13	# You should have received a copy of the GNU General Public License
14	# along with this program; if not, see <https://www.gnu.org/licenses/>.
15	#
16	# As a special exceptionto the GNU General Public License, if you
17	# distribute this file as part of a program that contains a
18	# configuration script generated by Autoconf, you may include it under
19	# the same distribution terms that you use for the rest of that
20	# program. This Exception is an additional permission under section 7
21	# of the GNU General Public License, version 3 ("GPLv3").
22	#
23	# Originally written by Per Bothner; maintained since 2000 by Ben Elliston.
24	#
25	# You can get the latest version of this script from:
26	# https://git.savannah.gnu.org/guess;hb=HEADeration mode4 Free Software Foundation, Inc.
27
28	$dummy.c$dummy.o $dummy.c{UNAME_SYSTEM}
29	cat <<-EOF > $dummy.c`$CC_FOR_BUILD -E $dummy.c'^LIBC' \| sed 's, ,,g'`{UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}/sbin/$sysctl/usr/sbin/$sysctl
30	# Attempt to guess a canoniAttempt to g! /bin/sh
31	# Attemp#*) machine=${! /bin/sh
32	# Attemp#! /bin/sh
33	# Attempt to guess a canonical system name.
34	# Copyright 1992-2018canonical system name.
35	# Copyrig! /bin/sh
36	# Attemp#! /b{UNAME_VERSION}${UNAME_REL{machine}-${os}${release}${! /bin/sh
37	# Attemp#! /bin/sh
38	# Attempt to guess a ${! /bin/sh
39	# Attemp#! /bin/sh
40	# Attempt to guess a cekkoBSD::)
41	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}SolidBSD::)
42	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}${UNAME_RELEASE}${UNAME_MACHINE}-unk"alpha""alpha""alpha""alphaev5"A"alphaev56""alphapca56""alphapca57""alphaev6""alphaev67""alphaev68""alphaev68""alphaev68""alphaev69""alphaev7""alphaev79"${UNAME_MACHINE}-dec-osf`echo RELEASE}'' ''` /bin/sh
43	# Attempt to guess a canonical system name.
44	# Copyright 1992-2018 Free Software FouAttempt to guess a canonical system name.
45	# Copyright 1992-2018 Free Software Foundation, Inc.
46
47	timestamp='2018-03-08it and/or modify it
48	# under the terms of the GNU General Public License as published by
49	# t;e Free Software Foundation, either version 3 of the L;cense, or
50	# (at your o

	--- a/autosetup/config.guess
	+++ b/autosetup/config.guess
	@@ -1,50 +0,0 @@

D autosetup/config.sub

-75

		--- a/autosetup/config.sub
		+++ b/autosetup/config.sub
		@@ -1,75 +0,0 @@
1		-#! /bin/sh
2		-# Configuration validation subroutine script.
3		-# Copyright 1992-2014 Free Software Found4-12-03it and/or modify it
4		-# under the terms of the GNU General Public License as published by
5		-# t;e Free Software Foundation, either version 3 of the L;cense, or
6		-# (at your option) any later version.
7		-#
8		-# This program is distributed in the hope that it will be useful, but
9		-# WITHOUT ANY WARRANTY; without even the implied warranty of
10		-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
11		-# General Public License for more details.
12		-#
13		-# You should have received a copy of the GNU General Public License
14		-# along with this program; if not, see <https://www.gnu.org/licenses/>.
15		-#
16		-# As a special exception#
17		-# As a special exception to the GNU General Public License, if you
18		-# distribute this file as part of a program that contains a
19		-# configuration script generated by Autoconf, you may include it under
20		-# the same distribution terms that you use for the rest of that
21		-# program. This Exception is an additional permission under section 7
22		-# of the GNU General Public License, version 3 ("GPLv3").
23		-
24		-
25		-# Please send patches to <[email protected]>.
26		-#
27		-# Configuration subroutine to validate and canonicalize a configuration type.
28		-# Supply the specified configuration type as an argument.
29		-# If it is invalid, we print 1 Free Software Foundation,3 Free Software Foundation, Inc.
30		-
31		-'orting which valid configurations
32		-# it does not support. The user should be able to distinguish
33		-# a failure to support;hb=HEAD
34		- $0 [OPTION]f not, see <https:/eration mode a special exception to the GNU General Public License, if you
35		-# distribute this file as part of a program that contains a
36		-# configuration script generated by Autoconf, you may include it under
37		-# the same distribution terms that you use for the rest of that
38		-# program. This Excepti4 Free Software Foundation, Inc.
39		-
40		-er section 7
41		-# of the GNU General Public License, version 3 ("GPLv3").
42		-
43		-
44		-# Please send patches to <[email protected]>.
45		-#
46		-# Configuration subroutine to validate and canonicalize a configuration type.
47		-# Supply the specified configuration type as an argument.
48		-# If it is invalid, we print 1 Free Software Foundation,3 Free Software Foundation, Inc.
49		-
50		-'orting which valid configurations
51		-# it does not support. The user should be able to distinguish
52		-# a failure to support a valid configuration from a meaningless
53		-# configur$1$1$1$1$1$basic_machine !$1$1$1$1$15v6$1$1udk$1! /bin/sh
54		-# Cio$1$1windowsnt/windowsnt/windp11e32k \| z8k)
55		- ;;
56		- msbut
57		-# WITHOUT ANY W#! /bin/sh
58		-# Configuration validation subroutine script.
59		-# Copyright 1992-2018 Free Software Foundation, Inc.
60		-
61		-timestamp='2018-03-08it and/or modify it
62		-# under the terms of the GNU General Public License as published by
63		-# t;e Free Software Foundation, either version 3 of the L;cense, or
64		-# (at your option) any later version.
65		-#
66		-# This program is distributed in the hope that it will be useful, but
67		-# WITHOUT ANY WARRANTY; without even the implied warranty of
68		-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the $1\': machine \`$basic_machineyramid?unknown$basic_machineu$basic_machine$basic_machine$basic_machine$basic_machinec9c \| dpx2*-bull-next)
69		- os=-nextstep3$1$1$1$1i386-vsta \| vstabin/sh
70		-# Configuration validation subroutine script.
71		-# Copyright 1992-2018 Free Software Foundation, Inc.
72		-
73		-timestamp='2018-03-08it and/or modify it
74		-# under the terms of the GNU General Public License as published bon subroutine $basic_machine-linuxomron$basic_machine$basic_machine$basic_machine ext$basic_machine$basic_machine$basic_machine$basic_machine$basic_machinepentium4i786-`echo $basic_machinepn$basic_machineppcle \| ppc-le \| powerpc-littlele$basic_machine$basic_machine \| ppc64-le \| powerpc64-little64le$basic_machinepsshsh5elh6h64-unknown
75		- ;

	--- a/autosetup/config.sub
	+++ b/autosetup/config.sub
	@@ -1,75 +0,0 @@
1	#! /bin/sh
2	# Configuration validation subroutine script.
3	# Copyright 1992-2014 Free Software Found4-12-03it and/or modify it
4	# under the terms of the GNU General Public License as published by
5	# t;e Free Software Foundation, either version 3 of the L;cense, or
6	# (at your option) any later version.
7	#
8	# This program is distributed in the hope that it will be useful, but
9	# WITHOUT ANY WARRANTY; without even the implied warranty of
10	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
11	# General Public License for more details.
12	#
13	# You should have received a copy of the GNU General Public License
14	# along with this program; if not, see <https://www.gnu.org/licenses/>.
15	#
16	# As a special exception#
17	# As a special exception to the GNU General Public License, if you
18	# distribute this file as part of a program that contains a
19	# configuration script generated by Autoconf, you may include it under
20	# the same distribution terms that you use for the rest of that
21	# program. This Exception is an additional permission under section 7
22	# of the GNU General Public License, version 3 ("GPLv3").
23
24
25	# Please send patches to <[email protected]>.
26	#
27	# Configuration subroutine to validate and canonicalize a configuration type.
28	# Supply the specified configuration type as an argument.
29	# If it is invalid, we print 1 Free Software Foundation,3 Free Software Foundation, Inc.
30
31	'orting which valid configurations
32	# it does not support. The user should be able to distinguish
33	# a failure to support;hb=HEAD
34	$0 [OPTION]f not, see <https:/eration mode a special exception to the GNU General Public License, if you
35	# distribute this file as part of a program that contains a
36	# configuration script generated by Autoconf, you may include it under
37	# the same distribution terms that you use for the rest of that
38	# program. This Excepti4 Free Software Foundation, Inc.
39
40	er section 7
41	# of the GNU General Public License, version 3 ("GPLv3").
42
43
44	# Please send patches to <[email protected]>.
45	#
46	# Configuration subroutine to validate and canonicalize a configuration type.
47	# Supply the specified configuration type as an argument.
48	# If it is invalid, we print 1 Free Software Foundation,3 Free Software Foundation, Inc.
49
50	'orting which valid configurations
51	# it does not support. The user should be able to distinguish
52	# a failure to support a valid configuration from a meaningless
53	# configur$1$1$1$1$1$basic_machine !$1$1$1$1$15v6$1$1udk$1! /bin/sh
54	# Cio$1$1windowsnt/windowsnt/windp11e32k \| z8k)
55	;;
56	msbut
57	# WITHOUT ANY W#! /bin/sh
58	# Configuration validation subroutine script.
59	# Copyright 1992-2018 Free Software Foundation, Inc.
60
61	timestamp='2018-03-08it and/or modify it
62	# under the terms of the GNU General Public License as published by
63	# t;e Free Software Foundation, either version 3 of the L;cense, or
64	# (at your option) any later version.
65	#
66	# This program is distributed in the hope that it will be useful, but
67	# WITHOUT ANY WARRANTY; without even the implied warranty of
68	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the $1\': machine \`$basic_machineyramid?unknown$basic_machineu$basic_machine$basic_machine$basic_machine$basic_machinec9c \| dpx2*-bull-next)
69	os=-nextstep3$1$1$1$1i386-vsta \| vstabin/sh
70	# Configuration validation subroutine script.
71	# Copyright 1992-2018 Free Software Foundation, Inc.
72
73	timestamp='2018-03-08it and/or modify it
74	# under the terms of the GNU General Public License as published bon subroutine $basic_machine-linuxomron$basic_machine$basic_machine$basic_machine ext$basic_machine$basic_machine$basic_machine$basic_machine$basic_machinepentium4i786-`echo $basic_machinepn$basic_machineppcle \| ppc-le \| powerpc-littlele$basic_machine$basic_machine \| ppc64-le \| powerpc64-little64le$basic_machinepsshsh5elh6h64-unknown
75	;

	--- a/autosetup/config.sub
	+++ b/autosetup/config.sub
	@@ -1,75 +0,0 @@

D autosetup/find-tclsh

-10

		--- a/autosetup/find-tclsh
		+++ b/autosetup/find-tclsh
		@@ -1,10 +0,0 @@
1		-#!/bin/sh
2		-# Looks for a suitable tclsh or jimsh in the PATH
3		-# If not foundstrap jimsh d=`dirname "$0"`
4		-{ "$d/jimshd/${1-ac"; } 2>&1done
5		-echo 1>&2 bootstrap jimsh0"
6		-for cc in tclsh8.7; do
7		- { $tclsh "$d/c"; } 2>&1 >/dev "$d/${1-autosetup--tclsh}"; } 2>/devexit 0
8		-done
9		-echo 1>&2 "No installed jimsh or tclsh, building local bootstrap jimsh0"
10		-for cc in ${CC_FOR_BUILD:-PATH="$PATH:$d2>/dev/null

	--- a/autosetup/find-tclsh
	+++ b/autosetup/find-tclsh
	@@ -1,10 +0,0 @@
1	#!/bin/sh
2	# Looks for a suitable tclsh or jimsh in the PATH
3	# If not foundstrap jimsh d=`dirname "$0"`
4	{ "$d/jimshd/${1-ac"; } 2>&1done
5	echo 1>&2 bootstrap jimsh0"
6	for cc in tclsh8.7; do
7	{ $tclsh "$d/c"; } 2>&1 >/dev "$d/${1-autosetup--tclsh}"; } 2>/devexit 0
8	done
9	echo 1>&2 "No installed jimsh or tclsh, building local bootstrap jimsh0"
10	for cc in ${CC_FOR_BUILD:-PATH="$PATH:$d2>/dev/null

	--- a/autosetup/find-tclsh
	+++ b/autosetup/find-tclsh
	@@ -1,10 +0,0 @@

M autosetup/jimsh0.c

+3701 -3421

		--- autosetup/jimsh0.c
		+++ autosetup/jimsh0.c
		@@ -1,9 +1,7 @@
1	1	/* This is single source file, bootstrap version of Jim Tcl. See http://jim.tcl.tk/ */
2		-#define _GNU_SOURCE
3	2	#define JIM_TCL_COMPAT
4		-#define JIM_REFERENCES
5	3	#define JIM_ANSIC
6	4	#define JIM_REGEXP
7	5	#define HAVE_NO_AUTOCONF
8	6	#define _JIMAUTOCONF_H
9	7	#define TCL_LIBRARY "."
		@@ -31,24 +29,39 @@
31	29	#define HAVE_MKDIR_ONE_ARG
32	30	#define HAVE_SYSTEM
33	31	#define HAVE_SYS_TIME_H
34	32	#define HAVE_DIRENT_H
35	33	#define HAVE_UNISTD_H
	34	+#define HAVE_UMASK
	35	+#include <sys/stat.h>
	36	+#ifndef S_IRWXG
	37	+#define S_IRWXG 0
	38	+#endif
	39	+#ifndef S_IRWXO
	40	+#define S_IRWXO 0
	41	+#endif
36	42	#else
37	43	#define TCL_PLATFORM_OS "unknown"
38	44	#define TCL_PLATFORM_PLATFORM "unix"
39	45	#define TCL_PLATFORM_PATH_SEPARATOR ":"
	46	+#ifdef _MINIX
	47	+#define vfork fork
	48	+#define _POSIX_SOURCE
	49	+#else
	50	+#define _GNU_SOURCE
	51	+#endif
40	52	#define HAVE_VFORK
41	53	#define HAVE_WAITPID
42	54	#define HAVE_ISATTY
43	55	#define HAVE_MKSTEMP
44	56	#define HAVE_LINK
45	57	#define HAVE_SYS_TIME_H
46	58	#define HAVE_DIRENT_H
47	59	#define HAVE_UNISTD_H
	60	+#define HAVE_UMASK
48	61	#endif
49		-#define JIM_VERSION 76
	62	+#define JIM_VERSION 78
50	63	#ifndef JIM_WIN32COMPAT_H
51	64	#define JIM_WIN32COMPAT_H
52	65
53	66
54	67
		@@ -88,11 +101,10 @@
88	101	#define JIM_WIDE_MIN LLONG_MIN
89	102	#define JIM_WIDE_MAX LLONG_MAX
90	103	#define JIM_WIDE_MODIFIER "I64d"
91	104	#define strcasecmp _stricmp
92	105	#define strtoull _strtoui64
93		-#define snprintf _snprintf
94	106
95	107	#include <io.h>
96	108
97	109	struct timeval {
98	110	long tv_sec;
		@@ -105,29 +117,24 @@
105	117	struct dirent {
106	118	char *d_name;
107	119	};
108	120
109	121	typedef struct DIR {
110		- long handle;
	122	+ long handle;
111	123	struct _finddata_t info;
112		- struct dirent result;
113		- char *name;
	124	+ struct dirent result;
	125	+ char *name;
114	126	} DIR;
115	127
116	128	DIR opendir(const char name);
117	129	int closedir(DIR *dir);
118	130	struct dirent readdir(DIR dir);
119	131
120		-#elif defined(__MINGW32__)
121		-
122		-#include <stdlib.h>
123		-#define strtod __strtod
	132	+#endif
124	133
125	134	#endif
126	135
127		-#endif
128		-
129	136	#ifdef __cplusplus
130	137	}
131	138	#endif
132	139
133	140	#endif
		@@ -146,19 +153,21 @@
146	153
147	154	#ifndef JIM_UTF8
148	155	#include <ctype.h>
149	156
150	157
151		-#define utf8_strlen(S, B) ((B) < 0 ? strlen(S) : (B))
	158	+#define utf8_strlen(S, B) ((B) < 0 ? (int)strlen(S) : (B))
	159	+#define utf8_strwidth(S, B) utf8_strlen((S), (B))
152	160	#define utf8_tounicode(S, CP) ((CP) = (unsigned char)(S), 1)
153	161	#define utf8_getchars(CP, C) (*(CP) = (C), 1)
154	162	#define utf8_upper(C) toupper(C)
155	163	#define utf8_title(C) toupper(C)
156	164	#define utf8_lower(C) tolower(C)
157	165	#define utf8_index(C, I) (I)
158	166	#define utf8_charlen(C) 1
159	167	#define utf8_prev_len(S, L) 1
	168	+#define utf8_width(C) 1
160	169
161	170	#else
162	171
163	172	#endif
164	173
		@@ -175,13 +184,13 @@
175	184	extern "C" {
176	185	#endif
177	186
178	187	#include <time.h>
179	188	#include <limits.h>
180		-#include <stdio.h>
181		-#include <stdlib.h>
182		-#include <stdarg.h>
	189	+#include <stdio.h>
	190	+#include <stdlib.h>
	191	+#include <stdarg.h>
183	192
184	193
185	194	#ifndef HAVE_NO_AUTOCONF
186	195	#endif
187	196
		@@ -224,31 +233,31 @@
224	233	#define JIM_SIGNAL 5
225	234	#define JIM_EXIT 6
226	235
227	236	#define JIM_EVAL 7
228	237
229		-#define JIM_MAX_CALLFRAME_DEPTH 1000
230		-#define JIM_MAX_EVAL_DEPTH 2000
	238	+#define JIM_MAX_CALLFRAME_DEPTH 1000
	239	+#define JIM_MAX_EVAL_DEPTH 2000
231	240
232	241
233	242	#define JIM_PRIV_FLAG_SHIFT 20
234	243
235		-#define JIM_NONE 0
236		-#define JIM_ERRMSG 1
237		-#define JIM_ENUM_ABBREV 2
238		-#define JIM_UNSHARED 4
239		-#define JIM_MUSTEXIST 8
240		-
241		-
242		-#define JIM_SUBST_NOVAR 1
243		-#define JIM_SUBST_NOCMD 2
244		-#define JIM_SUBST_NOESC 4
245		-#define JIM_SUBST_FLAG 128
246		-
247		-
248		-#define JIM_CASESENS 0
249		-#define JIM_NOCASE 1
	244	+#define JIM_NONE 0
	245	+#define JIM_ERRMSG 1
	246	+#define JIM_ENUM_ABBREV 2
	247	+#define JIM_UNSHARED 4
	248	+#define JIM_MUSTEXIST 8
	249	+
	250	+
	251	+#define JIM_SUBST_NOVAR 1
	252	+#define JIM_SUBST_NOCMD 2
	253	+#define JIM_SUBST_NOESC 4
	254	+#define JIM_SUBST_FLAG 128
	255	+
	256	+
	257	+#define JIM_CASESENS 0
	258	+#define JIM_NOCASE 1
250	259
251	260
252	261	#define JIM_PATH_LEN 1024
253	262
254	263
		@@ -339,79 +348,80 @@
339	348	#define Jim_GetHashTableSize(ht) ((ht)->size)
340	349	#define Jim_GetHashTableUsed(ht) ((ht)->used)
341	350
342	351
343	352	typedef struct Jim_Obj {
344		- char *bytes;
345		- const struct Jim_ObjType *typePtr;
346		- int refCount;
347		- int length;
348		-
	353	+ char *bytes;
	354	+ const struct Jim_ObjType *typePtr;
	355	+ int refCount;
	356	+ int length;
	357	+
349	358	union {
350		-
	359	+
351	360	jim_wide wideValue;
352		-
	361	+
353	362	int intValue;
354		-
	363	+
355	364	double doubleValue;
356		-
	365	+
357	366	void *ptr;
358		-
	367	+
359	368	struct {
360	369	void *ptr1;
361	370	void *ptr2;
362	371	} twoPtrValue;
363		-
	372	+
	373	+ struct {
	374	+ void *ptr;
	375	+ int int1;
	376	+ int int2;
	377	+ } ptrIntValue;
	378	+
364	379	struct {
365	380	struct Jim_Var *varPtr;
366		- unsigned long callFrameId;
367		- int global;
	381	+ unsigned long callFrameId;
	382	+ int global;
368	383	} varValue;
369		-
	384	+
370	385	struct {
371	386	struct Jim_Obj *nsObj;
372	387	struct Jim_Cmd *cmdPtr;
373		- unsigned long procEpoch;
	388	+ unsigned long procEpoch;
374	389	} cmdValue;
375		-
	390	+
376	391	struct {
377		- struct Jim_Obj **ele;
378		- int len;
379		- int maxLen;
	392	+ struct Jim_Obj **ele;
	393	+ int len;
	394	+ int maxLen;
380	395	} listValue;
381		-
	396	+
382	397	struct {
383	398	int maxLength;
384		- int charLength;
	399	+ int charLength;
385	400	} strValue;
386		-
	401	+
387	402	struct {
388	403	unsigned long id;
389	404	struct Jim_Reference *refPtr;
390	405	} refValue;
391		-
	406	+
392	407	struct {
393	408	struct Jim_Obj *fileNameObj;
394	409	int lineNumber;
395	410	} sourceValue;
396		-
	411	+
397	412	struct {
398	413	struct Jim_Obj *varNameObjPtr;
399	414	struct Jim_Obj *indexObjPtr;
400	415	} dictSubstValue;
401		-
402		- struct {
403		- void *compre;
404		- unsigned flags;
405		- } regexpValue;
406	416	struct {
407	417	int line;
408	418	int argc;
409	419	} scriptLineValue;
410	420	} internalRep;
411		- struct Jim_Obj *prevObjPtr;
412		- struct Jim_Obj *nextObjPtr;
	421	+ struct Jim_Obj *prevObjPtr;
	422	+ struct Jim_Obj *nextObjPtr;
413	423	} Jim_Obj;
414	424
415	425
416	426	#define Jim_IncrRefCount(objPtr) \
417	427	++(objPtr)->refCount
		@@ -442,40 +452,40 @@
442	452	typedef void (Jim_DupInternalRepProc)(struct Jim_Interp *interp,
443	453	struct Jim_Obj srcPtr, Jim_Obj dupPtr);
444	454	typedef void (Jim_UpdateStringProc)(struct Jim_Obj *objPtr);
445	455
446	456	typedef struct Jim_ObjType {
447		- const char *name;
	457	+ const char *name;
448	458	Jim_FreeInternalRepProc *freeIntRepProc;
449	459	Jim_DupInternalRepProc *dupIntRepProc;
450	460	Jim_UpdateStringProc *updateStringProc;
451	461	int flags;
452	462	} Jim_ObjType;
453	463
454	464
455		-#define JIM_TYPE_NONE 0
456		-#define JIM_TYPE_REFERENCES 1
	465	+#define JIM_TYPE_NONE 0
	466	+#define JIM_TYPE_REFERENCES 1
457	467
458	468
459	469
460	470	typedef struct Jim_CallFrame {
461		- unsigned long id;
462		- int level;
463		- struct Jim_HashTable vars;
464		- struct Jim_HashTable *staticVars;
465		- struct Jim_CallFrame *parent;
466		- Jim_Obj const argv;
467		- int argc;
468		- Jim_Obj *procArgsObjPtr;
469		- Jim_Obj *procBodyObjPtr;
470		- struct Jim_CallFrame *next;
471		- Jim_Obj *nsObj;
472		- Jim_Obj *fileNameObj;
	471	+ unsigned long id;
	472	+ int level;
	473	+ struct Jim_HashTable vars;
	474	+ struct Jim_HashTable *staticVars;
	475	+ struct Jim_CallFrame *parent;
	476	+ Jim_Obj const argv;
	477	+ int argc;
	478	+ Jim_Obj *procArgsObjPtr;
	479	+ Jim_Obj *procBodyObjPtr;
	480	+ struct Jim_CallFrame *next;
	481	+ Jim_Obj *nsObj;
	482	+ Jim_Obj *fileNameObj;
473	483	int line;
474		- Jim_Stack *localCommands;
475		- struct Jim_Obj *tailcallObj;
476		- struct Jim_Cmd *tailcallCmd;
	484	+ Jim_Stack *localCommands;
	485	+ struct Jim_Obj *tailcallObj;
	486	+ struct Jim_Cmd *tailcallCmd;
477	487	} Jim_CallFrame;
478	488
479	489	typedef struct Jim_Var {
480	490	Jim_Obj *objPtr;
481	491	struct Jim_CallFrame *linkFramePtr;
		@@ -487,35 +497,35 @@
487	497	typedef void Jim_DelCmdProc(struct Jim_Interp interp, void privData);
488	498
489	499
490	500
491	501	typedef struct Jim_Cmd {
492		- int inUse;
493		- int isproc;
494		- struct Jim_Cmd *prevCmd;
	502	+ int inUse;
	503	+ int isproc;
	504	+ struct Jim_Cmd *prevCmd;
495	505	union {
496	506	struct {
497		-
498		- Jim_CmdProc *cmdProc;
499		- Jim_DelCmdProc *delProc;
500		- void *privData;
	507	+
	508	+ Jim_CmdProc *cmdProc;
	509	+ Jim_DelCmdProc *delProc;
	510	+ void *privData;
501	511	} native;
502	512	struct {
503		-
	513	+
504	514	Jim_Obj *argListObjPtr;
505	515	Jim_Obj *bodyObjPtr;
506		- Jim_HashTable *staticVars;
507		- int argListLen;
508		- int reqArity;
509		- int optArity;
510		- int argsPos;
511		- int upcall;
	516	+ Jim_HashTable *staticVars;
	517	+ int argListLen;
	518	+ int reqArity;
	519	+ int optArity;
	520	+ int argsPos;
	521	+ int upcall;
512	522	struct Jim_ProcArg {
513		- Jim_Obj *nameObjPtr;
514		- Jim_Obj *defaultObjPtr;
	523	+ Jim_Obj *nameObjPtr;
	524	+ Jim_Obj *defaultObjPtr;
515	525	} *arglist;
516		- Jim_Obj *nsObj;
	526	+ Jim_Obj *nsObj;
517	527	} proc;
518	528	} u;
519	529	} Jim_Cmd;
520	530
521	531
		@@ -523,64 +533,64 @@
523	533	unsigned char sbox[256];
524	534	unsigned int i, j;
525	535	} Jim_PrngState;
526	536
527	537	typedef struct Jim_Interp {
528		- Jim_Obj *result;
529		- int errorLine;
530		- Jim_Obj *errorFileNameObj;
531		- int addStackTrace;
532		- int maxCallFrameDepth;
533		- int maxEvalDepth;
534		- int evalDepth;
535		- int returnCode;
536		- int returnLevel;
537		- int exitCode;
538		- long id;
539		- int signal_level;
540		- jim_wide sigmask;
541		- int (signal_set_result)(struct Jim_Interp interp, jim_wide sigmask);
542		- Jim_CallFrame *framePtr;
543		- Jim_CallFrame *topFramePtr;
544		- struct Jim_HashTable commands;
	538	+ Jim_Obj *result;
	539	+ int errorLine;
	540	+ Jim_Obj *errorFileNameObj;
	541	+ int addStackTrace;
	542	+ int maxCallFrameDepth;
	543	+ int maxEvalDepth;
	544	+ int evalDepth;
	545	+ int returnCode;
	546	+ int returnLevel;
	547	+ int exitCode;
	548	+ long id;
	549	+ int signal_level;
	550	+ jim_wide sigmask;
	551	+ int (signal_set_result)(struct Jim_Interp interp, jim_wide sigmask);
	552	+ Jim_CallFrame *framePtr;
	553	+ Jim_CallFrame *topFramePtr;
	554	+ struct Jim_HashTable commands;
545	555	unsigned long procEpoch; /* Incremented every time the result
546	556	of procedures names lookup caching
547	557	may no longer be valid. */
548	558	unsigned long callFrameEpoch; /* Incremented every time a new
549	559	callframe is created. This id is used for the
550	560	'ID' field contained in the Jim_CallFrame
551	561	structure. */
552		- int local;
553		- Jim_Obj *liveList;
554		- Jim_Obj *freeList;
555		- Jim_Obj *currentScriptObj;
556		- Jim_Obj *nullScriptObj;
557		- Jim_Obj *emptyObj;
558		- Jim_Obj *trueObj;
559		- Jim_Obj *falseObj;
560		- unsigned long referenceNextId;
561		- struct Jim_HashTable references;
	562	+ int local;
	563	+ Jim_Obj *liveList;
	564	+ Jim_Obj *freeList;
	565	+ Jim_Obj *currentScriptObj;
	566	+ Jim_Obj *nullScriptObj;
	567	+ Jim_Obj *emptyObj;
	568	+ Jim_Obj *trueObj;
	569	+ Jim_Obj *falseObj;
	570	+ unsigned long referenceNextId;
	571	+ struct Jim_HashTable references;
562	572	unsigned long lastCollectId; /* reference max Id of the last GC
563		- execution. It's set to -1 while the collection
	573	+ execution. It's set to ~0 while the collection
564	574	is running as sentinel to avoid to recursive
565	575	calls via the [collect] command inside
566	576	finalizers. */
567		- time_t lastCollectTime;
568		- Jim_Obj *stackTrace;
569		- Jim_Obj *errorProc;
570		- Jim_Obj *unknown;
571		- int unknown_called;
572		- int errorFlag;
	577	+ time_t lastCollectTime;
	578	+ Jim_Obj *stackTrace;
	579	+ Jim_Obj *errorProc;
	580	+ Jim_Obj *unknown;
	581	+ int unknown_called;
	582	+ int errorFlag;
573	583	void cmdPrivData; / Used to pass the private data pointer to
574	584	a command. It is set to what the user specified
575	585	via Jim_CreateCommand(). */
576	586
577		- struct Jim_CallFrame *freeFramesList;
578		- struct Jim_HashTable assocData;
579		- Jim_PrngState *prngState;
580		- struct Jim_HashTable packages;
581		- Jim_Stack *loadHandles;
	587	+ struct Jim_CallFrame *freeFramesList;
	588	+ struct Jim_HashTable assocData;
	589	+ Jim_PrngState *prngState;
	590	+ struct Jim_HashTable packages;
	591	+ Jim_Stack *loadHandles;
582	592	} Jim_Interp;
583	593
584	594	#define Jim_InterpIncrProcEpoch(i) (i)->procEpoch++
585	595	#define Jim_SetResultString(i,s,l) Jim_SetResult(i, Jim_NewStringObj(i,s,l))
586	596	#define Jim_SetResultInt(i,intval) Jim_SetResult(i, Jim_NewIntObj(i,intval))
		@@ -623,11 +633,11 @@
623	633	JIM_EXPORT char Jim_StrDupLen(const char s, int l);
624	634
625	635
626	636	JIM_EXPORT char **Jim_GetEnviron(void);
627	637	JIM_EXPORT void Jim_SetEnviron(char **env);
628		-JIM_EXPORT int Jim_MakeTempFile(Jim_Interp interp, const char template);
	638	+JIM_EXPORT int Jim_MakeTempFile(Jim_Interp interp, const char filename_template, int unlink_file);
629	639
630	640
631	641	JIM_EXPORT int Jim_Eval(Jim_Interp interp, const char script);
632	642
633	643
		@@ -816,25 +826,33 @@
816	826	Jim_Obj *newObjPtr, int flags);
817	827	JIM_EXPORT int Jim_DictPairs(Jim_Interp *interp,
818	828	Jim_Obj dictPtr, Jim_Obj *objPtrPtr, int len);
819	829	JIM_EXPORT int Jim_DictAddElement(Jim_Interp interp, Jim_Obj objPtr,
820	830	Jim_Obj keyObjPtr, Jim_Obj valueObjPtr);
821		-JIM_EXPORT int Jim_DictKeys(Jim_Interp interp, Jim_Obj objPtr, Jim_Obj *patternObj);
822		-JIM_EXPORT int Jim_DictValues(Jim_Interp interp, Jim_Obj dictObjPtr, Jim_Obj *patternObjPtr);
	831	+
	832	+#define JIM_DICTMATCH_KEYS 0x0001
	833	+#define JIM_DICTMATCH_VALUES 0x002
	834	+
	835	+JIM_EXPORT int Jim_DictMatchTypes(Jim_Interp interp, Jim_Obj objPtr, Jim_Obj *patternObj, int match_type, int return_types);
823	836	JIM_EXPORT int Jim_DictSize(Jim_Interp interp, Jim_Obj objPtr);
824	837	JIM_EXPORT int Jim_DictInfo(Jim_Interp interp, Jim_Obj objPtr);
	838	+JIM_EXPORT Jim_Obj Jim_DictMerge(Jim_Interp interp, int objc, Jim_Obj const objv);
825	839
826	840
827	841	JIM_EXPORT int Jim_GetReturnCode (Jim_Interp interp, Jim_Obj objPtr,
828	842	int *intPtr);
829	843
830	844
831	845	JIM_EXPORT int Jim_EvalExpression (Jim_Interp *interp,
832		- Jim_Obj exprObjPtr, Jim_Obj *exprResultPtrPtr);
	846	+ Jim_Obj *exprObjPtr);
833	847	JIM_EXPORT int Jim_GetBoolFromExpr (Jim_Interp *interp,
834	848	Jim_Obj exprObjPtr, int boolPtr);
835	849
	850	+
	851	+JIM_EXPORT int Jim_GetBoolean(Jim_Interp interp, Jim_Obj objPtr,
	852	+ int *booleanPtr);
	853	+
836	854
837	855	JIM_EXPORT int Jim_GetWide (Jim_Interp interp, Jim_Obj objPtr,
838	856	jim_wide *widePtr);
839	857	JIM_EXPORT int Jim_GetLong (Jim_Interp interp, Jim_Obj objPtr,
840	858	long *longPtr);
		@@ -852,10 +870,12 @@
852	870
853	871	JIM_EXPORT void Jim_WrongNumArgs (Jim_Interp *interp, int argc,
854	872	Jim_Obj const argv, const char *msg);
855	873	JIM_EXPORT int Jim_GetEnum (Jim_Interp interp, Jim_Obj objPtr,
856	874	const char * const tablePtr, int indexPtr, const char *name, int flags);
	875	+JIM_EXPORT int Jim_CheckShowCommands(Jim_Interp interp, Jim_Obj objPtr,
	876	+ const char const tablePtr);
857	877	JIM_EXPORT int Jim_ScriptIsComplete(Jim_Interp *interp,
858	878	Jim_Obj scriptObj, char stateCharPtr);
859	879
860	880	JIM_EXPORT int Jim_FindByName(const char name, const char const array[], size_t len);
861	881
		@@ -878,11 +898,12 @@
878	898
879	899
880	900	JIM_EXPORT int Jim_InteractivePrompt (Jim_Interp *interp);
881	901	JIM_EXPORT void Jim_HistoryLoad(const char *filename);
882	902	JIM_EXPORT void Jim_HistorySave(const char *filename);
883		-JIM_EXPORT char Jim_HistoryGetline(const char prompt);
	903	+JIM_EXPORT char Jim_HistoryGetline(Jim_Interp interp, const char *prompt);
	904	+JIM_EXPORT void Jim_HistorySetCompletion(Jim_Interp interp, Jim_Obj commandObj);
884	905	JIM_EXPORT void Jim_HistoryAdd(const char *line);
885	906	JIM_EXPORT void Jim_HistoryShow(void);
886	907
887	908
888	909	JIM_EXPORT int Jim_InitStaticExtensions(Jim_Interp *interp);
		@@ -904,11 +925,11 @@
904	925
905	926	#ifdef __cplusplus
906	927	}
907	928	#endif
908	929
909		-#endif
	930	+#endif
910	931
911	932	#ifndef JIM_SUBCMD_H
912	933	#define JIM_SUBCMD_H
913	934
914	935
		@@ -915,24 +936,24 @@
915	936	#ifdef __cplusplus
916	937	extern "C" {
917	938	#endif
918	939
919	940
920		-#define JIM_MODFLAG_HIDDEN 0x0001
921		-#define JIM_MODFLAG_FULLARGV 0x0002
	941	+#define JIM_MODFLAG_HIDDEN 0x0001
	942	+#define JIM_MODFLAG_FULLARGV 0x0002
922	943
923	944
924	945
925	946	typedef int jim_subcmd_function(Jim_Interp interp, int argc, Jim_Obj const *argv);
926	947
927	948	typedef struct {
928		- const char *cmd;
929		- const char *args;
930		- jim_subcmd_function *function;
931		- short minargs;
932		- short maxargs;
933		- unsigned short flags;
	949	+ const char *cmd;
	950	+ const char *args;
	951	+ jim_subcmd_function *function;
	952	+ short minargs;
	953	+ short maxargs;
	954	+ unsigned short flags;
934	955	} jim_subcmd_type;
935	956
936	957	const jim_subcmd_type *
937	958	Jim_ParseSubCmd(Jim_Interp interp, const jim_subcmd_type command_table, int argc, Jim_Obj const argv);
938	959
		@@ -960,36 +981,36 @@
960	981	int rm_eo;
961	982	} regmatch_t;
962	983
963	984
964	985	typedef struct regexp {
965		-
966		- int re_nsub;
967		-
968		-
969		- int cflags;
970		- int err;
971		- int regstart;
972		- int reganch;
973		- int regmust;
974		- int regmlen;
975		- int *program;
976		-
977		-
978		- const char *regparse;
979		- int p;
980		- int proglen;
981		-
982		-
983		- int eflags;
984		- const char *start;
985		- const char *reginput;
986		- const char *regbol;
987		-
988		-
989		- regmatch_t *pmatch;
990		- int nmatch;
	986	+
	987	+ int re_nsub;
	988	+
	989	+
	990	+ int cflags;
	991	+ int err;
	992	+ int regstart;
	993	+ int reganch;
	994	+ int regmust;
	995	+ int regmlen;
	996	+ int *program;
	997	+
	998	+
	999	+ const char *regparse;
	1000	+ int p;
	1001	+ int proglen;
	1002	+
	1003	+
	1004	+ int eflags;
	1005	+ const char *start;
	1006	+ const char *reginput;
	1007	+ const char *regbol;
	1008	+
	1009	+
	1010	+ regmatch_t *pmatch;
	1011	+ int nmatch;
991	1012	} regexp;
992	1013
993	1014	typedef regexp regex_t;
994	1015
995	1016	#define REG_EXTENDED 0
		@@ -997,13 +1018,13 @@
997	1018	#define REG_ICASE 2
998	1019
999	1020	#define REG_NOTBOL 16
1000	1021
1001	1022	enum {
1002		- REG_NOERROR,
1003		- REG_NOMATCH,
1004		- REG_BADPAT,
	1023	+ REG_NOERROR,
	1024	+ REG_NOMATCH,
	1025	+ REG_BADPAT,
1005	1026	REG_ERR_NULL_ARGUMENT,
1006	1027	REG_ERR_UNKNOWN,
1007	1028	REG_ERR_TOO_BIG,
1008	1029	REG_ERR_NOMEM,
1009	1030	REG_ERR_TOO_MANY_PAREN,
		@@ -1028,24 +1049,101 @@
1028	1049
1029	1050	#ifdef __cplusplus
1030	1051	}
1031	1052	#endif
1032	1053
	1054	+#endif
	1055	+#ifndef JIM_SIGNAL_H
	1056	+#define JIM_SIGNAL_H
	1057	+
	1058	+#ifdef __cplusplus
	1059	+extern "C" {
	1060	+#endif
	1061	+
	1062	+const char *Jim_SignalId(int sig);
	1063	+
	1064	+#ifdef __cplusplus
	1065	+}
	1066	+#endif
	1067	+
	1068	+#endif
	1069	+#ifndef JIMIOCOMPAT_H
	1070	+#define JIMIOCOMPAT_H
	1071	+
	1072	+
	1073	+#include <stdio.h>
	1074	+#include <errno.h>
	1075	+
	1076	+
	1077	+void Jim_SetResultErrno(Jim_Interp interp, const char msg);
	1078	+
	1079	+int Jim_OpenForWrite(const char *filename, int append);
	1080	+
	1081	+int Jim_OpenForRead(const char *filename);
	1082	+
	1083	+#if defined(__MINGW32__)
	1084	+ #ifndef STRICT
	1085	+ #define STRICT
	1086	+ #endif
	1087	+ #define WIN32_LEAN_AND_MEAN
	1088	+ #include <windows.h>
	1089	+ #include <fcntl.h>
	1090	+ #include <io.h>
	1091	+ #include <process.h>
	1092	+
	1093	+ typedef HANDLE pidtype;
	1094	+ #define JIM_BAD_PID INVALID_HANDLE_VALUE
	1095	+
	1096	+ #define JIM_NO_PID INVALID_HANDLE_VALUE
	1097	+
	1098	+
	1099	+ #define WIFEXITED(STATUS) (((STATUS) & 0xff00) == 0)
	1100	+ #define WEXITSTATUS(STATUS) ((STATUS) & 0x00ff)
	1101	+ #define WIFSIGNALED(STATUS) (((STATUS) & 0xff00) != 0)
	1102	+ #define WTERMSIG(STATUS) (((STATUS) >> 8) & 0xff)
	1103	+ #define WNOHANG 1
	1104	+
	1105	+ int Jim_Errno(void);
	1106	+ pidtype waitpid(pidtype pid, int *status, int nohang);
	1107	+
	1108	+ #define HAVE_PIPE
	1109	+ #define pipe(P) _pipe((P), 0, O_NOINHERIT)
	1110	+
	1111	+#elif defined(HAVE_UNISTD_H)
	1112	+ #include <unistd.h>
	1113	+ #include <fcntl.h>
	1114	+ #include <sys/wait.h>
	1115	+ #include <sys/stat.h>
	1116	+
	1117	+ typedef int pidtype;
	1118	+ #define Jim_Errno() errno
	1119	+ #define JIM_BAD_PID -1
	1120	+ #define JIM_NO_PID 0
	1121	+
	1122	+ #ifndef HAVE_EXECVPE
	1123	+ #define execvpe(ARG0, ARGV, ENV) execvp(ARG0, ARGV)
	1124	+ #endif
	1125	+#endif
	1126	+
1033	1127	#endif
1034	1128	int Jim_bootstrapInit(Jim_Interp *interp)
1035	1129	{
1036	1130	if (Jim_PackageProvide(interp, "bootstrap", "1.0", JIM_ERRMSG))
1037	1131	return JIM_ERR;
1038	1132
1039	1133	return Jim_EvalSource(interp, "bootstrap.tcl", 1,
1040	1134	"\n"
1041	1135	"\n"
1042		-"proc package {cmd pkg} {\n"
	1136	+"proc package {cmd pkg args} {\n"
1043	1137	" if {$cmd eq \"require\"} {\n"
1044	1138	" foreach path $::auto_path {\n"
1045		-" if {[file exists $path/$pkg.tcl]} {\n"
1046		-" uplevel #0 [list source $path/$pkg.tcl]\n"
	1139	+" set pkgpath $path/$pkg.tcl\n"
	1140	+" if {$path eq \".\"} {\n"
	1141	+" set pkgpath $pkg.tcl\n"
	1142	+" }\n"
	1143	+" if {[file exists $pkgpath]} {\n"
	1144	+" uplevel #0 [list source $pkgpath]\n"
1047	1145	" return\n"
1048	1146	" }\n"
1049	1147	" }\n"
1050	1148	" }\n"
1051	1149	"}\n"
		@@ -1100,10 +1198,43 @@
1100	1198	"\n"
1101	1199	"if {$tcl_platform(platform) eq \"windows\"} {\n"
1102	1200	" set jim::argv0 [string map {\\\\ /} $jim::argv0]\n"
1103	1201	"}\n"
1104	1202	"\n"
	1203	+"\n"
	1204	+"set tcl::autocomplete_commands {info tcl::prefix socket namespace array clock file package string dict signal history}\n"
	1205	+"\n"
	1206	+"\n"
	1207	+"\n"
	1208	+"proc tcl::autocomplete {prefix} {\n"
	1209	+" if {[set space [string first \" \" $prefix]] != -1} {\n"
	1210	+" set cmd [string range $prefix 0 $space-1]\n"
	1211	+" if {$cmd in $::tcl::autocomplete_commands \|\| [info channel $cmd] ne \"\"} {\n"
	1212	+" set arg [string range $prefix $space+1 end]\n"
	1213	+"\n"
	1214	+" return [lmap p [$cmd -commands] {\n"
	1215	+" if {![string match \"${arg}*\" $p]} continue\n"
	1216	+" function \"$cmd $p\"\n"
	1217	+" }]\n"
	1218	+" }\n"
	1219	+" }\n"
	1220	+"\n"
	1221	+" if {[string match \"source *\" $prefix]} {\n"
	1222	+" set path [string range $prefix 7 end]\n"
	1223	+" return [lmap p [glob -nocomplain \"${path}*\"] {\n"
	1224	+" function \"source $p\"\n"
	1225	+" }]\n"
	1226	+" }\n"
	1227	+"\n"
	1228	+" return [lmap p [lsort [info commands $prefix*]] {\n"
	1229	+" if {[string match \"* *\" $p]} {\n"
	1230	+" continue\n"
	1231	+" }\n"
	1232	+" function $p\n"
	1233	+" }]\n"
	1234	+"}\n"
	1235	+"\n"
1105	1236	"_jimsh_init\n"
1106	1237	);
1107	1238	}
1108	1239	int Jim_globInit(Jim_Interp *interp)
1109	1240	{
		@@ -1315,10 +1446,17 @@
1315	1446	return JIM_ERR;
1316	1447
1317	1448	return Jim_EvalSource(interp, "stdlib.tcl", 1,
1318	1449	"\n"
1319	1450	"\n"
	1451	+"if {![exists -command ref]} {\n"
	1452	+"\n"
	1453	+" proc ref {args} {{count 0}} {\n"
	1454	+" format %08x [incr count]\n"
	1455	+" }\n"
	1456	+"}\n"
	1457	+"\n"
1320	1458	"\n"
1321	1459	"proc lambda {arglist args} {\n"
1322	1460	" tailcall proc [ref {} function lambda.finalizer] $arglist {*}$args\n"
1323	1461	"}\n"
1324	1462	"\n"
		@@ -1375,10 +1513,17 @@
1375	1513	" }\n"
1376	1514	" join $lines \\n\n"
1377	1515	"}\n"
1378	1516	"\n"
1379	1517	"\n"
	1518	+"\n"
	1519	+"proc defer {script} {\n"
	1520	+" upvar jim::defer v\n"
	1521	+" lappend v $script\n"
	1522	+"}\n"
	1523	+"\n"
	1524	+"\n"
1380	1525	"\n"
1381	1526	"proc errorInfo {msg {stacktrace \"\"}} {\n"
1382	1527	" if {$stacktrace eq \"\"} {\n"
1383	1528	"\n"
1384	1529	" set stacktrace [info stacktrace]\n"
		@@ -1402,31 +1547,10 @@
1402	1547	" if {[exists ::jim::exe]} {\n"
1403	1548	" return $::jim::exe\n"
1404	1549	" }\n"
1405	1550	"}\n"
1406	1551	"\n"
1407		-"\n"
1408		-"proc {dict with} {&dictVar {args key} script} {\n"
1409		-" set keys {}\n"
1410		-" foreach {n v} [dict get $dictVar {*}$key] {\n"
1411		-" upvar $n var_$n\n"
1412		-" set var_$n $v\n"
1413		-" lappend keys $n\n"
1414		-" }\n"
1415		-" catch {uplevel 1 $script} msg opts\n"
1416		-" if {[info exists dictVar] && ([llength $key] == 0 \|\| [dict exists $dictVar {*}$key])} {\n"
1417		-" foreach n $keys {\n"
1418		-" if {[info exists var_$n]} {\n"
1419		-" dict set dictVar {*}$key $n [set var_$n]\n"
1420		-" } else {\n"
1421		-" dict unset dictVar {*}$key $n\n"
1422		-" }\n"
1423		-" }\n"
1424		-" }\n"
1425		-" return {*}$opts $msg\n"
1426		-"}\n"
1427		-"\n"
1428	1552	"\n"
1429	1553	"proc {dict update} {&varName args script} {\n"
1430	1554	" set keys {}\n"
1431	1555	" foreach {n v} $args {\n"
1432	1556	" upvar $v var_$v\n"
		@@ -1445,23 +1569,10 @@
1445	1569	" }\n"
1446	1570	" }\n"
1447	1571	" return {*}$opts $msg\n"
1448	1572	"}\n"
1449	1573	"\n"
1450		-"\n"
1451		-"\n"
1452		-"proc {dict merge} {dict args} {\n"
1453		-" foreach d $args {\n"
1454		-"\n"
1455		-" dict size $d\n"
1456		-" foreach {k v} $d {\n"
1457		-" dict set dict $k $v\n"
1458		-" }\n"
1459		-" }\n"
1460		-" return $dict\n"
1461		-"}\n"
1462		-"\n"
1463	1574	"proc {dict replace} {dictionary {args {key value}}} {\n"
1464	1575	" if {[llength ${key value}] % 2} {\n"
1465	1576	" tailcall {dict replace}\n"
1466	1577	" }\n"
1467	1578	" tailcall dict merge $dictionary ${key value}\n"
		@@ -1503,15 +1614,10 @@
1503	1614	" dict unset dictionary $k\n"
1504	1615	" }\n"
1505	1616	" return $dictionary\n"
1506	1617	"}\n"
1507	1618	"\n"
1508		-"\n"
1509		-"proc {dict values} {dictionary {pattern *}} {\n"
1510		-" dict keys [lreverse $dictionary] $pattern\n"
1511		-"}\n"
1512		-"\n"
1513	1619	"\n"
1514	1620	"proc {dict for} {vars dictionary script} {\n"
1515	1621	" if {[llength $vars] != 2} {\n"
1516	1622	" return -code error \"must have exactly two variable names\"\n"
1517	1623	" }\n"
		@@ -1591,11 +1697,10 @@
1591	1697	" tailcall {*}$args\n"
1592	1698	"}\n"
1593	1699	"\n"
1594	1700	"\n"
1595	1701	"\n"
1596		-"\n"
1597	1702	"proc parray {arrayname {pattern *} {puts puts}} {\n"
1598	1703	" upvar $arrayname a\n"
1599	1704	"\n"
1600	1705	" set max 0\n"
1601	1706	" foreach name [array names a $pattern]] {\n"
		@@ -1647,11 +1752,11 @@
1647	1752	"}\n"
1648	1753	"\n"
1649	1754	"\n"
1650	1755	"\n"
1651	1756	"proc popen {cmd {mode r}} {\n"
1652		-" lassign [socket pipe] r w\n"
	1757	+" lassign [pipe] r w\n"
1653	1758	" try {\n"
1654	1759	" if {[string match \"w*\" $mode]} {\n"
1655	1760	" lappend cmd <@$r &\n"
1656	1761	" set pids [exec {*}$cmd]\n"
1657	1762	" $r close\n"
		@@ -1663,16 +1768,31 @@
1663	1768	" set f $r\n"
1664	1769	" }\n"
1665	1770	" lambda {cmd args} {f pids} {\n"
1666	1771	" if {$cmd eq \"pid\"} {\n"
1667	1772	" return $pids\n"
	1773	+" }\n"
	1774	+" if {$cmd eq \"getfd\"} {\n"
	1775	+" $f getfd\n"
1668	1776	" }\n"
1669	1777	" if {$cmd eq \"close\"} {\n"
1670	1778	" $f close\n"
1671	1779	"\n"
1672		-" foreach p $pids { os.wait $p }\n"
1673		-" return\n"
	1780	+" set retopts {}\n"
	1781	+" foreach p $pids {\n"
	1782	+" lassign [wait $p] status - rc\n"
	1783	+" if {$status eq \"CHILDSTATUS\"} {\n"
	1784	+" if {$rc == 0} {\n"
	1785	+" continue\n"
	1786	+" }\n"
	1787	+" set msg \"child process exited abnormally\"\n"
	1788	+" } else {\n"
	1789	+" set msg \"child killed: received signal\"\n"
	1790	+" }\n"
	1791	+" set retopts [list -code error -errorcode [list $status $p $rc] $msg]\n"
	1792	+" }\n"
	1793	+" return {*}$retopts\n"
1674	1794	" }\n"
1675	1795	" tailcall $f $cmd {*}$args\n"
1676	1796	" }\n"
1677	1797	" } on error {error opts} {\n"
1678	1798	" $r close\n"
		@@ -1692,14 +1812,10 @@
1692	1812	" if {[catch {$channelId pid} pids]} {\n"
1693	1813	" return \"\"\n"
1694	1814	" }\n"
1695	1815	" return $pids\n"
1696	1816	"}\n"
1697		-"\n"
1698		-"\n"
1699		-"\n"
1700		-"\n"
1701	1817	"\n"
1702	1818	"\n"
1703	1819	"\n"
1704	1820	"\n"
1705	1821	"\n"
		@@ -1780,10 +1896,13 @@
1780	1896	"}\n"
1781	1897	);
1782	1898	}
1783	1899
1784	1900
	1901	+#ifndef _GNU_SOURCE
	1902	+#define _GNU_SOURCE
	1903	+#endif
1785	1904	#include <stdio.h>
1786	1905	#include <string.h>
1787	1906	#include <errno.h>
1788	1907	#include <fcntl.h>
1789	1908	#ifdef HAVE_UNISTD_H
		@@ -1793,27 +1912,34 @@
1793	1912
1794	1913
1795	1914	#if defined(HAVE_SYS_SOCKET_H) && defined(HAVE_SELECT) && defined(HAVE_NETINET_IN_H) && defined(HAVE_NETDB_H) && defined(HAVE_ARPA_INET_H)
1796	1915	#include <sys/socket.h>
1797	1916	#include <netinet/in.h>
	1917	+#include <netinet/tcp.h>
1798	1918	#include <arpa/inet.h>
1799	1919	#include <netdb.h>
1800	1920	#ifdef HAVE_SYS_UN_H
1801	1921	#include <sys/un.h>
1802	1922	#endif
	1923	+#define HAVE_SOCKETS
	1924	+#elif defined (__MINGW32__)
	1925	+
1803	1926	#else
1804	1927	#define JIM_ANSIC
1805	1928	#endif
1806	1929
1807	1930	#if defined(JIM_SSL)
1808	1931	#include <openssl/ssl.h>
1809	1932	#include <openssl/err.h>
1810	1933	#endif
1811	1934
	1935	+#ifdef HAVE_TERMIOS_H
	1936	+#endif
1812	1937
1813		-#define AIO_CMD_LEN 32
1814		-#define AIO_BUF_LEN 256
	1938	+
	1939	+#define AIO_CMD_LEN 32
	1940	+#define AIO_BUF_LEN 256
1815	1941
1816	1942	#ifndef HAVE_FTELLO
1817	1943	#define ftello ftell
1818	1944	#endif
1819	1945	#ifndef HAVE_FSEEKO
		@@ -1829,11 +1955,15 @@
1829	1955	#ifndef PF_INET6
1830	1956	#define PF_INET6 0
1831	1957	#endif
1832	1958	#endif
1833	1959
1834		-#define JimCheckStreamError(interp, af) af->fops->error(af)
	1960	+#ifdef JIM_ANSIC
	1961	+
	1962	+#undef HAVE_PIPE
	1963	+#undef HAVE_SOCKETPAIR
	1964	+#endif
1835	1965
1836	1966
1837	1967	struct AioFile;
1838	1968
1839	1969	typedef struct {
		@@ -1848,11 +1978,11 @@
1848	1978	typedef struct AioFile
1849	1979	{
1850	1980	FILE *fp;
1851	1981	Jim_Obj *filename;
1852	1982	int type;
1853		- int openFlags;
	1983	+ int openFlags;
1854	1984	int fd;
1855	1985	Jim_Obj *rEvent;
1856	1986	Jim_Obj *wEvent;
1857	1987	Jim_Obj *eEvent;
1858	1988	int addr_family;
		@@ -1879,21 +2009,21 @@
1879	2009	{
1880	2010	if (!ferror(af->fp)) {
1881	2011	return JIM_OK;
1882	2012	}
1883	2013	clearerr(af->fp);
1884		-
	2014	+
1885	2015	if (feof(af->fp) \|\| errno == EAGAIN \|\| errno == EINTR) {
1886	2016	return JIM_OK;
1887	2017	}
1888	2018	#ifdef ECONNRESET
1889	2019	if (errno == ECONNRESET) {
1890	2020	return JIM_OK;
1891	2021	}
1892	2022	#endif
1893	2023	#ifdef ECONNABORTED
1894		- if (errno != ECONNABORTED) {
	2024	+ if (errno == ECONNABORTED) {
1895	2025	return JIM_OK;
1896	2026	}
1897	2027	#endif
1898	2028	return JIM_ERR;
1899	2029	}
		@@ -1935,10 +2065,19 @@
1935	2065	}
1936	2066	else {
1937	2067	Jim_SetResultString(interp, JimAioErrorString(af), -1);
1938	2068	}
1939	2069	}
	2070	+
	2071	+static int JimCheckStreamError(Jim_Interp interp, AioFile af)
	2072	+{
	2073	+ int ret = af->fops->error(af);
	2074	+ if (ret) {
	2075	+ JimAioSetError(interp, af->filename);
	2076	+ }
	2077	+ return ret;
	2078	+}
1940	2079
1941	2080	static void JimAioDelProc(Jim_Interp interp, void privData)
1942	2081	{
1943	2082	AioFile *af = privData;
1944	2083
		@@ -1945,20 +2084,19 @@
1945	2084	JIM_NOTUSED(interp);
1946	2085
1947	2086	Jim_DecrRefCount(interp, af->filename);
1948	2087
1949	2088	#ifdef jim_ext_eventloop
1950		-
1951		- Jim_DeleteFileHandler(interp, af->fp, JIM_EVENT_READABLE \| JIM_EVENT_WRITABLE \| JIM_EVENT_EXCEPTION);
	2089	+
	2090	+ Jim_DeleteFileHandler(interp, af->fd, JIM_EVENT_READABLE \| JIM_EVENT_WRITABLE \| JIM_EVENT_EXCEPTION);
1952	2091	#endif
1953	2092
1954	2093	#if defined(JIM_SSL)
1955	2094	if (af->ssl != NULL) {
1956	2095	SSL_free(af->ssl);
1957	2096	}
1958	2097	#endif
1959		-
1960	2098	if (!(af->openFlags & AIO_KEEPOPEN)) {
1961	2099	fclose(af->fp);
1962	2100	}
1963	2101
1964	2102	Jim_Free(af);
		@@ -1968,11 +2106,11 @@
1968	2106	{
1969	2107	AioFile *af = Jim_CmdPrivData(interp);
1970	2108	char buf[AIO_BUF_LEN];
1971	2109	Jim_Obj *objPtr;
1972	2110	int nonewline = 0;
1973		- jim_wide neededLen = -1;
	2111	+ jim_wide neededLen = -1;
1974	2112
1975	2113	if (argc && Jim_CompareStringImmediate(interp, argv[0], "-nonewline")) {
1976	2114	nonewline = 1;
1977	2115	argv++;
1978	2116	argc--;
		@@ -2007,11 +2145,11 @@
2007	2145	}
2008	2146	}
2009	2147	if (retval != readlen)
2010	2148	break;
2011	2149	}
2012		-
	2150	+
2013	2151	if (JimCheckStreamError(interp, af)) {
2014	2152	Jim_FreeNewObj(interp, objPtr);
2015	2153	return JIM_ERR;
2016	2154	}
2017	2155	if (nonewline) {
		@@ -2029,11 +2167,11 @@
2029	2167
2030	2168	AioFile Jim_AioFile(Jim_Interp interp, Jim_Obj *command)
2031	2169	{
2032	2170	Jim_Cmd *cmdPtr = Jim_GetCommand(interp, command, JIM_ERRMSG);
2033	2171
2034		-
	2172	+
2035	2173	if (cmdPtr && !cmdPtr->isproc && cmdPtr->u.native.cmdProc == JimAioSubCmdProc) {
2036	2174	return (AioFile *) cmdPtr->u.native.privData;
2037	2175	}
2038	2176	Jim_SetResultFormatted(interp, "Not a filehandle: \"%#s\"", command);
2039	2177	return NULL;
		@@ -2048,10 +2186,20 @@
2048	2186	return NULL;
2049	2187	}
2050	2188
2051	2189	return af->fp;
2052	2190	}
	2191	+
	2192	+static int aio_cmd_getfd(Jim_Interp interp, int argc, Jim_Obj const *argv)
	2193	+{
	2194	+ AioFile *af = Jim_CmdPrivData(interp);
	2195	+
	2196	+ fflush(af->fp);
	2197	+ Jim_SetResultInt(interp, fileno(af->fp));
	2198	+
	2199	+ return JIM_OK;
	2200	+}
2053	2201
2054	2202	static int aio_cmd_copy(Jim_Interp interp, int argc, Jim_Obj const *argv)
2055	2203	{
2056	2204	AioFile *af = Jim_CmdPrivData(interp);
2057	2205	jim_wide count = 0;
		@@ -2110,21 +2258,21 @@
2110	2258	}
2111	2259	else {
2112	2260	len = strlen(buf);
2113	2261
2114	2262	if (len && (buf[len - 1] == '\n')) {
2115		-
	2263	+
2116	2264	len--;
2117	2265	}
2118	2266
2119	2267	Jim_AppendString(interp, objPtr, buf, len);
2120	2268	break;
2121	2269	}
2122	2270	}
2123	2271
2124	2272	if (JimCheckStreamError(interp, af)) {
2125		-
	2273	+
2126	2274	Jim_FreeNewObj(interp, objPtr);
2127	2275	return JIM_ERR;
2128	2276	}
2129	2277
2130	2278	if (argc) {
		@@ -2134,11 +2282,11 @@
2134	2282	}
2135	2283
2136	2284	len = Jim_Length(objPtr);
2137	2285
2138	2286	if (len == 0 && feof(af->fp)) {
2139		-
	2287	+
2140	2288	len = -1;
2141	2289	}
2142	2290	Jim_SetResultInt(interp, len);
2143	2291	}
2144	2292	else {
		@@ -2207,11 +2355,11 @@
2207	2355	}
2208	2356
2209	2357	static int aio_cmd_close(Jim_Interp interp, int argc, Jim_Obj const *argv)
2210	2358	{
2211	2359	if (argc == 3) {
2212		-#if !defined(JIM_ANSIC) && defined(HAVE_SHUTDOWN)
	2360	+#if defined(HAVE_SOCKETS) && defined(HAVE_SHUTDOWN)
2213	2361	static const char * const options[] = { "r", "w", NULL };
2214	2362	enum { OPT_R, OPT_W, };
2215	2363	int option;
2216	2364	AioFile *af = Jim_CmdPrivData(interp);
2217	2365
		@@ -2297,10 +2445,11 @@
2297	2445	}
2298	2446	Jim_SetResultInt(interp, (fmode & O_NONBLOCK) ? 1 : 0);
2299	2447	return JIM_OK;
2300	2448	}
2301	2449	#endif
	2450	+
2302	2451
2303	2452	#ifdef HAVE_FSYNC
2304	2453	static int aio_cmd_sync(Jim_Interp interp, int argc, Jim_Obj const *argv)
2305	2454	{
2306	2455	AioFile *af = Jim_CmdPrivData(interp);
		@@ -2364,33 +2513,33 @@
2364	2513
2365	2514	static int aio_eventinfo(Jim_Interp interp, AioFile af, unsigned mask, Jim_Obj **scriptHandlerObj,
2366	2515	int argc, Jim_Obj * const *argv)
2367	2516	{
2368	2517	if (argc == 0) {
2369		-
	2518	+
2370	2519	if (*scriptHandlerObj) {
2371	2520	Jim_SetResult(interp, *scriptHandlerObj);
2372	2521	}
2373	2522	return JIM_OK;
2374	2523	}
2375	2524
2376	2525	if (*scriptHandlerObj) {
2377		-
2378		- Jim_DeleteFileHandler(interp, af->fp, mask);
	2526	+
	2527	+ Jim_DeleteFileHandler(interp, af->fd, mask);
2379	2528	}
2380	2529
2381		-
	2530	+
2382	2531	if (Jim_Length(argv[0]) == 0) {
2383		-
	2532	+
2384	2533	return JIM_OK;
2385	2534	}
2386	2535
2387		-
	2536	+
2388	2537	Jim_IncrRefCount(argv[0]);
2389	2538	*scriptHandlerObj = argv[0];
2390	2539
2391		- Jim_CreateFileHandler(interp, af->fp, mask,
	2540	+ Jim_CreateFileHandler(interp, af->fd, mask,
2392	2541	JimAioFileEventHandler, scriptHandlerObj, JimAioFileEventFinalizer);
2393	2542
2394	2543	return JIM_OK;
2395	2544	}
2396	2545
		@@ -2414,136 +2563,145 @@
2414	2563
2415	2564	return aio_eventinfo(interp, af, JIM_EVENT_EXCEPTION, &af->eEvent, argc, argv);
2416	2565	}
2417	2566	#endif
2418	2567
	2568	+
	2569	+
2419	2570
2420	2571	static const jim_subcmd_type aio_command_table[] = {
2421	2572	{ "read",
2422	2573	"?-nonewline? ?len?",
2423	2574	aio_cmd_read,
2424	2575	0,
2425	2576	2,
2426		-
	2577	+
2427	2578	},
2428	2579	{ "copyto",
2429	2580	"handle ?size?",
2430	2581	aio_cmd_copy,
2431	2582	1,
2432	2583	2,
2433		-
	2584	+
	2585	+ },
	2586	+ { "getfd",
	2587	+ NULL,
	2588	+ aio_cmd_getfd,
	2589	+ 0,
	2590	+ 0,
	2591	+
2434	2592	},
2435	2593	{ "gets",
2436	2594	"?var?",
2437	2595	aio_cmd_gets,
2438	2596	0,
2439	2597	1,
2440		-
	2598	+
2441	2599	},
2442	2600	{ "puts",
2443	2601	"?-nonewline? str",
2444	2602	aio_cmd_puts,
2445	2603	1,
2446	2604	2,
2447		-
	2605	+
2448	2606	},
2449	2607	{ "isatty",
2450	2608	NULL,
2451	2609	aio_cmd_isatty,
2452	2610	0,
2453	2611	0,
2454		-
	2612	+
2455	2613	},
2456	2614	{ "flush",
2457	2615	NULL,
2458	2616	aio_cmd_flush,
2459	2617	0,
2460	2618	0,
2461		-
	2619	+
2462	2620	},
2463	2621	{ "eof",
2464	2622	NULL,
2465	2623	aio_cmd_eof,
2466	2624	0,
2467	2625	0,
2468		-
	2626	+
2469	2627	},
2470	2628	{ "close",
2471	2629	"?r(ead)\|w(rite)?",
2472	2630	aio_cmd_close,
2473	2631	0,
2474	2632	1,
2475	2633	JIM_MODFLAG_FULLARGV,
2476		-
	2634	+
2477	2635	},
2478	2636	{ "seek",
2479	2637	"offset ?start\|current\|end",
2480	2638	aio_cmd_seek,
2481	2639	1,
2482	2640	2,
2483		-
	2641	+
2484	2642	},
2485	2643	{ "tell",
2486	2644	NULL,
2487	2645	aio_cmd_tell,
2488	2646	0,
2489	2647	0,
2490		-
	2648	+
2491	2649	},
2492	2650	{ "filename",
2493	2651	NULL,
2494	2652	aio_cmd_filename,
2495	2653	0,
2496	2654	0,
2497		-
	2655	+
2498	2656	},
2499	2657	#ifdef O_NDELAY
2500	2658	{ "ndelay",
2501	2659	"?0\|1?",
2502	2660	aio_cmd_ndelay,
2503	2661	0,
2504	2662	1,
2505		-
	2663	+
2506	2664	},
2507	2665	#endif
2508	2666	#ifdef HAVE_FSYNC
2509	2667	{ "sync",
2510	2668	NULL,
2511	2669	aio_cmd_sync,
2512	2670	0,
2513	2671	0,
2514		-
	2672	+
2515	2673	},
2516	2674	#endif
2517	2675	{ "buffering",
2518	2676	"none\|line\|full",
2519	2677	aio_cmd_buffering,
2520	2678	1,
2521	2679	1,
2522		-
	2680	+
2523	2681	},
2524	2682	#ifdef jim_ext_eventloop
2525	2683	{ "readable",
2526	2684	"?readable-script?",
2527	2685	aio_cmd_readable,
2528	2686	0,
2529	2687	1,
2530		-
	2688	+
2531	2689	},
2532	2690	{ "writable",
2533	2691	"?writable-script?",
2534	2692	aio_cmd_writable,
2535	2693	0,
2536	2694	1,
2537		-
	2695	+
2538	2696	},
2539	2697	{ "onexception",
2540	2698	"?exception-script?",
2541	2699	aio_cmd_onexception,
2542	2700	0,
2543	2701	1,
2544		-
	2702	+
2545	2703	},
2546	2704	#endif
2547	2705	{ NULL }
2548	2706	};
2549	2707
		@@ -2566,11 +2724,11 @@
2566	2724
2567	2725	#ifdef jim_ext_tclcompat
2568	2726	{
2569	2727	const char *filename = Jim_String(argv[1]);
2570	2728
2571		-
	2729	+
2572	2730	if (*filename == '\|') {
2573	2731	Jim_Obj *evalObj[3];
2574	2732
2575	2733	evalObj[0] = Jim_NewStringObj(interp, "::popen", -1);
2576	2734	evalObj[1] = Jim_NewStringObj(interp, filename + 1, -1);
		@@ -2603,42 +2761,44 @@
2603	2761	}
2604	2762
2605	2763	Jim_IncrRefCount(filename);
2606	2764
2607	2765	if (fh == NULL) {
2608		-#if !defined(JIM_ANSIC)
2609	2766	if (fd >= 0) {
	2767	+#ifndef JIM_ANSIC
2610	2768	fh = fdopen(fd, mode);
	2769	+#endif
2611	2770	}
2612	2771	else
2613		-#endif
2614	2772	fh = fopen(Jim_String(filename), mode);
2615	2773
2616	2774	if (fh == NULL) {
2617	2775	JimAioSetError(interp, filename);
2618		-#if !defined(JIM_ANSIC)
	2776	+#ifndef JIM_ANSIC
2619	2777	if (fd >= 0) {
2620	2778	close(fd);
2621	2779	}
2622	2780	#endif
2623	2781	Jim_DecrRefCount(interp, filename);
2624	2782	return NULL;
2625	2783	}
2626	2784	}
2627	2785
2628		-
	2786	+
2629	2787	af = Jim_Alloc(sizeof(*af));
2630	2788	memset(af, 0, sizeof(*af));
2631	2789	af->fp = fh;
2632		- af->fd = fileno(fh);
2633	2790	af->filename = filename;
	2791	+ af->openFlags = openFlags;
	2792	+#ifndef JIM_ANSIC
	2793	+ af->fd = fileno(fh);
2634	2794	#ifdef FD_CLOEXEC
2635	2795	if ((openFlags & AIO_KEEPOPEN) == 0) {
2636	2796	(void)fcntl(af->fd, F_SETFD, FD_CLOEXEC);
2637	2797	}
2638	2798	#endif
2639		- af->openFlags = openFlags;
	2799	+#endif
2640	2800	af->addr_family = family;
2641	2801	af->fops = &stdio_fops;
2642	2802	af->ssl = NULL;
2643	2803
2644	2804	Jim_CreateCommand(interp, buf, JimAioSubCmdProc, af, JimAioDelProc);
		@@ -2653,72 +2813,45 @@
2653	2813	const char hdlfmt, int family, const char mode[2])
2654	2814	{
2655	2815	if (JimMakeChannel(interp, NULL, p[0], filename, hdlfmt, family, mode[0])) {
2656	2816	Jim_Obj *objPtr = Jim_NewListObj(interp, NULL, 0);
2657	2817	Jim_ListAppendElement(interp, objPtr, Jim_GetResult(interp));
2658		-
2659	2818	if (JimMakeChannel(interp, NULL, p[1], filename, hdlfmt, family, mode[1])) {
2660	2819	Jim_ListAppendElement(interp, objPtr, Jim_GetResult(interp));
2661	2820	Jim_SetResult(interp, objPtr);
2662	2821	return JIM_OK;
2663	2822	}
2664	2823	}
2665	2824
2666		-
	2825	+
2667	2826	close(p[0]);
2668	2827	close(p[1]);
2669	2828	JimAioSetError(interp, NULL);
2670	2829	return JIM_ERR;
2671	2830	}
2672	2831	#endif
2673	2832
2674		-
2675		-int Jim_MakeTempFile(Jim_Interp interp, const char template)
2676		-{
2677		-#ifdef HAVE_MKSTEMP
2678		- int fd;
2679		- mode_t mask;
2680		- Jim_Obj *filenameObj;
2681		-
2682		- if (template == NULL) {
2683		- const char *tmpdir = getenv("TMPDIR");
2684		- if (tmpdir == NULL \|\| *tmpdir == '\0' \|\| access(tmpdir, W_OK) != 0) {
2685		- tmpdir = "/tmp/";
2686		- }
2687		- filenameObj = Jim_NewStringObj(interp, tmpdir, -1);
2688		- if (tmpdir[0] && tmpdir[strlen(tmpdir) - 1] != '/') {
2689		- Jim_AppendString(interp, filenameObj, "/", 1);
2690		- }
2691		- Jim_AppendString(interp, filenameObj, "tcl.tmp.XXXXXX", -1);
2692		- }
2693		- else {
2694		- filenameObj = Jim_NewStringObj(interp, template, -1);
2695		- }
2696		-
2697		-#if defined(S_IRWXG) && defined(S_IRWXO)
2698		- mask = umask(S_IXUSR \| S_IRWXG \| S_IRWXO);
2699		-#else
2700		-
2701		- mask = umask(S_IXUSR);
2702		-#endif
2703		-
2704		-
2705		- fd = mkstemp(filenameObj->bytes);
2706		- umask(mask);
2707		- if (fd < 0) {
2708		- JimAioSetError(interp, filenameObj);
2709		- Jim_FreeNewObj(interp, filenameObj);
2710		- return -1;
2711		- }
2712		-
2713		- Jim_SetResult(interp, filenameObj);
2714		- return fd;
2715		-#else
2716		- Jim_SetResultString(interp, "platform has no tempfile support", -1);
2717		- return -1;
2718		-#endif
2719		-}
	2833	+#ifdef HAVE_PIPE
	2834	+static int JimAioPipeCommand(Jim_Interp interp, int argc, Jim_Obj const *argv)
	2835	+{
	2836	+ int p[2];
	2837	+ static const char *mode[2] = { "r", "w" };
	2838	+
	2839	+ if (argc != 1) {
	2840	+ Jim_WrongNumArgs(interp, 1, argv, "");
	2841	+ return JIM_ERR;
	2842	+ }
	2843	+
	2844	+ if (pipe(p) != 0) {
	2845	+ JimAioSetError(interp, NULL);
	2846	+ return JIM_ERR;
	2847	+ }
	2848	+
	2849	+ return JimMakeChannelPair(interp, p, argv[0], "aio.pipe%ld", 0, mode);
	2850	+}
	2851	+#endif
	2852	+
2720	2853
2721	2854
2722	2855	int Jim_aioInit(Jim_Interp *interp)
2723	2856	{
2724	2857	if (Jim_PackageProvide(interp, "aio", "1.0", JIM_ERRMSG))
		@@ -2727,15 +2860,18 @@
2727	2860	#if defined(JIM_SSL)
2728	2861	Jim_CreateCommand(interp, "load_ssl_certs", JimAioLoadSSLCertsCommand, NULL, NULL);
2729	2862	#endif
2730	2863
2731	2864	Jim_CreateCommand(interp, "open", JimAioOpenCommand, NULL, NULL);
2732		-#ifndef JIM_ANSIC
	2865	+#ifdef HAVE_SOCKETS
2733	2866	Jim_CreateCommand(interp, "socket", JimAioSockCommand, NULL, NULL);
2734	2867	#endif
	2868	+#ifdef HAVE_PIPE
	2869	+ Jim_CreateCommand(interp, "pipe", JimAioPipeCommand, NULL, NULL);
	2870	+#endif
2735	2871
2736		-
	2872	+
2737	2873	JimMakeChannel(interp, stdin, -1, NULL, "stdin", 0, "r");
2738	2874	JimMakeChannel(interp, stdout, -1, NULL, "stdout", 0, "w");
2739	2875	JimMakeChannel(interp, stderr, -1, NULL, "stderr", 0, "w");
2740	2876
2741	2877	return JIM_OK;
		@@ -2813,12 +2949,12 @@
2813	2949	#include <regex.h>
2814	2950	#endif
2815	2951
2816	2952	static void FreeRegexpInternalRep(Jim_Interp interp, Jim_Obj objPtr)
2817	2953	{
2818		- regfree(objPtr->internalRep.regexpValue.compre);
2819		- Jim_Free(objPtr->internalRep.regexpValue.compre);
	2954	+ regfree(objPtr->internalRep.ptrIntValue.ptr);
	2955	+ Jim_Free(objPtr->internalRep.ptrIntValue.ptr);
2820	2956	}
2821	2957
2822	2958	static const Jim_ObjType regexpObjType = {
2823	2959	"regexp",
2824	2960	FreeRegexpInternalRep,
		@@ -2831,20 +2967,20 @@
2831	2967	{
2832	2968	regex_t *compre;
2833	2969	const char *pattern;
2834	2970	int ret;
2835	2971
2836		-
	2972	+
2837	2973	if (objPtr->typePtr == &regexpObjType &&
2838		- objPtr->internalRep.regexpValue.compre && objPtr->internalRep.regexpValue.flags == flags) {
2839		-
2840		- return objPtr->internalRep.regexpValue.compre;
	2974	+ objPtr->internalRep.ptrIntValue.ptr && objPtr->internalRep.ptrIntValue.int1 == flags) {
	2975	+
	2976	+ return objPtr->internalRep.ptrIntValue.ptr;
2841	2977	}
2842	2978
2843		-
2844	2979
2845		-
	2980	+
	2981	+
2846	2982	pattern = Jim_String(objPtr);
2847	2983	compre = Jim_Alloc(sizeof(regex_t));
2848	2984
2849	2985	if ((ret = regcomp(compre, pattern, REG_EXTENDED \| flags)) != 0) {
2850	2986	char buf[100];
		@@ -2857,12 +2993,12 @@
2857	2993	}
2858	2994
2859	2995	Jim_FreeIntRep(interp, objPtr);
2860	2996
2861	2997	objPtr->typePtr = &regexpObjType;
2862		- objPtr->internalRep.regexpValue.flags = flags;
2863		- objPtr->internalRep.regexpValue.compre = compre;
	2998	+ objPtr->internalRep.ptrIntValue.int1 = flags;
	2999	+ objPtr->internalRep.ptrIntValue.ptr = compre;
2864	3000
2865	3001	return compre;
2866	3002	}
2867	3003
2868	3004	int Jim_RegexpCmd(Jim_Interp interp, int argc, Jim_Obj const *argv)
		@@ -3001,11 +3137,11 @@
3001	3137	}
3002	3138
3003	3139	num_matches++;
3004	3140
3005	3141	if (opt_all && !opt_inline) {
3006		-
	3142	+
3007	3143	goto try_next_match;
3008	3144	}
3009	3145
3010	3146
3011	3147	j = 0;
		@@ -3041,11 +3177,11 @@
3041	3177
3042	3178	if (opt_inline) {
3043	3179	Jim_ListAppendElement(interp, resultListObj, resultObj);
3044	3180	}
3045	3181	else {
3046		-
	3182	+
3047	3183	result = Jim_SetVariable(interp, argv[i], resultObj);
3048	3184
3049	3185	if (result != JIM_OK) {
3050	3186	Jim_FreeObj(interp, resultObj);
3051	3187	break;
		@@ -3168,11 +3304,11 @@
3168	3304
3169	3305	source_str = Jim_GetString(argv[i + 1], &source_len);
3170	3306	replace_str = Jim_GetString(argv[i + 2], &replace_len);
3171	3307	varname = argv[i + 3];
3172	3308
3173		-
	3309	+
3174	3310	resultObj = Jim_NewStringObj(interp, "", 0);
3175	3311
3176	3312	if (offset) {
3177	3313	if (offset < 0) {
3178	3314	offset += source_len + 1;
		@@ -3183,11 +3319,11 @@
3183	3319	else if (offset < 0) {
3184	3320	offset = 0;
3185	3321	}
3186	3322	}
3187	3323
3188		-
	3324	+
3189	3325	Jim_AppendString(interp, resultObj, source_str, offset);
3190	3326
3191	3327
3192	3328	n = source_len - offset;
3193	3329	p = source_str + offset;
		@@ -3242,23 +3378,23 @@
3242	3378	}
3243	3379
3244	3380	p += pmatch[0].rm_eo;
3245	3381	n -= pmatch[0].rm_eo;
3246	3382
3247		-
	3383	+
3248	3384	if (!opt_all \|\| n == 0) {
3249	3385	break;
3250	3386	}
3251	3387
3252		-
	3388	+
3253	3389	if ((regcomp_flags & REG_NEWLINE) == 0 && pattern[0] == '^') {
3254	3390	break;
3255	3391	}
3256	3392
3257		-
	3393	+
3258	3394	if (pattern[0] == '\0' && n) {
3259		-
	3395	+
3260	3396	Jim_AppendString(interp, resultObj, p, 1);
3261	3397	p++;
3262	3398	n--;
3263	3399	}
3264	3400
		@@ -3265,11 +3401,11 @@
3265	3401	regexec_flags \|= REG_NOTBOL;
3266	3402	} while (n);
3267	3403
3268	3404	Jim_AppendString(interp, resultObj, p, -1);
3269	3405
3270		-
	3406	+
3271	3407	if (argc - i == 4) {
3272	3408	result = Jim_SetVariable(interp, varname, resultObj);
3273	3409
3274	3410	if (result == JIM_OK) {
3275	3411	Jim_SetResultInt(interp, num_matches);
		@@ -3320,16 +3456,23 @@
3320	3456
3321	3457	# ifndef MAXPATHLEN
3322	3458	# define MAXPATHLEN JIM_PATH_LEN
3323	3459	# endif
3324	3460
3325		-#if defined(__MINGW32__) \|\| defined(_MSC_VER)
	3461	+#if defined(__MINGW32__) \|\| defined(__MSYS__) \|\| defined(_MSC_VER)
3326	3462	#define ISWINDOWS 1
3327	3463	#else
3328	3464	#define ISWINDOWS 0
3329	3465	#endif
3330	3466
	3467	+
	3468	+#if defined(HAVE_STRUCT_STAT_ST_MTIMESPEC)
	3469	+ #define STAT_MTIME_US(STAT) ((STAT).st_mtimespec.tv_sec * 1000000ll + (STAT).st_mtimespec.tv_nsec / 1000)
	3470	+#elif defined(HAVE_STRUCT_STAT_ST_MTIM)
	3471	+ #define STAT_MTIME_US(STAT) ((STAT).st_mtim.tv_sec * 1000000ll + (STAT).st_mtim.tv_nsec / 1000)
	3472	+#endif
	3473	+
3331	3474
3332	3475	static const char *JimGetFileType(int mode)
3333	3476	{
3334	3477	if (S_ISREG(mode)) {
3335	3478	return "file";
		@@ -3371,11 +3514,11 @@
3371	3514	Jim_ListAppendElement(interp, listObj, Jim_NewIntObj(interp, value));
3372	3515	}
3373	3516
3374	3517	static int StoreStatData(Jim_Interp interp, Jim_Obj varName, const struct stat *sb)
3375	3518	{
3376		-
	3519	+
3377	3520	Jim_Obj *listObj = Jim_NewListObj(interp, NULL, 0);
3378	3521
3379	3522	AppendStatElement(interp, listObj, "dev", sb->st_dev);
3380	3523	AppendStatElement(interp, listObj, "ino", sb->st_ino);
3381	3524	AppendStatElement(interp, listObj, "mode", sb->st_mode);
		@@ -3384,39 +3527,44 @@
3384	3527	AppendStatElement(interp, listObj, "gid", sb->st_gid);
3385	3528	AppendStatElement(interp, listObj, "size", sb->st_size);
3386	3529	AppendStatElement(interp, listObj, "atime", sb->st_atime);
3387	3530	AppendStatElement(interp, listObj, "mtime", sb->st_mtime);
3388	3531	AppendStatElement(interp, listObj, "ctime", sb->st_ctime);
	3532	+#ifdef STAT_MTIME_US
	3533	+ AppendStatElement(interp, listObj, "mtimeus", STAT_MTIME_US(*sb));
	3534	+#endif
3389	3535	Jim_ListAppendElement(interp, listObj, Jim_NewStringObj(interp, "type", -1));
3390	3536	Jim_ListAppendElement(interp, listObj, Jim_NewStringObj(interp, JimGetFileType((int)sb->st_mode), -1));
3391	3537
3392		-
	3538	+
3393	3539	if (varName) {
3394		- Jim_Obj *objPtr = Jim_GetVariable(interp, varName, JIM_NONE);
	3540	+ Jim_Obj *objPtr;
	3541	+ objPtr = Jim_GetVariable(interp, varName, JIM_NONE);
	3542	+
3395	3543	if (objPtr) {
3396		- if (Jim_DictSize(interp, objPtr) < 0) {
3397		-
	3544	+ Jim_Obj *objv[2];
	3545	+
	3546	+ objv[0] = objPtr;
	3547	+ objv[1] = listObj;
	3548	+
	3549	+ objPtr = Jim_DictMerge(interp, 2, objv);
	3550	+ if (objPtr == NULL) {
	3551	+
3398	3552	Jim_SetResultFormatted(interp, "can't set \"%#s(dev)\": variable isn't array", varName);
3399	3553	Jim_FreeNewObj(interp, listObj);
3400	3554	return JIM_ERR;
3401	3555	}
3402	3556
3403		- if (Jim_IsShared(objPtr))
3404		- objPtr = Jim_DuplicateObj(interp, objPtr);
3405		-
3406		-
3407		- Jim_ListAppendList(interp, objPtr, listObj);
3408		- Jim_DictSize(interp, objPtr);
3409	3557	Jim_InvalidateStringRep(objPtr);
3410	3558
3411	3559	Jim_FreeNewObj(interp, listObj);
3412	3560	listObj = objPtr;
3413	3561	}
3414	3562	Jim_SetVariable(interp, varName, listObj);
3415	3563	}
3416	3564
3417		-
	3565	+
3418	3566	Jim_SetResult(interp, listObj);
3419	3567
3420	3568	return JIM_OK;
3421	3569	}
3422	3570
		@@ -3432,11 +3580,11 @@
3432	3580	}
3433	3581	else if (p == path) {
3434	3582	Jim_SetResultString(interp, "/", -1);
3435	3583	}
3436	3584	else if (ISWINDOWS && p[-1] == ':') {
3437		-
	3585	+
3438	3586	Jim_SetResultString(interp, path, p - path + 1);
3439	3587	}
3440	3588	else {
3441	3589	Jim_SetResultString(interp, path, p - path);
3442	3590	}
		@@ -3512,35 +3660,35 @@
3512	3660	char *newname = Jim_Alloc(MAXPATHLEN + 1);
3513	3661	char *last = newname;
3514	3662
3515	3663	*newname = 0;
3516	3664
3517		-
	3665	+
3518	3666	for (i = 0; i < argc; i++) {
3519	3667	int len;
3520	3668	const char *part = Jim_GetString(argv[i], &len);
3521	3669
3522	3670	if (*part == '/') {
3523		-
	3671	+
3524	3672	last = newname;
3525	3673	}
3526	3674	else if (ISWINDOWS && strchr(part, ':')) {