]> git.ipfire.org Git - thirdparty/ntp.git/commitdiff
Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-stable-1725
authorDave Hart <hart@ntp.org>
Wed, 24 Nov 2010 00:06:32 +0000 (00:06 +0000)
committerDave Hart <hart@ntp.org>
Wed, 24 Nov 2010 00:06:32 +0000 (00:06 +0000)
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-quiet-reconf

bk: 4cec5708444xk2_AAl-RnKmfnc7mNw

1  2 
configure.ac
sntp/configure.ac

diff --cc configure.ac
Simple merge
index 9c4b5532e40784004fe3a4311f1ca4cd86c7f8fb,c488e22d74601db3b658caae7c6400a0cc5ea28c..b6e853e788c40d10917ce7c65b7708fcfd86137e
@@@ -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