X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=configure.ac;h=ee79a0a578ec4bb16d634c82c060af3d727492ea;hb=af586ebe59b73c23b2291624ab0015913c5a3687;hp=49221ff373d4fe840d9d07c8937bf16c08280c67;hpb=393c9290adc27e6d85b780c2434f51f95ea6df5b;p=mmh

diff --git a/configure.ac b/configure.ac
index 49221ff..ee79a0a 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)])
 
@@ -71,6 +71,12 @@ AC_DEFINE_UNQUOTED([BACKUP_PREFIX], "$backup_prefix",
     [The prefix that is prepended to the name of message files when they are "removed" by rmm. This should typically be `,' or `#'.])dnl
 
 dnl What method of locking to use?
+AS_CASE(["$host_os"],
+  [aix*|cygwin*|linux*],
+    [default_locktype="fcntl"; default_locking=FCNTL_LOCKING],
+  [freebsd*], [default_locktype="flock"; default_locking=FLOCK_LOCKING],
+  [default_locktype="dot"; default_locking=DOT_LOCKING])
+
 AC_ARG_WITH(locking,
   AS_HELP_STRING([--with-locking=@<:@dot|fcntl|flock|lockf@:>@],
   [specify the file locking method]))
@@ -88,13 +94,13 @@ elif test x"$with_locking" = x"fcntl"; then
   LOCKTYPE="fcntl"
   AC_DEFINE(FCNTL_LOCKING, 1, [Define to use fnctl() based locking.])dnl
 else
-  LOCKTYPE="dot"
-  AC_DEFINE(DOT_LOCKING)dnl
+  LOCKTYPE="$default_locktype"
+  AC_DEFINE_UNQUOTED($default_locking, 1)dnl
 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],[
@@ -168,6 +174,19 @@ if test "$nmh_cv_has_unusedmacros" = 'yes'; then
 fi
 AC_SUBST(DISABLE_UNUSED_MACROS_WARNING)dnl
 
+AC_CACHE_CHECK([whether compiler supports -Wno-sign-compare],
+  [nmh_cv_has_nosigncompare],
+  [nmh_saved_cppflags="$CPPFLAGS"
+   CPPFLAGS="$CPPFLAGS -Wno-sign-compare"
+   AC_TRY_COMPILE([],[],nmh_cv_has_nosigncompare=yes,
+                  nmh_cv_has_nosigncompare=no)
+   CPPFLAGS="$nmh_saved_cppflags"])
+
+if test "$nmh_cv_has_nosigncompare" = 'yes'; then
+  DISABLE_SIGN_COMPARE_WARNING=-Wno-sign-compare
+fi
+AC_SUBST(DISABLE_SIGN_COMPARE_WARNING)dnl
+
 AC_CACHE_CHECK([whether compiler supports -Wextra], [nmh_cv_has_wextra],
 [nmh_saved_cflags="$CFLAGS"
  CFLAGS="$CFLAGS -Wextra -Wno-clobbered"
@@ -189,16 +208,18 @@ dnl also use -Wno-pointer-sign, because gcc 4 now produces a lot of new
 dnl warnings which are probably mostly spurious and which in any case we
 dnl don't want to deal with now.
 if test "$nmh_cv_has_noptrsign" = "yes"; then
+    nmh_gcc_common_flags="-ansi -pedantic -Wall"
     if test "$nmh_cv_has_wextra" = "yes"; then
-        nmh_gcc_warnflags="-Wall -Wextra -Wno-clobbered -Wno-pointer-sign"
+        nmh_gcc_warnflags="${nmh_gcc_common_flags} -Wextra -Wno-clobbered "\
+"-Wno-pointer-sign"
     else
-        nmh_gcc_warnflags="-Wall -Wno-pointer-sign"
+        nmh_gcc_warnflags="${nmh_gcc_common_flags} -Wno-pointer-sign"
     fi
 else
     if test "$nmh_cv_has_wextra" = "yes"; then
-        nmh_gcc_warnflags="-Wall -Wextra -Wno-clobbered"
+        nmh_gcc_warnflags="${nmh_gcc_common_flags} -Wextra -Wno-clobbered"
     else
-        nmh_gcc_warnflags="-Wall"
+        nmh_gcc_warnflags="${nmh_gcc_common_flags}"
     fi
 fi
 
@@ -349,6 +370,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
@@ -411,7 +438,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" \