From: Francis Dupont <fdupont@isc.org>
Date: Tue, 18 Apr 2017 14:38:30 +0000 (+0200)
Subject: [master] Finished merge of trac4242 (boost version detection)
X-Git-Tag: trac5187_base
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f354240011eb4e3060de247a61123a013fdbf868;p=thirdparty%2Fkea.git

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

f354240011eb4e3060de247a61123a013fdbf868
diff --cc configure.ac
index 19ee2e9349,26d5c37190..db8e6fced4
mode 100644,100755..100644
--- a/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