#3980 Re: rsync-2.5.3pre1 preview release -- please try it

[Albert Chin]

On Thu, Feb 21, 2002 at 11:12:19AM -0800, Jos Backus wrote:
> On Thu, Feb 21, 2002 at 10:05:19AM -0600, Albert Chin wrote:
> > > gcc -I. -I. -g -O2 -DHAVE_CONFIG_H -Wall -W -I./popt -c lib/getaddrinfo.c -o lib/getaddrinfo.o
> > > lib/getaddrinfo.c: In function `get_addr':
> > > lib/getaddrinfo.c:595: structure has no member named `s6_addr32'
> > > lib/getaddrinfo.c:597: structure has no member named `s6_addr32'
> > > *** Error code 1
> 
> Here are the results by configure revision:
> 
>     1.128 works.
>     1.129: (which contains your patch) breaks.
>     1.130: breaks.
>     1.131: (head) works (regenned from fixed configure.in).
> 
> > Without my patch, does it work?
> 
> Unfortunately, yes (see above).

Ok, try the following patch. This is against CVS. I would also be
interested in the config.log file from the configure run using 1.129
and 1.131. Does 1.130 have my patch as well?

-- 
albert chin (china at thewrittenword.com)

-- snip snip
Index: configure.in
===================================================================
RCS file: /cvsroot/rsync/configure.in,v
retrieving revision 1.136
diff -u -3 -p -r1.136 configure.in
--- configure.in	21 Feb 2002 00:56:11 -0000	1.136
+++ configure.in	21 Feb 2002 23:39:10 -0000
@@ -315,7 +315,19 @@ dnl AC_MSG_NOTICE([Looking in libraries:
 AC_CHECK_FUNCS(inet_ntop, , AC_LIBOBJ(lib/inet_ntop)) 
 AC_CHECK_FUNCS(inet_pton, , AC_LIBOBJ(lib/inet_pton))
 
-AC_CHECK_FUNCS(getaddrinfo, , AC_LIBOBJ(lib/getaddrinfo))
+# Tru64 UNIX has getaddrinfo() but has it renamed in libc as
+# something else so we must include <netdb.h> to get the
+# redefinition.
+AC_CHECK_FUNCS(getaddrinfo, ,
+	[AC_MSG_CHECKING([for getaddrinfo by including <netdb.h>])
+	AC_TRY_LINK([#include <sys/types.h>
+	#include <sys/socket.h>
+	#include <netdb.h>],[getaddrinfo(NULL, NULL, NULL, NULL);],
+		[AC_MSG_RESULT([yes])
+		AC_DEFINE(HAVE_GETADDRINFO, 1,
+			[Define if you have the `getaddrinfo' function.])],
+		[AC_MSG_RESULT([no])
+		AC_LIBOBJ(lib/getaddrinfo)])])
 AC_CHECK_FUNCS(getnameinfo, , AC_LIBOBJ(lib/getnameinfo))
 
 AC_CHECK_MEMBER([struct sockaddr.sa_len],