Changes On Branch jan-buildfixes
Not logged in

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

Changes In Branch jan-buildfixes Excluding Merge-Ins

This is equivalent to a diff from f32b042eed to d03aca4a77

2012-02-19
16:42
Added -verbose flag to /json/wiki/list, which returns the metadata for all pages but not their content. check-in: fe99188e60 user: stephan tags: trunk
03:04
Added mistachkin's openssl name collision workaround to the autoconfigurator. Fixed a typo. Leaf check-in: d03aca4a77 user: jan tags: jan-buildfixes
02:31
Merge latest changes from trunk. check-in: 0c3af1ecf8 user: jan tags: jan-buildfixes
2012-02-18
22:56
latest cson code - minor gcc 4.6 portability fixes only. check-in: f32b042eed user: stephan tags: trunk
19:06
Merge into trunk the fix for --with-openssl with a manual path. check-in: 06143581fe user: drh tags: trunk

Changes to auto.def.

165
166
167
168
169
170
171



172
173
174
175
176
177
178
179
180
181
                break
            }
        }
    }
    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"

        # Silence OpenSSL deprecation warnings on Mac OS X 10.7.
        if {[string match *-darwin* [get-define host]]} {
            if {[cctest -cflags {-Wdeprecated-declarations}]} {
                define-append EXTRA_CFLAGS -Wdeprecated-declarations
            }
        }






>
>
>


|







165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
                break
            }
        }
    }
    if {$found} {
        define FOSSIL_ENABLE_SSL
        define-append EXTRA_CFLAGS $cflags
        if {[opt-bool static]} {
            define-append EXTRA_CFLAGS -Dpqueue_insert=pqueue_insert_fossil
        }
        define-append EXTRA_LDFLAGS $ldflags
        define-append LIBS -lssl -lcrypto
        msg-result "HTTPS support enabled"

        # Silence OpenSSL deprecation warnings on Mac OS X 10.7.
        if {[string match *-darwin* [get-define host]]} {
            if {[cctest -cflags {-Wdeprecated-declarations}]} {
                define-append EXTRA_CFLAGS -Wdeprecated-declarations
            }
        }