Fossil SCM
Added mistachkin's openssl name collision workaround to the autoconfigurator. Fixed a typo.
Commit
d03aca4a77f354340a54042c52a0c55be71f9238
Parent
0c3af1ecf89b979…
1 file changed
+4
-1
M
auto.def
+4
-1
| --- auto.def | ||
| +++ auto.def | ||
| @@ -167,13 +167,16 @@ | ||
| 167 | 167 | } |
| 168 | 168 | } |
| 169 | 169 | if {$found} { |
| 170 | 170 | define FOSSIL_ENABLE_SSL |
| 171 | 171 | define-append EXTRA_CFLAGS $cflags |
| 172 | + if {[opt-bool static]} { | |
| 173 | + define-append EXTRA_CFLAGS -Dpqueue_insert=pqueue_insert_fossil | |
| 174 | + } | |
| 172 | 175 | define-append EXTRA_LDFLAGS $ldflags |
| 173 | 176 | define-append LIBS -lssl -lcrypto |
| 174 | - msg-result "HTTP support enabled" | |
| 177 | + msg-result "HTTPS support enabled" | |
| 175 | 178 | |
| 176 | 179 | # Silence OpenSSL deprecation warnings on Mac OS X 10.7. |
| 177 | 180 | if {[string match *-darwin* [get-define host]]} { |
| 178 | 181 | if {[cctest -cflags {-Wdeprecated-declarations}]} { |
| 179 | 182 | define-append EXTRA_CFLAGS -Wdeprecated-declarations |
| 180 | 183 |
| --- auto.def | |
| +++ auto.def | |
| @@ -167,13 +167,16 @@ | |
| 167 | } |
| 168 | } |
| 169 | if {$found} { |
| 170 | define FOSSIL_ENABLE_SSL |
| 171 | define-append EXTRA_CFLAGS $cflags |
| 172 | define-append EXTRA_LDFLAGS $ldflags |
| 173 | define-append LIBS -lssl -lcrypto |
| 174 | msg-result "HTTP support enabled" |
| 175 | |
| 176 | # Silence OpenSSL deprecation warnings on Mac OS X 10.7. |
| 177 | if {[string match *-darwin* [get-define host]]} { |
| 178 | if {[cctest -cflags {-Wdeprecated-declarations}]} { |
| 179 | define-append EXTRA_CFLAGS -Wdeprecated-declarations |
| 180 |
| --- auto.def | |
| +++ auto.def | |
| @@ -167,13 +167,16 @@ | |
| 167 | } |
| 168 | } |
| 169 | if {$found} { |
| 170 | define FOSSIL_ENABLE_SSL |
| 171 | define-append EXTRA_CFLAGS $cflags |
| 172 | if {[opt-bool static]} { |
| 173 | define-append EXTRA_CFLAGS -Dpqueue_insert=pqueue_insert_fossil |
| 174 | } |
| 175 | define-append EXTRA_LDFLAGS $ldflags |
| 176 | define-append LIBS -lssl -lcrypto |
| 177 | msg-result "HTTPS support enabled" |
| 178 | |
| 179 | # Silence OpenSSL deprecation warnings on Mac OS X 10.7. |
| 180 | if {[string match *-darwin* [get-define host]]} { |
| 181 | if {[cctest -cflags {-Wdeprecated-declarations}]} { |
| 182 | define-append EXTRA_CFLAGS -Wdeprecated-declarations |
| 183 |