Fossil SCM
Reverted part of commit [b9a6e1a9c9c52edc] which moved an Autosetup include in auto.def, apparently because it looked more correct. What it actually does is prevents default Autosetup options like --prefix from being added to the list of legal options.
Commit
65c71961195d13598eb73ca1da6a58a858124fb83acb8bd32b4a4e3b5807c10e
Parent
f09b0f1d63eff17…
1 file changed
+4
-2
M
auto.def
+4
-2
| --- auto.def | ||
| +++ auto.def | ||
| @@ -1,7 +1,11 @@ | ||
| 1 | 1 | # System autoconfiguration. Try: ./configure --help |
| 2 | 2 | |
| 3 | +# This must be above "options" below because it implicitly brings in the | |
| 4 | +# default Autosetup options, things like --prefix. | |
| 5 | +use cc cc-lib | |
| 6 | + | |
| 3 | 7 | options { |
| 4 | 8 | with-openssl:path|auto|tree|none |
| 5 | 9 | => {Look for OpenSSL in the given path, automatically, in the source tree, or none} |
| 6 | 10 | with-miniz=0 => {Use miniz from the source tree} |
| 7 | 11 | with-zlib:path|auto|tree |
| @@ -33,12 +37,10 @@ | ||
| 33 | 37 | if {[opt-bool print-minimum-sqlite-version]} { |
| 34 | 38 | puts [get-define MINIMUM_SQLITE_VERSION] |
| 35 | 39 | exit 0 |
| 36 | 40 | } |
| 37 | 41 | |
| 38 | -use cc cc-lib | |
| 39 | - | |
| 40 | 42 | # sqlite wants these types if possible |
| 41 | 43 | cc-with {-includes {stdint.h inttypes.h}} { |
| 42 | 44 | cc-check-types uint32_t uint16_t int16_t uint8_t |
| 43 | 45 | } |
| 44 | 46 | |
| 45 | 47 |
| --- auto.def | |
| +++ auto.def | |
| @@ -1,7 +1,11 @@ | |
| 1 | # System autoconfiguration. Try: ./configure --help |
| 2 | |
| 3 | options { |
| 4 | with-openssl:path|auto|tree|none |
| 5 | => {Look for OpenSSL in the given path, automatically, in the source tree, or none} |
| 6 | with-miniz=0 => {Use miniz from the source tree} |
| 7 | with-zlib:path|auto|tree |
| @@ -33,12 +37,10 @@ | |
| 33 | if {[opt-bool print-minimum-sqlite-version]} { |
| 34 | puts [get-define MINIMUM_SQLITE_VERSION] |
| 35 | exit 0 |
| 36 | } |
| 37 | |
| 38 | use cc cc-lib |
| 39 | |
| 40 | # sqlite wants these types if possible |
| 41 | cc-with {-includes {stdint.h inttypes.h}} { |
| 42 | cc-check-types uint32_t uint16_t int16_t uint8_t |
| 43 | } |
| 44 | |
| 45 |
| --- auto.def | |
| +++ auto.def | |
| @@ -1,7 +1,11 @@ | |
| 1 | # System autoconfiguration. Try: ./configure --help |
| 2 | |
| 3 | # This must be above "options" below because it implicitly brings in the |
| 4 | # default Autosetup options, things like --prefix. |
| 5 | use cc cc-lib |
| 6 | |
| 7 | options { |
| 8 | with-openssl:path|auto|tree|none |
| 9 | => {Look for OpenSSL in the given path, automatically, in the source tree, or none} |
| 10 | with-miniz=0 => {Use miniz from the source tree} |
| 11 | with-zlib:path|auto|tree |
| @@ -33,12 +37,10 @@ | |
| 37 | if {[opt-bool print-minimum-sqlite-version]} { |
| 38 | puts [get-define MINIMUM_SQLITE_VERSION] |
| 39 | exit 0 |
| 40 | } |
| 41 | |
| 42 | # sqlite wants these types if possible |
| 43 | cc-with {-includes {stdint.h inttypes.h}} { |
| 44 | cc-check-types uint32_t uint16_t int16_t uint8_t |
| 45 | } |
| 46 | |
| 47 |