From: Dave Hart <hart@ntp.org>
Date: Wed, 24 Nov 2010 00:06:32 +0000 (+0000)
Subject: Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-1725
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=70a0d620e4ea2e0c0ae4f70a4ffc5b1ad1f0aa5b;p=thirdparty%2Fntp.git

Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-1725
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-quiet-reconf

bk: 4cec5708444xk2_AAl-RnKmfnc7mNw
---

70a0d620e4ea2e0c0ae4f70a4ffc5b1ad1f0aa5b
diff --cc sntp/configure.ac
index 9c4b5532e4,c488e22d74..b6e853e788
--- a/sntp/configure.ac
+++ b/sntp/configure.ac
@@@ -43,15 -43,9 +43,16 @@@ AC_CONFIG_HEADER([config.h]
  dnl AC_ARG_PROGRAM
  AC_PREREQ([2.53])
  
 +# Expose a cross-compilation indicator to makefiles
 +AM_CONDITIONAL(SNTP_CROSSCOMPILE, test $build != $host)
 +
 +dnl check these early to avoid autoconf warnings
 +AC_AIX
 +AC_MINIX
 +
  # Checks for programs.
- AC_PROG_CC
+ AM_PROG_CC_C_O
+ AC_PROG_CPP
  
  # AC_PROG_CC_STDC has two functions.  It attempts to find a compiler
  # capable of C99, or failing that, for C89.  CC is set afterward with