From ac4b75c2b7a9d324b831a850c8a1f75703ca2996 Mon Sep 17 00:00:00 2001
From: rip-nsk <rip.nsk@gmail.com>
Date: Thu, 14 Dec 2017 12:20:33 -0800
Subject: [PATCH] #define Z_PREFIX if zlib built with --zprefix

---
 c++/src/Adaptor.hh.in  |  5 +++++
 c++/src/CMakeLists.txt | 12 ++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/c++/src/Adaptor.hh.in b/c++/src/Adaptor.hh.in
index 34306e8a80..c09fa02272 100644
--- a/c++/src/Adaptor.hh.in
+++ b/c++/src/Adaptor.hh.in
@@ -28,6 +28,7 @@
 #cmakedefine HAS_STD_ISNAN
 #cmakedefine HAS_STD_MUTEX
 #cmakedefine NEEDS_REDUNDANT_MOVE
+#cmakedefine NEEDS_Z_PREFIX
 
 #include "orc/orc-config.hh"
 #include <string>
@@ -142,4 +143,8 @@
   #include <mutex>
 #endif
 
+#ifdef NEEDS_Z_PREFIX
+#define Z_PREFIX 1
+#endif
+
 #endif /* ADAPTER_HH */
diff --git a/c++/src/CMakeLists.txt b/c++/src/CMakeLists.txt
index 7a39b4d549..51811ca25c 100644
--- a/c++/src/CMakeLists.txt
+++ b/c++/src/CMakeLists.txt
@@ -111,6 +111,18 @@ CHECK_CXX_SOURCE_RUNS("
   HAS_POST_2038
 )
 
+set(CMAKE_REQUIRED_INCLUDES ${ZLIB_INCLUDE_DIR})
+set(CMAKE_REQUIRED_LIBRARIES zlib)
+CHECK_CXX_SOURCE_COMPILES("
+    #define Z_PREFIX
+    #include<zlib.h>
+    z_stream strm;
+    int main(int, char *[]) {
+        deflateReset(&strm);
+    }"
+  NEEDS_Z_PREFIX
+)
+
 configure_file (
   "Adaptor.hh.in"
   "${CMAKE_CURRENT_BINARY_DIR}/Adaptor.hh"