Updated NEWS & tweaked a comment.

diff --git a/NEWS b/NEWS
index 5f2e738761611e5826b716f90f5d267dfa04185e..9ad8306826179c56ac2d77f1850fa5a4bad00a71 100644 (file)
--- 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 5b061ade10d2de92777e78e99488d7904d038be7..62dfe4f022474ad08b13988fa7fd8875c4cff2b6 100644 (file)
--- 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... */