X-Git-Url: http://git.marmaro.de/?a=blobdiff_plain;f=configure.ac;h=c3ebacf08d60cbad6637bc8431b8abe72626137c;hb=9c6b9968baa6313051ea2eb2d69e220186004e1c;hp=a0602df339ea865215fd9c656bbea617f36cf630;hpb=48959daf724bb10802ca489654035f69e701efc0;p=mmh

diff --git a/configure.ac b/configure.ac
index a0602df..c3ebacf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,7 +8,7 @@ AC_PREREQ([2.61])
 AC_INIT([nmh], m4_normalize(m4_include([VERSION])), [nmh-workers@nongnu.org])
 AC_CONFIG_SRCDIR([h/nmh.h])
 AC_CONFIG_HEADER([config.h])
-AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
+AM_INIT_AUTOMAKE([-Wall foreign subdir-objects])
 
 AC_CANONICAL_HOST
 
@@ -74,7 +74,7 @@ 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],
+  [freebsd*|openbsd*|darwin*], [default_locktype="flock"; default_locking=FLOCK_LOCKING],
   [default_locktype="dot"; default_locking=DOT_LOCKING])
 
 AC_ARG_WITH(locking,
@@ -111,11 +111,13 @@ AC_ARG_ENABLE([lockdir],
 
 dnl What method of posting should post use?
 AC_ARG_WITH([mts],
-  AS_HELP_STRING([--with-mts=@<:@smtp|sendmail@:>@],
+  AS_HELP_STRING([--with-mts=@<:@smtp|sendmail/smtp|sendmail/pipe@:>@],
   [specify the default mail transport agent/service]))
 
 AS_IF([test x"$with_mts" = x"smtp"], [MTS="smtp"],
-      [test x"$with_mts" = x"sendmail"], [MTS="sendmail"],
+      [test x"$with_mts" = x"sendmail"], [MTS="sendmail/smtp"],
+      [test x"$with_mts" = x"sendmail/smtp"], [MTS="sendmail/smtp"],
+      [test x"$with_mts" = x"sendmail/pipe"], [MTS="sendmail/pipe"],
       [MTS="smtp"])
 AC_SUBST([MTS])dnl
 
@@ -199,6 +201,25 @@ AC_CACHE_CHECK([whether compiler supports -Wno-pointer-sign], [nmh_cv_has_noptrs
  AC_TRY_COMPILE([],[],nmh_cv_has_noptrsign=yes,nmh_cv_has_noptrsign=no)
  CFLAGS="$nmh_saved_cflags"])
 
+dnl Can't use -ansi with gcc 4.5.3 on Cygwin, at least through setup
+dnl setup version 2.763, because it disables some features in the
+dnl system system header files and warns about them with -Wall.  Try
+dnl to test for that generally, though still with gcc.
+if test "$GCC" = yes; then
+  AC_CACHE_CHECK([whether we can use -ansi with gcc], [nmh_cv_has_dash_ansi],
+    [nmh_saved_cppflags="$CPPFLAGS"
+     nmh_saved_cflags="$CFLAGS"
+     CPPFLAGS="-D_GNU_SOURCE"
+     CFLAGS="-ansi -Wall -Werror"
+     AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include <time.h>],[tzset();])],
+       [nmh_cv_has_dash_ansi=yes],
+       [nmh_cv_has_dash_ansi=no])
+     CPPFLAGS="$nmh_saved_cppflags"
+     CFLAGS="$nmh_saved_cflags"])
+else
+  nmh_cv_has_dash_ansi=no
+fi
+
 dnl if the user hasn't specified CFLAGS, then
 dnl   if compiler is gcc, then
 dnl    use -O2 and some warning flags
@@ -208,7 +229,11 @@ 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_dash_ansi" = "yes"; then
+        nmh_gcc_common_flags="-ansi -pedantic -Wall"
+    else
+        nmh_gcc_common_flags="-Wall"
+    fi
     if test "$nmh_cv_has_wextra" = "yes"; then
         nmh_gcc_warnflags="${nmh_gcc_common_flags} -Wextra -Wno-clobbered "\
 "-Wno-pointer-sign"
@@ -327,12 +352,12 @@ dnl then use `vi' as the default.
 AS_IF([test -z "$editorpath"], [editorpath="$vipath"])
 AC_SUBST([editorpath])dnl
 
-dnl Cygwin FAT filesystems do not support hard links.  So use cp instead,
-dnl even if running on an NTFS or other filesystem.
+dnl Cygwin FAT filesystems do not support hard links.  So default to
+dnl cp instead, even if running on an NTFS or other filesystem.
 AS_CASE(["$host_os"],
-  [cygwin*],[LINK_FILE=cp],
-  [LINK_FILE=ln])
-AC_SUBST([LINK_FILE])
+  [cygwin*],[LN=cp],
+  [LN=ln])
+AC_SUBST([LN])
 
 dnl ----------------------------------------------------------
 dnl FIND MAIL SPOOL AND SEE IF WE NEED TO MAKE inc SETGID MAIL
@@ -794,4 +819,5 @@ dnl ---------------
 dnl OUTPUT MAKEFILE
 dnl ---------------
 AC_CONFIG_FILES([Makefile test/common.sh])
+AC_CONFIG_FILES([uip/spost], [chmod +x uip/spost])
 AC_OUTPUT