From: Dave Hart <hart@ntp.org>
Date: Tue, 14 Apr 2009 13:50:11 +0000 (+0000)
Subject: Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-1157-1158
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3672800457eab46937db3c08cc7c5fca974e4080;p=thirdparty%2Fntp.git

Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-1157-1158
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1152-1153-1157-1158

bk: 49e49493YrNpgoFqrDfp5yXDQtGS7g
---

3672800457eab46937db3c08cc7c5fca974e4080
diff --cc configure.ac
index ea3eea3c22,975ad35eba..db5b744562
--- a/configure.ac
+++ b/configure.ac
@@@ -4488,7 -4456,11 +4488,12 @@@ AC_CONFIG_FILES(scripts/plot_summary,	[
  AC_CONFIG_FILES(scripts/summary,	[chmod +x scripts/summary])
  AC_CONFIG_FILES(util/Makefile)
  
- AC_CONFIG_SUBDIRS(gsoc_sntp)
- AC_CONFIG_SUBDIRS(sntp)
 -dnl it is not safe to share configuration
 -dnl cache with sntp as it uses different
 -dnl headers in a different order and 
 -dnl tests for different libraries.
++dnl  it is not safe to share configuration
++dnl  cache with sntp or gsoc_sntp as they use
++dnl  different headers in a different order
++dnl  and tests for different libraries.
+ dnl 
+ dnl AC_CONFIG_SUBDIRS(sntp)
++dnl AC_CONFIG_SUBDIRS(gsoc_sntp)
  
  AC_OUTPUT