[patch] svn commit 71889

svn71889.patch (text/plain), 841 bytes, created by Martin von Gagern on 2017-01-04 17:48:27 UTC

------------------------------------------------------------------------
r71889 | lawrence | 2017-01-04 04:57:31 +0100 (Mi, 04 Jan 2017) | 4 lines

R_ZLIB macro tests ZLIB_VERNUM to handle zlib 1.2.10 (6 chars)

Thanks to George Hartzell for the fix.


Index: m4/R.m4
===================================================================
--- m4/R.m4	(revision 71888)
+++ m4/R.m4	(revision 71889)
@@ -3105,10 +3105,11 @@
 #include <string.h>
 #include <zlib.h>
 int main() {
-#ifdef ZLIB_VERSION
-/* Work around Debian bug: it uses 1.2.3.4 even though there was no such
-   version on the master site zlib.net */
-  exit(strncmp(ZLIB_VERSION, "1.2.5", 5) < 0);
+#ifdef ZLIB_VERNUM
+  if (ZLIB_VERNUM < 0x1250) {
+    exit(1);
+  }
+  exit(0);
 #else
   exit(1);
 #endif

------------------------------------------------------------------------