MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-12-26 15:33:54 +01:00
Code Issues Releases Wiki Activity

configure: Support libzstd related in build.

Browse source
This commit is contained in:
Jason Volk 2020-09-21 16:20:23 -07:00
parent ca9314ce49
commit 5ac0457d55
2 changed files with 48 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
configure.ac
View file

@ -1621,6 +1621,48 @@ AM_COND_IF([MAGIC],
MAGIC_LIBS="-lmagic" 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 dnl
dnl zlib support dnl zlib support
@ -2310,6 +2352,7 @@ ASIO_UNIT_CPPFLAGS+=" -include ircd/asio.h"
dnl Units which include rocksdb headers use these flags. dnl Units which include rocksdb headers use these flags.
AC_SUBST(ROCKSDB_UNIT_CPPFLAGS) AC_SUBST(ROCKSDB_UNIT_CPPFLAGS)
ROCKSDB_UNIT_CPPFLAGS+=" $ROCKSDB_CPPFLAGS" ROCKSDB_UNIT_CPPFLAGS+=" $ROCKSDB_CPPFLAGS"
ROCKSDB_UNIT_CPPFLAGS+=" $ZSTD_CPPFLAGS"
ROCKSDB_UNIT_CPPFLAGS+=" $SNAPPY_CPPFLAGS" ROCKSDB_UNIT_CPPFLAGS+=" $SNAPPY_CPPFLAGS"
ROCKSDB_UNIT_CPPFLAGS+=" $LZ4_CPPFLAGS" ROCKSDB_UNIT_CPPFLAGS+=" $LZ4_CPPFLAGS"
ROCKSDB_UNIT_CPPFLAGS+=" $Z_CPPFLAGS" ROCKSDB_UNIT_CPPFLAGS+=" $Z_CPPFLAGS"
@ -2470,10 +2513,11 @@ echo "Building boost .................... $with_included_boost"
echo "Building RocksDB .................. $with_included_rocksdb" echo "Building RocksDB .................. $with_included_rocksdb"
echo "Building JS (SpiderMonkey) ........ $with_included_js" echo "Building JS (SpiderMonkey) ........ $with_included_js"
echo "IPv6 support ...................... $ipv6" echo "IPv6 support ...................... $ipv6"
echo "Unicode support ................... $have_icuuc" echo "Unicode (icuuc) support ........... $have_icuuc"
echo "Ziplinks (libz) support ........... $have_zlib" echo "Ziplinks (libz) support ........... $have_zlib"
echo "LZ4 support ....................... $have_lz4"
echo "Snappy support .................... $have_snappy" echo "Snappy support .................... $have_snappy"
echo "LZ4 support ....................... $have_lz4"
echo "Zstandard ......................... $have_zstd"
echo "GNU MP support .................... $have_gmp" echo "GNU MP support .................... $have_gmp"
echo "Crypto support .................... $have_crypto" echo "Crypto support .................... $have_crypto"
echo "Sodium support .................... $have_sodium" echo "Sodium support .................... $have_sodium"

2
ircd/Makefile.am
View file

@ -80,6 +80,7 @@ libircd_la_LDFLAGS = \
@SODIUM_LDFLAGS@ \ @SODIUM_LDFLAGS@ \
@MAGIC_LDFLAGS@ \ @MAGIC_LDFLAGS@ \
@IMAGEMAGICK_LDFLAGS@ \ @IMAGEMAGICK_LDFLAGS@ \
@ZSTD_LDFLAGS@ \
@SNAPPY_LDFLAGS@ \ @SNAPPY_LDFLAGS@ \
@LZ4_LDFLAGS@ \ @LZ4_LDFLAGS@ \
@Z_LDFLAGS@ \ @Z_LDFLAGS@ \
@ -97,6 +98,7 @@ libircd_la_LIBADD = \
@SODIUM_LIBS@ \ @SODIUM_LIBS@ \
@MAGIC_LIBS@ \ @MAGIC_LIBS@ \
@IMAGEMAGICK_LIBS@ \ @IMAGEMAGICK_LIBS@ \
@ZSTD_LIBS@ \
@SNAPPY_LIBS@ \ @SNAPPY_LIBS@ \
@LZ4_LIBS@ \ @LZ4_LIBS@ \
@Z_LIBS@ \ @Z_LIBS@ \