mirror of
https://github.com/matrix-construct/construct
synced 2024-09-27 19:28:52 +02:00
configure: Allow --with-included-rocksdb=version $withval for deps/rocksdb checkout.
This commit is contained in:
parent
676f9ad532
commit
6c2e78128f
1 changed files with 10 additions and 6 deletions
16
configure.ac
16
configure.ac
|
@ -1799,7 +1799,7 @@ dnl RocksDB support
|
||||||
dnl
|
dnl
|
||||||
dnl
|
dnl
|
||||||
|
|
||||||
ROCKSDB_VERSION_MIN="v6.6.4"
|
ROCKSDB_VERSION_DEFAULT="v6.6.4"
|
||||||
|
|
||||||
AC_SUBST(ROCKSDB_CPPFLAGS, [])
|
AC_SUBST(ROCKSDB_CPPFLAGS, [])
|
||||||
AC_SUBST(ROCKSDB_LDFLAGS, [])
|
AC_SUBST(ROCKSDB_LDFLAGS, [])
|
||||||
|
@ -1819,20 +1819,24 @@ AC_HELP_STRING([--with-rocksdb-libs=[[[DIR]]]], [Path to RocksDB library directo
|
||||||
|
|
||||||
AC_MSG_CHECKING([whether you asked to use the RocksDB included here])
|
AC_MSG_CHECKING([whether you asked to use the RocksDB included here])
|
||||||
AC_ARG_WITH(included-rocksdb,
|
AC_ARG_WITH(included-rocksdb,
|
||||||
AC_HELP_STRING([--with-included-rocksdb[[[=shared]]]], [Use the RocksDB sources from included submodule]),
|
AC_HELP_STRING([--with-included-rocksdb[[[=version]]]], [Use the RocksDB sources from included submodule]),
|
||||||
[
|
[
|
||||||
AC_MSG_RESULT([yes])
|
AC_MSG_RESULT([yes])
|
||||||
with_included_rocksdb="yes"
|
with_included_rocksdb="yes"
|
||||||
|
|
||||||
|
AC_MSG_NOTICE([Shared RocksDB linkage requires running charybdis with an intact build directory])
|
||||||
ROCKSDB_CPPFLAGS="-isystem $PWD/deps/rocksdb/include"
|
ROCKSDB_CPPFLAGS="-isystem $PWD/deps/rocksdb/include"
|
||||||
ROCKSDB_LDFLAGS="-L$PWD/deps/rocksdb/"
|
ROCKSDB_LDFLAGS="-L$PWD/deps/rocksdb/"
|
||||||
|
|
||||||
AC_MSG_NOTICE([Shared RocksDB linkage requires running charybdis with an intact build directory])
|
|
||||||
ROCKSDB_LDFLAGS+=" -Wl,-rpath=$PWD/deps/rocksdb"
|
ROCKSDB_LDFLAGS+=" -Wl,-rpath=$PWD/deps/rocksdb"
|
||||||
ROCKSDB_LIBS="-lrocksdb"
|
ROCKSDB_LIBS="-lrocksdb"
|
||||||
rocksdb_linkage="shared_lib"
|
|
||||||
|
|
||||||
bash tools/buildrocks.sh $rocksdb_linkage "$ROCKSDB_VERSION_MIN"
|
rocksdb_linkage="shared_lib"
|
||||||
|
rocksdb_version="$withval"
|
||||||
|
if test -z $rocksdb_version; then
|
||||||
|
rocksdb_version="$ROCKSDB_VERSION_DEFAULT"
|
||||||
|
fi
|
||||||
|
|
||||||
|
bash tools/buildrocks.sh $rocksdb_linkage $rocksdb_version
|
||||||
AS_IF([ test $? != 0 ],
|
AS_IF([ test $? != 0 ],
|
||||||
[
|
[
|
||||||
AC_MSG_ERROR([Failed to build RocksDB])
|
AC_MSG_ERROR([Failed to build RocksDB])
|
||||||
|
|
Loading…
Reference in a new issue