From: Harlan Stenn Date: Tue, 26 Oct 2010 08:49:14 +0000 (-0400) Subject: configure.ac, ChangeLog: X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=37e60e28a4a3b048d53efdf40521c59cb73818a4;p=thirdparty%2Fntp.git configure.ac, ChangeLog: * [Bug 1679] Fix test for -lsocket. * Clean up missing ;; entries in configure.ac bk: 4cc6960al4ktimhT1MplJv2MQqHQEQ --- diff --git a/ChangeLog b/ChangeLog index 8d7c47630e..e3f1d3f11c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,5 @@ +* [Bug 1679] Fix test for -lsocket. +* Clean up missing ;; entries in configure.ac. (4.2.7p71) 2010/10/25 Released by Harlan Stenn * [Bug 1676] from 4.2.6p3-RC7: NMEA: $GPGLL did not work after fix for Bug 1571. diff --git a/configure.ac b/configure.ac index 4686cc0719..57b54e4265 100644 --- a/configure.ac +++ b/configure.ac @@ -79,6 +79,7 @@ case "$ac_cv_prog_cc_stdc" in no) AC_MSG_WARN([ANSI C89/ISO C90 is the minimum to compile NTP ] [version 4.2.5 and higher.]) + ;; esac # HMS: These need to be moved to AM_CPPFLAGS and/or AM_CFLAGS @@ -144,6 +145,7 @@ AC_CACHE_CHECK( case "$ac_cv_cpp_warning" in no) AC_DEFINE([NO_OPTION_NAME_WARNINGS], [1], [Should we avoid @%:@warning on option name collisions?]) + ;; esac case "$GCC" in @@ -167,6 +169,7 @@ case "$GCC" in # $ac_cv_gcc_Wstrict_overflow is tested later to add the # flag to CFLAGS. # + ;; esac @@ -191,6 +194,7 @@ case "$GCC" in # $ac_cv_gcc_Winit_self is tested later to add the # flag to CFLAGS. # + ;; esac # Expose a cross-compilation indicator to makefiles @@ -225,6 +229,7 @@ AC_MSG_RESULT([$ans]) case "$ans" in yes) AC_MSG_WARN([Please do not use --with-arlib, arlib is no longer included. In the future, --with-arlib will not be recognized.]) + ;; esac AC_ARG_WITH(rpath, @@ -282,12 +287,15 @@ case "$GCC" in case "$ac_cv_gcc_Winit_self" in yes) CFLAGS="$CFLAGS -Winit-self" + ;; esac case "$ac_cv_gcc_Wstrict_overflow" in yes) CFLAGS="$CFLAGS -Wstrict-overflow" + ;; esac # -W[no-]strict-prototypes is added later depending on OpenSSL + ;; esac ac_busted_vpath_in_make=no @@ -313,7 +321,9 @@ case "$ac_busted_vpath_in_make$srcdir" in *) case "`${MAKE-make} -v -f /dev/null 2>/dev/null | grep 'GNU Make'`" in '') AC_MSG_ERROR([building outside of the main directory requires GNU make]) + ;; esac + ;; esac AC_SUBST(CFLAGS)dnl @@ -387,7 +397,11 @@ case "$ac_cv_search_setsockopt" in case "$ac_cv_search_getsockopt" in -lxnet) LIBS="-lxnet -lsocket $saved_LIBS" + ;; + *) LIBS="-lsocket $saved_LIBS" + ;; esac + ;; esac $as_unset saved_LIBS @@ -470,6 +484,7 @@ esac case "$host" in *-*-sunos*|*-*-solaris*) AC_CHECK_FUNCS([getpassphrase]) + ;; esac AC_CHECK_HEADERS([arpa/nameser.h]) @@ -549,6 +564,7 @@ AC_CACHE_CHECK( case "$ac_cv_ip_tos" in yes) AC_DEFINE(HAVE_IPTOS_SUPPORT, 1, [Do we have IPTOS support?]) + ;; esac AC_CHECK_HEADERS(netinfo/ni.h, [AC_DEFINE(HAVE_NETINFO, 1, [NetInfo support?])]) @@ -750,7 +766,9 @@ case "$ac_cv_type_int32::$ac_cv_header_resolv_h" in case "$ntp_cv_type_int32_with_dns" in yes) AC_DEFINE([HAVE_INT32_ONLY_WITH_DNS], , [int32 type in DNS headers, not others.]) + ;; esac + ;; esac case "$ac_cv_type_u_int32::$ac_cv_header_resolv_h" in @@ -777,7 +795,9 @@ case "$ac_cv_type_u_int32::$ac_cv_header_resolv_h" in case "$ntp_cv_type_u_int32_with_dns" in yes) AC_DEFINE([HAVE_U_INT32_ONLY_WITH_DNS], , [u_int32 type in DNS headers, not others.]) + ;; esac + ;; esac AC_CHECK_SIZEOF([time_t]) @@ -933,6 +953,7 @@ AC_CACHE_CHECK( case "$ntp_cv_sockaddr_storage" in yes) AC_DEFINE(HAVE_STRUCT_SOCKADDR_STORAGE, 1, [Does a system header define struct sockaddr_storage?]) + ;; esac AC_CACHE_CHECK( @@ -991,7 +1012,9 @@ case "$ntp_cv_have_ss_family" in case "$ntp_cv_have___ss_family" in yes) AC_DEFINE(HAVE___SS_FAMILY_IN_SS, 1, [Does struct sockaddr_storage have __ss_family?]) + ;; esac + ;; esac AH_VERBATIM( @@ -1060,7 +1083,9 @@ case "$ntp_cv_have_ss_len" in case "$ntp_cv_have___ss_len" in yes) AC_DEFINE(HAVE___SS_LEN_IN_SS, 1, [Does struct sockaddr_storage have __ss_len?]) + ;; esac + ;; esac AH_VERBATIM( @@ -1096,7 +1121,8 @@ AC_CACHE_CHECK( ) case "$isc_cv_have_in_port_t" in no) - AC_DEFINE(ISC_PLATFORM_NEEDPORTT, 1, [Declare in_port_t?]) + AC_DEFINE(ISC_PLATFORM_NEEDPORTT, 1, [Declare in_port_t?]) + ;; esac case "$ac_cv_header_machine_soundcard_h$ac_cv_header_sys_soundcard_h" in @@ -1195,6 +1221,7 @@ case "$ac_cv_c_inline" in *) AC_DEFINE(HAVE_INLINE,1,[inline keyword or macro available]) AC_SUBST(HAVE_INLINE) + ;; esac AC_C_CHAR_UNSIGNED dnl CROSS_COMPILE? @@ -1260,12 +1287,12 @@ glibc: Use getifaddrs() in glibc if you know it supports IPv6.]), want_getifaddrs="$enableval", want_getifaddrs="yes") case $want_getifaddrs in -yes|glibc) -# -# Do we have getifaddrs() ? -# -case $host in -*-*linux*) + yes|glibc) + # + # Do we have getifaddrs() ? + # + case $host in + *-*linux*) # Some recent versions of glibc support getifaddrs() which does not # provide AF_INET6 addresses while the function provided by the USAGI # project handles the AF_INET6 case correctly. We need to avoid @@ -1283,13 +1310,13 @@ case $host in LIBS=${save_LIBS}) fi ;; -*) + *) AC_CHECK_FUNCS([getifaddrs]) ;; -esac -;; -no) -;; + esac + ;; + no) + ;; esac AC_MSG_CHECKING([type of socklen arg for getsockname()]) @@ -1339,13 +1366,14 @@ AC_CHECK_FUNC([if_nametoindex], ac_cv_have_if_nametoindex=yes, ac_cv_have_if_nametoindex=no) case $ac_cv_have_if_nametoindex in no) - case "$host" in - *-hp-hpux*) - AC_CHECK_LIB(ipv6, if_nametoindex, - ac_cv_have_if_nametoindex=yes - LIBS="-lipv6 $LIBS",) + case "$host" in + *-hp-hpux*) + AC_CHECK_LIB(ipv6, if_nametoindex, + ac_cv_have_if_nametoindex=yes + LIBS="-lipv6 $LIBS",) ;; esac + ;; esac case $ac_cv_have_if_nametoindex in yes) @@ -1467,10 +1495,10 @@ AC_CHECK_FUNCS([uname updwtmp updwtmpx vsnprintf vsprintf]) # http://bugs.ntp.org/737 case "$ac_cv_func_recvmsg" in yes) - AC_MSG_CHECKING([if we need extra help to define struct iovec]) - AC_CACHE_VAL(ac_cv_struct_iovec_help,dnl - [for ac_cv_struct_iovec_help in '0' '1'; do - AC_TRY_COMPILE(dnl + AC_MSG_CHECKING([if we need extra help to define struct iovec]) + AC_CACHE_VAL(ac_cv_struct_iovec_help,dnl + [for ac_cv_struct_iovec_help in '0' '1'; do + AC_TRY_COMPILE(dnl [#ifdef HAVE_SYS_TYPES_H #include #endif @@ -1501,6 +1529,7 @@ void foo() { ans=yes ;; *) ans=no + ;; esac AC_MSG_RESULT([$ans]) ;; @@ -1796,6 +1825,7 @@ AC_CACHE_CHECK( ;; *) ans=no + ;; esac ntp_cv_func_ctty_for_f_setown=$ans ] @@ -1803,6 +1833,7 @@ AC_CACHE_CHECK( case "$ntp_cv_func_ctty_for_f_setown" in yes) AC_DEFINE(USE_FSETOWNCTTY, 1, [Must we have a CTTY for fsetown?]) + ;; esac AC_CACHE_CHECK([if the OS fails to clear cached routes when more specific routes become available], ac_cv_os_routeupdates, @@ -2108,7 +2139,7 @@ case "$host" in i?86-*-*linux*) ans=yes ;; - mips-sgi-irix*) + mipe-sgi-irix*) ans=yes ;; i?86-*-freebsd[[123]].*) @@ -2169,6 +2200,7 @@ AC_ARG_ENABLE( case "$ans" in yes) AC_DEFINE(IGNORE_DNS_ERRORS, 1, [[Retry queries on _any_ DNS error?]]) + ;; esac AC_MSG_RESULT([$ans]) @@ -2213,6 +2245,7 @@ AC_CACHE_CHECK( [ntp_cv_multicast=yes], [] ) + ;; esac ] ) @@ -2233,6 +2266,7 @@ case "$ntp_cv_multicast" in ;; *) ntp_cv_typeof_ip_multicast_loop=u_char + ;; esac ] ) @@ -2240,6 +2274,7 @@ case "$ntp_cv_multicast" in $ntp_cv_typeof_ip_multicast_loop, [What type to use for setsockopt] ) + ;; esac AC_CACHE_CHECK([[availability of ntp_{adj,get}time()]], ac_cv_var_ntp_syscalls, @@ -3304,7 +3339,9 @@ case "$ntp_autokey" in *) AC_DEFINE(AUTOKEY, , [Support NTP Autokey protocol?]) ntp_autokey=yes + ;; esac + ;; esac AC_MSG_RESULT([$ntp_autokey]) @@ -3427,6 +3464,7 @@ case "$ac_cv_func_nlist$ac_cv_func_K_open$ac_cv_func_kvm_open" in ans=yes ;; *) ans=no + ;; esac case "$host" in @@ -3469,6 +3507,7 @@ case "$ans" in *) can_kmem=no AC_DEFINE(NOKMEM, 1, [Should we NOT read /dev/kmem?]) + ;; esac @@ -3505,6 +3544,7 @@ case "$host" in ans=yes ;; *) ans=no + ;; esac # --enable-accurate-adjtime / --disable-accurate-adjtime @@ -3526,6 +3566,7 @@ case "$ans" in ;; *) adjtime_is_accurate=no + ;; esac AC_CACHE_CHECK([the name of 'tick' in the kernel], @@ -3807,6 +3848,7 @@ case "$host" in case "$adjtime_is_accurate" in yes) ans='tick/16' + ;; esac ;; XXX-*-pc-cygwin*) @@ -3819,18 +3861,21 @@ case "$host" in case "$can_kmem" in no) ans=1000 + ;; esac ;; *-*-domainos) # Skippy: won't be found... case "$can_kmem" in no) ans=668 + ;; esac ;; *-*-hpux*) case "$adjtime_is_accurate" in yes) ans='tick/16' + ;; esac ;; *-*-irix*) @@ -3847,6 +3892,7 @@ case "$host" in ;; *-*-unicosmp*) ans=150 + ;; esac AC_ARG_ENABLE( @@ -4174,6 +4220,7 @@ case "$host" in ans=yes ;; *) ans=no + ;; esac AC_ARG_ENABLE( @@ -4203,6 +4250,7 @@ case "$host" in ;; *) ans=no + ;; esac AC_ARG_ENABLE( @@ -4242,6 +4290,7 @@ case "$host" in ;; *) ans=yes + ;; esac ;; *-*-solaris2.7) @@ -4262,10 +4311,12 @@ case "$host" in ;; *) ans=yes + ;; esac ;; *) ans=no + ;; esac AC_ARG_ENABLE( @@ -4301,6 +4352,7 @@ AC_MSG_RESULT([$ans]) case "$ans" in no) AC_DEFINE([DISABLE_BUG1243_FIX], 1, [use old autokey session key behavior?]) + ;; esac @@ -4314,6 +4366,7 @@ case "$host" in ans=yes ;; *) ans=no + ;; esac AC_ARG_ENABLE( @@ -4331,7 +4384,6 @@ case "$ans" in yes) AC_DEFINE(IRIG_SUCKS, 1, [Should we use the IRIG sawtooth filter?]) ;; esac - AC_MSG_CHECKING([if we should enable NIST lockclock scheme]) AC_ARG_ENABLE( @@ -4350,7 +4402,6 @@ case "$ans" in yes) AC_DEFINE(LOCKCLOCK, 1, [Should we align with the NIST lockclock scheme?]) ;; esac - AC_MSG_CHECKING([if we want support for Samba's signing daemon]) AC_ARG_ENABLE( @@ -4382,9 +4433,9 @@ case "$ntp_signd_path" in *) AC_DEFINE(HAVE_NTP_SIGND, ,[Do we want support for Samba's signing daemon?]) AC_DEFINE_UNQUOTED(NTP_SIGND_PATH, "$ntp_signd_path", [Path to sign daemon rendezvous socket]) + ;; esac - AC_CHECK_HEADERS(sys/clockctl.h) case "$host" in @@ -4426,6 +4477,7 @@ case "$ac_cv_header_sys_capability_h$ac_cv_header_sys_prctl_h" in ;; *) ntp_have_linuxcaps=no + ;; esac AC_ARG_ENABLE( @@ -4443,19 +4495,21 @@ case "$ntp_have_linuxcaps" in yes) AC_DEFINE(HAVE_LINUX_CAPABILITIES, ,[Do we have Linux capabilities?]) LIBS="$LIBS -lcap" + ;; esac case "$ntp_use_dev_clockctl$ntp_have_linuxcaps" in *yes*) AC_DEFINE(HAVE_DROPROOT, ,[Can we drop root privileges?]) + ;; esac - AC_CHECK_HEADERS([libscf.h]) case "$ac_cv_header_libscf_h" in yes) AC_SUBST(LSCF, [-lscf]) + ;; esac AC_CHECK_FUNC( @@ -4463,7 +4517,6 @@ AC_CHECK_FUNC( AC_DEFINE(HAVE_SOLARIS_PRIVS, ,[Are Solaris privileges available?]) ) - # # ISC stuff # @@ -4584,6 +4637,7 @@ case "$host" in ;; *) isc_netinet6in6_hack="" + ;; esac # @@ -4596,6 +4650,7 @@ case "$host" in ;; *) isc_netinetin6_hack="" + ;; esac @@ -4631,6 +4686,7 @@ case "$ac_cv_isc_found_ipv6" in case "$ac_cv_have_in6_pktinfo" in yes) AC_DEFINE(ISC_PLATFORM_HAVEIN6PKTINFO, , [have struct in6_pktinfo?]) + ;; esac @@ -4664,7 +4720,9 @@ case "$ac_cv_isc_found_ipv6" in case "$ac_cv_have_sin6_scope_id" in yes) AC_DEFINE(ISC_PLATFORM_HAVESCOPEID, , [have sin6_scope_id?]) + ;; esac + ;; esac @@ -4699,6 +4757,7 @@ AC_CACHE_CHECK( case "$isc_cv_have_in6addr_any" in no) AC_DEFINE(ISC_PLATFORM_NEEDIN6ADDRANY, , [missing in6addr_any?]) + ;; esac @@ -4727,6 +4786,7 @@ AC_CACHE_CHECK( case "$ac_cv_isc_struct_if_laddrconf" in yes) AC_DEFINE(ISC_PLATFORM_HAVEIF_LADDRCONF, , [have struct if_laddrconf?]) + ;; esac AC_CACHE_CHECK( @@ -4754,6 +4814,7 @@ AC_CACHE_CHECK( case "$ac_cv_isc_struct_if_laddrreq" in yes) AC_DEFINE(ISC_PLATFORM_HAVEIF_LADDRREQ, , [have struct if_laddrreq?]) + ;; esac # @@ -4780,6 +4841,7 @@ AC_CACHE_CHECK( case "$ac_cv_iflist_sysctl" in yes) AC_DEFINE(HAVE_IFLIST_SYSCTL,1,[have iflist_sysctl?]) + ;; esac ###