Fossil SCM

Get configure and make, via autosetup, working on MinGW.

mistachkin 2016-01-19 18:48 trunk merge

Commit a0061bb2ed9b1433e732d77e48846dd356784ea0

Parent 0d120a6102c662b…

6 files changed +1 +118 -59 +12 -2 +12 -2 +5 -1 +5 -1

~ Makefile.in ~ auto.def ~ src/main.mk ~ src/makemake.tcl ~ www/changes.wiki ~ www/changes.wiki

M Makefile.in

		--- Makefile.in
		+++ Makefile.in
		@@ -40,10 +40,11 @@
40	40
41	41	LIB = @LDFLAGS@ @EXTRA_LDFLAGS@ @LIBS@
42	42	TCCFLAGS = @EXTRA_CFLAGS@ @CPPFLAGS@ @CFLAGS@ -DHAVE_AUTOCONFIG_H -D_HAVE_SQLITE_CONFIG_H
43	43	INSTALLDIR = $(DESTDIR)@prefix@/bin
44	44	USE_SYSTEM_SQLITE = @USE_SYSTEM_SQLITE@
	45	+USE_LINENOISE = @USE_LINENOISE@
45	46	FOSSIL_ENABLE_MINIZ = @FOSSIL_ENABLE_MINIZ@
46	47
47	48	include $(SRCDIR)/main.mk
48	49
49	50	distclean: clean
50	51

	--- Makefile.in
	+++ Makefile.in
	@@ -40,10 +40,11 @@
40
41	LIB = @LDFLAGS@ @EXTRA_LDFLAGS@ @LIBS@
42	TCCFLAGS = @EXTRA_CFLAGS@ @CPPFLAGS@ @CFLAGS@ -DHAVE_AUTOCONFIG_H -D_HAVE_SQLITE_CONFIG_H
43	INSTALLDIR = $(DESTDIR)@prefix@/bin
44	USE_SYSTEM_SQLITE = @USE_SYSTEM_SQLITE@

45	FOSSIL_ENABLE_MINIZ = @FOSSIL_ENABLE_MINIZ@
46
47	include $(SRCDIR)/main.mk
48
49	distclean: clean
50

	--- Makefile.in
	+++ Makefile.in
	@@ -40,10 +40,11 @@
40
41	LIB = @LDFLAGS@ @EXTRA_LDFLAGS@ @LIBS@
42	TCCFLAGS = @EXTRA_CFLAGS@ @CPPFLAGS@ @CFLAGS@ -DHAVE_AUTOCONFIG_H -D_HAVE_SQLITE_CONFIG_H
43	INSTALLDIR = $(DESTDIR)@prefix@/bin
44	USE_SYSTEM_SQLITE = @USE_SYSTEM_SQLITE@
45	USE_LINENOISE = @USE_LINENOISE@
46	FOSSIL_ENABLE_MINIZ = @FOSSIL_ENABLE_MINIZ@
47
48	include $(SRCDIR)/main.mk
49
50	distclean: clean
51

M auto.def

+118 -59

		--- auto.def
		+++ auto.def
		@@ -1,15 +1,15 @@
