From: Francis Dupont Date: Mon, 21 Nov 2016 14:10:19 +0000 (+0100) Subject: [5057] Added --with-gtest-source googletest directory helper X-Git-Tag: trac4631b_base^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=72961fc6df644c74ce2b6359234a2ddb6f24dc6c;p=thirdparty%2Fkea.git [5057] Added --with-gtest-source googletest directory helper --- diff --git a/configure.ac b/configure.ac index 7a0f45cd8a..a9e49f8aec 100644 --- a/configure.ac +++ b/configure.ac @@ -1212,6 +1212,9 @@ if test "x$enable_gtest" = "xyes" ; then AC_MSG_ERROR([no gtest source but it was selected]) fi else + if test ! -d $GTEST_SOURCE/src -a -d $GTEST_SOURCE/googletest; then + GTEST_SOURCE=$GTEST_SOURCE/googletest + fi AC_CHECK_FILES([$GTEST_SOURCE/src/gtest-all.cc] [$GTEST_SOURCE/src/gtest_main.cc], [have_gtest_source=yes],