Index: server-src/Makefile.am
===================================================================
--- server-src/Makefile.am	(révision 2269)
+++ server-src/Makefile.am	(copie de travail)
@@ -63,14 +63,18 @@
 INSTALLPERMS_exec = \
 	dest=$(sbindir) chown=amanda chmod= \
 		$(sbin_PROGRAMS) \
-	chown=root chmod=04750 \
-		amcheck amservice \
 	dest=$(amlibexecdir) chown=amanda chmod= \
 		$(amlibexec_PROGRAMS) \
-		$(amlibexec_SCRIPTS) \
-	chown=root chmod=04750 \
+		$(amlibexec_SCRIPTS)
+
+if WANT_SETUID_SERVER
+INSTALLPERMS_exec += chown=root chmod=04750 \
+		amcheck amservice
+INSTALLPERMS_exec += chown=root chmod=04750 \
 		dumper planner
 
+endif
+
 INSTALLPERMS_data = \
 	dest=$(sbindir) chown=amanda chmod= \
 		$(sbin_SCRIPTS) \
Index: config/amanda/userid.m4
===================================================================
--- config/amanda/userid.m4	(révision 2269)
+++ config/amanda/userid.m4	(copie de travail)
@@ -164,7 +164,14 @@
 [
     SINGLE_USERID=${SINGLE_USERID:-no}
     WANT_SETUID_CLIENT=${WANT_SETUID_CLIENT:-true}
+    WANT_SETUID_SERVER=${WANT_SETUID_SERVER:-true}
 
+    AC_ARG_WITH(setuid-root,
+        AS_HELP_STRING([--with-setuid-root]
+            [force amanda to chown root and setuid programs (default is true) - if set to no, to use together with --with-single-userid=yes]),
+        [   WANT_SETUID_CLIENT==$withval ] [   WANT_SETUID_SERVER==$withval ])
+
+
     AC_ARG_WITH(single-userid,
         AS_HELP_STRING([--with-single-userid]
             [force amanda to run as a single userid (for testing)]),
@@ -173,6 +180,7 @@
     case "$host" in
         *-pc-cygwin)
             WANT_SETUID_CLIENT=false
+            WANT_SETUID_SERVER=false
 	    SINGLE_USERID=yes
             ;;
     esac
@@ -183,6 +191,12 @@
     fi
     AM_CONDITIONAL(WANT_SETUID_CLIENT, test x"$WANT_SETUID_CLIENT" = x"true")
 
+    if test x"$WANT_SETUID_SERVER = x"true"; then
+        AC_DEFINE(WANT_SETUID_SERVER,1,
+            [Define if server should be built setuid-root])
+    fi
+    AM_CONDITIONAL(WANT_SETUID_SERVER, test x"$WANT_SETUID_SERVER = x"true")
+
     if test x"$SINGLE_USERID" = x"yes"; then
         AC_DEFINE(SINGLE_USERID, 1,
 	    [Define if all of Amanda will run as a single userid (e.g., on Cygwin or for installchecks)])