tjh.dev
1Add support for 2-digit zlib version like "1.3".
2--- a/src/acinclude.m4
3+++ b/src/acinclude.m4
4@@ -67,7 +67,7 @@ char* my_strdup (char *str)
5
6 int main (int argc, char *argv[])
7 {
8- int major, minor, micro, zlib_major_version, zlib_minor_version, zlib_micro_version;
9+ int major, minor, micro, zlib_major_version, zlib_minor_version, zlib_micro_version = 0;
10
11 char *zlibver, *tmp_version;
12
13@@ -85,7 +85,7 @@ int main (int argc, char *argv[])
14 printf("%s, bad version string for\n\tmin_zlib_version... ", "$min_zlib_version");
15 exit(1);
16 }
17- if (sscanf(zlibver, "%d.%d.%d", &zlib_major_version, &zlib_minor_version, &zlib_micro_version) != 3) {
18+ if (sscanf(zlibver, "%d.%d.%d", &zlib_major_version, &zlib_minor_version, &zlib_micro_version) != 3 && sscanf(zlibver, "%d.%d", &zlib_major_version, &zlib_minor_version) != 2) {
19 printf("%s, bad version string given\n", zlibver);
20 puts("\tby zlib, sometimes due to very old zlibs that didnt correctly");
21 printf("\tdefine their version. Please upgrade if you are running an\n\told zlib... ");
22--- a/src/configure
23+++ b/src/configure
24@@ -3817,7 +3817,7 @@ char* my_strdup (char *str)
25
26 int main (int argc, char *argv[])
27 {
28- int major, minor, micro, zlib_major_version, zlib_minor_version, zlib_micro_version;
29+ int major, minor, micro, zlib_major_version, zlib_minor_version, zlib_micro_version = 0;
30
31 char *zlibver, *tmp_version;
32
33@@ -3835,7 +3835,7 @@ int main (int argc, char *argv[])
34 printf("%s, bad version string for\n\tmin_zlib_version... ", "$min_zlib_version");
35 exit(1);
36 }
37- if (sscanf(zlibver, "%d.%d.%d", &zlib_major_version, &zlib_minor_version, &zlib_micro_version) != 3) {
38+ if (sscanf(zlibver, "%d.%d.%d", &zlib_major_version, &zlib_minor_version, &zlib_micro_version) != 3 && sscanf(zlibver, "%d.%d", &zlib_major_version, &zlib_minor_version) != 2) {
39 printf("%s, bad version string given\n", zlibver);
40 puts("\tby zlib, sometimes due to very old zlibs that didnt correctly");
41 printf("\tdefine their version. Please upgrade if you are running an\n\told zlib... ");