dnl $Id$
dnl
-dnl 2.13 definitely chokes; 2.53 is the earliest version I've tested.
+dnl 2.13 definitely chokes; 2.53 is the earliest version I've tested.
+dnl 2.58 needed for help string macro but that only affects help output
dnl 2.50 is the major breakpoint between the old autoconf and the new,
dnl so require that. If there are bug reports about 2.50-2.52 not working
dnl we can always move this up a little.
dnl --------------------------
dnl Do you want client-side support for apop?
-AC_ARG_ENABLE(apop,
-[ --enable-apop enable client-side support for POP3 and APOP])
+AC_ARG_ENABLE(apop, AS_HELP_STRING([--enable-apop],
+ [enable client-side support for POP3 and APOP]))
if test x"$enable_apop" = x"yes"; then
AC_DEFINE(APOP)dnl
APOPLIB=md5.o
dnl Do you want to debug nmh?
AC_ARG_ENABLE(debug,
-[ --enable-debug enable nmh code debugging])
+ AS_HELP_STRING([--enable-debug],[enable nmh code debugging]))
dnl The old redundant --enable-nmh-debug is deprecated and undocumented.
if test x"$enable_nmh_debug" = x"yes"; then
enable_debug=yes
dnl Allow users to send email from addresses other than their default?
AC_ARG_ENABLE(masquerade,
- [ --enable-masquerade[='draft_from mmailid username_extension']
- enable up to 3 types of address masquerading [none]],
+ 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
dnl Do you want mhe support?
AC_ARG_ENABLE(mhe,
-[ --enable-mhe enable mhe support (DEFAULT)])
+ 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.
dnl Do you want client-side support for pop?
AC_ARG_ENABLE(pop,
-[ --enable-pop enable client-side support for plain POP3])
+ AS_HELP_STRING([--enable-pop], [enable client-side support for plain POP3]))
dnl The old redundant --enable-nmh-pop is deprecated and undocumented.
if test x"$enable_nmh_pop" = x"yes"; then
enable_pop=yes
dnl Do you want client-side support for using SASL for authentication?
dnl Note that this code will be enabled for both POP and SMTP
-AC_ARG_WITH(cyrus-sasl,
-[ --with-cyrus-sasl=<dir> Specify location of Cyrus SASL library for auth])
+AC_ARG_WITH(cyrus-sasl, AS_HELP_STRING([--with-cyrus-sasl=DIR],
+ [specify location of Cyrus SASL library]))
if test x"$with_cyrus_sasl" != x -a x"$with_cyrus_sasl" != x"no"; then
AC_DEFINE(CYRUS_SASL)dnl
sasl_support=yes
dnl What should be the default editor?
AC_ARG_WITH(editor,
-[ --with-editor=EDITOR specify the default editor])
+ AS_HELP_STRING([--with-editor=EDITOR],[specify the default editor]))
if test -n "$with_editor"; then
editorpath="$with_editor"
dnl Set the backup prefix
AC_ARG_WITH([hash-backup],
- [ --with-hash-backup use # as the backup prefix (default: ,)])
+ AS_HELP_STRING([--with-hash-backup],[use # as the backup prefix (default: ,)]))
if test x"$with_hash_backup" != x -a x"$with_hash_backup" != x"no"; then
backup_prefix="#"
else
dnl Do you want support for hesiod
AC_ARG_WITH(hesiod,
-[ --with-hesiod=PREFIX specify location of Hesiod])
+ AS_HELP_STRING([--with-hesiod=DIR],[specify location of Hesiod]))
if test x"$with_hesiod" != x -a x"$with_hesiod" != x"no"; then
AC_DEFINE(HESIOD)dnl
fi
dnl Do you want client-side support for kpop
-AC_ARG_WITH(krb4,
-[ --with-krb4=PREFIX specify location of Kerberos V4 for KPOP support])
+AC_ARG_WITH(krb4, AS_HELP_STRING([--with-krb4=DIR],
+ [specify location of Kerberos V4 for KPOP support]))
if test x"$with_krb4" != x -a x"$with_krb4" != x"no"; then
enable_pop=yes
AC_DEFINE(KPOP)dnl
dnl What method of locking to use?
AC_ARG_WITH(locking,
-[ --with-locking=LOCKTYPE specify the file locking method
- (one of dot, fcntl, flock, lockf)])
+ AS_HELP_STRING([--with-locking=@<:@dot|fcntl|flock|lockf@:>@],
+ [specify the file locking method]))
if test x"$with_locking" = x"dot"; then
LOCKTYPE="dot"
dnl What method of posting should post use?
AC_ARG_WITH(mts,
-[ --with-mts=MTS specify the default mail transport agent/service])
+ AS_HELP_STRING([--with-mts=@<:@smtp|sendmail@:>@],
+ [specify the default mail transport agent/service]))
if test x"$with_mts" = x"smtp"; then
MTS="smtp"
dnl What should be the default pager?
AC_ARG_WITH(pager,
-[ --with-pager=PAGER specify the default pager])
+ AS_HELP_STRING([--with-pager=PAGER],[specify the default pager]))
if test -n "$with_pager"; then
pagerpath="$with_pager"
dnl What should be the default mail server(s)?
AC_ARG_WITH(smtpservers,
-[ --with-smtpservers='SMTPSERVER1[ SMTPSERVER2...]'
- specify the default SMTP server(s) [localhost]])
+ AS_HELP_STRING([--with-smtpservers='SMTPSERVER1@<:@ SMTPSERVER2...@:>@'],
+ [specify the default SMTP server(s) @<:@localhost@:>@]))
if test -n "$with_smtpservers"; then
smtpservers="$with_smtpservers"
else
AC_PROG_CC
+AC_CACHE_CHECK(whether compiler supports -Wno-pointer-sign, nmh_cv_has_noptrsign,
+[nmh_saved_cflags="$CFLAGS"
+ CFLAGS="$CFLAGS -Wno-pointer-sign"
+ AC_TRY_COMPILE([],[],nmh_cv_has_noptrsign=yes,nmh_cv_has_noptrsign=no)
+ CFLAGS="$nmh_saved_cflags"])
+
dnl if the user hasn't specified CFLAGS, then
dnl if compiler is gcc, then
dnl use -O2 and some warning flags
dnl else use -O
+dnl We use -Wall; if the compiler supports it we also use -Wno-pointer-sign,
+dnl because gcc 4 now produces a lot of new warnings which are probably mostly
+dnl spurious and which in any case we don't want to deal with now.
+if test "$nmh_cv_has_noptrsign" = "yes"; then
+ nmh_gcc_warnflags="-Wall -Wno-pointer-sign"
+else
+ nmh_gcc_warnflags="-Wall"
+fi
+
if test -n "$auto_cflags"; then
if test x"$enable_debug" = x"yes"; then
if test -n "$GCC"; then
- test -z "$CFLAGS" && CFLAGS="-Wall -g" || CFLAGS="$CFLAGS -Wall -g"
+ test -z "$CFLAGS" && CFLAGS="$nmh_gcc_warnflags -g" || CFLAGS="$CFLAGS $nmh_gcc_warnflags -g"
else
test -z "$CFLAGS" && CFLAGS=-g || CFLAGS="$CFLAGS -g"
fi
esac
fi
if test -n "$GCC"; then
- test -z "$CFLAGS" && CFLAGS="-Wall -O2" || CFLAGS="$CFLAGS -Wall -O2"
+ test -z "$CFLAGS" && CFLAGS="$nmh_gcc_warnflags -O2" || CFLAGS="$CFLAGS $nmh_gcc_warnflags -O2"
else
test -z "$CFLAGS" && CFLAGS=-O || CFLAGS="$CFLAGS -O"
fi
fi
AC_SUBST(editorpath)dnl
-dnl Check for broken vi
-AC_CACHE_CHECK(for broken vi, nmh_cv_attvibug,
-[if echo 'r /nonexist-file
-q' | ex > /dev/null
-then
- nmh_cv_attvibug=no
-else
- nmh_cv_attvibug=yes
-fi])
-
-if test "$nmh_cv_attvibug" = yes; then
- AC_DEFINE(ATTVIBUG)dnl
-fi
-
dnl ----------------------------------------------------------
dnl FIND MAIL SPOOL AND SEE IF WE NEED TO MAKE inc SETGID MAIL
dnl ----------------------------------------------------------
dnl If mailspool is not world-writable and dotlockfile is not setgid,
dnl we need to #define MAILGROUP to 1 and make inc setgid.
-if test x"$nmh_cv_mailspool_world_writable" = x"no" -a x"$nmh_cv_dotlockfile_setgid" != x"yes" ; then
+if test x"$LOCKTYPE" = x"dot" -a x"$nmh_cv_mailspool_world_writable" = x"no" -a x"$nmh_cv_dotlockfile_setgid" != x"yes" ; then
dnl do we really need both of these?
AC_DEFINE(MAILGROUP)dnl
SETGID_MAIL=1
dnl ------------------
dnl CHECK HEADER FILES
dnl ------------------
+
+dnl On glibc we need to define at least the '_XOPEN_SOURCE' level of features,
+dnl or wchar.h doesn't declare a prototype for wcwidth(). But if we only define
+dnl that level then db.h won't compile. So we define _GNU_SOURCE which turns
+dnl on everything. Perhaps other OSes need some feature switch set to get wcwidth()
+dnl declared; if so they should have an entry added to this case statement.
+dnl NB that we must define this on the compiler command line, not in config.h,
+dnl because it must be set before any system header is included and there's no
+dnl portable way to make sure that files generated by lex include config.h
+dnl before system header files.
+
+case "$target_os" in
+ linux*)
+ # Like DEFS, but doesn't get stomped on by configure when using config.h:
+ OURDEFS="$OURDEFS -D_GNU_SOURCE"
+ ;;
+esac
+AC_SUBST(OURDEFS)
+
AC_HEADER_DIRENT
AC_HEADER_STDC
AC_HEADER_TIME
AC_HEADER_STAT
AC_CHECK_HEADERS(string.h memory.h stdlib.h unistd.h errno.h fcntl.h \
limits.h crypt.h termcap.h termio.h termios.h locale.h \
- langinfo.h netdb.h sys/param.h sys/time.h sys/utsname.h \
- iconv.h sys/stream.h arpa/inet.h arpa/ftp.h)
-
+ langinfo.h wchar.h wctype.h iconv.h netdb.h \
+ sys/param.h sys/time.h sys/utsname.h sys/stream.h \
+ arpa/inet.h arpa/ftp.h)
AC_CACHE_CHECK(POSIX termios, nmh_cv_sys_posix_termios,
[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
AC_CHECK_LIB(mkstemp,mkstemp)
AC_CHECK_FUNCS(waitpid wait3 sigaction sigprocmask sigblock sigsetmask \
sighold sigrelse writev lstat uname tzset killpg mkstemp \
- sethostent getutent nl_langinfo)
+ sethostent getutent nl_langinfo mbtowc wcwidth)
dnl solaris screws this up
AC_CHECK_FUNC(gethostbyname, [AC_DEFINE(HAVE_GETHOSTBYNAME)],
dnl prototype.
AC_EGREP_HEADER(snprintf, stdio.h, AC_DEFINE(HAVE_SNPRINTF_PROTOTYPE))
+dnl Check for multibyte character set support
+if test "x$ac_cv_header_wchar_h" = "xyes" -a "x$ac_cv_header_wctype_h" = "xyes" \
+ -a "x$ac_cv_func_wcwidth" = "xyes" -a "x$ac_cv_func_mbtowc" = "xyes"; then
+ AC_DEFINE(MULTIBYTE_SUPPORT, 1,
+ [Define to enable support for multibyte character sets])
+fi
+
dnl -------------------
dnl CHECK FOR LIBRARIES
dnl -------------------
compiler : ${CC}
compiler flags : ${CFLAGS}
linker flags : ${LDFLAGS}
+definitions : ${OURDEFS}
source code location : ${srcdir}
binary install path : ${nmhbin2}
libary install path : ${nmhlib2}
projects / mmh / blobdiff