Fossil SCM
Got the last bit of Baruch's patch in.
Commit
d8902124d481ced2a800fc3ec4d3212640c25563
Parent
26ecec6c2c7d955…
2 files changed
+1
-1
+1
-1
+1
-1
| --- Makefile.classic | ||
| +++ Makefile.classic | ||
| @@ -44,11 +44,11 @@ | ||
| 44 | 44 | # to link against the Z-Lib compression library. There are no |
| 45 | 45 | # other dependencies. We sometimes add the -static option here |
| 46 | 46 | # so that we can build a static executable that will run in a |
| 47 | 47 | # chroot jail. |
| 48 | 48 | # |
| 49 | -LIB = -lz $(LDFLAGS) | |
| 49 | +LIB = $(LDFLAGS) | |
| 50 | 50 | |
| 51 | 51 | # If using HTTPS: |
| 52 | 52 | LIB += -lcrypto -lssl |
| 53 | 53 | |
| 54 | 54 | #### Tcl shell for use in running the fossil testsuite. If you do not |
| 55 | 55 |
| --- Makefile.classic | |
| +++ Makefile.classic | |
| @@ -44,11 +44,11 @@ | |
| 44 | # to link against the Z-Lib compression library. There are no |
| 45 | # other dependencies. We sometimes add the -static option here |
| 46 | # so that we can build a static executable that will run in a |
| 47 | # chroot jail. |
| 48 | # |
| 49 | LIB = -lz $(LDFLAGS) |
| 50 | |
| 51 | # If using HTTPS: |
| 52 | LIB += -lcrypto -lssl |
| 53 | |
| 54 | #### Tcl shell for use in running the fossil testsuite. If you do not |
| 55 |
| --- Makefile.classic | |
| +++ Makefile.classic | |
| @@ -44,11 +44,11 @@ | |
| 44 | # to link against the Z-Lib compression library. There are no |
| 45 | # other dependencies. We sometimes add the -static option here |
| 46 | # so that we can build a static executable that will run in a |
| 47 | # chroot jail. |
| 48 | # |
| 49 | LIB = $(LDFLAGS) |
| 50 | |
| 51 | # If using HTTPS: |
| 52 | LIB += -lcrypto -lssl |
| 53 | |
| 54 | #### Tcl shell for use in running the fossil testsuite. If you do not |
| 55 |
+1
-1
| --- src/main.c | ||
| +++ src/main.c | ||
| @@ -955,11 +955,11 @@ | ||
| 955 | 955 | #endif |
| 956 | 956 | fossil_print("Compiled on %s %s using %s (%d-bit)\n", |
| 957 | 957 | __DATE__, __TIME__, COMPILER_NAME, sizeof(void*)*8); |
| 958 | 958 | fossil_print("SQLite %s %.30s\n", sqlite3_libversion(), sqlite3_sourceid()); |
| 959 | 959 | fossil_print("Schema version %s\n", AUX_SCHEMA); |
| 960 | - fossil_print("zlib %s, loaded %s\n", ZLIB_VERSION, zlibVersion()); | |
| 960 | + fossil_print("miniz %s, loaded %s\n", MZ_VERSION, mz_version()); | |
| 961 | 961 | #if defined(FOSSIL_ENABLE_SSL) |
| 962 | 962 | fossil_print("SSL (%s)\n", SSLeay_version(SSLEAY_VERSION)); |
| 963 | 963 | #endif |
| 964 | 964 | #if defined(FOSSIL_ENABLE_TH1_HOOKS) |
| 965 | 965 | fossil_print("TH1_HOOKS\n"); |
| 966 | 966 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -955,11 +955,11 @@ | |
| 955 | #endif |
| 956 | fossil_print("Compiled on %s %s using %s (%d-bit)\n", |
| 957 | __DATE__, __TIME__, COMPILER_NAME, sizeof(void*)*8); |
| 958 | fossil_print("SQLite %s %.30s\n", sqlite3_libversion(), sqlite3_sourceid()); |
| 959 | fossil_print("Schema version %s\n", AUX_SCHEMA); |
| 960 | fossil_print("zlib %s, loaded %s\n", ZLIB_VERSION, zlibVersion()); |
| 961 | #if defined(FOSSIL_ENABLE_SSL) |
| 962 | fossil_print("SSL (%s)\n", SSLeay_version(SSLEAY_VERSION)); |
| 963 | #endif |
| 964 | #if defined(FOSSIL_ENABLE_TH1_HOOKS) |
| 965 | fossil_print("TH1_HOOKS\n"); |
| 966 |
| --- src/main.c | |
| +++ src/main.c | |
| @@ -955,11 +955,11 @@ | |
| 955 | #endif |
| 956 | fossil_print("Compiled on %s %s using %s (%d-bit)\n", |
| 957 | __DATE__, __TIME__, COMPILER_NAME, sizeof(void*)*8); |
| 958 | fossil_print("SQLite %s %.30s\n", sqlite3_libversion(), sqlite3_sourceid()); |
| 959 | fossil_print("Schema version %s\n", AUX_SCHEMA); |
| 960 | fossil_print("miniz %s, loaded %s\n", MZ_VERSION, mz_version()); |
| 961 | #if defined(FOSSIL_ENABLE_SSL) |
| 962 | fossil_print("SSL (%s)\n", SSLeay_version(SSLEAY_VERSION)); |
| 963 | #endif |
| 964 | #if defined(FOSSIL_ENABLE_TH1_HOOKS) |
| 965 | fossil_print("TH1_HOOKS\n"); |
| 966 |