Just removed some useless whitespace that [X]Emacs' Make mode highlights as

[mmh] / configure.in

diff --git a/configure.in b/configure.in
index 6b4e237..6b3367f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -7,6 +7,8 @@ dnl
 AC_INIT(h/nmh.h)
 AC_CONFIG_HEADER(config.h)
 
+AC_CANONICAL_SYSTEM
+
 dnl What version of nmh are we building?
 VERSION=`sed -e 's/nmh-//' ${srcdir}/VERSION`
 echo "configuring for nmh-$VERSION"
@@ -149,6 +151,10 @@ AC_PROG_RANLIB             dnl Check for `ranlib'
 AC_PROG_AWK             dnl Check for mawk,gawk,nawk, then awk
 AC_PROG_LEX             dnl Check for lex/flex
 
+dnl Look for `cut'
+pathtmp=/usr/bin:/bin:/usr/local/bin:/usr/xpg4/bin:/usr/ucb
+AC_PATH_PROG(cutpath, cut, no, [$pathtmp])
+
 dnl Check for lorder and tsort commands
 AC_CHECK_PROG(LORDER, lorder, lorder, no)dnl
 AC_CHECK_PROG(TSORT, tsort, tsort, no)dnl
@@ -161,9 +167,9 @@ if test x$ac_cv_prog_LORDER != xlorder -o x$ac_cv_prog_TSORT != xtsort; then
   AC_SUBST(TSORT)dnl
 fi
 
