From cc4c83b1e56c5a8460deda15b28ff8a027c1a998 Mon Sep 17 00:00:00 2001
From: Onur Tirtir <onurcantirtir@gmail.com>
Date: Thu, 16 Dec 2021 16:21:52 +0300
Subject: [PATCH] HAVE_LZ4 -> HAVE_CITUS_LZ4 (#5541)

---
 configure                                   | 6 +++++-
 configure.in                                | 3 ++-
 src/backend/columnar/columnar.c             | 4 ++--
 src/backend/columnar/columnar_compression.c | 6 +++---
 src/include/citus_config.h.in               | 2 +-
 src/include/citus_version.h.in              | 2 +-
 6 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/configure b/configure
index ea3374c64..5766ce8d6 100755
--- a/configure
+++ b/configure
@@ -4543,7 +4543,9 @@ if test "${with_lz4+set}" = set; then :
   withval=$with_lz4;
   case $withval in
     yes)
-      :
+
+$as_echo "#define HAVE_CITUS_LIBLZ4 1" >>confdefs.h
+
       ;;
     no)
       :
@@ -4556,6 +4558,8 @@ if test "${with_lz4+set}" = set; then :
 else
   with_lz4=yes
 
+$as_echo "#define HAVE_CITUS_LIBLZ4 1" >>confdefs.h
+
 fi
 
 
diff --git a/configure.in b/configure.in
index 8a5192f58..cb1d15b6b 100644
--- a/configure.in
+++ b/configure.in
@@ -220,7 +220,8 @@ AC_DEFINE_UNQUOTED(REPORTS_BASE_URL, "$REPORTS_BASE_URL",
 # LZ4
 #
 PGAC_ARG_BOOL(with, lz4, yes,
-              [do not use lz4])
+              [do not use lz4],
+              [AC_DEFINE([HAVE_CITUS_LIBLZ4], 1, [Define to 1 to build with lz4 support. (--with-lz4)])])
 AC_SUBST(with_lz4)
 
 if test "$with_lz4" = yes; then
diff --git a/src/backend/columnar/columnar.c b/src/backend/columnar/columnar.c
index d555a565c..35a6f6da9 100644
--- a/src/backend/columnar/columnar.c
+++ b/src/backend/columnar/columnar.c
@@ -29,7 +29,7 @@
 
 #if HAVE_LIBZSTD
 #define DEFAULT_COMPRESSION_TYPE COMPRESSION_ZSTD
-#elif HAVE_LIBLZ4
+#elif HAVE_CITUS_LIBLZ4
 #define DEFAULT_COMPRESSION_TYPE COMPRESSION_LZ4
 #else
 #define DEFAULT_COMPRESSION_TYPE COMPRESSION_PG_LZ
@@ -44,7 +44,7 @@ static const struct config_enum_entry columnar_compression_options[] =
 {
 	{ "none", COMPRESSION_NONE, false },
 	{ "pglz", COMPRESSION_PG_LZ, false },
-#if HAVE_LIBLZ4
+#if HAVE_CITUS_LIBLZ4
 	{ "lz4", COMPRESSION_LZ4, false },
 #endif
 #if HAVE_LIBZSTD
diff --git a/src/backend/columnar/columnar_compression.c b/src/backend/columnar/columnar_compression.c
index 961048018..b73c1dac6 100644
--- a/src/backend/columnar/columnar_compression.c
+++ b/src/backend/columnar/columnar_compression.c
@@ -19,7 +19,7 @@
 
 #include "columnar/columnar_compression.h"
 
-#if HAVE_LIBLZ4
+#if HAVE_CITUS_LIBLZ4
 #include <lz4.h>
 #endif
 
@@ -63,7 +63,7 @@ CompressBuffer(StringInfo inputBuffer,
 {
 	switch (compressionType)
 	{
-#if HAVE_LIBLZ4
+#if HAVE_CITUS_LIBLZ4
 		case COMPRESSION_LZ4:
 		{
 			int maximumLength = LZ4_compressBound(inputBuffer->len);
@@ -170,7 +170,7 @@ DecompressBuffer(StringInfo buffer,
 			return buffer;
 		}
 
-#if HAVE_LIBLZ4
+#if HAVE_CITUS_LIBLZ4
 		case COMPRESSION_LZ4:
 		{
 			StringInfo decompressedBuffer = makeStringInfo();
diff --git a/src/include/citus_config.h.in b/src/include/citus_config.h.in
index 30868d4ba..b9b639ef6 100644
--- a/src/include/citus_config.h.in
+++ b/src/include/citus_config.h.in
@@ -38,7 +38,7 @@
 #undef HAVE_LIBCURL
 
 /* Define to 1 if you have the `lz4' library (-llz4). */
-#undef HAVE_LIBLZ4
+#undef HAVE_CITUS_LIBLZ4
 
 /* Define to 1 if you have the `zstd' library (-lzstd). */
 #undef HAVE_LIBZSTD
diff --git a/src/include/citus_version.h.in b/src/include/citus_version.h.in
index 29e64adb7..68670dc34 100644
--- a/src/include/citus_version.h.in
+++ b/src/include/citus_version.h.in
@@ -25,7 +25,7 @@
 #undef HAVE_LIBCURL
 
 /* Define to 1 if you have the `liblz4' library (-llz4). */
-#undef HAVE_LIBLZ4
+#undef HAVE_CITUS_LIBLZ4
 
 /* Define to 1 if you have the `libzstd' library (-lzstd). */
 #undef HAVE_LIBZSTD