[master] Finished merge of trac4242 (boost version detection)

diff --cc configure.ac
index 19ee2e9349d984ee28c4d989021547b3e2caee60,26d5c37190de2e7dae87040b837e88b91eca0739..db8e6fced477315bae8fa8b353839665de77dd9f
mode 100644,100755..100644
--- 1/configure.ac
--- 2/configure.ac
+++ b/configure.ac
@@@ -1374,9 -1126,10 +1379,10 @@@ if test "x$enable_gtest" = "xyes" ; the
                  [AC_MSG_ERROR([no gtest source at $GTEST_SOURCE])])
          fi
          have_gtest_source=yes
 -        GTEST_LDFLAGS="\$(top_builddir)/ext/gtest/libgtest.a"
 +        GTEST_LDADD="\$(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