mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-09-01 06:25:34 +00:00
Code Issues Releases Wiki Activity

[4242] Fixed boost and gtest versionings

Browse Source
This commit is contained in:
Francis Dupont
2015-12-16 00:00:45 +01:00
parent 057ba44d78
commit b71cbefe6b
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
configure.ac
View File

@@ -1129,6 +1129,7 @@ if test "x$enable_gtest" = "xyes" ; then
GTEST_LDFLAGS="\$(top_builddir)/ext/gtest/libgtest.a" GTEST_LDFLAGS="\$(top_builddir)/ext/gtest/libgtest.a"
DISTCHECK_GTEST_CONFIGURE_FLAG="--with-gtest-source=$GTEST_SOURCE" DISTCHECK_GTEST_CONFIGURE_FLAG="--with-gtest-source=$GTEST_SOURCE"
GTEST_INCLUDES="-I$GTEST_SOURCE -I$GTEST_SOURCE/include" GTEST_INCLUDES="-I$GTEST_SOURCE -I$GTEST_SOURCE/include"
GTEST_VERSION="`basename $GTEST_SOURCE`"
fi fi
if test "$gtest_path" != "no" ; then if test "$gtest_path" != "no" ; then

2
m4macros/ax_boost_for_kea.m4
View File

@@ -210,7 +210,7 @@ cat > conftest.cpp << EOF
AUTOCONF_BOOST_LIB_VERSION=BOOST_LIB_VERSION AUTOCONF_BOOST_LIB_VERSION=BOOST_LIB_VERSION
EOF EOF
BOOST_VERSION=`$CPP $CPPFLAGS conftest.cpp | grep '^AUTOCONF_BOOST_LIB_VERSION=' | $SED -e 's/^AUTOCONF_BOOST_LIB_VERSION=//' -e 's/_/./g' -e 's/"//g' 2> /dev/null` BOOST_VERSION=`$CPPP $CPPFLAGS conftest.cpp | grep '^AUTOCONF_BOOST_LIB_VERSION=' | $SED -e 's/^AUTOCONF_BOOST_LIB_VERSION=//' -e 's/_/./g' -e 's/"//g' 2> /dev/null`
if test -z "$BOOST_VERSION"; then if test -z "$BOOST_VERSION"; then
BOOST_VERSION="unknown" BOOST_VERSION="unknown"
fi fi