-dnl Look for `sendmail'
-pathtmp=/usr/lib:/usr/sbin:/usr/etc:/usr/ucblib:/usr/bin:/bin
-AC_PATH_PROG(sendmailpath, sendmail, no, [$pathtmp])
+dnl Look for `ls'
+pathtmp=/usr/bin:/bin:/usr/local/bin:/usr/xpg4/bin:/usr/ucb
+AC_PATH_PROG(lspath, ls, no, [$pathtmp])
 
 dnl Look for `more'
 pathtmp=/usr/bin:/bin:/usr/ucb:/usr/local/bin
@@ -176,6 +182,10 @@ if test -z "$pagerpath"; then
 fi
 AC_SUBST(pagerpath)dnl
 
+dnl Look for `sendmail'
+pathtmp=/usr/lib:/usr/sbin:/usr/etc:/usr/ucblib:/usr/bin:/bin
+AC_PATH_PROG(sendmailpath, sendmail, no, [$pathtmp])
+
 dnl Look for `vi'
 pathtmp=/usr/bin:/bin:/usr/ucb:/usr/local/bin
 AC_PATH_PROG(vipath, vi, no, [$pathtmp])
@@ -201,9 +211,9 @@ if test "$nmh_cv_attvibug" = yes; then
   AC_DEFINE(ATTVIBUG)
 fi
 
-dnl ---------------
-dnl FIND MAIL SPOOL
-dnl ---------------
+dnl ----------------------------------------------------------
+dnl FIND MAIL SPOOL AND SEE IF WE NEED TO MAKE inc SETGID MAIL
+dnl ----------------------------------------------------------
 AC_CACHE_CHECK(where mail spool is located, nmh_cv_mailspool,
 [for mailspool in /var/mail        dnl
                   /var/spool/mail  dnl
@@ -217,6 +227,24 @@ nmh_cv_mailspool=$mailspool
 mailspool=$nmh_cv_mailspool
 AC_SUBST(mailspool)dnl
 
+dnl See whether the mail spool directory is world-writable.
+if test "$lspath" != "no" -a "$cutpath" != "no"; then
+  AC_CACHE_CHECK(whether the mail spool is world-writable, 
+                nmh_cv_mailspool_world_writable,
+  [if test "`$lspath -dl $mailspool | $cutpath -c9`" = "-"; then
+    nmh_cv_mailspool_world_writable=no
+  else
+    nmh_cv_mailspool_world_writable=yes
+  fi])
+fi
+
+dnl ...If it's not, we need to #define MAILGROUP to 1 and make inc setgid mail.
+if test "$nmh_cv_mailspool_world_writable" = "no"; then
+  AC_DEFINE(MAILGROUP)
+  SETGID_MAIL=1
+fi
+AC_SUBST(SETGID_MAIL)dnl
+
 dnl ------------------
 dnl CHECK HEADER FILES
 dnl ------------------
@@ -269,15 +297,23 @@ dnl ---------------
 dnl CHECK FUNCTIONS
 dnl ---------------
 AC_FUNC_VFORK
+AC_CHECK_LIB(mkstemp,mkstemp)
 AC_CHECK_FUNCS(waitpid wait3 sigaction sigprocmask sigblock sigsetmask \
-               sighold sigrelse writev lstat uname tzset killpg \
-               sigsetjmp)
+               sighold sigrelse writev lstat uname tzset killpg mkstemp)
+
+dnl sigsetjmp may be a macro
+AC_MSG_CHECKING(for sigsetjmp)
+AC_TRY_LINK([#include <setjmp.h>], [sigsetjmp((void *)0, 0);],
+        [AC_DEFINE(HAVE_SIGSETJMP) AC_MSG_RESULT(yes)], AC_MSG_RESULT(no))
 
 AC_REPLACE_FUNCS(snprintf strerror strdup)
 
 dnl -------------------
 dnl CHECK FOR LIBRARIES
 dnl -------------------
+dnl Check location of modf
+AC_CHECK_FUNC(modf, , AC_CHECK_LIB(m, modf))
+
 dnl Checks for network libraries (nsl, socket)
 AC_CHECK_NETLIBS
 
@@ -291,6 +327,7 @@ for lib in $termcap_curses_order; do
 done
 AC_SUBST(TERMLIB)dnl
 
+
 dnl --------------
 dnl CHECK FOR NDBM
 dnl --------------
@@ -480,6 +517,61 @@ SIGNAL_H=$nmh_cv_path_signal_h
 AC_SUBST(SIGNAL_H)dnl
 
 dnl ----------------
+dnl OS SPECIFIC DEFINES
+dnl ----------------
+case "$target_os" in
+
+  solaris2*)
+    AC_DEFINE(SYS5)
+    AC_DEFINE(SVR4)
+    ;;
+  irix*)
+    AC_DEFINE(SYS5)
+    AC_DEFINE(SVR4)
+    ;;
+  osf*)
+    AC_DEFINE(SYS5)
+    AC_DEFINE(SVR4)
+    ;;
+  aix*)
+    AC_DEFINE(SYS5)
+    AC_DEFINE(SVR4)
+    ;;
+  sunos4*)
+    AC_DEFINE(BIND)
+    AC_DEFINE(BSD42)
+    ;;
+  linux*)
+    AC_DEFINE(LINUX_STDIO)
+    ;;
+  freebsd*)  
+    AC_DEFINE(BIND)
+    AC_DEFINE(BSD42)
+    AC_DEFINE(BSD44)
+    ;;
+  netbsd*)
+    AC_DEFINE(BIND)
+    AC_DEFINE(BSD42)
+    AC_DEFINE(BSD44)
+    ;;
+  openbsd*)
+    AC_DEFINE(BIND)
+    AC_DEFINE(BSD42)
+    AC_DEFINE(BSD44)
+    ;;
+  bsd/os*)
+    AC_DEFINE(BIND)
+    AC_DEFINE(BSD42)
+    AC_DEFINE(BSD44)
+    ;;
+  sco5*)
+    AC_DEFINE(SYS5)
+    AC_DEFINE(SCO_5_STDIO)
+    ;;
+esac
+
+
+dnl ----------------
 dnl OUTPUT MAKEFILES
 dnl ----------------
 AC_OUTPUT(Makefile config/Makefile h/Makefile sbr/Makefile uip/Makefile \
@@ -498,6 +590,7 @@ echo "
 nmh configuration
 -----------------
 nmh version               : ${VERSION}
+target os                 : ${target}
 compiler                  : ${CC}
 compiler flags            : ${CFLAGS}
 linker flags              : ${LDFLAGS}