dnl (I was able to configure with autoconf-2.59 --meillo 2012-03-22)
AC_INIT(mmh, m4_normalize(m4_include([VERSION])))
-AC_CONFIG_SRCDIR(h/nmh.h)
+AC_CONFIG_SRCDIR(h/mh.h)
AC_CONFIG_HEADER(config.h)
AC_CANONICAL_TARGET
dnl define a macro or two
dnl ---------------------
-AC_DEFUN(NMH_PROG_GNU_LIBTOOL, [
+AC_DEFUN([NMH_PROG_GNU_LIBTOOL], [
if test -n "$LIBTOOL" ; then
tmptest=`$LIBTOOL --version 2>&1 | grep GNU`
if test x"$tmptest" != x ; then
enable_debug=yes
fi
-dnl Do you want mhe support?
-AC_ARG_ENABLE(mhe,
- AS_HELP_STRING([--disable-mhe],[disable mhe support]))
-
-dnl mhe support is on by default, so define it unless --disable-mhe or the
-dnl deprecated, undocumented --disable-nmh-mhe are specified.
-if test x"$enable_mhe" != x"no" -a x"$enable_nmh_mhe" != x"no"; then
- AC_DEFINE(MHE, 1,
- [Define to compile in support for the Emacs front-end mh-e.])dnl
-fi
-
-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]),
-[if test x$enableval = xyes; then
- AC_DEFINE(LOCALE)
-fi],
-AC_DEFINE(LOCALE)
-)
-
dnl What method of locking to use?
AC_ARG_WITH(locking,
AS_HELP_STRING([--with-locking=@<:@dot|fcntl|flock|lockf@:>@],
AC_DEFINE(DOT_LOCKING)dnl
fi
+dnl Should we use a locking directory?
+AC_ARG_WITH(lockdir,
+ AS_HELP_STRING([--with-lockdir=dir], [Store dot-lock files in "dir"]), [
+ AS_IF([test "x$with_lockdir" = xyes],[
+ AC_MSG_ERROR([--with-lockdir requires an argument])])
+])
+
+if test x"$with_lockdir" != x; then
+ LOCKDIR="$with_lockdir"
+ AC_DEFINE_UNQUOTED(LOCKDIR, ["$with_lockdir"],
+ [Directory to store dot-locking lock files.])dnl
+fi
+
dnl ----------------------------------------------------
dnl Default location is /usr/local/mmh/{bin,etc,lib,share/man}
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 -dlL $mailspool | $cutpath -c9`" = "-"; then
+ [if test "`$lspath -dl $mailspool/ | $cutpath -c9`" = "-"; then
nmh_cv_mailspool_world_writable=no
else
nmh_cv_mailspool_world_writable=yes
AC_SUBST(OURDEFS)
AC_HEADER_STDC
-AC_HEADER_TIME
AC_HEADER_TIOCGWINSZ
AC_CHECK_HEADERS(fcntl.h crypt.h termcap.h \
langinfo.h wchar.h wctype.h iconv.h \
dnl ---------------
dnl CHECK FUNCTIONS
dnl ---------------
-AC_CHECK_FUNCS(sigaction sigprocmask sigblock sigsetmask \
- sighold sigrelse lstat tzset \
- getutent nl_langinfo mbtowc wcwidth)
+AC_CHECK_FUNCS(nl_langinfo mbtowc wcwidth)
dnl Look for the initgroups() declaration. On AIX 4.[13], Solaris 4.1.3, and
dnl ULTRIX 4.2A the function is defined in libc but there's no declaration in
dnl Check location of modf
AC_CHECK_FUNC(modf, , AC_CHECK_LIB(m, modf))
-dnl Checks for network libraries (nsl, socket)
-AC_CHECK_NETLIBS
-
-termcap_curses_order="termcap curses ncurses"
+termcap_curses_order="termcap curses ncurses tinfo"
for lib in $termcap_curses_order; do
AC_CHECK_LIB(${lib}, tgetent, [TERMLIB="-l$lib"; break])
done
AC_SUBST(TERMLIB)dnl
+if test "x$TERMLIB" = "x"; then
+ echo 'Could not find tgetent() in any library.'
+ echo 'Is there a ncurses-devel package that you can install?'
+ exit 1
+fi
+
dnl ---------------
dnl CHECK FOR ICONV
AC_TYPE_MODE_T
AC_TYPE_SIZE_T
-dnl Check for sigset_t. Currently I'm looking in
-dnl <sys/types.h> and <signal.h>. Others might need
-dnl to be added.
-AC_CACHE_CHECK(for sigset_t, nmh_cv_type_sigset_t,
-[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
-#include <signal.h>]], [[sigset_t tempsigset;]])],
-nmh_cv_type_sigset_t=yes,nmh_cv_type_sigset_t=no)])
-if test $nmh_cv_type_sigset_t = no; then
- AC_DEFINE(sigset_t, unsigned int,
- [Define to `unsigned int' if <sys/types.h> or <signal.h> doesn't define.])
-fi
-
dnl ----------------
dnl CHECK STRUCTURES
dnl ----------------
-AC_CHECK_MEMBERS(struct tm.tm_gmtoff,,,
- [#ifdef TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# ifdef TM_IN_SYS_TIME
-# include <sys/time.h>
-# else
-# include <time.h>
-# endif
-#endif])
-
-AC_CHECK_MEMBERS(struct utmp.ut_type,,,[#include <utmp.h>])
+dnl For platforms such as FreeBSD that have tm_gmtoff in struct tm.
+dnl (FreeBSD has a timezone() function but not a timezone global
+dnl variable that is visible).
+AC_CHECK_MEMBERS([struct tm.tm_gmtoff],,,[#include <time.h>])
AC_STRUCT_DIRENT_D_TYPE
-dnl -------------
-dnl CHECK SIGNALS
-dnl -------------
-dnl What style of signal do you have (POSIX, BSD, or SYSV)?
-AH_TEMPLATE(RELIABLE_SIGNALS, [Define to 1 if you have reliable signals.])
-AC_MSG_CHECKING(what style of signals to use)
-if test $ac_cv_func_sigaction = yes -a $ac_cv_func_sigprocmask = yes; then
- signals_style=POSIX_SIGNALS
- AC_DEFINE(POSIX_SIGNALS, 1,
- [Define to 1 if you use POSIX style signal handling.])
- AC_DEFINE(RELIABLE_SIGNALS)
-elif test $ac_cv_func_sigblock = yes -a $ac_cv_func_sigsetmask = yes; then
- signals_style=BSD_SIGNALS
- AC_DEFINE(BSD_SIGNALS,1,
- [Define to 1 if you use BSD style signal handling (and can block signals).])
- AC_DEFINE(RELIABLE_SIGNALS)
-elif test $ac_cv_func_sighold = yes -a $ac_cv_func_sigrelse = yes; then
- signals_style=SYSV_SIGNALS
- AC_DEFINE(SYSV_SIGNALS,1,
- [Define to 1 if you use SYSV style signal handling (and can block signals).])
-else
- signals_style=NO_SIGNAL_BLOCKING
- AC_DEFINE(NO_SIGNAL_BLOCKING,1,
- [Define to 1 if you have no signal blocking at all (bummer).])
-fi
-
-AC_MSG_RESULT($signals_style)
-
dnl Where is <signal.h> located? Needed as input for signames.awk
AC_CACHE_CHECK(where signal.h is located, nmh_cv_path_signal_h,
[for SIGNAL_H in /usr/include/bsd/sys/signal.h dnl Next
SIGNAL_H=$nmh_cv_path_signal_h
AC_SUBST(SIGNAL_H)dnl
-dnl ----------------
-dnl OS SPECIFIC DEFINES
-dnl ----------------
-AH_TEMPLATE(BSD42, [Defined for SunOS 4, FreeBSD, NetBSD, OpenBSD, BSD/OS, Mac OS X/Rhapsody -- does PicoBSD have uname?])
-AH_TEMPLATE(SCO_5_STDIO, [Defined for SCO5.])
-
-case "$target_os" in
-
- sunos4*)
- AC_DEFINE(BSD42)
- ;;
- freebsd*)
- AC_DEFINE(BSD42)
- ;;
- netbsd*)
- AC_DEFINE(BSD42)
- ;;
- openbsd*)
- AC_DEFINE(BSD42)
- ;;
- bsd/os*)
- AC_DEFINE(BSD42)
- ;;
- sco5*)
- AC_DEFINE(SCO_5_STDIO)
- ;;
-esac
-
dnl ----------------
dnl OUTPUT MAKEFILES
dnl ----------------
AC_CONFIG_FILES(Makefile config/Makefile h/Makefile sbr/Makefile uip/Makefile \
- etc/Makefile docs/Makefile man/Makefile)
+ etc/Makefile man/Makefile)
AC_CONFIG_COMMANDS([stamp],[test -z "$CONFIG_HEADERS" || echo > stamp-h])
AC_OUTPUT
eval "nmhlib=${libdir}"; eval "nmhlib=${nmhlib}"
eval "nmhman=${mandir}"; eval "nmhman=${nmhman}"
-echo "
+cat <<!
mmh configuration
-----------------
mmh version : AC_PACKAGE_VERSION
mail spool : ${mailspool}
file locking type : ${LOCKTYPE}
-"
+!
+if test x"$LOCKTYPE" = x"dot" && test x"$LOCKDIR" != x; then
+ echo "lockfile directory : ${LOCKDIR}"
+fi
projects / mmh / blobdiff