From: Dave Hart <hart@ntp.org>
Date: Wed, 15 Apr 2009 01:44:05 +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=4e90e0a64d6ff0bda7d02cd174db04a77df82ebb;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: 49e53be5NdkZ58geGxhxTmlyuLEb_Q
---

4e90e0a64d6ff0bda7d02cd174db04a77df82ebb
diff --cc configure.ac
index db5b744562,4d7744c283..123de5938b
--- a/configure.ac
+++ b/configure.ac
@@@ -30,13 -30,11 +30,15 @@@ AC_DISABLE_SHARE
  
  dnl  we need to check for cross compile tools for vxWorks here
  AC_PROG_CC
 +AC_PROG_CC_STDC
 +dnl AC_PROG_CC_C89
 +# We should make sure CC is *some* version of ANSI.
  # Ralf Wildenhues: With per-target flags we need CC_C_O
- AC_PROG_CC_C_O
+ # AM_PROG_CC_C_O supersets AC_PROG_CC_C_O
+ AM_PROG_CC_C_O
+ AC_PROG_CC_STDC
  AC_PROG_CPP
 +AC_PROG_YACC
  
  # HMS: These need to be moved to AM_CPPFLAGS and/or AM_CFLAGS
  case "$host" in
@@@ -368,16 -339,41 +370,15 @@@ case "$host" i
      ;;
  esac
  
- AC_CHECK_FUNC(gethostent, ,
-   AC_CHECK_LIB(nsl, gethostent, , , $libxnet -lsocket))
- AC_CHECK_FUNC(openlog, , 
-   AC_CHECK_LIB(gen, openlog, , 
-   AC_CHECK_LIB(syslog, openlog, , , $libxnet -lsocket)))
- AC_CHECK_LIB(md5, MD5Init, , 
-   AC_CHECK_LIB(md, MD5Init))
+ AC_CHECK_FUNC([gethostent], ,
+   AC_SEARCH_LIBS([gethostent], [nsl], , , [$libxnet -lsocket]))
+ AC_CHECK_FUNC([openlog], , 
+   AC_SEARCH_LIBS([openlog], [gen], , 
+   AC_SEARCH_LIBS([openlog], [syslog], , , [$libxnet -lsocket])))
+ AC_SEARCH_LIBS([MD5Init], [md5 md])
  AC_CHECK_FUNCS(MD5Init)
  
 -# following block becomes on 4.2.5: NTP_LINEEDITLIBS
 -dnl HMS: What a hack...
 -AC_CHECK_HEADERS(readline/history.h readline/readline.h)
 -case "$ac_cv_header_readline_history_h$ac_cv_header_readline_readline_h" in
 - *no*) ;;
 - *) save_LIBS=$LIBS
 -    LIBS=
 -    # Ralf Wildenhues: either unset ... or cache READLINE_LIBS
 -    unset ac_cv_lib_readline_readline
 -    AC_CHECK_LIB(readline, readline, ,
 -     AC_MSG_NOTICE([Trying again with -lcurses])
 -     unset ac_cv_lib_readline_readline
 -     AC_CHECK_LIB(readline, readline,
 -      LIBS="-lreadline -lcurses $LIBS"
 -      AC_DEFINE(HAVE_LIBREADLINE)
 -      AC_DEFINE(HAVE_LIBCURSES, , [Do we have the curses library?]),
 -      AC_CHECK_LIB(edit, readline,
 -       LIBS="-ledit -lcurses"
 -       AC_DEFINE(HAVE_LIBEDIT, , [Do we have the edit library?])
 -       AC_DEFINE(HAVE_LIBCURSES, , [Do we have the curses library?])
 -       , , -lcurses)
 -      , -lcurses))
 -    READLINE_LIBS=$LIBS
 -    AC_SUBST(READLINE_LIBS)
 -    LIBS=$save_LIBS
 -    ;;
 -esac
 +NTP_LINEEDITLIBS
  
  dnl Digital UNIX V4.0 and Solaris 7 have POSIX.1c functions in -lrt
  dnl Solaris 2.6 only has -lposix4; in Solaris 7, this is a symlink to -lrt,
@@@ -4488,12 -4453,6 +4488,7 @@@ AC_CONFIG_FILES(scripts/plot_summary,	[
  AC_CONFIG_FILES(scripts/summary,	[chmod +x scripts/summary])
  AC_CONFIG_FILES(util/Makefile)
  
- 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_CONFIG_SUBDIRS(sntp)
++AC_CONFIG_SUBDIRS(gsoc_sntp)
  
  AC_OUTPUT