From: Linux Karlsson <karlsson@ntp.org>
Date: Mon, 14 Jun 2010 10:26:21 +0000 (-0700)
Subject: Corrected configure checks for google test
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=23ba799febc752a4210a4f83507972b0842bf96c;p=thirdparty%2Fntp.git

Corrected configure checks for google test

bk: 4c1603cdtBl9Jih7WCsJjv870dg-3Q
---

diff --git a/configure.ac b/configure.ac
index 281e3b0f30..cee8ca6d51 100644
--- 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 0ba6004577..5b02c6e0d5 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1 +1,6 @@
-SUBDIRS = libntp
+SUBDIRS = 
+
+if GTEST_AVAILABLE
+SUBDIRS += libntp
+endif
+