diff --git a/nbase/configure b/nbase/configure index d5e5dfe1f..882233c58 100755 --- a/nbase/configure +++ b/nbase/configure @@ -4519,18 +4519,6 @@ if test "$ac_res" != no; then : fi -for ac_func in gai_strerror inet_pton inet_ntop -do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -if eval test \"x\$"$as_ac_var"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - -fi -done - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing inet_ntop" >&5 $as_echo_n "checking for library containing inet_ntop... " >&6; } if ${ac_cv_search_inet_ntop+:} false; then : @@ -4659,6 +4647,18 @@ esac fi +for ac_func in gai_strerror inet_pton inet_ntop +do : + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` +ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : + cat >>confdefs.h <<_ACEOF +#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +_ACEOF + +fi +done + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working getaddrinfo" >&5 $as_echo_n "checking for working getaddrinfo... " >&6; } diff --git a/nbase/configure.ac b/nbase/configure.ac index 6af2dca2a..996935347 100644 --- a/nbase/configure.ac +++ b/nbase/configure.ac @@ -185,13 +185,13 @@ AC_ARG_ENABLE(ipv6, AC_SEARCH_LIBS(getaddrinfo, [inet6 socket]) AC_SEARCH_LIBS(gai_strerror, [inet6 socket]) AC_SEARCH_LIBS(getnameinfo, [inet6 socket]) -AC_CHECK_FUNCS([gai_strerror inet_pton inet_ntop]) AC_SEARCH_LIBS(inet_ntop, [nsl resolv network], [], [AC_LIBOBJ(inet_ntop) ]) AC_SEARCH_LIBS(inet_pton, [nsl resolv network], [], [AC_LIBOBJ(inet_pton) ]) +AC_CHECK_FUNCS([gai_strerror inet_pton inet_ntop]) APR_CHECK_WORKING_GETADDRINFO # The inet_addr function is used by APR_CHECK_WORKING_GETNAMEINFO. AC_SEARCH_LIBS(inet_addr, [nsl])