From 5ac0457d55af30e2f0f35f08bac2f8298d7ea367 Mon Sep 17 00:00:00 2001
From: Jason Volk <jason@zemos.net>
Date: Mon, 21 Sep 2020 16:20:23 -0700
Subject: [PATCH] configure: Support libzstd related in build.

---
 configure.ac     | 48 ++++++++++++++++++++++++++++++++++++++++++++++--
 ircd/Makefile.am |  2 ++
 2 files changed, 48 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 78146e0ec..fc9490509 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1621,6 +1621,48 @@ AM_COND_IF([MAGIC],
 	MAGIC_LIBS="-lmagic"
 ])
 
+dnl
+dnl
+dnl zstd
+dnl
+dnl
+
+AC_SUBST(ZSTD_CPPFLAGS)
+AC_SUBST(ZSTD_LDFLAGS)
+AC_SUBST(ZSTD_LIBS)
+
+AC_ARG_WITH(zstd-includes,
+RB_HELP_STRING([--with-zstd-includes=[[[DIR]]]], [Path to zstd include directory]),
+[
+	ZSTD_CPPFLAGS="-I$withval"
+], [])
+
+AC_ARG_WITH(zstd-libs,
+RB_HELP_STRING([--with-zstd-libs=[[[DIR]]]], [Path to zstd library directory]),
+[
+	ZSTD_LDFLAGS="-L$withval"
+], [])
+
+RB_CHK_SYSHEADER(zstd.h, [ZSTD_H])
+PKG_CHECK_MODULES(zstd, [zstd],
+[
+	have_zstd="yes"
+], [
+	AC_CHECK_LIB(zstd, ZSTD_versionNumber,
+	[
+		have_zstd="yes"
+	], [
+		have_zstd="no"
+	])
+])
+
+AM_CONDITIONAL([ZSTD], [test "x$have_zstd" = "xyes"])
+
+AM_COND_IF([ZSTD],
+[
+	ZSTD_LIBS="-lzstd"
+])
+
 dnl
 dnl
 dnl zlib support
@@ -2310,6 +2352,7 @@ ASIO_UNIT_CPPFLAGS+=" -include ircd/asio.h"
 dnl Units which include rocksdb headers use these flags.
 AC_SUBST(ROCKSDB_UNIT_CPPFLAGS)
 ROCKSDB_UNIT_CPPFLAGS+=" $ROCKSDB_CPPFLAGS"
+ROCKSDB_UNIT_CPPFLAGS+=" $ZSTD_CPPFLAGS"
 ROCKSDB_UNIT_CPPFLAGS+=" $SNAPPY_CPPFLAGS"
 ROCKSDB_UNIT_CPPFLAGS+=" $LZ4_CPPFLAGS"
 ROCKSDB_UNIT_CPPFLAGS+=" $Z_CPPFLAGS"
@@ -2470,10 +2513,11 @@ echo "Building boost .................... $with_included_boost"
 echo "Building RocksDB .................. $with_included_rocksdb"
 echo "Building JS (SpiderMonkey) ........ $with_included_js"
 echo "IPv6 support ...................... $ipv6"
-echo "Unicode support ................... $have_icuuc"
+echo "Unicode (icuuc) support ........... $have_icuuc"
 echo "Ziplinks (libz) support ........... $have_zlib"
-echo "LZ4 support ....................... $have_lz4"
 echo "Snappy support .................... $have_snappy"
+echo "LZ4 support ....................... $have_lz4"
+echo "Zstandard ......................... $have_zstd"
 echo "GNU MP support .................... $have_gmp"
 echo "Crypto support .................... $have_crypto"
 echo "Sodium support .................... $have_sodium"
diff --git a/ircd/Makefile.am b/ircd/Makefile.am
index 326a8298e..eb4a15a76 100644
--- a/ircd/Makefile.am
+++ b/ircd/Makefile.am
@@ -80,6 +80,7 @@ libircd_la_LDFLAGS = \
 	@SODIUM_LDFLAGS@ \
 	@MAGIC_LDFLAGS@ \
 	@IMAGEMAGICK_LDFLAGS@ \
+	@ZSTD_LDFLAGS@ \
 	@SNAPPY_LDFLAGS@ \
 	@LZ4_LDFLAGS@ \
 	@Z_LDFLAGS@ \
@@ -97,6 +98,7 @@ libircd_la_LIBADD = \
 	@SODIUM_LIBS@ \
 	@MAGIC_LIBS@ \
 	@IMAGEMAGICK_LIBS@ \
+	@ZSTD_LIBS@ \
 	@SNAPPY_LIBS@ \
 	@LZ4_LIBS@ \
 	@Z_LIBS@ \