diff options
| author | Frederic Peters <fpeters@entrouvert.com> | 2005-02-24 19:13:04 +0000 |
|---|---|---|
| committer | Frederic Peters <fpeters@entrouvert.com> | 2005-02-24 19:13:04 +0000 |
| commit | 812c16d3c03878e00873f996d93c0128e769fd88 (patch) | |
| tree | 15204de9275b5ba0ce7be25ad2d6070b8dc9140b /configure.ac | |
| parent | 3d1211dd9f282332a772f3c4e189145fbb94df92 (diff) | |
| download | lasso-812c16d3c03878e00873f996d93c0128e769fd88.tar.gz lasso-812c16d3c03878e00873f996d93c0128e769fd88.tar.xz lasso-812c16d3c03878e00873f996d93c0128e769fd88.zip | |
don't require sasl if wsf is not wanted; allow sasl2 dir to be passed to
configure; include <sasl/sasl.h> instead of <sasl.h> since mutt does it that
way.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 27 |
1 files changed, 17 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac index 3496bac6..6b999339 100644 --- a/configure.ac +++ b/configure.ac @@ -586,8 +586,6 @@ AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir) AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir) AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir) - - dnl Check if wsf is explicitly disabled. AC_ARG_ENABLE(wsf, [ --enable-wsf enable experimental ID-WSF], enable_wsf="yes", enable_wsf="no") @@ -599,14 +597,8 @@ if test "x$enable_wsf" = "xyes"; then LASSO_WSF_SUPPORT=1 fi AC_SUBST(LASSO_WSF_SUPPORT) - -AC_CHECK_LIB(sasl2, sasl_server_init, enable_wsf="yes", enable_wsf="no") -if test "x$enable_wsf" = xyes ; then - SASL_CFLAGS="-I/usr/include/sasl" - LDFLAGS="${LDFLAGS} -lsasl2" - AC_SUBST(SASL_CFLAGS) -fi - +AM_CONDITIONAL([WSF_ENABLED], [test "x$enable_wsf" = "xyes"]) +AM_CONDITIONAL([WSF_AUTH_ENABLED], [test "x$enable_wsf" = "xyes"]) dnl ========================================================================== dnl User specific option. @@ -641,6 +633,21 @@ fi PKG_CHECK_MODULES(LASSO, glib-2.0 >= 2.4.0 gobject-2.0 >= 2.4.0 libxml-2.0 libxslt xmlsec1 >= 1.2.6 xmlsec1-openssl >= 1.2.6 openssl) +AC_ARG_WITH(sasl2, [ --with-sasl2[=PFX] Use Cyrus SASL library version 2 for WSF-Auth]) +if test "x$enable_wsf" = "xyes"; then + if test "$with_sasl2" != "no" && test "$with_sasl2" != "yes" + then + CPPFLAGS="$CPPFLAGS -I$with_sasl2/include" + LDFLAGS="$LDFLAGS -L$with_sasl2/lib" + fi + + saved_LIBS="$LIBS" + AC_CHECK_LIB(sasl2, sasl_server_init,, + AC_MSG_ERROR([libsasl must be installed for WSF support]),) + LIBS="$saved_LIBS" + LASSO_LIBS="$LASSO_LIBS -lsasl2" +fi + dnl Let people disable the gtk-doc stuff. AC_ARG_ENABLE(gtk-doc, [ --disable-gtk-doc disable documentation build],, enable_gtk_doc="yes") |