configure.ac: Don't check for vfork and wait3 when we don't use them (anymore).

[mmh] / configure.ac

diff --git a/configure.ac b/configure.ac
index 3de6bf6..806214c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -45,17 +45,6 @@ if test x"$enable_nmh_debug" = x"yes"; then
   enable_debug=yes
 fi
 
-dnl Allow users to send email from addresses other than their default?
-AC_ARG_ENABLE(masquerade,
-  AS_HELP_STRING([--enable-masquerade='draft_from mmailid username_extension'],
-    [enable up to 3 types of address masquerading]),
-  [if test x"$enable_masquerade" = x"yes"; then
-    masquerade="draft_from mmailid username_extension"
-  else
-    masquerade="$enable_masquerade"
-  fi], [masquerade="draft_from mmailid username_extension"])
-AC_SUBST(masquerade)dnl
-
 dnl Do you want mhe support?
 AC_ARG_ENABLE(mhe,
   AS_HELP_STRING([--disable-mhe],[disable mhe support]))
@@ -375,9 +364,8 @@ AC_CHECK_HEADER([sys/ptem.h], AC_DEFINE(WINSIZE_IN_PTEM,1,
 dnl ---------------
 dnl CHECK FUNCTIONS
 dnl ---------------
-AC_FUNC_VFORK
 AC_CHECK_LIB(mkstemp,mkstemp)
-AC_CHECK_FUNCS(waitpid wait3 sigaction sigprocmask sigblock sigsetmask \
+AC_CHECK_FUNCS(waitpid sigaction sigprocmask sigblock sigsetmask \
                sighold sigrelse lstat uname tzset killpg mkstemp \
                getutent nl_langinfo mbtowc wcwidth)
 
@@ -479,69 +467,6 @@ if test "x$ac_found_iconv" = "xyes"; then
     [Define as const if the declaration of iconv() needs const.])
 fi
 
-dnl --------------
-dnl CHECK FOR NDBM
-dnl --------------
-
-AC_ARG_WITH([ndbm],AS_HELP_STRING([--with-ndbm=ARG],[use -lARG to link with ndbm]),
-            [nmh_ndbm=$withval],[nmh_ndbm=autodetect])
-AC_ARG_WITH([ndbmheader],AS_HELP_STRING([--with-ndbmheader=ARG],[#include <ARG> to use ndbm]),
-            [nmh_ndbmheader=$withval],[nmh_ndbmheader=autodetect])
-
-if test "$nmh_ndbm" = "autodetect"; then
-  if test "$nmh_ndbmheader" != "autodetect"; then
-    AC_MSG_ERROR([must specify both --with-ndbm and --with-ndbmheader or neither])
-  else
-
-    dnl There are at least four implementations of ndbm, and
-    dnl several of those can be in different places at the whim
-    dnl of the system integrator. A good summary of this mess
-    dnl can be found at http://www.unixpapa.com/incnote/dbm.html
-
-    dnl Classic ndbm with no library required (eg NetBSD): try this
-    dnl first so we don't accidentally link in a pointless but harmless
-    dnl library in one of the later ndbm.h+libfoo tests:
-    NMH_CHECK_NDBM(ndbm.h,,,
-    dnl Berkeley DBv2 emulating ndbm: header in db.h:
-      NMH_CHECK_NDBM(db.h,db,,
-    dnl Berkeley DBv1 emulating ndbm:
-        NMH_CHECK_NDBM(ndbm.h,db,,
-          NMH_CHECK_NDBM(ndbm.h,db1,,
-    dnl Classic ndbm:
-            NMH_CHECK_NDBM(ndbm.h,ndbm,,
-    dnl glibc2.1 systems put db1 in a subdir:
-              NMH_CHECK_NDBM(db1/ndbm.h,db1,,
-    dnl GNU gdbm emulating ndbm, with header possibly in gdbm/
-    dnl and possibly needing gbdm_compat library:
-                NMH_CHECK_NDBM(gdbm/ndbm.h,gdbm,,
-                  NMH_CHECK_NDBM(gdbm/ndbm.h,gdbm_compat -lgdbm,,
-                    NMH_CHECK_NDBM(ndbm.h,gdbm,,
-                      NMH_CHECK_NDBM(ndbm.h,gdbm_compat -lgdbm))))))))))
-
-  fi
-else
-  dnl We don't really need to check that the user-specified values work,
-  dnl but it is a convenience to the user to bomb out early rather than
-  dnl after configure and half the compile process.
-  NMH_CHECK_NDBM([$nmh_ndbmheader],[$nmh_ndbm])
-fi
-
-if test "$nmh_ndbm_found" = "no"; then
-  AC_MSG_ERROR([could not find a working ndbm library/header combination])
-else
-  dnl Now export the lib/header to our makefile/config.h:
-  if test x"$nmh_ndbmheader" != x; then
-    AC_DEFINE_UNQUOTED(NDBM_HEADER, <$nmh_ndbmheader>,
-      [Define to the header containing the ndbm API prototypes.])
-  fi
-  if test x"$nmh_ndbm" != x; then
-    NDBM_LIBS="-l$nmh_ndbm"
-  else
-    NDBM_LIBS=
-  fi
-  AC_SUBST(NDBM_LIBS)
-fi
-
 
 dnl ---------------------
 dnl CHECK TERMCAP LIBRARY
@@ -837,5 +762,4 @@ sendmail path          : ${sendmailpath}
 mail spool             : ${mailspool}
 
 file locking type      : ${LOCKTYPE}
-address masquerading   : ${masquerade}
 "