From: Harlan Stenn <stenn@ntp.org>
Date: Sun, 9 Jan 2011 01:37:20 +0000 (-0500)
Subject: Merge psp-fb1.ntp.org:/home/stenn/ntp-dev
X-Git-Tag: NTP_4_2_7P131~38
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=820c4019cc491919f78610ffd7d4bf4aad810aaa;p=thirdparty%2Fntp.git

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
---

820c4019cc491919f78610ffd7d4bf4aad810aaa
diff --cc sntp/configure.ac
index f620f171f,f09c72b7c..3d1137c69
--- a/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
  
 +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_CONFIG_FILES([tests/Makefile])
++
  AC_OUTPUT