mirror of
https://github.com/matrix-construct/construct
synced 2024-09-27 19:28:52 +02:00
Add --with-included-boost=shared because it is not going to be installed.
This commit is contained in:
parent
649561f79f
commit
530faa46a4
1 changed files with 35 additions and 16 deletions
51
configure.ac
51
configure.ac
|
@ -780,7 +780,7 @@ dnl
|
||||||
|
|
||||||
AC_MSG_CHECKING([whether to use boost sources included here])
|
AC_MSG_CHECKING([whether to use boost sources included here])
|
||||||
AC_ARG_WITH(included-boost,
|
AC_ARG_WITH(included-boost,
|
||||||
AC_HELP_STRING([--with-included-boost], [Use the boost sources from included submodule]),
|
AC_HELP_STRING([--with-included-boost[[[=shared]]]], [Use the boost sources from included submodule]),
|
||||||
[
|
[
|
||||||
AC_MSG_RESULT([yes])
|
AC_MSG_RESULT([yes])
|
||||||
AC_MSG_NOTICE([Bootstrapping boost])
|
AC_MSG_NOTICE([Bootstrapping boost])
|
||||||
|
@ -798,17 +798,30 @@ AC_HELP_STRING([--with-included-boost], [Use the boost sources from included sub
|
||||||
AC_MSG_ERROR([Failed to build included boost.])
|
AC_MSG_ERROR([Failed to build included boost.])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AC_MSG_NOTICE([Bootstrapping boost: done])
|
|
||||||
|
|
||||||
AC_SUBST(BOOST_CPPFLAGS, "-isystem $PWD/boost/include")
|
|
||||||
|
|
||||||
AM_COND_IF([MINGW],
|
AM_COND_IF([MINGW],
|
||||||
[
|
[
|
||||||
AC_SUBST(BOOST_LDFLAGS, "-L$PWD/boost/stage/lib")
|
boost_libdir="$PWD/boost/stage/lib"
|
||||||
], [
|
], [
|
||||||
AC_SUBST(BOOST_LDFLAGS, "-L$PWD/boost/lib")
|
boost_libdir="$PWD/boost/lib"
|
||||||
])
|
])
|
||||||
|
|
||||||
|
AC_SUBST(BOOST_CPPFLAGS, ["-isystem $PWD/boost/include"])
|
||||||
|
AC_SUBST(BOOST_LDFLAGS, ["-L$boost_libdir"])
|
||||||
|
|
||||||
|
boost_linkage="$withval"
|
||||||
|
AC_MSG_CHECKING([whether to use shared boost])
|
||||||
|
if [[ $withval = "shared" ]]; then
|
||||||
|
AC_MSG_RESULT([yes])
|
||||||
|
BOOST_LDFLAGS += " -Wl,-rpath -Wl,$boost_libdir"
|
||||||
|
else
|
||||||
|
AC_MSG_RESULT([no])
|
||||||
|
fi
|
||||||
|
|
||||||
|
AC_DEFINE(HAVE_LIB_BOOST_SYSTEM, 1, [Define if you have boost_system])
|
||||||
|
AC_MSG_NOTICE([Bootstrapping boost: done])
|
||||||
],[
|
],[
|
||||||
|
AC_MSG_RESULT([no])
|
||||||
|
|
||||||
AC_SEARCH_LIBS(boost_system, boost_system,
|
AC_SEARCH_LIBS(boost_system, boost_system,
|
||||||
[
|
[
|
||||||
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])
|
||||||
|
@ -818,17 +831,23 @@ AC_HELP_STRING([--with-included-boost], [Use the boost sources from included sub
|
||||||
|
|
||||||
AC_SUBST(BOOST_CPPFLAGS, "")
|
AC_SUBST(BOOST_CPPFLAGS, "")
|
||||||
AC_SUBST(BOOST_LDFLAGS, "")
|
AC_SUBST(BOOST_LDFLAGS, "")
|
||||||
AC_MSG_RESULT([no])
|
|
||||||
])
|
|
||||||
|
|
||||||
AM_COND_IF([MINGW],
|
|
||||||
[
|
|
||||||
dnl TODO
|
|
||||||
AC_SUBST(BOOST_LIBS, "-lboost_system-mgw53-1_61.dll")
|
|
||||||
], [
|
|
||||||
AC_SUBST(BOOST_LIBS, "-lboost_system")
|
|
||||||
])
|
])
|
||||||
|
|
||||||
|
if [[ "$boost_linkage" = "shared" ]]; then
|
||||||
|
AM_COND_IF([MINGW],
|
||||||
|
[
|
||||||
|
AC_SUBST(BOOST_LIBS, ["-lboost_system-mgw53-1_61.dll"])
|
||||||
|
], [
|
||||||
|
AC_SUBST(BOOST_LIBS, ["-lboost_system"])
|
||||||
|
])
|
||||||
|
else
|
||||||
|
AM_COND_IF([MINGW],
|
||||||
|
[
|
||||||
|
AC_SUBST(BOOST_LIBS, ["$boost_libdir/libboost_system-mgw53-1_61.dll.a"])
|
||||||
|
], [
|
||||||
|
AC_SUBST(BOOST_LIBS, ["$boost_libdir/libboost_system.a"])
|
||||||
|
])
|
||||||
|
fi
|
||||||
|
|
||||||
AC_DEFINE([HAVE_BOOST_ASIO_HPP], [1], [ boost asio. ])
|
AC_DEFINE([HAVE_BOOST_ASIO_HPP], [1], [ boost asio. ])
|
||||||
RB_DEFINE_UNQUOTED([INC_BOOST_ASIO_HPP], [boost/asio.hpp>], [ boost asio. ])
|
RB_DEFINE_UNQUOTED([INC_BOOST_ASIO_HPP], [boost/asio.hpp>], [ boost asio. ])
|
||||||
|
|
Loading…
Reference in a new issue