1	1	# System autoconfiguration. Try: ./configure --help
2	2
3	3	use cc cc-lib
4	4
5	5	options {
6		- with-openssl:path\|auto\|none
7		- => {Look for OpenSSL in the given path, or auto or none}
	6	+ with-openssl:path\|auto\|tree\|none
	7	+ => {Look for OpenSSL in the given path, automatically, in the source tree, or none}
8	8	with-miniz=0 => {Use miniz from the source tree}
9	9	with-zlib:path\|auto\|tree
10		- => {Look for zlib in the given path, or auto or in the source tree}
	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	13	with-legacy-mv-rm=0 => {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}
		@@ -36,10 +36,11 @@
36	36	cc-check-progs tclsh
37	37
38	38	define EXTRA_CFLAGS ""
39	39	define EXTRA_LDFLAGS ""
40	40	define USE_SYSTEM_SQLITE 0
	41	+define USE_LINENOISE 0
41	42
42	43	if {![opt-bool internal-sqlite]} {
43	44	proc find_internal_sqlite {} {
44	45
45	46	# On some systems (slackware), libsqlite3 requires -ldl to link. So
		@@ -69,10 +70,25 @@
69	70	user-error "system sqlite3 not found"
70	71	}
71	72
72	73	find_internal_sqlite
73	74	}
	75	+
	76	+proc is_mingw {} {
	77	+ return [string match mingw [get-define host]]
	78	+}
	79	+
	80	+if {[is_mingw]} {
	81	+ define-append EXTRA_CFLAGS -DBROKEN_MINGW_CMDLINE
	82	+ define-append LIBS -lkernel32 -lws2_32 -lmingw32
	83	+} else {
	84	+ #
	85	+ # NOTE: All platforms except MinGW should use the linenoise
	86	+ # package. It is currently unsupported on Win32.
	87	+ #
	88	+ define USE_LINENOISE 1
	89	+}
74	90
75	91	if {[string match -solaris [get-define host]]} {
76	92	define-append EXTRA_CFLAGS {-D_XOPEN_SOURCE=500 -D__EXTENSIONS__}
77	93	}
78	94
		@@ -214,63 +230,131 @@
214	230	define-append EXTRA_LDFLAGS $tclconfig(TCL_LD_FLAGS)
215	231	define FOSSIL_ENABLE_TCL
216	232	}
217	233
218	234	# Helper for OpenSSL checking
219		-proc check-for-openssl {msg {cflags {}}} {
	235	+proc check-for-openssl {msg {cflags {}} {libs {-lssl -lcrypto}}} {
220	236	msg-checking "Checking for $msg..."
221	237	set rc 0
222		- msg-quiet cc-with [list -cflags $cflags -libs {-lssl -lcrypto}] {
223		- if {[cc-check-includes openssl/ssl.h] && [cc-check-functions SSL_new]} {
	238	+ if {[is_mingw]} {
	239	+ lappend libs -lgdi32 -lwsock32
	240	+ }
	241	+ if {[info exists ::zlib_for_ssl]} {
	242	+ lappend libs $::zlib_for_ssl
	243	+ }
	244	+ msg-quiet cc-with [list -cflags $cflags -libs $libs] {
	245	+ if {[cc-check-includes openssl/ssl.h] && \
	246	+ [cc-check-functions SSL_new]} {
224	247	incr rc
225	248	}
	249	+ }
	250	+ if {!$rc && ![is_mingw]} {
	251	+ # On some systems, OpenSSL appears to require -ldl to link.
	252	+ lappend libs -ldl
	253	+ msg-quiet cc-with [list -cflags $cflags -libs $libs] {
	254	+ if {[cc-check-includes openssl/ssl.h] && \
	255	+ [cc-check-functions SSL_new]} {
	256	+ incr rc
	257	+ }
	258	+ }
226	259	}
227	260	if {$rc} {
228	261	msg-result "ok"
229	262	return 1
230	263	} else {
231	264	msg-result "no"
232	265	return 0
233	266	}
234	267	}
	268	+
	269	+if {[opt-bool with-miniz]} {
	270	+ define FOSSIL_ENABLE_MINIZ 1
	271	+ msg-result "Using miniz for compression"
	272	+} else {
	273	+ # Check for zlib, using the given location if specified
	274	+ set zlibpath [opt-val with-zlib]
	275	+ if {$zlibpath eq "tree"} {
	276	+ set zlibdir [file dirname $autosetup(dir)]/compat/zlib
	277	+ if {![file isdirectory $zlibdir]} {
	278	+ user-error "The zlib in source tree directory does not exist"
	279	+ }
	280	+ cc-with [list -cflags "-I$zlibdir -L$zlibdir"]
	281	+ define-append EXTRA_CFLAGS -I$zlibdir
	282	+ define-append LIBS $zlibdir/libz.a
	283	+ set ::zlib_for_ssl $zlibdir/libz.a
	284	+ msg-result "Using zlib in source tree"
	285	+ } else {
	286	+ if {$zlibpath ni {auto ""}} {
	287	+ cc-with [list -cflags "-I$zlibpath -L$zlibpath"]
	288	+ define-append EXTRA_CFLAGS -I$zlibpath
	289	+ define-append EXTRA_LDFLAGS -L$zlibpath
	290	+ msg-result "Using zlib from $zlibpath"
	291	+ }
	292	+ if {![cc-check-includes zlib.h] \|\| ![cc-check-function-in-lib inflateEnd z]} {
	293	+ user-error "zlib not found please install it or specify the location with --with-zlib"
	294	+ }
	295	+ set ::zlib_for_ssl -lz
	296	+ }
	297	+}
235	298
236	299	set ssldirs [opt-val with-openssl]
237	300	if {$ssldirs ne "none"} {
238		- set found 0
239		- if {$ssldirs in {auto ""}} {
240		- catch {
241		- set cflags [exec pkg-config openssl --cflags-only-I]
242		- set ldflags [exec pkg-config openssl --libs-only-L]
243		-
244		- set found [check-for-openssl "ssl via pkg-config" "$cflags $ldflags"]
245		- } msg
246		- if {!$found} {
247		- set ssldirs "{} /usr/sfw /usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /usr"
248		- }
249		- }
250		- if {!$found} {
251		- foreach dir $ssldirs {
252		- if {$dir eq ""} {
253		- set msg "system ssl"
254		- set cflags ""
255		- set ldflags ""
256		- } else {
257		- set msg "ssl in $dir"
258		- set cflags "-I$dir/include"
259		- set ldflags "-L$dir/lib"
260		- }
261		- if {[check-for-openssl $msg "$cflags $ldflags"]} {
262		- incr found
263		- break
	301	+ if {[opt-bool with-miniz]} {
	302	+ user-error "The --with-miniz option is incompatible with OpenSSL"
	303	+ }
	304	+ set found 0
	305	+ if {$ssldirs eq "tree"} {
	306	+ set ssldir [file dirname $autosetup(dir)]/compat/openssl
	307	+ if {![file isdirectory $ssldir]} {
	308	+ user-error "The OpenSSL in source tree directory does not exist"
	309	+ }
	310	+ set msg "ssl in $ssldir"
	311	+ set cflags "-I$ssldir/include"
	312	+ set ldflags "-L$ssldir"
	313	+ set ssllibs "$ssldir/libssl.a $ssldir/libcrypto.a"
	314	+ set found [check-for-openssl "ssl in source tree" "$cflags $ldflags" $ssllibs]
	315	+ } else {
	316	+ if {$ssldirs in {auto ""}} {
	317	+ catch {
	318	+ set cflags [exec pkg-config openssl --cflags-only-I]
	319	+ set ldflags [exec pkg-config openssl --libs-only-L]
	320	+ set found [check-for-openssl "ssl via pkg-config" "$cflags $ldflags"]
	321	+ } msg
	322	+ if {!$found} {
	323	+ set ssldirs "{} /usr/sfw /usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /usr"
	324	+ }
	325	+ }
	326	+ if {!$found} {
	327	+ foreach dir $ssldirs {
	328	+ if {$dir eq ""} {
	329	+ set msg "system ssl"
	330	+ set cflags ""
	331	+ set ldflags ""
	332	+ } else {
	333	+ set msg "ssl in $dir"
	334	+ set cflags "-I$dir/include"
	335	+ set ldflags "-L$dir/lib"
	336	+ }
	337	+ if {[check-for-openssl $msg "$cflags $ldflags"]} {
	338	+ incr found
	339	+ break
	340	+ }
264	341	}
265	342	}
266	343	}
267	344	if {$found} {
268	345	define FOSSIL_ENABLE_SSL
269	346	define-append EXTRA_CFLAGS $cflags
270	347	define-append EXTRA_LDFLAGS $ldflags
271		- define-append LIBS -lssl -lcrypto
	348	+ if {[info exists ssllibs]} {
	349	+ define-append LIBS $ssllibs
	350	+ } else {
	351	+ define-append LIBS -lssl -lcrypto
	352	+ }
	353	+ if {[is_mingw]} {
	354	+ define-append LIBS -lgdi32 -lwsock32
	355	+ }
272	356	msg-result "HTTPS support enabled"
273	357
274	358	# Silence OpenSSL deprecation warnings on Mac OS X 10.7.
275	359	if {[string match -darwin [get-define host]]} {
276	360	if {[cctest -cflags {-Wdeprecated-declarations}]} {
		@@ -280,40 +364,15 @@
280	364	} else {
281	365	user-error "OpenSSL not found. Consider --with-openssl=none to disable HTTPS support"
282	366	}
283	367	}
284	368
285		-if {[opt-bool with-miniz]} {
286		- define FOSSIL_ENABLE_MINIZ 1
287		- msg-result "Using miniz for compression"
288		-} else {
289		- # Check for zlib, using the given location if specified
290		- set zlibpath [opt-val with-zlib]
291		- if {$zlibpath eq "tree"} {
292		- set zlibdir [file dirname $autosetup(dir)]/compat/zlib
293		- cc-with [list -cflags "-I$zlibdir"]
294		- define-append EXTRA_CFLAGS -I$zlibdir
295		- define-append LIBS $zlibdir/libz.a
296		- msg-result "Using zlib in source tree"
297		- } else {
298		- if {$zlibpath ni {auto ""}} {
299		- cc-with [list -cflags "-I$zlibpath -L$zlibpath"]
300		- define-append EXTRA_CFLAGS -I$zlibpath
301		- define-append EXTRA_LDFLAGS -L$zlibpath
302		- msg-result "Using zlib from $zlibpath"
303		- }
304		- if {![cc-check-includes zlib.h] \|\| ![cc-check-function-in-lib inflateEnd z]} {
305		- user-error "zlib not found please install it or specify the location with --with-zlib"
306		- }
307		- }
308		-}
309		-
310	369	# Network functions require libraries on some systems
311	370	cc-check-function-in-lib gethostbyname nsl
312	371	if {![cc-check-function-in-lib socket {socket network}]} {
313	372	# Last resort, may be Windows
314		- if {[string match mingw [get-define host]]} {
	373	+ if {[is_mingw]} {
315	374	define-append LIBS -lwsock32
316	375	}
317	376	}
318	377	cc-check-function-in-lib iconv iconv
319	378	cc-check-functions utime
320	379

	--- auto.def
	+++ auto.def
	@@ -1,15 +1,15 @@
1	# System autoconfiguration. Try: ./configure --help
2
3	use cc cc-lib
4
5	options {
6	with-openssl:path\|auto\|none
7	=> {Look for OpenSSL in the given path, or auto or none}
8	with-miniz=0 => {Use miniz from the source tree}
9	with-zlib:path\|auto\|tree
10	=> {Look for zlib in the given path, or auto 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}
	@@ -36,10 +36,11 @@
36	cc-check-progs tclsh
37
38	define EXTRA_CFLAGS ""
39	define EXTRA_LDFLAGS ""
40	define USE_SYSTEM_SQLITE 0

41
42	if {![opt-bool internal-sqlite]} {
43	proc find_internal_sqlite {} {
44
45	# On some systems (slackware), libsqlite3 requires -ldl to link. So
	@@ -69,10 +70,25 @@
69	user-error "system sqlite3 not found"
70	}
71
72	find_internal_sqlite
73	}















74
75	if {[string match -solaris [get-define host]]} {
76	define-append EXTRA_CFLAGS {-D_XOPEN_SOURCE=500 -D__EXTENSIONS__}
77	}
78
	@@ -214,63 +230,131 @@
214	define-append EXTRA_LDFLAGS $tclconfig(TCL_LD_FLAGS)
215	define FOSSIL_ENABLE_TCL
216	}
217
218	# Helper for OpenSSL checking
219	proc check-for-openssl {msg {cflags {}}} {
220	msg-checking "Checking for $msg..."
221	set rc 0
222	msg-quiet cc-with [list -cflags $cflags -libs {-lssl -lcrypto}] {
223	if {[cc-check-includes openssl/ssl.h] && [cc-check-functions SSL_new]} {







224	incr rc
225	}










226	}
227	if {$rc} {
228	msg-result "ok"
229	return 1
230	} else {
231	msg-result "no"
232	return 0
233	}
234	}






























235
236	set ssldirs [opt-val with-openssl]
237	if {$ssldirs ne "none"} {
238	set found 0
239	if {$ssldirs in {auto ""}} {
240	catch {
241	set cflags [exec pkg-config openssl --cflags-only-I]
242	set ldflags [exec pkg-config openssl --libs-only-L]
243
244	set found [check-for-openssl "ssl via pkg-config" "$cflags $ldflags"]
245	} msg
246	if {!$found} {
247	set ssldirs "{} /usr/sfw /usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /usr"
248	}
249	}
250	if {!$found} {
251	foreach dir $ssldirs {
252	if {$dir eq ""} {
253	set msg "system ssl"
254	set cflags ""
255	set ldflags ""
256	} else {
257	set msg "ssl in $dir"
258	set cflags "-I$dir/include"
259	set ldflags "-L$dir/lib"
260	}
261	if {[check-for-openssl $msg "$cflags $ldflags"]} {
262	incr found
263	break














264	}
265	}
266	}
267	if {$found} {
268	define FOSSIL_ENABLE_SSL
269	define-append EXTRA_CFLAGS $cflags
270	define-append EXTRA_LDFLAGS $ldflags
271	define-append LIBS -lssl -lcrypto







272	msg-result "HTTPS support enabled"
273
274	# Silence OpenSSL deprecation warnings on Mac OS X 10.7.
275	if {[string match -darwin [get-define host]]} {
276	if {[cctest -cflags {-Wdeprecated-declarations}]} {
	@@ -280,40 +364,15 @@
280	} else {
281	user-error "OpenSSL not found. Consider --with-openssl=none to disable HTTPS support"
282	}
283	}
284
285	if {[opt-bool with-miniz]} {
286	define FOSSIL_ENABLE_MINIZ 1
287	msg-result "Using miniz for compression"
288	} else {
289	# Check for zlib, using the given location if specified
290	set zlibpath [opt-val with-zlib]
291	if {$zlibpath eq "tree"} {
292	set zlibdir [file dirname $autosetup(dir)]/compat/zlib
293	cc-with [list -cflags "-I$zlibdir"]
294	define-append EXTRA_CFLAGS -I$zlibdir
295	define-append LIBS $zlibdir/libz.a
296	msg-result "Using zlib in source tree"
297	} else {
298	if {$zlibpath ni {auto ""}} {
299	cc-with [list -cflags "-I$zlibpath -L$zlibpath"]
300	define-append EXTRA_CFLAGS -I$zlibpath
301	define-append EXTRA_LDFLAGS -L$zlibpath
302	msg-result "Using zlib from $zlibpath"
303	}
304	if {![cc-check-includes zlib.h] \|\| ![cc-check-function-in-lib inflateEnd z]} {
305	user-error "zlib not found please install it or specify the location with --with-zlib"
306	}
307	}
308	}
309
310	# Network functions require libraries on some systems
311	cc-check-function-in-lib gethostbyname nsl
312	if {![cc-check-function-in-lib socket {socket network}]} {
313	# Last resort, may be Windows
314	if {[string match mingw [get-define host]]} {
315	define-append LIBS -lwsock32
316	}
317	}
318	cc-check-function-in-lib iconv iconv
319	cc-check-functions utime
320

	--- auto.def
	+++ auto.def
	@@ -1,15 +1,15 @@
1	# System autoconfiguration. Try: ./configure --help
2
3	use cc cc-lib
4
5	options {
6	with-openssl:path\|auto\|tree\|none
7	=> {Look for OpenSSL in the given path, automatically, in the source tree, or none}
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}
	@@ -36,10 +36,11 @@
36	cc-check-progs tclsh
37
38	define EXTRA_CFLAGS ""
39	define EXTRA_LDFLAGS ""
40	define USE_SYSTEM_SQLITE 0
41	define USE_LINENOISE 0
42
43	if {![opt-bool internal-sqlite]} {
44	proc find_internal_sqlite {} {
45
46	# On some systems (slackware), libsqlite3 requires -ldl to link. So
	@@ -69,10 +70,25 @@
70	user-error "system sqlite3 not found"
71	}
72
73	find_internal_sqlite
74	}
75
76	proc is_mingw {} {
77	return [string match mingw [get-define host]]
78	}
79
80	if {[is_mingw]} {
81	define-append EXTRA_CFLAGS -DBROKEN_MINGW_CMDLINE
82	define-append LIBS -lkernel32 -lws2_32 -lmingw32
83	} else {
84	#
85	# NOTE: All platforms except MinGW should use the linenoise
86	# package. It is currently unsupported on Win32.
87	#
88	define USE_LINENOISE 1
89	}
90
91	if {[string match -solaris [get-define host]]} {
92	define-append EXTRA_CFLAGS {-D_XOPEN_SOURCE=500 -D__EXTENSIONS__}
93	}
94
	@@ -214,63 +230,131 @@
230	define-append EXTRA_LDFLAGS $tclconfig(TCL_LD_FLAGS)
231	define FOSSIL_ENABLE_TCL
232	}
233
234	# Helper for OpenSSL checking
235	proc check-for-openssl {msg {cflags {}} {libs {-lssl -lcrypto}}} {
236	msg-checking "Checking for $msg..."
237	set rc 0
238	if {[is_mingw]} {
239	lappend libs -lgdi32 -lwsock32
240	}
241	if {[info exists ::zlib_for_ssl]} {
242	lappend libs $::zlib_for_ssl
243	}
244	msg-quiet cc-with [list -cflags $cflags -libs $libs] {
245	if {[cc-check-includes openssl/ssl.h] && \
246	[cc-check-functions SSL_new]} {
247	incr rc
248	}
249	}
250	if {!$rc && ![is_mingw]} {
251	# On some systems, OpenSSL appears to require -ldl to link.
252	lappend libs -ldl
253	msg-quiet cc-with [list -cflags $cflags -libs $libs] {
254	if {[cc-check-includes openssl/ssl.h] && \
255	[cc-check-functions SSL_new]} {
256	incr rc
257	}
258	}
259	}
260	if {$rc} {
261	msg-result "ok"
262	return 1
263	} else {
264	msg-result "no"
265	return 0
266	}
267	}
268
269	if {[opt-bool with-miniz]} {
270	define FOSSIL_ENABLE_MINIZ 1
271	msg-result "Using miniz for compression"
272	} else {
273	# Check for zlib, using the given location if specified
274	set zlibpath [opt-val with-zlib]
275	if {$zlibpath eq "tree"} {
276	set zlibdir [file dirname $autosetup(dir)]/compat/zlib
277	if {![file isdirectory $zlibdir]} {
278	user-error "The zlib in source tree directory does not exist"
279	}
280	cc-with [list -cflags "-I$zlibdir -L$zlibdir"]
281	define-append EXTRA_CFLAGS -I$zlibdir
282	define-append LIBS $zlibdir/libz.a
283	set ::zlib_for_ssl $zlibdir/libz.a
284	msg-result "Using zlib in source tree"
285	} else {
286	if {$zlibpath ni {auto ""}} {
287	cc-with [list -cflags "-I$zlibpath -L$zlibpath"]
288	define-append EXTRA_CFLAGS -I$zlibpath
289	define-append EXTRA_LDFLAGS -L$zlibpath
290	msg-result "Using zlib from $zlibpath"
291	}
292	if {![cc-check-includes zlib.h] \|\| ![cc-check-function-in-lib inflateEnd z]} {
293	user-error "zlib not found please install it or specify the location with --with-zlib"
294	}
295	set ::zlib_for_ssl -lz
296	}
297	}
298
299	set ssldirs [opt-val with-openssl]
300	if {$ssldirs ne "none"} {
301	if {[opt-bool with-miniz]} {
302	user-error "The --with-miniz option is incompatible with OpenSSL"
303	}
304	set found 0
305	if {$ssldirs eq "tree"} {
306	set ssldir [file dirname $autosetup(dir)]/compat/openssl
307	if {![file isdirectory $ssldir]} {
308	user-error "The OpenSSL in source tree directory does not exist"
309	}
310	set msg "ssl in $ssldir"
311	set cflags "-I$ssldir/include"
312	set ldflags "-L$ssldir"
313	set ssllibs "$ssldir/libssl.a $ssldir/libcrypto.a"
314	set found [check-for-openssl "ssl in source tree" "$cflags $ldflags" $ssllibs]
315	} else {
316	if {$ssldirs in {auto ""}} {
317	catch {
318	set cflags [exec pkg-config openssl --cflags-only-I]
319	set ldflags [exec pkg-config openssl --libs-only-L]
320	set found [check-for-openssl "ssl via pkg-config" "$cflags $ldflags"]
321	} msg
322	if {!$found} {
323	set ssldirs "{} /usr/sfw /usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /usr"
324	}
325	}
326	if {!$found} {
327	foreach dir $ssldirs {
328	if {$dir eq ""} {
329	set msg "system ssl"
330	set cflags ""
331	set ldflags ""
332	} else {
333	set msg "ssl in $dir"
334	set cflags "-I$dir/include"
335	set ldflags "-L$dir/lib"
336	}
337	if {[check-for-openssl $msg "$cflags $ldflags"]} {
338	incr found
339	break
340	}
341	}
342	}
343	}
344	if {$found} {
345	define FOSSIL_ENABLE_SSL
346	define-append EXTRA_CFLAGS $cflags
347	define-append EXTRA_LDFLAGS $ldflags
348	if {[info exists ssllibs]} {
349	define-append LIBS $ssllibs
350	} else {
351	define-append LIBS -lssl -lcrypto
352	}
353	if {[is_mingw]} {
354	define-append LIBS -lgdi32 -lwsock32
355	}
356	msg-result "HTTPS support enabled"
357
358	# Silence OpenSSL deprecation warnings on Mac OS X 10.7.
359	if {[string match -darwin [get-define host]]} {
360	if {[cctest -cflags {-Wdeprecated-declarations}]} {
	@@ -280,40 +364,15 @@
364	} else {
365	user-error "OpenSSL not found. Consider --with-openssl=none to disable HTTPS support"
366	}
367	}
368

























369	# Network functions require libraries on some systems
370	cc-check-function-in-lib gethostbyname nsl
371	if {![cc-check-function-in-lib socket {socket network}]} {
372	# Last resort, may be Windows
373	if {[is_mingw]} {
374	define-append LIBS -lwsock32
375	}
376	}
377	cc-check-function-in-lib iconv iconv
378	cc-check-functions utime
379

M src/main.mk

+12 -2

		--- src/main.mk
		+++ src/main.mk
		@@ -508,15 +508,25 @@
508	508	# source tree should be used; otherwise, it should not.
509	509	MINIZ_OBJ.0 =
510	510	MINIZ_OBJ.1 = $(OBJDIR)/miniz.o
511	511	MINIZ_OBJ. = $(MINIZ_OBJ.0)
512	512
	513	+# The USE_LINENOISE variable may be undefined, set to 0, or set
	514	+# to 1. If it is set to 0, then there is no need to build or link
	515	+# the linenoise.o object.
	516	+LINENOISE_DEF.0 =
	517	+LINENOISE_DEF.1 = -DHAVE_LINENOISE
	518	+LINENOISE_DEF. = $(LINENOISE_DEF.0)
	519	+LINENOISE_OBJ.0 =
	520	+LINENOISE_OBJ.1 = $(OBJDIR)/linenoise.o
	521	+LINENOISE_OBJ. = $(LINENOISE_OBJ.0)
	522	+
513	523
514	524	EXTRAOBJ = \
515	525	$(SQLITE3_OBJ.$(USE_SYSTEM_SQLITE)) \
516	526	$(MINIZ_OBJ.$(FOSSIL_ENABLE_MINIZ)) \
517		- $(OBJDIR)/linenoise.o \
	527	+ $(LINENOISE_OBJ.$(USE_LINENOISE)) \
518	528	$(OBJDIR)/shell.o \
519	529	$(OBJDIR)/th.o \
520	530	$(OBJDIR)/th_lang.o \
521	531	$(OBJDIR)/th_tcl.o \
522	532	$(OBJDIR)/cson_amalgamation.o
		@@ -1623,11 +1633,11 @@
1623	1633
1624	1634	$(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
1625	1635	$(XTCC) $(SQLITE_OPTIONS) $(SQLITE_CFLAGS) -c $(SRCDIR)/sqlite3.c -o $@
1626	1636
1627	1637	$(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1628		- $(XTCC) $(SHELL_OPTIONS) $(SHELL_CFLAGS) -DHAVE_LINENOISE -c $(SRCDIR)/shell.c -o $@
	1638	+ $(XTCC) $(SHELL_OPTIONS) $(SHELL_CFLAGS) $(LINENOISE_DEF.$(USE_LINENOISE)) -c $(SRCDIR)/shell.c -o $@
1629	1639
1630	1640	$(OBJDIR)/linenoise.o: $(SRCDIR)/linenoise.c $(SRCDIR)/linenoise.h
1631	1641	$(XTCC) -c $(SRCDIR)/linenoise.c -o $@
1632	1642
1633	1643	$(OBJDIR)/th.o: $(SRCDIR)/th.c
1634	1644

	--- src/main.mk
	+++ src/main.mk
	@@ -508,15 +508,25 @@
508	# source tree should be used; otherwise, it should not.
509	MINIZ_OBJ.0 =
510	MINIZ_OBJ.1 = $(OBJDIR)/miniz.o
511	MINIZ_OBJ. = $(MINIZ_OBJ.0)
512










513
514	EXTRAOBJ = \
515	$(SQLITE3_OBJ.$(USE_SYSTEM_SQLITE)) \
516	$(MINIZ_OBJ.$(FOSSIL_ENABLE_MINIZ)) \
517	$(OBJDIR)/linenoise.o \
518	$(OBJDIR)/shell.o \
519	$(OBJDIR)/th.o \
520	$(OBJDIR)/th_lang.o \
521	$(OBJDIR)/th_tcl.o \
522	$(OBJDIR)/cson_amalgamation.o
	@@ -1623,11 +1633,11 @@
1623
1624	$(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
1625	$(XTCC) $(SQLITE_OPTIONS) $(SQLITE_CFLAGS) -c $(SRCDIR)/sqlite3.c -o $@
1626
1627	$(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1628	$(XTCC) $(SHELL_OPTIONS) $(SHELL_CFLAGS) -DHAVE_LINENOISE -c $(SRCDIR)/shell.c -o $@
1629
1630	$(OBJDIR)/linenoise.o: $(SRCDIR)/linenoise.c $(SRCDIR)/linenoise.h
1631	$(XTCC) -c $(SRCDIR)/linenoise.c -o $@
1632
1633	$(OBJDIR)/th.o: $(SRCDIR)/th.c
1634

	--- src/main.mk
	+++ src/main.mk
	@@ -508,15 +508,25 @@
508	# source tree should be used; otherwise, it should not.
509	MINIZ_OBJ.0 =
510	MINIZ_OBJ.1 = $(OBJDIR)/miniz.o
511	MINIZ_OBJ. = $(MINIZ_OBJ.0)
512
513	# The USE_LINENOISE variable may be undefined, set to 0, or set
514	# to 1. If it is set to 0, then there is no need to build or link
515	# the linenoise.o object.
516	LINENOISE_DEF.0 =
517	LINENOISE_DEF.1 = -DHAVE_LINENOISE
518	LINENOISE_DEF. = $(LINENOISE_DEF.0)
519	LINENOISE_OBJ.0 =
520	LINENOISE_OBJ.1 = $(OBJDIR)/linenoise.o
521	LINENOISE_OBJ. = $(LINENOISE_OBJ.0)
522
523
524	EXTRAOBJ = \
525	$(SQLITE3_OBJ.$(USE_SYSTEM_SQLITE)) \
526	$(MINIZ_OBJ.$(FOSSIL_ENABLE_MINIZ)) \
527	$(LINENOISE_OBJ.$(USE_LINENOISE)) \
528	$(OBJDIR)/shell.o \
529	$(OBJDIR)/th.o \
530	$(OBJDIR)/th_lang.o \
531	$(OBJDIR)/th_tcl.o \
532	$(OBJDIR)/cson_amalgamation.o
	@@ -1623,11 +1633,11 @@
1633
1634	$(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
1635	$(XTCC) $(SQLITE_OPTIONS) $(SQLITE_CFLAGS) -c $(SRCDIR)/sqlite3.c -o $@
1636
1637	$(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1638	$(XTCC) $(SHELL_OPTIONS) $(SHELL_CFLAGS) $(LINENOISE_DEF.$(USE_LINENOISE)) -c $(SRCDIR)/shell.c -o $@
1639
1640	$(OBJDIR)/linenoise.o: $(SRCDIR)/linenoise.c $(SRCDIR)/linenoise.h
1641	$(XTCC) -c $(SRCDIR)/linenoise.c -o $@
1642
1643	$(OBJDIR)/th.o: $(SRCDIR)/th.c
1644

M src/makemake.tcl

+12 -2

		--- src/makemake.tcl
		+++ src/makemake.tcl
		@@ -337,17 +337,27 @@
337	337	# set to 1. If it is set to 1, the miniz library included in the
338	338	# source tree should be used; otherwise, it should not.
339	339	MINIZ_OBJ.0 =
340	340	MINIZ_OBJ.1 = $(OBJDIR)/miniz.o
341	341	MINIZ_OBJ. = $(MINIZ_OBJ.0)
	342	+
	343	+# The USE_LINENOISE variable may be undefined, set to 0, or set
	344	+# to 1. If it is set to 0, then there is no need to build or link
	345	+# the linenoise.o object.
	346	+LINENOISE_DEF.0 =
	347	+LINENOISE_DEF.1 = -DHAVE_LINENOISE
	348	+LINENOISE_DEF. = $(LINENOISE_DEF.0)
	349	+LINENOISE_OBJ.0 =
	350	+LINENOISE_OBJ.1 = $(OBJDIR)/linenoise.o
	351	+LINENOISE_OBJ. = $(LINENOISE_OBJ.0)
342	352	}]
343	353
344	354	writeln [string map [list <<<NEXT_LINE>>> \\] {
345	355	EXTRAOBJ = <<<NEXT_LINE>>>
346	356	$(SQLITE3_OBJ.$(USE_SYSTEM_SQLITE)) <<<NEXT_LINE>>>
347	357	$(MINIZ_OBJ.$(FOSSIL_ENABLE_MINIZ)) <<<NEXT_LINE>>>
348		- $(OBJDIR)/linenoise.o <<<NEXT_LINE>>>
	358	+ $(LINENOISE_OBJ.$(USE_LINENOISE)) <<<NEXT_LINE>>>
349	359	$(OBJDIR)/shell.o <<<NEXT_LINE>>>
350	360	$(OBJDIR)/th.o <<<NEXT_LINE>>>
351	361	$(OBJDIR)/th_lang.o <<<NEXT_LINE>>>
352	362	$(OBJDIR)/th_tcl.o <<<NEXT_LINE>>>
353	363	$(OBJDIR)/cson_amalgamation.o
		@@ -404,11 +414,11 @@
404	414
405	415	writeln "\$(OBJDIR)/sqlite3.o:\t\$(SRCDIR)/sqlite3.c"
406	416	writeln "\t\$(XTCC) \$(SQLITE_OPTIONS) \$(SQLITE_CFLAGS) -c \$(SRCDIR)/sqlite3.c -o \$@\n"
407	417
408	418	writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h"
409		-writeln "\t\$(XTCC) \$(SHELL_OPTIONS) \$(SHELL_CFLAGS) -DHAVE_LINENOISE -c \$(SRCDIR)/shell.c -o \$@\n"
	419	+writeln "\t\$(XTCC) \$(SHELL_OPTIONS) \$(SHELL_CFLAGS) \$(LINENOISE_DEF.\$(USE_LINENOISE)) -c \$(SRCDIR)/shell.c -o \$@\n"
410	420
411	421	writeln "\$(OBJDIR)/linenoise.o:\t\$(SRCDIR)/linenoise.c \$(SRCDIR)/linenoise.h"
412	422	writeln "\t\$(XTCC) -c \$(SRCDIR)/linenoise.c -o \$@\n"
413	423
414	424	writeln "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c"
415	425

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -337,17 +337,27 @@
337	# set to 1. If it is set to 1, the miniz library included in the
338	# source tree should be used; otherwise, it should not.
339	MINIZ_OBJ.0 =
340	MINIZ_OBJ.1 = $(OBJDIR)/miniz.o
341	MINIZ_OBJ. = $(MINIZ_OBJ.0)










342	}]
343
344	writeln [string map [list <<<NEXT_LINE>>> \\] {
345	EXTRAOBJ = <<<NEXT_LINE>>>
346	$(SQLITE3_OBJ.$(USE_SYSTEM_SQLITE)) <<<NEXT_LINE>>>
347	$(MINIZ_OBJ.$(FOSSIL_ENABLE_MINIZ)) <<<NEXT_LINE>>>
348	$(OBJDIR)/linenoise.o <<<NEXT_LINE>>>
349	$(OBJDIR)/shell.o <<<NEXT_LINE>>>
350	$(OBJDIR)/th.o <<<NEXT_LINE>>>
351	$(OBJDIR)/th_lang.o <<<NEXT_LINE>>>
352	$(OBJDIR)/th_tcl.o <<<NEXT_LINE>>>
353	$(OBJDIR)/cson_amalgamation.o
	@@ -404,11 +414,11 @@
404
405	writeln "\$(OBJDIR)/sqlite3.o:\t\$(SRCDIR)/sqlite3.c"
406	writeln "\t\$(XTCC) \$(SQLITE_OPTIONS) \$(SQLITE_CFLAGS) -c \$(SRCDIR)/sqlite3.c -o \$@\n"
407
408	writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h"
409	writeln "\t\$(XTCC) \$(SHELL_OPTIONS) \$(SHELL_CFLAGS) -DHAVE_LINENOISE -c \$(SRCDIR)/shell.c -o \$@\n"
410
411	writeln "\$(OBJDIR)/linenoise.o:\t\$(SRCDIR)/linenoise.c \$(SRCDIR)/linenoise.h"
412	writeln "\t\$(XTCC) -c \$(SRCDIR)/linenoise.c -o \$@\n"
413
414	writeln "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c"
415

	--- src/makemake.tcl
	+++ src/makemake.tcl
	@@ -337,17 +337,27 @@
337	# set to 1. If it is set to 1, the miniz library included in the
338	# source tree should be used; otherwise, it should not.
339	MINIZ_OBJ.0 =
340	MINIZ_OBJ.1 = $(OBJDIR)/miniz.o
341	MINIZ_OBJ. = $(MINIZ_OBJ.0)
342
343	# The USE_LINENOISE variable may be undefined, set to 0, or set
344	# to 1. If it is set to 0, then there is no need to build or link
345	# the linenoise.o object.
346	LINENOISE_DEF.0 =
347	LINENOISE_DEF.1 = -DHAVE_LINENOISE
348	LINENOISE_DEF. = $(LINENOISE_DEF.0)
349	LINENOISE_OBJ.0 =
350	LINENOISE_OBJ.1 = $(OBJDIR)/linenoise.o
351	LINENOISE_OBJ. = $(LINENOISE_OBJ.0)
352	}]
353
354	writeln [string map [list <<<NEXT_LINE>>> \\] {
355	EXTRAOBJ = <<<NEXT_LINE>>>
356	$(SQLITE3_OBJ.$(USE_SYSTEM_SQLITE)) <<<NEXT_LINE>>>
357	$(MINIZ_OBJ.$(FOSSIL_ENABLE_MINIZ)) <<<NEXT_LINE>>>
358	$(LINENOISE_OBJ.$(USE_LINENOISE)) <<<NEXT_LINE>>>
359	$(OBJDIR)/shell.o <<<NEXT_LINE>>>
360	$(OBJDIR)/th.o <<<NEXT_LINE>>>
361	$(OBJDIR)/th_lang.o <<<NEXT_LINE>>>
362	$(OBJDIR)/th_tcl.o <<<NEXT_LINE>>>
363	$(OBJDIR)/cson_amalgamation.o
	@@ -404,11 +414,11 @@
414
415	writeln "\$(OBJDIR)/sqlite3.o:\t\$(SRCDIR)/sqlite3.c"
416	writeln "\t\$(XTCC) \$(SQLITE_OPTIONS) \$(SQLITE_CFLAGS) -c \$(SRCDIR)/sqlite3.c -o \$@\n"
417
418	writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h"
419	writeln "\t\$(XTCC) \$(SHELL_OPTIONS) \$(SHELL_CFLAGS) \$(LINENOISE_DEF.\$(USE_LINENOISE)) -c \$(SRCDIR)/shell.c -o \$@\n"
420
421	writeln "\$(OBJDIR)/linenoise.o:\t\$(SRCDIR)/linenoise.c \$(SRCDIR)/linenoise.h"
422	writeln "\t\$(XTCC) -c \$(SRCDIR)/linenoise.c -o \$@\n"
423
424	writeln "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c"
425

M www/changes.wiki

+5 -1

		--- www/changes.wiki
		+++ www/changes.wiki
		@@ -14,11 +14,11 @@
14	14	the ancestors of a particular file version, it only shows direct
15	15	ancestors and omits changes on branches, thus making it show the same set
16	16	of ancestors that are used for [/help?cmd=/blame\|/blame].
17	17	* Added the --page option to the [/help?cmd=ui\|fossil ui] command
18	18	* Added the [/help?cmd=bisect\|fossil bisect ui] command
19		- * Enhanced the [/help?cmd=diff\|fossil diff] command so that it accepts
	19	+ * Enhanced the [/help?cmd=diff\|fossil diff] command so that it accepts
20	20	directory names as arguments and computes diffs on all files contained
21	21	within those directories.
22	22	* Fix the [/help?cmd=add\|fossil add] command so that it shows "SKIP" for
23	23	files added that were already under management.
24	24	* TH1 enhancements:
		@@ -25,10 +25,14 @@
25	25	<ul><li>Add <nowiki>[array exists]</nowiki> command.</li>
26	26	<li>Add minimal <nowiki>[array names]</nowiki> command.</li>
27	27	<li>Add tcl_platform(engine) and tcl_platform(platform) array
28	28	elements.</li>
29	29	</ul>
	30	+ * Get autosetup working with MinGW.
	31	+ * Fix autosetup detection of zlib in the source tree.
	32	+ * Added autosetup detection of OpenSSL when it may be present under the
	33	+ "compat" subdirectory of the source tree.
30	34
31	35	<h2>Changes for Version 1.34 (2015-11-02)</h2>
32	36
33	37	* Make the [/help?cmd=clean\|fossil clean] command undoable for files less
34	38	than 10MiB.
35	39

	--- www/changes.wiki
	+++ www/changes.wiki
	@@ -14,11 +14,11 @@
14	the ancestors of a particular file version, it only shows direct
15	ancestors and omits changes on branches, thus making it show the same set
16	of ancestors that are used for [/help?cmd=/blame\|/blame].
17	* Added the --page option to the [/help?cmd=ui\|fossil ui] command
18	* Added the [/help?cmd=bisect\|fossil bisect ui] command
19	* Enhanced the [/help?cmd=diff\|fossil diff] command so that it accepts
20	directory names as arguments and computes diffs on all files contained
21	within those directories.
22	* Fix the [/help?cmd=add\|fossil add] command so that it shows "SKIP" for
23	files added that were already under management.
24	* TH1 enhancements:
	@@ -25,10 +25,14 @@
25	<ul><li>Add <nowiki>[array exists]</nowiki> command.</li>
26	<li>Add minimal <nowiki>[array names]</nowiki> command.</li>
27	<li>Add tcl_platform(engine) and tcl_platform(platform) array
28	elements.</li>
29	</ul>




30
31	<h2>Changes for Version 1.34 (2015-11-02)</h2>
32
33	* Make the [/help?cmd=clean\|fossil clean] command undoable for files less
34	than 10MiB.
35

	--- www/changes.wiki
	+++ www/changes.wiki
	@@ -14,11 +14,11 @@
14	the ancestors of a particular file version, it only shows direct
15	ancestors and omits changes on branches, thus making it show the same set
16	of ancestors that are used for [/help?cmd=/blame\|/blame].
17	* Added the --page option to the [/help?cmd=ui\|fossil ui] command
18	* Added the [/help?cmd=bisect\|fossil bisect ui] command
19	* Enhanced the [/help?cmd=diff\|fossil diff] command so that it accepts
20	directory names as arguments and computes diffs on all files contained
21	within those directories.
22	* Fix the [/help?cmd=add\|fossil add] command so that it shows "SKIP" for
23	files added that were already under management.
24	* TH1 enhancements:
	@@ -25,10 +25,14 @@
25	<ul><li>Add <nowiki>[array exists]</nowiki> command.</li>
26	<li>Add minimal <nowiki>[array names]</nowiki> command.</li>
27	<li>Add tcl_platform(engine) and tcl_platform(platform) array
28	elements.</li>
29	</ul>
30	* Get autosetup working with MinGW.
31	* Fix autosetup detection of zlib in the source tree.
32	* Added autosetup detection of OpenSSL when it may be present under the
33	"compat" subdirectory of the source tree.
34
35	<h2>Changes for Version 1.34 (2015-11-02)</h2>
36
37	* Make the [/help?cmd=clean\|fossil clean] command undoable for files less
38	than 10MiB.
39

M www/changes.wiki

+5 -1

		--- www/changes.wiki
		+++ www/changes.wiki
		@@ -14,11 +14,11 @@
14	14	the ancestors of a particular file version, it only shows direct
15	15	ancestors and omits changes on branches, thus making it show the same set
16	16	of ancestors that are used for [/help?cmd=/blame\|/blame].
17	17	* Added the --page option to the [/help?cmd=ui\|fossil ui] command
18	18	* Added the [/help?cmd=bisect\|fossil bisect ui] command
19		- * Enhanced the [/help?cmd=diff\|fossil diff] command so that it accepts
	19	+ * Enhanced the [/help?cmd=diff\|fossil diff] command so that it accepts
20	20	directory names as arguments and computes diffs on all files contained
21	21	within those directories.
22	22	* Fix the [/help?cmd=add\|fossil add] command so that it shows "SKIP" for
23	23	files added that were already under management.
24	24	* TH1 enhancements:
		@@ -25,10 +25,14 @@
25	25	<ul><li>Add <nowiki>[array exists]</nowiki> command.</li>
26	26	<li>Add minimal <nowiki>[array names]</nowiki> command.</li>
27	27	<li>Add tcl_platform(engine) and tcl_platform(platform) array
28	28	elements.</li>
29	29	</ul>
	30	+ * Get autosetup working with MinGW.
	31	+ * Fix autosetup detection of zlib in the source tree.
	32	+ * Added autosetup detection of OpenSSL when it may be present under the
	33	+ "compat" subdirectory of the source tree.
30	34
31	35	<h2>Changes for Version 1.34 (2015-11-02)</h2>
32	36
33	37	* Make the [/help?cmd=clean\|fossil clean] command undoable for files less
34	38	than 10MiB.
35	39

	--- www/changes.wiki
	+++ www/changes.wiki
	@@ -14,11 +14,11 @@
14	the ancestors of a particular file version, it only shows direct
15	ancestors and omits changes on branches, thus making it show the same set
16	of ancestors that are used for [/help?cmd=/blame\|/blame].
17	* Added the --page option to the [/help?cmd=ui\|fossil ui] command
18	* Added the [/help?cmd=bisect\|fossil bisect ui] command
19	* Enhanced the [/help?cmd=diff\|fossil diff] command so that it accepts
20	directory names as arguments and computes diffs on all files contained
21	within those directories.
22	* Fix the [/help?cmd=add\|fossil add] command so that it shows "SKIP" for
23	files added that were already under management.
24	* TH1 enhancements:
	@@ -25,10 +25,14 @@
25	<ul><li>Add <nowiki>[array exists]</nowiki> command.</li>
26	<li>Add minimal <nowiki>[array names]</nowiki> command.</li>
27	<li>Add tcl_platform(engine) and tcl_platform(platform) array
28	elements.</li>
29	</ul>




30
31	<h2>Changes for Version 1.34 (2015-11-02)</h2>
32
33	* Make the [/help?cmd=clean\|fossil clean] command undoable for files less
34	than 10MiB.
35

	--- www/changes.wiki
	+++ www/changes.wiki
	@@ -14,11 +14,11 @@
14	the ancestors of a particular file version, it only shows direct
15	ancestors and omits changes on branches, thus making it show the same set
16	of ancestors that are used for [/help?cmd=/blame\|/blame].
17	* Added the --page option to the [/help?cmd=ui\|fossil ui] command
18	* Added the [/help?cmd=bisect\|fossil bisect ui] command
19	* Enhanced the [/help?cmd=diff\|fossil diff] command so that it accepts
20	directory names as arguments and computes diffs on all files contained
21	within those directories.
22	* Fix the [/help?cmd=add\|fossil add] command so that it shows "SKIP" for
23	files added that were already under management.
24	* TH1 enhancements:
	@@ -25,10 +25,14 @@
25	<ul><li>Add <nowiki>[array exists]</nowiki> command.</li>
26	<li>Add minimal <nowiki>[array names]</nowiki> command.</li>
27	<li>Add tcl_platform(engine) and tcl_platform(platform) array
28	elements.</li>
29	</ul>
30	* Get autosetup working with MinGW.
31	* Fix autosetup detection of zlib in the source tree.
32	* Added autosetup detection of OpenSSL when it may be present under the
33	"compat" subdirectory of the source tree.
34
35	<h2>Changes for Version 1.34 (2015-11-02)</h2>
36
37	* Make the [/help?cmd=clean\|fossil clean] command undoable for files less
38	than 10MiB.
39

Fossil SCM

Keyboard Shortcuts