Uses configure script to check for gtest-config.

bk: 4c15f25asmTK7Yb6thxJnrGyKDTW8Q

diff --git a/configure.ac b/configure.ac
index 314ca43141d9c0130953b53888e1167e79cb4686..281e3b0f30d582fa6034fb6ef870c01dfba1439d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4790,6 +4790,17 @@ AC_CONFIG_FILES(scripts/summary, [chmod +x scripts/summary])
 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)
+
 AC_CONFIG_FILES(tests/Makefile)
 AC_CONFIG_FILES(tests/libntp/Makefile)
 

diff --git a/tests/libntp/Makefile.am b/tests/libntp/Makefile.am
index 2c0d633be278a1c8539b7556858ab30dc6a32c87..c074a3c30aee42904fc40c5a328e40d6f8b321a0 100644 (file)
--- a/tests/libntp/Makefile.am
+++ b/tests/libntp/Makefile.am
@@ -1,6 +1,9 @@
 check_PROGRAMS = tests
-LDADD = @top_builddir@/libntp/libntp.a @LCRYPTO@ -lgtest_main -lpthread
-tests_SOURCES = libntptest.cpp         \
+LDADD = @LCRYPTO@ @GTEST_LDFLAGS@ @GTEST_LIBS@ @top_builddir@/libntp/libntp.a
+AM_CXXFLAGS = @GTEST_CXXFLAGS@
+AM_CPPFLAGS = @GTEST_CPPFLAGS@
+tests_SOURCES = ../main.cpp            \
+               libntptest.cpp          \
                a_md5encrypt.cpp        \
                atoint.cpp              \
                atolfp.cpp              \

diff --git a/tests/main.cpp b/tests/main.cpp
new file mode 100644 (file)
index 0000000..200b19a
--- /dev/null
+++ b/tests/main.cpp
@@ -0,0 +1,6 @@
+#include "main.h"
+
+int main(int argc, char **argv) {
+  ::testing::InitGoogleTest(&argc, argv);
+  return RUN_ALL_TESTS();
+}