Changed the --width-* option to an --enable-* option (as it should

have been all along) and made the configure.in support use the
AC_HELP_STRING() macro.

diff --git a/acls.diff b/acls.diff
index cc45f6f..afcad17 100644 (file)
--- a/acls.diff
+++ b/acls.diff
@@ -2,7 +2,7 @@ After applying this patch, run these commands for a successful build:
 
     autoconf
     autoheader
-    ./configure --with-acl-support
+    ./configure --enable-acl-support
     make proto
     make
 
@@ -1192,7 +1192,7 @@ ACLs to a non-ACL-supporting disk should complain.
        free(file);
  
        if (verbose > 1) {
---- orig/configure.in  2005-07-29 02:47:19
+--- orig/configure.in  2005-09-24 17:40:30
 +++ configure.in       2004-08-19 19:53:27
 @@ -489,6 +489,11 @@ if test x"$ac_cv_func_strcasecmp" = x"no
      AC_CHECK_LIB(resolv, strcasecmp)
@@ -1216,8 +1216,8 @@ ACLs to a non-ACL-supporting disk should complain.
 +# check for ACL support
 +
 +AC_MSG_CHECKING(whether to support ACLs)
-+AC_ARG_WITH(acl-support,
-+[  --with-acl-support      Include ACL support (default=no)],
++AC_ARG_ENABLE(acl-support,
++AC_HELP_STRING([--enable-acl-support], [Include ACL support (default=no)]),
 +[ case "$withval" in
 +  yes)
 +
@@ -1284,9 +1284,9 @@ ACLs to a non-ACL-supporting disk should complain.
  AC_CONFIG_FILES([Makefile lib/dummy zlib/dummy popt/dummy shconfig])
  AC_OUTPUT
  
---- orig/flist.c       2005-08-17 06:45:07
+--- orig/flist.c       2005-09-17 21:48:45
 +++ flist.c    2005-07-29 02:49:06
-@@ -974,6 +974,8 @@ static struct file_struct *send_file_nam
+@@ -968,6 +968,8 @@ static struct file_struct *send_file_nam
        file = make_file(fname, flist, f == -2 ? SERVER_FILTERS : ALL_FILTERS);
        if (!file)
                return NULL;
@@ -1295,7 +1295,7 @@ ACLs to a non-ACL-supporting disk should complain.
  
        maybe_emit_filelist_progress(flist->count + flist_count_offset);
  
-@@ -982,6 +984,10 @@ static struct file_struct *send_file_nam
+@@ -976,6 +978,10 @@ static struct file_struct *send_file_nam
        if (file->basename[0]) {
                flist->files[flist->count++] = file;
                send_file_entry(file, f, base_flags);
@@ -1306,7 +1306,7 @@ ACLs to a non-ACL-supporting disk should complain.
        }
        return file;
  }
-@@ -1327,6 +1333,8 @@ struct file_list *recv_file_list(int f)
+@@ -1321,6 +1327,8 @@ struct file_list *recv_file_list(int f)
                        flags |= read_byte(f) << 8;
                file = receive_file_entry(flist, flags, f);
  
@@ -1315,7 +1315,7 @@ ACLs to a non-ACL-supporting disk should complain.
                if (S_ISREG(file->mode))
                        stats.total_size += file->length;
  
-@@ -1349,6 +1357,8 @@ struct file_list *recv_file_list(int f)
+@@ -1343,6 +1351,8 @@ struct file_list *recv_file_list(int f)
  
        clean_flist(flist, relative_paths, 1);
  
@@ -1324,7 +1324,7 @@ ACLs to a non-ACL-supporting disk should complain.
        if (f >= 0) {
                /* Now send the uid/gid list. This was introduced in
                 * protocol version 15 */
---- orig/generator.c   2005-08-17 06:45:07
+--- orig/generator.c   2005-09-15 18:09:14
 +++ generator.c        2005-05-12 23:34:00
 @@ -725,6 +725,10 @@ static void recv_generator(char *fname, 
                if (set_perms(fname, file, statret ? NULL : &st, 0)
@@ -4624,7 +4624,7 @@ ACLs to a non-ACL-supporting disk should complain.
    next;
  }
  
---- orig/options.c     2005-08-27 21:11:26
+--- orig/options.c     2005-09-24 17:40:31
 +++ options.c  2005-08-27 21:15:29
 @@ -43,6 +43,7 @@ int keep_dirlinks = 0;
  int copy_links = 0;
@@ -4665,7 +4665,7 @@ ACLs to a non-ACL-supporting disk should complain.
  
        /* Note that this field may not have type ino_t.  It depends
         * on the complicated interaction between largefile feature
-@@ -284,6 +290,7 @@ void usage(enum logcode F)
+@@ -283,6 +289,7 @@ void usage(enum logcode F)
    rprintf(F," -H, --hard-links            preserve hard links\n");
    rprintf(F," -K, --keep-dirlinks         treat symlinked dir on receiver as dir\n");
    rprintf(F," -p, --perms                 preserve permissions\n");
@@ -4683,7 +4683,7 @@ ACLs to a non-ACL-supporting disk should complain.
    {"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 },
-@@ -916,6 +926,24 @@ int parse_arguments(int *argc, const cha
+@@ -927,6 +937,24 @@ int parse_arguments(int *argc, const cha
                        basis_dir[basis_dir_cnt++] = (char *)arg;
                        break;
  
@@ -4708,7 +4708,7 @@ ACLs to a non-ACL-supporting disk should complain.
                default:
                        /* A large opt value means that set_refuse_options()
                         * turned this option off. */
-@@ -1329,6 +1357,8 @@ void server_options(char **args,int *arg
+@@ -1348,6 +1376,8 @@ void server_options(char **args,int *arg
  
        if (preserve_hard_links)
                argstr[x++] = 'H';
@@ -4734,9 +4734,9 @@ ACLs to a non-ACL-supporting disk should complain.
        if (verbose > 1 && flags & PERMS_REPORT) {
                enum logcode code = daemon_log_format_has_i || dry_run
                                  ? FCLIENT : FINFO;
---- orig/rsync.h       2005-08-17 06:45:08
+--- orig/rsync.h       2005-09-24 17:40:31
 +++ rsync.h    2005-07-29 02:25:55
-@@ -646,6 +646,44 @@ struct stats {
+@@ -650,6 +650,44 @@ struct stats {
  #include "lib/permstring.h"
  #include "lib/addrinfo.h"
  
@@ -4781,9 +4781,9 @@ ACLs to a non-ACL-supporting disk should complain.
  #include "proto.h"
  
  /* We have replacement versions of these if they're missing. */
---- orig/rsync.yo      2005-08-27 21:05:12
+--- orig/rsync.yo      2005-09-24 17:40:31
 +++ rsync.yo   2004-07-03 20:11:58
-@@ -318,6 +318,7 @@ to the detailed description below for a 
+@@ -316,6 +316,7 @@ to the detailed description below for a 
   -H, --hard-links            preserve hard links
   -K, --keep-dirlinks         treat symlinked dir on receiver as dir
   -p, --perms                 preserve permissions

diff --git a/xattrs.diff b/xattrs.diff
index 4b05252..601d89d 100644 (file)
--- a/xattrs.diff
+++ b/xattrs.diff
@@ -4,7 +4,7 @@ After applying this patch, run these commands for a successful build:
 
     autoconf
     autoheader
-    ./configure --with-acl-support --with-xattr-support
+    ./configure --enable-acl-support --enable-xattr-support
     make proto
     make
 
@@ -60,8 +60,8 @@ After applying this patch, run these commands for a successful build:
  
 +AC_CHECK_HEADERS(attr/xattr.h)
 +AC_MSG_CHECKING(whether to support extended attributes)
-+AC_ARG_WITH(xattr-support,
-+[  --with-xattr-support        Include extended attribute support (default=no)],
++AC_ARG_ENABLE(xattr-support,
++AC_HELP_STRING([--enable-xattr-support], [Include extended attribute support (default=no)]),
 +[ case "$withval" in
 +  yes)
 +      case "$host_os" in
@@ -87,7 +87,7 @@ After applying this patch, run these commands for a successful build:
  
 --- orig/flist.c       2005-07-29 02:49:06
 +++ flist.c    2005-05-12 22:55:41
-@@ -976,6 +976,8 @@ static struct file_struct *send_file_nam
+@@ -970,6 +970,8 @@ static struct file_struct *send_file_nam
                return NULL;
        if (MAKE_ACL(file, fname) < 0)
                return NULL;
@@ -96,7 +96,7 @@ After applying this patch, run these commands for a successful build:
  
        maybe_emit_filelist_progress(flist->count + flist_count_offset);
  
-@@ -985,9 +987,11 @@ static struct file_struct *send_file_nam
+@@ -979,9 +981,11 @@ static struct file_struct *send_file_nam
                flist->files[flist->count++] = file;
                send_file_entry(file, f, base_flags);
                SEND_ACL(file, f);
@@ -108,7 +108,7 @@ After applying this patch, run these commands for a successful build:
        }
        return file;
  }
-@@ -1334,6 +1338,7 @@ struct file_list *recv_file_list(int f)
+@@ -1328,6 +1332,7 @@ struct file_list *recv_file_list(int f)
                file = receive_file_entry(flist, flags, f);
  
                RECEIVE_ACL(file, f);
@@ -116,7 +116,7 @@ After applying this patch, run these commands for a successful build:
  
                if (S_ISREG(file->mode))
                        stats.total_size += file->length;
-@@ -1358,6 +1363,7 @@ struct file_list *recv_file_list(int f)
+@@ -1352,6 +1357,7 @@ struct file_list *recv_file_list(int f)
        clean_flist(flist, relative_paths, 1);
  
        SORT_FILE_ACL_INDEX_LISTS();
@@ -234,7 +234,7 @@ After applying this patch, run these commands for a successful build:
  
        /* Note that this field may not have type ino_t.  It depends
         * on the complicated interaction between largefile feature
-@@ -291,6 +295,7 @@ void usage(enum logcode F)
+@@ -290,6 +294,7 @@ void usage(enum logcode F)
    rprintf(F," -K, --keep-dirlinks         treat symlinked dir on receiver as dir\n");
    rprintf(F," -p, --perms                 preserve permissions\n");
    rprintf(F," -A, --acls                  preserve ACLs (implies --perms)\n");
@@ -252,7 +252,7 @@ After applying this patch, run these commands for a successful build:
    {"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 },
-@@ -943,6 +951,17 @@ int parse_arguments(int *argc, const cha
+@@ -954,6 +962,17 @@ int parse_arguments(int *argc, const cha
                        return 0;
  #endif /* SUPPORT_ACLS */
  
@@ -270,7 +270,7 @@ After applying this patch, run these commands for a successful build:
  
                default:
                        /* A large opt value means that set_refuse_options()
-@@ -1359,6 +1378,8 @@ void server_options(char **args,int *arg
+@@ -1378,6 +1397,8 @@ void server_options(char **args,int *arg
                argstr[x++] = 'H';
        if (preserve_acls)
                argstr[x++] = 'A';
@@ -298,7 +298,7 @@ After applying this patch, run these commands for a successful build:
                enum logcode code = daemon_log_format_has_i || dry_run
 --- orig/rsync.h       2005-07-29 02:25:55
 +++ rsync.h    2005-05-12 23:19:46
-@@ -684,6 +684,38 @@ struct stats {
+@@ -688,6 +688,38 @@ struct stats {
  #endif /* SUPPORT_ACLS */
  #include "smb_acls.h"
  
@@ -339,7 +339,7 @@ After applying this patch, run these commands for a successful build:
  /* We have replacement versions of these if they're missing. */
 --- orig/rsync.yo      2004-07-03 20:11:58
 +++ rsync.yo   2005-03-03 01:33:53
-@@ -319,6 +319,7 @@ to the detailed description below for a 
+@@ -317,6 +317,7 @@ to the detailed description below for a 
   -K, --keep-dirlinks         treat symlinked dir on receiver as dir
   -p, --perms                 preserve permissions
   -A, --acls                  preserve ACLs (implies -p) [local option]