dnl Note that this code will be enabled for both POP and SMTP
AC_ARG_WITH([cyrus-sasl], AS_HELP_STRING([--with-cyrus-sasl],
[Enable SASL support via the Cyrus SASL library]))
-AS_IF([test x"$with_cyrus_sasl" != x -a x"$with_cyrus_sasl" != x"no"],[
- AC_DEFINE([CYRUS_SASL], [1],
- [Define to use the Cyrus SASL library for authentication of POP and SMTP.])dnl
- AS_IF([test x"$with_cyrus_sasl" != xyes],[
- AC_MSG_WARN([Arguments to --with-cyrus-sasl now ignored])
- AC_MSG_WARN([Please pass the appropriate arguments to CPPFLAGS/LDFLAGS])])
- sasl_support=yes], [sasl_support=no])
+AS_IF([test x"$with_cyrus_sasl" != x -a x"$with_cyrus_sasl" != xyes -a \
+ x"$with_cyrus_sasl" != xno],[
+ AC_MSG_WARN([Arguments to --with-cyrus-sasl now ignored])
+ AC_MSG_WARN([Please pass the appropriate arguments to CPPFLAGS/LDFLAGS])])
+
+dnl Do you want client-side support for encryption with TLS?
+AC_ARG_WITH([tls], AS_HELP_STRING([--with-tls], [Enable TLS support]))
dnl Do you want client-side support for using OAuth2 for SMTP authentication?
AC_ARG_WITH([oauth], AS_HELP_STRING([--with-oauth],
[Enable OAuth2 support in SMTP auth]))
-dnl Do you want client-side support for encryption with TLS?
-AC_ARG_WITH([tls], AS_HELP_STRING([--with-tls], [Enable TLS support]))
-AS_IF([test x"$with_tls" != x"no"],[
- AC_DEFINE([TLS_SUPPORT], [1], [Support TLS for session encryption.])dnl
- tls_support=yes],[tls_support=no])
-
dnl Set the backup prefix
AC_ARG_WITH([hash-backup],
AS_HELP_STRING([--with-hash-backup],[use # as the backup prefix (default: ,)]))
dnl If the user configures with a CFLAGS that contains a -O flag
dnl but then removes it a make time, they'll also have to remove
dnl -D_FORTIFY_SOURCE from AM_CPPFLAGS because it requires optimization.
+ dnl Use "\ " instead of ' ' or " " for compatiblity with posh.
AS_CASE([$CFLAGS],
- [-O*|*' -O'*],[AM_CPPFLAGS="${AM_CPPFLAGS:+$AM_CPPFLAGS }-D_FORTIFY_SOURCE=2"])
+ [-O|*\ -O|-O[[!0]]*|*\ -O[[!0]]*],
+ [AM_CPPFLAGS="${AM_CPPFLAGS:+$AM_CPPFLAGS }-D_FORTIFY_SOURCE=2"])
fi
dnl FreeBSD needs a bit of magic to bring getline() into scope.
dnl CHECK FOR CYRUS-SASL
dnl --------------------
-AS_IF([test x"$sasl_support" = x"yes"],[
- AC_CHECK_HEADER([sasl/sasl.h], , [AC_MSG_ERROR([sasl.h not found])])
- AC_CHECK_LIB([sasl2], [sasl_client_new], [SASLLIB="-lsasl2"],
- [AC_MSG_ERROR([Cyrus SASL library not found])])],[SASLLIB=""])
+AS_IF([test x"$with_cyrus_sasl" != x"no"],[
+ AC_CHECK_HEADER([sasl/sasl.h], HAVE_SASL_H=1)
+ AC_CHECK_LIB([sasl2], [sasl_client_new], [SASLLIB="-lsasl2"])])
AC_SUBST([SASLLIB])
+dnl -----------------
+dnl Enable SASL?
+dnl -----------------
+dnl By default (with_cyrus_sasl=''), enable SASL if header and lib are found.
+dnl If SASL requested (--with-sasl with_cyrus_sasl=yes), error if header or lib not found.
+dnl If SASL disabled (--without-sasl with_cyrus_sasl=no), don't enable it.
+sasl_support=no
+CYRUS_SASL=0
+AC_SUBST([CYRUS_SASL])
+AS_IF([test "x$with_cyrus_sasl" = xyes && test "x$HAVE_SASL_H" = x],
+ [AC_MSG_ERROR([SASL requested but sasl.h not found])],
+ [test "x$with_cyrus_sasl" = xyes && test "x$SASLLIB" = x],
+ [AC_MSG_ERROR([SASL requested but Cyrus SASL library not found])],
+ [test "x$with_cyrus_sasl" != xno && test "x$HAVE_SASL_H" = x1 &&
+ test "x$SASLLIB" != x],
+ [AC_DEFINE([CYRUS_SASL], [1],
+ [Define to use the Cyrus SASL library for authentication of POP and SMTP.])
+ CYRUS_SASL=1
+ sasl_support=yes])
+
dnl -----------------
dnl CHECK FOR OPENSSL
dnl -----------------
-AS_IF([test x"$tls_support" = x"yes"],[
- dnl OpenBSD 5 needs the other-libraries (fourth argument) to the
+AS_IF([test x"$with_tls" != x"no"],[
+ dnl OpenBSD 5 needs the other-libraries (fifth argument) to the
dnl AC_CHECK_LIB for SSL_new, because it doesn't
dnl automatically append -lcrypto when linking with -lssl.
- AC_CHECK_HEADER([openssl/ssl.h], , [AC_MSG_ERROR([openssl/ssl.h not found])])
- AC_CHECK_LIB([crypto], [BIO_write], [TLSLIB="-lcrypto"],
- [AC_MSG_ERROR([OpenSSL crypto library not found])])
- AC_CHECK_LIB([ssl], [SSL_new], [TLSLIB="-lssl $TLSLIB"],
- [AC_MSG_ERROR([OpenSSL library not found])],[$TLSLIB])],
- [TLSLIB=])
+ AC_CHECK_HEADER([openssl/ssl.h], HAVE_SSL_H=1)
+ AC_CHECK_LIB([crypto], [BIO_write], [TLSLIB="-lcrypto"])
+ AC_CHECK_LIB([ssl], [SSL_new], [TLSLIB="-lssl $TLSLIB"], [TLSLIB=],
+ [$TLSLIB])])
AC_SUBST([TLSLIB])
+dnl -----------------
+dnl Enable TLS?
+dnl -----------------
+dnl By default (with_tls=''), enable TLS if header and libs were found.
+dnl If TLS requested (--with-tls with_tls=yes), error if header/lib not found.
+dnl If TLS disabled (--without-tls with_tls=no), don't enable it.
+tls_support=no
+TLS_SUPPORT=0
+AC_SUBST([TLS_SUPPORT])
+AS_IF([test "x$with_tls" = xyes && test "x$HAVE_SSL_H" = x],
+ [AC_MSG_ERROR([TLS requested but openssl/ssl.h not found])],
+ [test "x$with_tls" = xyes && test "x$TLSLIB" = x],
+ [AC_MSG_ERROR([TLS requested but crypto or ssl library not found])],
+ [test "x$with_tls" != xno && test "x$HAVE_SSL_H" = x1 && test "x$TLSLIB" != x],
+ [AC_DEFINE([TLS_SUPPORT], [1], [Support TLS for session encryption.])
+ TLS_SUPPORT=1
+ tls_support=yes])
+
dnl -----------------
dnl CHECK FOR CURL
dnl -----------------
dnl ----------------
dnl CHECK FLEX FIXUP
dnl ----------------
+dnl BUG: This stops $(LFLAGS) working as it comes after $(AM_FLAGS).
dnl Use AM_LFLAGS make variable setting to work around bugs in flex
dnl 2.5.36-37 that cause signed/unsigned mismatch,
dnl http://sourceforge.net/p/flex/bugs/140/
+dnl 2.6.1 bug: https://github.com/westes/flex/issues/97
AS_IF([test "$LEX" = flex],
[AS_CASE([`$LEX -V`],
[flex\ 2.5.35], [AM_LFLAGS=\
'; sed "s/ int n;/ size_t n;/" $@ >$@.tmp && mv -f $@.tmp $@'],
[flex\ 2.5.3[[67]]], [AM_LFLAGS=\
-'; sed "s/\( \)int i;/\1yy_size_t i;/" $@ >$@.tmp && mv -f $@.tmp $@'])
+'; sed "s/\( \)int i;/\1yy_size_t i;/" $@ >$@.tmp && mv -f $@.tmp $@'],
+ [flex\ 2.6.1], [AM_LFLAGS=\
+'; sed '\''/\<int num_to_read\>/s/int/size_t/; s/\<yy_size_t i\>/int i/'\'' $@ >$@.tmp && mv -f $@.tmp $@'])
AC_SUBST([AM_LFLAGS])])
dnl ------------------
projects / nmh / blobdiff