X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/9a689986c6d416c66195d2a16f54fcb74dc7d805..740819ef7b3b96451e16b2fa3891d46cfc73ec64:/configure.in

diff --git a/configure.in b/configure.in
index 4c2f1dba..21bbab74 100644
--- a/configure.in
+++ b/configure.in
@@ -252,8 +252,15 @@ if test x"$ac_cv_func_connect" = x"no"; then
     fi
 fi
 
+AC_CHECK_LIB(resolv, inet_ntop)
+
 AC_MSG_NOTICE([Looking in libraries: $LIBS])
-AC_REPLACE_FUNCS(getaddrinfo getnameinfo)
+
+AC_CHECK_FUNC(inet_ntop, , AC_LIBOBJ(lib/inet_ntop)) 
+AC_CHECK_FUNC(inet_pton, , AC_LIBOBJ(lib/inet_pton))
+
+AC_CHECK_FUNC(getaddrinfo, , AC_LIBOBJ(lib/getaddrinfo)) 
+AC_CHECK_FUNC(getnameinfo, , AC_LIBOBJ(lib/getnameinfo))
 
 AC_CHECK_MEMBER([struct sockaddr.sa_len], 
 		[ AC_DEFINE(HAVE_SOCKADDR_LEN) ],
@@ -270,15 +277,12 @@ if test x"$ac_cv_func_strcasecmp" = x"no"; then
     AC_CHECK_LIB(resolv, strcasecmp)
 fi
 
-AC_CHECK_LIB(resolv, inet_ntop)
-
 AC_FUNC_MEMCMP
 AC_FUNC_UTIME_NULL
 AC_CHECK_FUNCS(waitpid wait4 getcwd strdup strerror chown chmod mknod)
 AC_CHECK_FUNCS(fchmod fstat strchr readlink link utime utimes strftime)
 AC_CHECK_FUNCS(memmove lchown vsnprintf snprintf asprintf setsid glob strpbrk)
 AC_CHECK_FUNCS(strlcat strlcpy mtrace)
-AC_CHECK_FUNCS(inet_ntop inet_pton)
 
 AC_CACHE_CHECK([for working socketpair],rsync_cv_HAVE_SOCKETPAIR,[
 AC_TRY_RUN([#include <sys/types.h>