A tweak to the configure output from Mike Frysinger.

diff --git a/acls.diff b/acls.diff
index c3f3d21..eb95cf5 100644 (file)
--- a/acls.diff
+++ b/acls.diff
@@ -1390,7 +1390,7 @@ TODO items:
  dnl At the moment we don't test for a broken memcmp(), because all we
  dnl need to do is test for equality, not comparison, and it seems that
  dnl every platform has a memcmp that can do at least that.
-@@ -738,6 +743,77 @@ AC_SUBST(OBJ_RESTORE)
+@@ -738,6 +743,78 @@ AC_SUBST(OBJ_RESTORE)
  AC_SUBST(CC_SHOBJ_FLAG)
  AC_SUBST(BUILD_POPT)
  
@@ -1439,6 +1439,7 @@ TODO items:
 +#include <sys/acl.h>],
 +[ acl_t acl; int entry_id; acl_entry_t *entry_p; return acl_get_entry( acl, entry_id, entry_p);],
 +samba_cv_HAVE_POSIX_ACLS=yes,samba_cv_HAVE_POSIX_ACLS=no)])
++                      AC_MSG_CHECKING(ACL test results)
 +                      if test x"$samba_cv_HAVE_POSIX_ACLS" = x"yes"; then
 +                          AC_MSG_RESULT(Using posix ACLs)
 +                          AC_DEFINE(HAVE_POSIX_ACLS, 1, [true if you have posix ACLs])
@@ -4891,7 +4892,7 @@ TODO items:
  int preserve_perms = 0;
  int preserve_executability = 0;
  int preserve_devices = 0;
-@@ -194,6 +195,7 @@ static void print_rsync_version(enum log
+@@ -192,6 +193,7 @@ static void print_rsync_version(enum log
        char const *got_socketpair = "no ";
        char const *have_inplace = "no ";
        char const *hardlinks = "no ";
@@ -4899,7 +4900,7 @@ TODO items:
        char const *links = "no ";
        char const *ipv6 = "no ";
        STRUCT_STAT *dumstat;
-@@ -210,6 +212,10 @@ static void print_rsync_version(enum log
+@@ -208,6 +210,10 @@ static void print_rsync_version(enum log
        hardlinks = "";
  #endif
  
@@ -4910,7 +4911,7 @@ TODO items:
  #ifdef SUPPORT_LINKS
        links = "";
  #endif
-@@ -223,9 +229,9 @@ static void print_rsync_version(enum log
+@@ -221,9 +227,9 @@ static void print_rsync_version(enum log
        rprintf(f, "Copyright (C) 1996-2006 by Andrew Tridgell, Wayne Davison, and others.\n");
        rprintf(f, "<http://rsync.samba.org/>\n");
        rprintf(f, "Capabilities: %d-bit files, %ssocketpairs, "
@@ -4922,7 +4923,7 @@ TODO items:
  
        /* Note that this field may not have type ino_t.  It depends
         * on the complicated interaction between largefile feature
-@@ -295,6 +301,9 @@ void usage(enum logcode F)
+@@ -293,6 +299,9 @@ void usage(enum logcode F)
    rprintf(F," -H, --hard-links            preserve hard links\n");
    rprintf(F," -p, --perms                 preserve permissions\n");
    rprintf(F," -E, --executability         preserve the file's executability\n");
@@ -4932,7 +4933,7 @@ TODO items:
    rprintf(F,"     --chmod=CHMOD           change destination permissions\n");
    rprintf(F," -o, --owner                 preserve owner (super-user only)\n");
    rprintf(F," -g, --group                 preserve group\n");
-@@ -410,6 +419,9 @@ static struct poptOption long_options[] 
+@@ -408,6 +417,9 @@ static struct poptOption long_options[] 
    {"no-perms",         0,  POPT_ARG_VAL,    &preserve_perms, 0, 0, 0 },
    {"no-p",             0,  POPT_ARG_VAL,    &preserve_perms, 0, 0, 0 },
    {"executability",   'E', POPT_ARG_NONE,   &preserve_executability, 0, 0, 0 },
@@ -4942,7 +4943,7 @@ TODO items:
    {"times",           't', POPT_ARG_VAL,    &preserve_times, 1, 0, 0 },
    {"no-times",         0,  POPT_ARG_VAL,    &preserve_times, 0, 0, 0 },
    {"no-t",             0,  POPT_ARG_VAL,    &preserve_times, 0, 0, 0 },
-@@ -1068,6 +1080,24 @@ int parse_arguments(int *argc, const cha
+@@ -1066,6 +1078,24 @@ int parse_arguments(int *argc, const cha
                        usage(FINFO);
                        exit_cleanup(0);
  
@@ -4967,7 +4968,7 @@ TODO items:
                default:
                        /* A large opt value means that set_refuse_options()
                         * turned this option off. */
-@@ -1511,6 +1541,10 @@ void server_options(char **args,int *arg
+@@ -1508,6 +1538,10 @@ void server_options(char **args,int *arg
  
        if (preserve_hard_links)
                argstr[x++] = 'H';