diff options
| author | Francis Dupont <fdupont@isc.org> | 2015-12-16 00:00:45 +0100 |
|---|---|---|
| committer | Francis Dupont <fdupont@isc.org> | 2015-12-16 00:00:45 +0100 |
| commit | b71cbefe6bf8751c573d1d3f96d90e5909b29f4a (patch) | |
| tree | cefbe1879936f43bf3dbddbc1f689b6d8d59642f | |
| parent | [4242] Added -P to gnu cpp >= 5 (diff) | |
| download | kea-b71cbefe6bf8751c573d1d3f96d90e5909b29f4a.tar.xz kea-b71cbefe6bf8751c573d1d3f96d90e5909b29f4a.zip | |
[4242] Fixed boost and gtest versionings
| -rwxr-xr-x | configure.ac | 1 | ||||
| -rw-r--r-- | m4macros/ax_boost_for_kea.m4 | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 05c085cfed..f2cac0311a 100755 --- a/configure.ac +++ b/configure.ac @@ -1129,6 +1129,7 @@ if test "x$enable_gtest" = "xyes" ; then GTEST_LDFLAGS="\$(top_builddir)/ext/gtest/libgtest.a" DISTCHECK_GTEST_CONFIGURE_FLAG="--with-gtest-source=$GTEST_SOURCE" GTEST_INCLUDES="-I$GTEST_SOURCE -I$GTEST_SOURCE/include" + GTEST_VERSION="`basename $GTEST_SOURCE`" fi if test "$gtest_path" != "no" ; then diff --git a/m4macros/ax_boost_for_kea.m4 b/m4macros/ax_boost_for_kea.m4 index fa5536f1d8..7b45fdfa36 100644 --- a/m4macros/ax_boost_for_kea.m4 +++ b/m4macros/ax_boost_for_kea.m4 @@ -210,7 +210,7 @@ cat > conftest.cpp << EOF AUTOCONF_BOOST_LIB_VERSION=BOOST_LIB_VERSION 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 BOOST_VERSION="unknown" fi |