Fix from Jeff Garzik for inet_ntop prototype errors on some Linux

distributions: we were failing to define HAVE_INET_NTOP, so our
prototype in rsync.h came through.

Also rerun autoheader, and have comment for HAVE_SOCKADDR_STORAGE.

diff --git a/NEWS b/NEWS
index fc916f4ce7bfed1d24ca5cb2b25bcd44534162de..1e10a4f21d4dc995f16dd63432b06c58259a41ab 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,26 @@
 rsync 2.5.1 (sometime in 2001?)
 
+  BUG FIXES: 
+   
+    * Fix for segfault in --daemon mode configuration parser by Paul
+      Mackerras.
+
+    * Correct string<->address parsing for both IPv4 and 6.  Thankyou
+      to YOSHIFUJI Hideaki, SUMIKAWA Munechika and Jun-ichiro "itojun"
+      Hagino.
+
+    * Various fixes for IPv6 support by Dave Dykstra.
+
+    * rsync.1 typo fix by Matt Kraai.
+
+    * Test suite typo fixes by Tom Schmidt.
+
+    * rsync.1 grammar and clarity improvements.  Thanks to Edward
+      Welbourne.
+
+    * Correction to ./configure tests for inet_ntop.  Thankyou to Jeff
+      Garzik.
+
   ENHANCEMENTS:
 
     * --progress and -P now show estimated data transfer rate (in a
@@ -10,14 +31,4 @@ rsync 2.5.1 (sometime in 2001?)
         useful when running on Unix under daemontools, AIX's SRC, or a
         debugger.  Thanks to Max Bowsher and Jos Backus.
 
-  BUG FIXES: 
-   
-    * Correct string<->address parsing for both IPv4 and 6.  Thankyou
-      to YOSHIFUJI Hideaki, SUMIKAWA Munechika and Jun-ichiro "itojun"
-      Hagino.
-
-    * rsync.1 typo fix by Matt Kraai.
-
-    * Fix for segfault in rsyncd.conf parser by Paul Mackerras.
-
-    * Test suite typo fixes Tom Schmidt.
+    * Clearer error messages for some conditions.

diff --git a/configure.in b/configure.in
index 33ef7a3bbea3bd429f832e594ddc32c43a9ff12a..1f131e5e35da656f9ebf63916debe383bf07e719 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -270,11 +270,11 @@ AC_CHECK_LIB(resolv, inet_ntop)
 
 AC_MSG_NOTICE([Looking in libraries: $LIBS])
 
-AC_CHECK_FUNC(inet_ntop, , AC_LIBOBJ(lib/inet_ntop)) 
-AC_CHECK_FUNC(inet_pton, , AC_LIBOBJ(lib/inet_pton))
+AC_CHECK_FUNCS(inet_ntop, , AC_LIBOBJ(lib/inet_ntop)) 
+AC_CHECK_FUNCS(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_FUNCS(getaddrinfo, , AC_LIBOBJ(lib/getaddrinfo)) 
+AC_CHECK_FUNCS(getnameinfo, , AC_LIBOBJ(lib/getnameinfo))
 
 AC_CHECK_MEMBER([struct sockaddr.sa_len], 
                [ AC_DEFINE(HAVE_SOCKADDR_LEN) ],
@@ -289,7 +289,8 @@ AC_TRY_COMPILE([#include <sys/types.h>
 #include <sys/socket.h>],
 [struct sockaddr_storage x;],
        AC_MSG_RESULT(yes)
-       AC_DEFINE(HAVE_SOCKADDR_STORAGE),
+       AC_DEFINE(HAVE_SOCKADDR_STORAGE, 1, 
+               [Define if you have strct sockaddr_storage.] ),
        AC_MSG_RESULT(no))
 
 # if we can't find strcasecmp, look in -lresolv (for Unixware at least)