Check-in [172580e0a4]
Not logged in

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

Overview
Comment:Merge the latest autosetup changes into trunk.
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:172580e0a427d33db65735327bd3d46b6970e4fb
User & Date: drh 2011-09-02 12:18:14
Context
2011-09-02
12:33
Fix a bug in undo associated with symlinks. check-in: 56d624f6e2 user: drh tags: trunk
12:27
Merge latest trunk into symlinks branch. check-in: fee3c6767d user: dmitry tags: symlinks
12:18
Merge the latest autosetup changes into trunk. check-in: 172580e0a4 user: drh tags: trunk
10:31
Fix an autosetup bug which prevented libreadline from being detected when running autosetup under tclsh Leaf check-in: 7eeb5c64cc user: steveb tags: autosetup
10:10
Add Makefile.in back into the checkout. Was deleted accidently by the merge at [e4f1c1fe950425b]. check-in: 90b692ba5f user: drh tags: trunk
Changes

Changes to auto.def.

132
133
134
135
136
137
138







139
140
141
142
143
144
145
    }
    if {$found} {
        define FOSSIL_ENABLE_SSL
        define-append EXTRA_CFLAGS $cflags
        define-append EXTRA_LDFLAGS $ldflags
        define-append LIBS -lssl -lcrypto
        msg-result "HTTP support enabled"







    } else {
        user-error "OpenSSL not found. Consider --with-openssl=none to disable HTTPS support"
    }
}

if {[opt-bool lineedit]} {
    # Need readline-compatible line editing







>
>
>
>
>
>
>







132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
    }
    if {$found} {
        define FOSSIL_ENABLE_SSL
        define-append EXTRA_CFLAGS $cflags
        define-append EXTRA_LDFLAGS $ldflags
        define-append LIBS -lssl -lcrypto
        msg-result "HTTP support enabled"

        # Maybe needed to silence warnings on Mac OS X 10.7 with openssl
        if {[string match *-darwin* [get-define host]]} {
            if {[cctest -cflags {-Wdeprecated-declarations}]} {
                define-append EXTRA_CFLAGS -Wdeprecated-declarations
            }
        }
    } else {
        user-error "OpenSSL not found. Consider --with-openssl=none to disable HTTPS support"
    }
}

if {[opt-bool lineedit]} {
    # Need readline-compatible line editing

Changes to autosetup/cc.tcl.

329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349

# Similar to cc-add-settings, but each given setting
# simply replaces the existing value.
#
# Returns the previous settings
proc cc-update-settings {args} {
	set prev [cc-get-settings]
	array set new $prev

	foreach {name value} $args {
		set new($name) $value
	}
	cc-store-settings $new

	return $prev
}

# @cc-with settings ?{ script }?
#
# Sets the given 'cctest' settings and then runs the tests in 'script'.
# Note that settings such as -lang replace the current setting, while







<
<
<
<
<
|
<







329
330
331
332
333
334
335





336

337
338
339
340
341
342
343

# Similar to cc-add-settings, but each given setting
# simply replaces the existing value.
#
# Returns the previous settings
proc cc-update-settings {args} {
	set prev [cc-get-settings]





	cc-store-settings [dict merge $prev $args]

	return $prev
}

# @cc-with settings ?{ script }?
#
# Sets the given 'cctest' settings and then runs the tests in 'script'.
# Note that settings such as -lang replace the current setting, while