Corrected configure checks for google test

bk: 4c1603cdtBl9Jih7WCsJjv870dg-3Q

diff --git a/configure.ac b/configure.ac
index 281e3b0f30d582fa6034fb6ef870c01dfba1439d..cee8ca6d5191fed5ba4aeda9bf4803ed544512dd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4792,14 +4792,17 @@ AC_CONFIG_FILES(util/Makefile)
 AC_PROG_CXX
 
 AC_PATH_PROG([GTEST_CONFIG], [gtest-config])
-GTEST_LDFLAGS=`$GTEST_CONFIG --ldflags`
-GTEST_LIBS=`$GTEST_CONFIG --libs`
-GTEST_CXXFLAGS=`$GTEST_CONFIG --cxxflags`
-GTEST_CPPFLAGS=`$GTEST_CONFIG --cppflags`
-AC_SUBST(GTEST_LDFLAGS)
-AC_SUBST(GTEST_LIBS)
-AC_SUBST(GTEST_CXXFLAGS)
-AC_SUBST(GTEST_CPPFLAGS)
+if test x${GTEST_CONFIG} != x ; then
+       GTEST_LDFLAGS=`$GTEST_CONFIG --ldflags`
+       GTEST_LIBS=`$GTEST_CONFIG --libs`
+       GTEST_CXXFLAGS=`$GTEST_CONFIG --cxxflags`
+       GTEST_CPPFLAGS=`$GTEST_CONFIG --cppflags`
+       AC_SUBST(GTEST_LDFLAGS)
+       AC_SUBST(GTEST_LIBS)
+       AC_SUBST(GTEST_CXXFLAGS)
+       AC_SUBST(GTEST_CPPFLAGS)
+fi
+AM_CONDITIONAL([GTEST_AVAILABLE], [test x${GTEST_CONFIG} != x])
 
 AC_CONFIG_FILES(tests/Makefile)
 AC_CONFIG_FILES(tests/libntp/Makefile)

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 0ba60045770c8a6ee1e10a0a298185517b7d7a27..5b02c6e0d5a8219fc4bb89c8dbeccab1e310d80d 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1 +1,6 @@
-SUBDIRS = libntp
+SUBDIRS = 
+
+if GTEST_AVAILABLE
+SUBDIRS += libntp
+endif
+