Commit b71cbefe authored by Francis Dupont's avatar Francis Dupont

[4242] Fixed boost and gtest versionings

parent 057ba44d
...@@ -1129,6 +1129,7 @@ if test "x$enable_gtest" = "xyes" ; then ...@@ -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
......
...@@ -210,7 +210,7 @@ cat > conftest.cpp << EOF ...@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment