[SCM] The rsync repository. - branch master updated

[Rsync CVS commit messages]

The branch, master has been updated
       via  edb0d9c Updated NEWS & tweaked a comment.
      from  6ffd8f2 Put zlib and popt -I options early in the CFLAGS.

;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit edb0d9c79205a5d8840719462cd69b98642cfbf2
Author: Wayne Davison <wayned at samba.org>
Date:   Sat Jun 14 09:55:37 2014 -0700

    Updated NEWS & tweaked a comment.

-----------------------------------------------------------------------

Summary of changes:
 NEWS      |    3 +++
 options.c |    2 +-
 2 files changed, 4 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/NEWS b/NEWS
index 5f2e738..9ad8306 100644
--- a/NEWS
+++ b/NEWS
@@ -107,3 +107,6 @@ Changes since 3.1.0:
   DEVELOPER RELATED:
 
     - We now include an example systemd file (in packaging/systemd).
+
+    - Tweaked configure to make sure that any intended use of the included popt
+      and/or zlib code is put early in the CFLAGS.
diff --git a/options.c b/options.c
index 5b061ad..62dfe4f 100644
--- a/options.c
+++ b/options.c
@@ -2500,7 +2500,7 @@ void server_options(char **args, int *argc_p)
 		argstr[x++] = 's'; /* symlink iconv translation support */
 #endif
 		argstr[x++] = 'f'; /* flist I/O-error safety support */
-		argstr[x++] = 'x'; /* xattr hardlink optimization not supported */
+		argstr[x++] = 'x'; /* xattr hardlink optimization not desired */
 	}
 
 	if (x >= (int)sizeof argstr) { /* Not possible... */


-- 
The rsync repository.