Disable setgid of inc (SETGID_MAIL=1) when running distcheck.

(cherry picked from commit 9ba93ac9c535b678bb602094997a797ba8b33666)

diff --git a/Makefile.am b/Makefile.am
index e68973d1402ebdac050bfb7bd20fb6591b3fdf30..7326a5bf4efd6a9ceaa5cccf542769dab97f4083 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -73,6 +73,7 @@ TESTS = test/bad-input/test-header \
 
 check_SCRIPTS = test/common.sh
 check_PROGRAMS = test/getfullname test/getfqdn test/fakesmtp
+DISTCHECK_CONFIGURE_FLAGS = DISABLE_SETGID_MAIL=1
 
 ##
 ## Stuff that should be cleaned via "make clean"

diff --git a/configure.ac b/configure.ac
index 26b26066a5822e5a59f58046f2ee67d5be5893c1..5e9cae266e42188bb9a511d2bb509035e9619488 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -362,6 +362,12 @@ if test "$ac_cv_lib_lockfile_lockfile_create" != "no" ; then
   fi
 fi
 
+dnl Provide a way for distcheck to disable setgid_mail via
+dnl DISTCHECK_CONFIGURE_FLAGS.
+if test x"$DISABLE_SETGID_MAIL" != x; then
+  nmh_cv_dotlockfile_setgid=yes
+fi
+
 dnl If mailspool is not world-writable and dotlockfile is not setgid,
 dnl we need to #define MAILGROUP to 1 and make inc setgid.
 if test x"$LOCKTYPE" = x"dot" -a x"$nmh_cv_mailspool_world_writable" = x"no" -a x"$nmh_cv_dotlockfile_setgid" != x"yes" ; then