mirror of
https://github.com/matrix-construct/construct
synced 2024-09-27 11:18:51 +02:00
configure.ac: Boost related modifications in build system.
This commit is contained in:
parent
36eb3a778d
commit
5657878cd5
1 changed files with 12 additions and 12 deletions
24
configure.ac
24
configure.ac
|
@ -596,10 +596,20 @@ AC_HELP_STRING([--with-included-boost[[[=shared]]]], [Use the boost sources from
|
||||||
BTOOLSET=`echo $CXX | cut -d' ' -f1`
|
BTOOLSET=`echo $CXX | cut -d' ' -f1`
|
||||||
])
|
])
|
||||||
|
|
||||||
|
AM_COND_IF([MINGW],
|
||||||
|
[
|
||||||
|
boost_libdir="$PWD/boost/stage/lib"
|
||||||
|
], [
|
||||||
|
boost_libdir="$PWD/boost/lib"
|
||||||
|
])
|
||||||
|
|
||||||
|
AC_SUBST(BOOST_LDFLAGS, ["-L$boost_libdir"])
|
||||||
|
AC_SUBST(BOOST_CPPFLAGS, ["-isystem $PWD/boost/include"])
|
||||||
|
|
||||||
AC_MSG_CHECKING([whether to use shared boost])
|
AC_MSG_CHECKING([whether to use shared boost])
|
||||||
if [[ $withval = "shared" ]]; then
|
if [[ $withval = "shared" ]]; then
|
||||||
AC_MSG_RESULT([yes])
|
AC_MSG_RESULT([yes])
|
||||||
BOOST_LDFLAGS += " -Wl,-rpath -Wl,$boost_libdir"
|
BOOST_LDFLAGS += " -Wl,-rpath=$boost_libdir"
|
||||||
else
|
else
|
||||||
AC_MSG_RESULT([no])
|
AC_MSG_RESULT([no])
|
||||||
withval="static"
|
withval="static"
|
||||||
|
@ -611,16 +621,6 @@ AC_HELP_STRING([--with-included-boost[[[=shared]]]], [Use the boost sources from
|
||||||
AC_MSG_ERROR([Failed to build included boost.])
|
AC_MSG_ERROR([Failed to build included boost.])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AM_COND_IF([MINGW],
|
|
||||||
[
|
|
||||||
boost_libdir="$PWD/boost/stage/lib"
|
|
||||||
], [
|
|
||||||
boost_libdir="$PWD/boost/lib"
|
|
||||||
])
|
|
||||||
|
|
||||||
AC_SUBST(BOOST_CPPFLAGS, ["-isystem $PWD/boost/include"])
|
|
||||||
AC_SUBST(BOOST_LDFLAGS, ["-L$boost_libdir"])
|
|
||||||
|
|
||||||
AC_DEFINE(HAVE_LIB_BOOST_SYSTEM, 1, [Define if you have boost_system])
|
AC_DEFINE(HAVE_LIB_BOOST_SYSTEM, 1, [Define if you have boost_system])
|
||||||
AC_MSG_NOTICE([Bootstrapping boost: done])
|
AC_MSG_NOTICE([Bootstrapping boost: done])
|
||||||
],[
|
],[
|
||||||
|
@ -686,7 +686,7 @@ AC_HELP_STRING([--with-included-rocksdb[[[=shared]]]], [Use the RocksDB sources
|
||||||
AC_MSG_RESULT([yes])
|
AC_MSG_RESULT([yes])
|
||||||
rocksdb_linkage="shared_lib"
|
rocksdb_linkage="shared_lib"
|
||||||
AC_MSG_NOTICE([Shared RocksDB linkage requires running charybdis with an intact build directory])
|
AC_MSG_NOTICE([Shared RocksDB linkage requires running charybdis with an intact build directory])
|
||||||
ROCKSDB_LDFLAGS+=" -Wl,-rpath -Wl,$PWD/rocksdb/"
|
ROCKSDB_LDFLAGS+=" -Wl,-rpath=$PWD/rocksdb/"
|
||||||
AC_SUBST(ROCKSDB_LIBS, ["-lrocksdb"])
|
AC_SUBST(ROCKSDB_LIBS, ["-lrocksdb"])
|
||||||
else
|
else
|
||||||
AC_MSG_RESULT([no])
|
AC_MSG_RESULT([no])
|
||||||
|
|
Loading…
Reference in a new issue