[4242] Fixed boost and gtest versionings

diff --git a/configure.ac b/configure.ac
index 05c085cfeddea0cd5bf9fcb32aad32baa76eab6d..f2cac0311a22e75bd825974ac3008cd6c9d688c1 100755 (executable)
--- 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 fa5536f1d898c4c323672236a4cb737ac95590d1..7b45fdfa36a0c76ea47eb9980a487c11c9ce7d0b 100644 (file)
--- 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