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 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
dnl ---------------
dnl CHECK FUNCTIONS
dnl ---------------
-AC_CHECK_FUNCS(lstat 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)
-NMH_CHECK_NETLIBS
-
termcap_curses_order="termcap curses ncurses"
for lib in $termcap_curses_order; do
AC_CHECK_LIB(${lib}, tgetent, [TERMLIB="-l$lib"; break])
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