Use realpath to find the mailspool

[mmh] / configure.ac

diff --git a/configure.ac b/configure.ac
index 04f23d1..b8f41f2 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@ AC_PREREQ(2.61)
 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
@@ -46,28 +46,6 @@ if test x"$enable_nmh_debug" = x"yes"; 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@:>@],
@@ -165,6 +143,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 `realpath'
+pathtmp=/bin:/usr/bin:/usr/local/bin
+AC_PATH_PROG(realpathpath, realpath, no, [$pathtmp])
+
 dnl Look for `cut'
 pathtmp=/usr/bin:/bin:/usr/local/bin:/usr/xpg4/bin:/usr/ucb
 AC_PATH_PROG(cutpath, cut, no, [$pathtmp])
@@ -261,6 +243,7 @@ AC_CACHE_CHECK(where mail spool is located, nmh_cv_mailspool,
                   /usr/spool/mail  dnl
                   /dev/null;       dnl Just in case we fall through
 do
+  mailspool = $realpathpath $mailspool;
   test -d $mailspool && break
 done
 nmh_cv_mailspool=$mailspool
@@ -359,7 +342,7 @@ AC_CHECK_HEADER([sys/ptem.h], AC_DEFINE(WINSIZE_IN_PTEM,1,
 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