Fossil

Changes On Branch wy-autoreconfig
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Changes In Branch wy-autoreconfig Excluding Merge-Ins

This is equivalent to a diff from 7aad2af7 to 1d549aa8

2017-10-11
10:13
Merge the automatic reconfigure changes. ... (check-in: 67a90882 user: drh tags: trunk)
01:30
Merged in an upstream improvement from Autosetup addressing GH issue in a different output file. That in turn requires an adjustment to our new autoreconfigure feature to avoid a make(1) loop. ... (Closed-Leaf check-in: 1d549aa8 user: wyoung tags: wy-autoreconfig)
01:23
Small path fix to the new autoreconfigure Makefile rule. ... (check-in: b923d800 user: wyoung tags: wy-autoreconfig)
01:13
Added "reconfig" target to the top-level Makefile, which uses an autosetup feature to re-run configure with the same options you gave manually. ... (check-in: fd33b6a4 user: wyoung tags: wy-autoreconfig)
2017-10-10
23:08
Fix the on-line help for the pgo-command and gdiff-command settings. ... (check-in: 7aad2af7 user: drh tags: trunk)
2017-10-06
16:36
Improved help message for the /mlink page ... (check-in: bf94ffa0 user: drh tags: trunk)

Changes to Makefile.in.

47
48
49
50
51
52
53





















USE_SEE = @USE_SEE@
FOSSIL_ENABLE_MINIZ = @FOSSIL_ENABLE_MINIZ@

include $(SRCDIR)/main.mk

distclean: clean
	rm -f autoconfig.h config.log Makefile




























>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
USE_SEE = @USE_SEE@
FOSSIL_ENABLE_MINIZ = @FOSSIL_ENABLE_MINIZ@

include $(SRCDIR)/main.mk

distclean: clean
	rm -f autoconfig.h config.log Makefile

reconfig:
	@AUTOREMAKE@

# Reconfigure whenever an audiosetup file or one of the make source
# files change, unless this is "make clean".
#
# The "touch" is necessary to avoid a make loop due to a new upstream
# feature in autosetup where *.in outputs are touched only if they
# actually change.  If something other than Makefile.in changes, we'll
# reconfigure but Makefile won't change, so this rule will remain out of
# date, so we'll reconfigure but Makefile won't change, so we'll...
#
# This also why we repeat the reconfig target's command here instead
# of delegating to it with "$(MAKE) reconfig": having children running
# around interfering makes this worse.
ifeq ($(findstring clean,$(MAKECMDGOALS)),)
Makefile: @srcdir@/Makefile.in $(SRCDIR)/main.mk @AUTODEPS@
	@AUTOREMAKE@
	touch @builddir@/Makefile
endif

Changes to autosetup/system.tcl.

203
204
205
206
207
208
209
210
211
212

213
214
215
216
217
218
219
					set cond [expr {!$cond}]
				}
			}
			continue
		}
		lappend result $line
	}
	writefile $out [string map $mapping [join $result \n]]\n

	msg-result "Created [relative-path $out] from [relative-path $template]"

}

# build/host tuples and cross-compilation prefix
set build [opt-val build]
define build_alias $build
if {$build eq ""} {
	define build [config_guess]







|
<
|
>







203
204
205
206
207
208
209
210

211
212
213
214
215
216
217
218
219
					set cond [expr {!$cond}]
				}
			}
			continue
		}
		lappend result $line
	}
    write-if-changed $out [string map $mapping [join $result \n]]\n {

        msg-result "Created [relative-path $out] from [relative-path $template]"
    }
}

# build/host tuples and cross-compilation prefix
set build [opt-val build]
define build_alias $build
if {$build eq ""} {
	define build [config_guess]