This is now in CVS.

diff --git a/kikuchi_set_rsyncdconf_location.diff b/kikuchi_set_rsyncdconf_location.diff
deleted file mode 100644 (file)
index fa6ef25..0000000
--- a/kikuchi_set_rsyncdconf_location.diff
+++ /dev/null
@@ -1,53 +0,0 @@
-Date: Thu, 21 Feb 2002 01:43:17 +0900 (JST)
-From: Ayamura KIKUCHI <ayamura@ayamura.org>
-To: rsync@samba.org
-Subject: [patch] configurable RSYNCD_CONF
-
-I prefer configurable RSYNCD_CONF by autoconf to RSYNCD_CONF in rsync.h.
-
-[Updated to latest CVS by Wayne Davison.]
-
---- rsync.h    11 Feb 2004 08:01:21 -0000      1.186
-+++ rsync.h    23 Feb 2004 19:35:24 -0000
-@@ -27,7 +27,7 @@
- #define RSYNC_RSH_IO_ENV "RSYNC_RSH_IO"
- 
- #define RSYNC_NAME "rsync"
--#define RSYNCD_SYSCONF "/etc/rsyncd.conf"
-+/* RSYNCD_SYSCONF is now set in config.h */
- #define RSYNCD_USERCONF "rsyncd.conf"
- 
- #define DEFAULT_LOCK_FILE "/var/run/rsyncd.lock"
---- configure.in       4 Feb 2004 17:21:48 -0000       1.183
-+++ configure.in       23 Feb 2004 19:35:23 -0000
-@@ -97,6 +97,27 @@ AC_ARG_WITH(rsync-path,
- 
- AC_DEFINE_UNQUOTED(RSYNC_PATH, "$RSYNC_PATH", [location of rsync on remote machine])
- 
-+AC_ARG_WITH(rsyncd-conf,
-+      AC_HELP_STRING([--with-rsyncd-conf=PATH], [set configuration file for rsync server to PATH (default: /etc/rsyncd.conf)]),
-+      [ if test ! -z "$with_rsyncd_conf" ; then
-+              case $with_rsyncd_conf in
-+                      yes|no)
-+                              RSYNCD_SYSCONF="/etc/rsyncd.conf"
-+                              ;;
-+                      /*)
-+                              RSYNCD_SYSCONF="$with_rsyncd_conf"
-+                              ;;
-+                      *)
-+                                AC_MSG_ERROR(You must specify an absolute path to --with-rsyncd-conf=PATH)
-+                              ;;
-+              esac
-+      else
-+              RSYNCD_SYSCONF="/etc/rsyncd.conf"
-+      fi ],
-+      [ RSYNCD_SYSCONF="/etc/rsyncd.conf" ])
-+
-+AC_DEFINE_UNQUOTED(RSYNCD_SYSCONF, "$RSYNCD_SYSCONF", [location of configuration file for rsync server])
-+
- AC_ARG_WITH(rsh,
-       AC_HELP_STRING([--with-rsh=CMD], [set remote shell command to CMD (default: ssh)]))
- 
-
--- ayamura
-Ayamura KIKUCHI, M.D., Ph.D.