ChangeLog:

  [Bug 1708] "make check" fails with googletest 1.4.0
  [Bug 1718] Improve gtest checks in configure.ac

bk: 4cd9da10ICArHpelDGJcTkVlS1ulLg

diff --git a/ChangeLog b/ChangeLog
index 5bb85a3ae12580b56ab2c4f2b0042a2ca65e0c75..22b3a6db2438e3cec0c0fbb8c4f1af97187ff41c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,9 +2,11 @@
 * [Bug 1681] from 4.2.6p3-RC9: sntp logging cleanup.
 * [Bug 1683] from 4.2.6p3-RC9: Interface binding does not seem to work
   as intended.
+* [Bug 1708] make check fails with googletest 1.4.0.
 * [Bug 1709] from 4.2.6p3-RC9: ntpdate ignores replies with equal
   receive and transmit timestamps.
 * [Bug 1715] sntp utilitiesTest.IPv6Address failed.
+* [Bug 1718] Improve gtest checks in configure.ac.
 (4.2.7p79) 2010/11/07 Released by Harlan Stenn <stenn@ntp.org>
 * Correct frequency estimate with no drift file, from David Mills.
 (4.2.7p78) 2010/11/04 Released by Harlan Stenn <stenn@ntp.org>

diff --git a/configure.ac b/configure.ac
index e089f4678699e35e71c92ef581dd05a44c958360..c71c58f0502090f595d007bd3772df813f5d01cd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4896,18 +4896,44 @@ AC_CONFIG_FILES(util/Makefile)
 
 AC_PROG_CXX
 
-AC_PATH_PROG([GTEST_CONFIG], [gtest-config])
-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])
+gta=false
+AC_ARG_WITH([gtest],
+  [AS_HELP_STRING([--with-gtest],
+    [Use the gtest framework if it's available])],
+  [try_gtest=$withval], [try_gtest=yes])
+
+case "$try_gtest" in
+ yes)
+    AC_PATH_PROG([GTEST_CONFIG], [gtest-config])
+    case x${GTEST_CONFIG} in
+     x) ;;
+     *)
+       AC_MSG_CHECKING([gtest version])
+       gtest_version=`$GTEST_CONFIG --version`
+        case "$gtest_version" in
+         1.5.*)
+           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)
+           gta=true
+           ;;
+        esac
+       case "$gta" in
+        true)
+           AC_MSG_RESULT([($gtest_version) ok])
+           ;;
+        *) AC_MSG_RESULT([($gtest_version) not ok])
+           ;;
+       esac
+    esac
+esac
+
+AM_CONDITIONAL([GTEST_AVAILABLE], [$gta])
 
 AC_CONFIG_FILES(tests/Makefile)
 AC_CONFIG_FILES(tests/libntp/Makefile)

diff --git a/sntp/configure.ac b/sntp/configure.ac
index 410103ab7e37aed7ee798150b622084b5cdfdf70..9c4b5532e40784004fe3a4311f1ca4cd86c7f8fb 100644 (file)
--- a/sntp/configure.ac
+++ b/sntp/configure.ac
@@ -814,20 +814,47 @@ AM_CONDITIONAL(NTP_BINSUBDIR_IS_BIN, test "bin" = "$BINSUBDIR")
 
 AC_CONFIG_FILES([Makefile])
 
+# HMS: if we don't find c++ we should not look for gtest.
 AC_PROG_CXX
 
-AC_PATH_PROG([GTEST_CONFIG], [gtest-config])
-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])
+gta=false
+AC_ARG_WITH([gtest],
+  [AS_HELP_STRING([--with-gtest],
+    [Use the gtest framework if it's available])],
+  [try_gtest=$withval], [try_gtest=yes])
+
+case "$try_gtest" in
+ yes)
+    AC_PATH_PROG([GTEST_CONFIG], [gtest-config])
+    case x${GTEST_CONFIG} in
+     x) ;;
+     *)
+       AC_MSG_CHECKING([gtest version])
+       gtest_version=`$GTEST_CONFIG --version`
+        case "$gtest_version" in
+         1.5.*)
+           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)
+           gta=true
+           ;;
+        esac
+       case "$gta" in
+        true)
+           AC_MSG_RESULT([($gtest_version) ok])
+           ;;
+        *) AC_MSG_RESULT([($gtest_version) not ok])
+           ;;
+       esac
+    esac
+esac
+
+AM_CONDITIONAL([GTEST_AVAILABLE], [$gta])
 
 AC_CONFIG_FILES(tests/Makefile)
 AC_OUTPUT