[SCM] GNU gsasl branch, master, updated. gsasl-1-7-2-13-g679f6bb

[Simon Josefsson]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU gsasl".

http://git.savannah.gnu.org/cgit/gsasl.git/commit/?id=679f6bbfeda074cfdb384e29b73f50b8ed9222d5

The branch, master has been updated
       via  679f6bbfeda074cfdb384e29b73f50b8ed9222d5 (commit)
      from  79a6296b07dc2c44e6f6ee0dce2399e37bde253f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 679f6bbfeda074cfdb384e29b73f50b8ed9222d5
Author: Simon Josefsson <address@hidden>
Date:   Tue Apr 3 10:34:57 2012 +0200

    Disable Lasso by default on Windows.

-----------------------------------------------------------------------

Summary of changes:
 configure.ac |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index bea297c..cc7a639 100644
--- a/configure.ac
+++ b/configure.ac
@@ -90,11 +90,15 @@ GTK_DOC_CHECK(1.1)
 gl_INIT
 AM_CONDITIONAL(WINDOWS, test "$gl_cv_func_wsastartup" = "yes")
 
-# Check for Lasso.  For examples/saml20/.
+# Check for Lasso.  For examples/saml20/.  Disabled by default on Windows.
+lasso_default=yes
+if test "$gl_cv_func_wsastartup" = "yes"; then
+  lasso_default=no
+fi
 AC_ARG_WITH(lasso,
   AS_HELP_STRING([--without-lasso],
                  [disable Lasso (used by examples/saml20/)]),
-  lasso=$withval, lasso=yes)
+  lasso=$withval, lasso=$lasso_default)
 if test "$lasso" != "no"; then
   PKG_CHECK_MODULES(LASSO, lasso >= 2.2.1, [lasso=yes], [lasso=no])
   AC_SUBST(LASSO_CFLAGS)


hooks/post-receive
-- 
GNU gsasl