X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=configure.ac;h=70490cac6852811380254a311e043c98d232ebb6;hb=f3cf850f2bd74afbe32dc72b18af9c9da39552ff;hp=4fba67e680cdf0c013cb511541d2e17507b39fa3;hpb=596904cf07f08b3c28898a4c397eb1caf9aa9873;p=mmh

diff --git a/configure.ac b/configure.ac
index 4fba67e..70490ca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,7 +34,7 @@ dnl Do you want to disable use of locale functions
 AH_TEMPLATE([LOCALE],
 [Undefine if you don't want locale features.  By default this is defined.])
 AC_ARG_ENABLE([locale],
-  [AC_HELP_STRING([--disable-locale], [turn off locale features])],
+  [AS_HELP_STRING([--disable-locale], [turn off locale features])],
   [AS_IF([test x$enableval = xyes], [AC_DEFINE(LOCALE)])],
   [AC_DEFINE(LOCALE)])
 
@@ -93,8 +93,8 @@ else
 fi
 
 dnl Should we use a locking directory?
-AC_ARG_ENABLE([lockdir], [
-  AS_HELP_STRING([--enable-lockdir=dir], [Store dot-lock files in "dir"])], [
+AC_ARG_ENABLE([lockdir],
+  [AS_HELP_STRING([--enable-lockdir=dir], [Store dot-lock files in "dir"])], [
   AS_IF([test "x$enableval" = xyes],[
     AC_MSG_ERROR([--enable-lockdir requires an argument])])
   AS_IF([test "x$LOCKTYPE" != xdot],[
@@ -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 -a x"$DISABLE_SETGID_MAIL" != x0; 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
@@ -424,7 +430,7 @@ AC_CHECK_HEADER([sys/ptem.h], AC_DEFINE(WINSIZE_IN_PTEM,1,
 dnl ---------------
 dnl CHECK FUNCTIONS
 dnl ---------------
-AC_CHECK_FUNCS([wcwidth mbtowc writev lstat nl_langinfo])
+AC_CHECK_FUNCS([wcwidth mbtowc writev lstat nl_langinfo getutxent])
 
 dnl Check for multibyte character set support
 if test "x$ac_cv_header_wchar_h" = "xyes" -a "x$ac_cv_header_wctype_h" = "xyes" \