Mention the changes in the "patches" dir.

[rsync/rsync.git] / configure.in

diff --git a/configure.in b/configure.in
index 7ffd3df..ad1abde 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -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)]))
 
@@ -367,9 +388,16 @@ else
        AC_LIBOBJ(lib/getnameinfo)
 fi
 
-
 AC_CHECK_MEMBER([struct sockaddr.sa_len],
-               [ AC_DEFINE(HAVE_SOCKADDR_LEN) ],
+               [ AC_DEFINE(HAVE_SOCKADDR_SA_LEN, 1, [Do we have sockaddr.sa_len?]) ],
+               [],
+               [
+#include <sys/types.h>
+#include <sys/socket.h>
+])
+
+AC_CHECK_MEMBER([struct sockaddr.sin_len],
+               [ AC_DEFINE(HAVE_SOCKADDR_SIN_LEN, 1, [Do we have sockaddr.sin_len?]) ],
                [],
                [
 #include <sys/types.h>
@@ -386,7 +414,7 @@ AC_TRY_COMPILE([#include <sys/types.h>
        AC_MSG_RESULT(no))
 
 AC_CHECK_MEMBER([struct sockaddr_in6.sin6_scope_id],
-               [ AC_DEFINE(HAVE_SOCKADDR_IN6_SCOPE_ID) ],
+               [ AC_DEFINE(HAVE_SOCKADDR_IN6_SCOPE_ID, 1, [Do we have sockaddr_in6.sin6_scope_id?]) ],
                [],
                [
 #include <sys/types.h>