0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-06-02 01:59:33 +02:00

configure: more cleanups

This commit is contained in:
William Pitcock 2016-07-30 20:00:19 -05:00
parent e108151c20
commit f8e09c38dc

View file

@ -817,6 +817,7 @@ AC_HELP_STRING([--with-included-boost[[[=shared]]]], [Use the boost sources from
],[ ],[
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
with_included_boost="no"
AX_BOOST_BASE([1.60], [ AX_BOOST_BASE([1.60], [
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])
], [ ], [
@ -824,9 +825,6 @@ AC_HELP_STRING([--with-included-boost[[[=shared]]]], [Use the boost sources from
]) ])
AX_BOOST_ASIO AX_BOOST_ASIO
AX_BOOST_SYSTEM AX_BOOST_SYSTEM
AC_SUBST(BOOST_CPPFLAGS, "")
AC_SUBST(BOOST_LDFLAGS, "")
]) ])
if [[ "$boost_linkage" = "shared" ]]; then if [[ "$boost_linkage" = "shared" ]]; then
@ -1195,7 +1193,7 @@ VERSION_CMD="git describe --tags"
RB_VERSION=`$VERSION_CMD` RB_VERSION=`$VERSION_CMD`
RB_DEFINE_UNQUOTED([VERSION], ["$RB_VERSION"], [Version generated at configuration time.]) RB_DEFINE_UNQUOTED([VERSION], ["$RB_VERSION"], [Version generated at configuration time.])
DATESTR_CMD="date -R" DATESTR_CMD="date"
RB_DATESTR=`$DATESTR_CMD` RB_DATESTR=`$DATESTR_CMD`
RB_DEFINE_UNQUOTED([DATESTR], ["$RB_DATESTR"], [Readable date string of configuration time.]) RB_DEFINE_UNQUOTED([DATESTR], ["$RB_DATESTR"], [Readable date string of configuration time.])