Merge psp-fb1.ntp.org:/home/stenn/ntp-dev

into  psp-fb1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-dev-libevent

bk: 4d291150j9_hJf7fsxquMF_UQ6FLPg

diff --cc sntp/Makefile.am
Simple merge

diff --cc sntp/configure.ac
index f620f171f0749686c2bc6b3c5fe9f81a8563e5b5,f09c72b7cc49f7f450de53c7bceebdd221fb45cb..3d1137c697ced239baf677155de3c19b1e4a00b4
--- 1/sntp/configure.ac
--- 2/sntp/configure.ac
+++ b/sntp/configure.ac
@@@ -962,56 -961,10 +962,18 @@@ BINSUBDIR=$use_binsubdi
  AC_SUBST([BINSUBDIR])
  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
- 
- 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])
+ NTP_GOOGLETEST
  
- AC_CONFIG_FILES(tests/Makefile)
 +case "$NEED_LIBEVENT_DIR" in
 + true)
 +    AC_CONFIG_SUBDIRS([libevent])
 +    ;;
 +esac
 +
+ AC_CONFIG_FILES([Makefile])
 +AC_CONFIG_FILES(build-libevent/Makefile)
+ AC_CONFIG_FILES([tests/Makefile])
++
  AC_OUTPUT

diff --cc sntp/main.c
Simple merge