echo "configuring for nmh-$VERSION"
AC_SUBST(VERSION)dnl
+dnl What date of nmh are we building?
+DATE=`cat ${srcdir}/DATE`
+echo "configuring for nmh dated $DATE"
+AC_SUBST(DATE)dnl
+
dnl --------------------------
dnl CHECK COMMAND LINE OPTIONS
dnl --------------------------
AC_SUBST(APOPLIB)dnl
dnl Do you want to debug nmh?
-undefine([debug])dnl
AC_ARG_ENABLE(debug,
[ --enable-debug enable nmh code debugging])
dnl The old redundant --enable-nmh-debug is deprecated and undocumented.
fi
dnl Allow users to send email from addresses other than their default?
-undefine([masquerade])dnl
AC_ARG_ENABLE(masquerade,
[ --enable-masquerade[='draft_from mmailid username_extension']
enable up to 3 types of address masquerading [none]],
AC_SUBST(masquerade)dnl
dnl Do you want mhe support?
-undefine([mhe])dnl
AC_ARG_ENABLE(mhe,
[ --enable-mhe enable mhe support (DEFAULT)])
fi
dnl Do you want client-side support for pop?
-undefine([pop])dnl
AC_ARG_ENABLE(pop,
[ --enable-pop enable client-side support for plain POP3])
dnl The old redundant --enable-nmh-pop is deprecated and undocumented.
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])
-if test x"$with_cyrus_sasl" != x -a x"$with_cyrus_sasl" != "no"; then
+if test x"$with_cyrus_sasl" != x -a x"$with_cyrus_sasl" != x"no"; then
AC_DEFINE(CYRUS_SASL)dnl
+ sasl_support=yes
+else
+ sasl_support=no
fi
dnl What should be the default editor?
-undefine([editor])dnl
AC_ARG_WITH(editor,
[ --with-editor=EDITOR specify the default editor])
fi
dnl Set the backup prefix
-undefine([backup-prefix])dnl
AC_ARG_WITH([hash-backup],
[ --with-hash-backup use # as the backup prefix (default: ,)])
if test x"$with_hash_backup" != x -a x"$with_hash_backup" != x"no"; then
AC_SUBST(POPSED)dnl
dnl What method of locking to use?
-undefine([locking])dnl
AC_ARG_WITH(locking,
-[ --with-locking=LOCKTYPE specify the file locking method])
+[ --with-locking=LOCKTYPE specify the file locking method
+ (one of dot, fcntl, flock, lockf)])
if test x"$with_locking" = x"dot"; then
LOCKTYPE="dot"
fi
dnl What method of posting should post use?
-undefine([mts])dnl
AC_ARG_WITH(mts,
[ --with-mts=MTS specify the default mail transport agent/service])
AC_DEFINE(SMTPMTS)dnl
dnl What should be the default pager?
-undefine([pager])dnl
AC_ARG_WITH(pager,
[ --with-pager=PAGER specify the default pager])
fi
dnl What should be the default mail server(s)?
-undefine([smtpservers])dnl
AC_ARG_WITH(smtpservers,
[ --with-smtpservers='SMTPSERVER1[ SMTPSERVER2...]'
specify the default SMTP server(s) [localhost]])
dnl Check for broken vi
AC_CACHE_CHECK(for broken vi, nmh_cv_attvibug,
[if echo 'r /nonexist-file
-q' | ex > /dev/null 2>&1
+q' | ex > /dev/null
then
nmh_cv_attvibug=no
else
dnl Checks for ndbm
AC_CHECK_FUNC(dbm_open, ,
AC_CHECK_LIB(ndbm, dbm_open, ,
- AC_CHECK_LIB(dbm, dbm_open)))
+ AC_CHECK_LIB(dbm, dbm_open, ,
+ AC_CHECK_LIB(db1, dbm_open, ,
+ AC_CHECK_LIB(gdbm, dbm_open, ,
+ AC_CHECK_LIB(db, __db_ndbm_open))))))
dnl ----------------
dnl CHECK FOR NDBM.H
dnl ----------------
-AC_CHECK_HEADERS(db1/ndbm.h)
+
+AC_CHECK_HEADERS(db1/ndbm.h gdbm/ndbm.h db.h, break, )
dnl ----------------
dnl CHECK FOR HESIOD
HESIOD_INCLUDES="-I$with_hesiod/include"
HESIOD_LIBS="-L$with_hesiod/lib"
fi
- AC_CHECK_FUNC(res_send, ,
- AC_CHECK_LIB(resolv, res_send))
- AC_CHECK_LIB(hesiod, hes_resolve, [HESIOD_LIBS="$HESIOD_LIBS -lhesiod"],
- [AC_MSG_ERROR(Hesiod library not found)], $HESIOD_LIBS)
+ AC_CHECK_FUNC(res_send,
+ [AC_CHECK_LIB(hesiod, hes_resolve,
+ [HESIOD_LIBS="$HESIOD_LIBS -lhesiod"],
+ [AC_MSG_ERROR(Hesiod library not found)],
+ $HESIOD_LIBS)],
+ [AC_CHECK_LIB(hesiod, hes_resolve,
+ [HESIOD_LIBS="$HESIOD_LIBS -lhesiod -lresolv"],
+ [AC_MSG_ERROR(Hesiod library not found)],
+ $HESIOD_LIBS -lresolv)])
+
fi
AC_SUBST(HESIOD_INCLUDES)dnl
AC_SUBST(HESIOD_LIBS)dnl
elif test -d /usr/include/kerberosIV; then
KRB4_INCLUDES="-I/usr/include/kerberosIV"
fi
- AC_CHECK_LIB(krb4, krb_rd_req,
- [KRB4_LIBS="$KRB4_LIBS -lkrb4 -ldes425 -lkrb5 -lcrypto -lcom_err"],
- [AC_CHECK_LIB(krb, krb_rd_req,
- [KRB4_LIBS="$KRB4_LIBS -lkrb -ldes"],
- [AC_MSG_ERROR(Kerberos 4 libraries not found)],
- $KRB4_LIBS -ldes)],
- $KRB4_LIBS -ldes425 -lkrb5 -lcrypto -lcom_err)
+dnl First, check if we have -lk5crypto, since that means we have a recent krb5
+
+ AC_CHECK_LIB(k5crypto, krb5_encrypt,
+ [AC_CHECK_LIB(krb4, krb_rd_req,
+ [KRB4_LIBS="$KRB4_LIBS -lkrb4 -ldes425 -lkrb5 -lk5crypto -lcom_err"],
+ [AC_MSG_ERROR(Kerberos 4 compatibility libraries not found)],
+ $KRB4_LIBS -ldes425 -lkrb5 -lk5crypto -lcom_err)],
+
+ [AC_CHECK_LIB(krb4, krb_rd_req,
+ [KRB4_LIBS="$KRB4_LIBS -lkrb4 -ldes425 -lkrb5 -lcrypto -lcom_err"],
+ [AC_CHECK_LIB(krb, krb_rd_req,
+ [KRB4_LIBS="$KRB4_LIBS -lkrb -ldes"],
+ [AC_MSG_ERROR(Kerberos 4 libraries not found)],
+ $KRB4_LIBS -ldes)],
+ $KRB4_LIBS -ldes425 -lkrb5 -lcrypto -lcom_err)],
+ $KRB4_LIBS)
+
fi
AC_SUBST(KRB4_INCLUDES)dnl
AC_SUBST(KRB4_LIBS)dnl
dnl --------------------
dnl CHECK FOR CYRUS SASL
dnl --------------------
-if test x"$with_cyrus_sasl" != x -a x"$with_cyrus_sasl" != "no"; then
+if test x"$with_cyrus_sasl" != x -a x"$with_cyrus_sasl" != x"no"; then
if test x"$with_cyrus_sasl" != x"yes"; then
SASL_INCLUDES="-I$with_cyrus_sasl/include"
SASL_LIBS="-L$with_cyrus_sasl/lib"
+
+ dnl Do OS-specific hardcoding of SASL shared library path into executables,
+ dnl so user isn't forced to set environment variables like Solaris'
+ dnl LD_LIBRARY_PATH.
+ case "$target_os" in
+ solaris*)
+ SASL_LIBS="$SASL_LIBS -R$with_cyrus_sasl/lib"
+ ;;
+ esac
fi
save_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS $SASL_LIBS"
- AC_CHECK_LIB(sasl, sasl_client_new,
- [SASL_LIBS="$SASL_LIBS -lsasl"],
+ AC_CHECK_LIB(sasl2, sasl_client_new,
+ [SASL_LIBS="$SASL_LIBS -lsasl2"],
[AC_MSG_ERROR(Cyrus SASL library not found)])
LDFLAGS="$save_LDFLAGS"
fi
default editor : ${editorpath}
default pager : ${pagerpath}
email address masquerading : ${masquerade}
-pop is enabled : ${pop_kinds}"
+pop is enabled : ${pop_kinds}
+SASL support : ${sasl_support}"
echo ""
projects / mmh / blobdiff