diff options
Diffstat (limited to 'sntp/configure')
-rwxr-xr-x | sntp/configure | 394 |
1 files changed, 288 insertions, 106 deletions
diff --git a/sntp/configure b/sntp/configure index 0d6902b..76bdd28 100755 --- a/sntp/configure +++ b/sntp/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for sntp 4.2.7p482. +# Generated by GNU Autoconf 2.68 for sntp 4.2.8p2. # # Report bugs to <http://bugs.ntp.org./>. # @@ -570,8 +570,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='sntp' PACKAGE_TARNAME='sntp' -PACKAGE_VERSION='4.2.7p482' -PACKAGE_STRING='sntp 4.2.7p482' +PACKAGE_VERSION='4.2.8p2' +PACKAGE_STRING='sntp 4.2.8p2' PACKAGE_BUGREPORT='http://bugs.ntp.org./' PACKAGE_URL='http://www.ntp.org./' @@ -676,6 +676,7 @@ PTHREADS_TRUE LIBISC_PTHREADS_NOTHREADS PTHREAD_LIBS HAVE_INLINE +LDADD_LIBUTIL ALLOCA LIBM EDITLINE_LIBS @@ -685,6 +686,13 @@ SED LDADD_LIBNTP NTP_CROSSCOMPILE_FALSE NTP_CROSSCOMPILE_TRUE +INSTALL_UPDATE_LEAP_FALSE +INSTALL_UPDATE_LEAP_TRUE +UPDATE_LEAP_NI +UPDATE_LEAP_MS +UPDATE_LEAP_DS +UPDATE_LEAP_DL +UPDATE_LEAP_DB TIMETRIM_NI TIMETRIM_MS TIMETRIM_DS @@ -1456,7 +1464,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures sntp 4.2.7p482 to adapt to many kinds of systems. +\`configure' configures sntp 4.2.8p2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1526,7 +1534,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of sntp 4.2.7p482:";; + short | recursive ) echo "Configuration of sntp 4.2.8p2:";; esac cat <<\_ACEOF @@ -1669,7 +1677,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -sntp configure 4.2.7p482 +sntp configure 4.2.8p2 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2494,7 +2502,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by sntp $as_me 4.2.7p482, which was +It was created by sntp $as_me 4.2.8p2, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -3437,7 +3445,7 @@ fi # Define the identity of the package. PACKAGE='sntp' - VERSION='4.2.7p482' + VERSION='4.2.8p2' cat >>confdefs.h <<_ACEOF @@ -5220,6 +5228,183 @@ if test "x$ac_cv_prog_cc_c89" != xno; then : fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C99" >&5 +$as_echo_n "checking for $CC option to accept ISO C99... " >&6; } +if ${ac_cv_prog_cc_c99+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_cv_prog_cc_c99=no +ac_save_CC=$CC +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <stdarg.h> +#include <stdbool.h> +#include <stdlib.h> +#include <wchar.h> +#include <stdio.h> + +// Check varargs macros. These examples are taken from C99 6.10.3.5. +#define debug(...) fprintf (stderr, __VA_ARGS__) +#define showlist(...) puts (#__VA_ARGS__) +#define report(test,...) ((test) ? puts (#test) : printf (__VA_ARGS__)) +static void +test_varargs_macros (void) +{ + int x = 1234; + int y = 5678; + debug ("Flag"); + debug ("X = %d\n", x); + showlist (The first, second, and third items.); + report (x>y, "x is %d but y is %d", x, y); +} + +// Check long long types. +#define BIG64 18446744073709551615ull +#define BIG32 4294967295ul +#define BIG_OK (BIG64 / BIG32 == 4294967297ull && BIG64 % BIG32 == 0) +#if !BIG_OK + your preprocessor is broken; +#endif +#if BIG_OK +#else + your preprocessor is broken; +#endif +static long long int bignum = -9223372036854775807LL; +static unsigned long long int ubignum = BIG64; + +struct incomplete_array +{ + int datasize; + double data[]; +}; + +struct named_init { + int number; + const wchar_t *name; + double average; +}; + +typedef const char *ccp; + +static inline int +test_restrict (ccp restrict text) +{ + // See if C++-style comments work. + // Iterate through items via the restricted pointer. + // Also check for declarations in for loops. + for (unsigned int i = 0; *(text+i) != '\0'; ++i) + continue; + return 0; +} + +// Check varargs and va_copy. +static void +test_varargs (const char *format, ...) +{ + va_list args; + va_start (args, format); + va_list args_copy; + va_copy (args_copy, args); + + const char *str; + int number; + float fnumber; + + while (*format) + { + switch (*format++) + { + case 's': // string + str = va_arg (args_copy, const char *); + break; + case 'd': // int + number = va_arg (args_copy, int); + break; + case 'f': // float + fnumber = va_arg (args_copy, double); + break; + default: + break; + } + } + va_end (args_copy); + va_end (args); +} + +int +main () +{ + + // Check bool. + _Bool success = false; + + // Check restrict. + if (test_restrict ("String literal") == 0) + success = true; + char *restrict newvar = "Another string"; + + // Check varargs. + test_varargs ("s, d' f .", "string", 65, 34.234); + test_varargs_macros (); + + // Check flexible array members. + struct incomplete_array *ia = + malloc (sizeof (struct incomplete_array) + (sizeof (double) * 10)); + ia->datasize = 10; + for (int i = 0; i < ia->datasize; ++i) + ia->data[i] = i * 1.234; + + // Check named initializers. + struct named_init ni = { + .number = 34, + .name = L"Test wide string", + .average = 543.34343, + }; + + ni.number = 58; + + int dynamic_array[ni.number]; + dynamic_array[ni.number - 1] = 543; + + // work around unused variable warnings + return (!success || bignum == 0LL || ubignum == 0uLL || newvar[0] == 'x' + || dynamic_array[ni.number - 1] != 543); + + ; + return 0; +} +_ACEOF +for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -xc99=all -qlanglvl=extc99 +do + CC="$ac_save_CC $ac_arg" + if ac_fn_c_try_compile "$LINENO"; then : + ac_cv_prog_cc_c99=$ac_arg +fi +rm -f core conftest.err conftest.$ac_objext + test "x$ac_cv_prog_cc_c99" != "xno" && break +done +rm -f conftest.$ac_ext +CC=$ac_save_CC + +fi +# AC_CACHE_VAL +case "x$ac_cv_prog_cc_c99" in + x) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 +$as_echo "none needed" >&6; } ;; + xno) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 +$as_echo "unsupported" >&6; } ;; + *) + CC="$CC $ac_cv_prog_cc_c99" + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c99" >&5 +$as_echo "$ac_cv_prog_cc_c99" >&6; } ;; +esac +if test "x$ac_cv_prog_cc_c99" != xno; then : + +fi + + @@ -5953,6 +6138,7 @@ fi + CFLAGS_NTP= CPPFLAGS_NTP= LDADD_NTP= @@ -6853,6 +7039,19 @@ fi + if test -z "$UPDATE_LEAP_NI" ; then + INSTALL_UPDATE_LEAP_TRUE= + INSTALL_UPDATE_LEAP_FALSE='#' +else + INSTALL_UPDATE_LEAP_TRUE='#' + INSTALL_UPDATE_LEAP_FALSE= +fi + + + + + + # Expose a cross-compilation indicator to makefiles @@ -8916,6 +9115,73 @@ fi done +# Bug 2713 +LDADD_LIBUTIL= + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing snprintb" >&5 +$as_echo_n "checking for library containing snprintb... " >&6; } +if ${ac_cv_search_snprintb+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_func_search_save_LIBS=$LIBS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char snprintb (); +int +main () +{ +return snprintb (); + ; + return 0; +} +_ACEOF +for ac_lib in '' util; do + if test -z "$ac_lib"; then + ac_res="none required" + else + ac_res=-l$ac_lib + LIBS="-l$ac_lib $ac_func_search_save_LIBS" + fi + if ac_fn_c_try_link "$LINENO"; then : + ac_cv_search_snprintb=$ac_res +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext + if ${ac_cv_search_snprintb+:} false; then : + break +fi +done +if ${ac_cv_search_snprintb+:} false; then : + +else + ac_cv_search_snprintb=no +fi +rm conftest.$ac_ext +LIBS=$ac_func_search_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_snprintb" >&5 +$as_echo "$ac_cv_search_snprintb" >&6; } +ac_res=$ac_cv_search_snprintb +if test "$ac_res" != no; then : + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" + case "$ac_cv_search_snprintb" in + 'none required') ;; + no) ;; + *) LDADD_LIBUTIL="$ac_cv_search_snprintb $LDADD_LIBUTIL" ;; + esac + +$as_echo "#define USE_SNPRINTB 1" >>confdefs.h + +fi + + # for ac_header in errno.h sys/socket.h sys/types.h time.h do : @@ -24350,6 +24616,13 @@ $as_echo "#define NO_OPTIONAL_OPT_ARGS 1" >>confdefs.h # end of AC_DEFUN of LIBOPTS_CHECK +# From when we only used libevent for sntp: +#AM_COND_IF( +# [BUILD_SNTP], +# [NTP_LIBEVENT_CHECK], +# [NTP_LIBEVENT_CHECK_NOBUILD] +#) + ntp_pkgconfig_min_version='0.15.0' @@ -24485,13 +24758,11 @@ fi - if test -z "$BUILD_SNTP_TRUE"; then : - -ntp_libevent_min_version=2.0.9 +ntp_libevent_min_version=2 ntp_libevent_tearoff=libevent @@ -24601,95 +24872,6 @@ esac - else - - -ntp_libevent_min_version=2.0.9 -ntp_libevent_tearoff=libevent - - - - -case "$ntp_use_local_libevent" in - yes) - ;; - *) # If we have (a good enough) pkg-config, see if it can find libevent - case "$PKG_CONFIG" in - /*) - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if libevent $ntp_libevent_min_version or later is installed" >&5 -$as_echo_n "checking if libevent $ntp_libevent_min_version or later is installed... " >&6; } - if $PKG_CONFIG --atleast-version=$ntp_libevent_min_version libevent - then - ntp_use_local_libevent=no - { $as_echo "$as_me:${as_lineno-$LINENO}: Using the installed libevent" >&5 -$as_echo "$as_me: Using the installed libevent" >&6;} - CPPFLAGS_LIBEVENT=`$PKG_CONFIG --cflags-only-I libevent` - # HMS: I hope the following is accurate. - # We don't need -levent, we only need -levent_core. - # While we could grab only the -L stuff, there *might* be - # other flags there we want. Originally we just removed -levent - # but then somebody decided to install -levent-2.0 - # LDADD_LIBEVENT=`$PKG_CONFIG --libs libevent | sed 's:-levent::'` - # So now we dance... - LDADD_LIBEVENT= - for i in `$PKG_CONFIG --libs libevent` - do - case "$i" in - -levent*) ;; - *) case "$LDADD_LIBEVENT" in - '') LDADD_LIBEVENT="$i" ;; - *) LDADD_LIBEVENT="$LDADD_LIBEVENT $i" ;; - esac - ;; - esac - done - case "$LIBISC_PTHREADS_NOTHREADS" in - pthreads) - LDADD_LIBEVENT="$LDADD_LIBEVENT -levent_pthreads" - esac - LDADD_LIBEVENT="$LDADD_LIBEVENT -levent_core" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - else - ntp_use_local_libevent=yes - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - fi - ;; - *) - ntp_use_local_libevent=yes - ;; - esac - ;; -esac - -case "$ntp_use_local_libevent" in - yes) - { $as_echo "$as_me:${as_lineno-$LINENO}: Using libevent tearoff" >&5 -$as_echo "$as_me: Using libevent tearoff" >&6;} - CPPFLAGS_LIBEVENT="-I\$(top_builddir)/$ntp_libevent_tearoff/include -I\$(top_srcdir)/$ntp_libevent_tearoff/include" - case "$LIBISC_PTHREADS_NOTHREADS" in - pthreads) - LDADD_LIBEVENT="\$(top_builddir)/$ntp_libevent_tearoff/libevent_pthreads.la \$(top_builddir)/$ntp_libevent_tearoff/libevent_core.la" - ;; - *) - LDADD_LIBEVENT="\$(top_builddir)/$ntp_libevent_tearoff/libevent_core.la" - esac -esac - - if test "x$ntp_use_local_libevent" = "xyes"; then - BUILD_LIBEVENT_TRUE= - BUILD_LIBEVENT_FALSE='#' -else - BUILD_LIBEVENT_TRUE='#' - BUILD_LIBEVENT_FALSE= -fi - - - - - fi - # Checks for libraries. @@ -30023,6 +30205,10 @@ if test -z "${INSTALL_NTPSWEEP_TRUE}" && test -z "${INSTALL_NTPSWEEP_FALSE}"; th as_fn_error $? "conditional \"INSTALL_NTPSWEEP\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${INSTALL_UPDATE_LEAP_TRUE}" && test -z "${INSTALL_UPDATE_LEAP_FALSE}"; then + as_fn_error $? "conditional \"INSTALL_UPDATE_LEAP\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${NTP_CROSSCOMPILE_TRUE}" && test -z "${NTP_CROSSCOMPILE_FALSE}"; then as_fn_error $? "conditional \"NTP_CROSSCOMPILE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -30051,10 +30237,6 @@ if test -z "${BUILD_LIBEVENT_TRUE}" && test -z "${BUILD_LIBEVENT_FALSE}"; then as_fn_error $? "conditional \"BUILD_LIBEVENT\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${BUILD_LIBEVENT_TRUE}" && test -z "${BUILD_LIBEVENT_FALSE}"; then - as_fn_error $? "conditional \"BUILD_LIBEVENT\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then as_fn_error $? "conditional \"am__fastdepCXX\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -30472,7 +30654,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by sntp $as_me 4.2.7p482, which was +This file was extended by sntp $as_me 4.2.8p2, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -30539,7 +30721,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -sntp config.status 4.2.7p482 +sntp config.status 4.2.8p2 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" |