MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-11-25 08:12:37 +01:00
Code Issues Releases Wiki Activity

Add --with-included-boost=shared because it is not going to be installed.

Browse source
This commit is contained in:
Jason Volk 2016-07-24 20:31:08 -07:00
parent 649561f79f
commit 530faa46a4
1 changed files with 35 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
configure.ac
View file

@ -780,7 +780,7 @@ dnl
AC_MSG_CHECKING([whether to use boost sources included here])
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_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.])
fi
AC_MSG_NOTICE([Bootstrapping boost: done])
AC_SUBST(BOOST_CPPFLAGS, "-isystem $PWD/boost/include")
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_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_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. ])
RB_DEFINE_UNQUOTED([INC_BOOST_ASIO_HPP], [boost/asio.hpp>], [ boost asio. ])