[SCM] GNU gsasl branch, master, updated. gsasl-1-7-4-6-gb68f71e

[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=b68f71ee30e13cd2a1e7ed1cd1381a224e7133bb

The branch, master has been updated
       via  b68f71ee30e13cd2a1e7ed1cd1381a224e7133bb (commit)
       via  3ad7ce5e00588e651c5b5016b7dee9de0cd1681a (commit)
       via  b53a74d30a45d2014ab99f7c6c960d12006b0bae (commit)
      from  50a1c6c0a1853347cf85b588b7e94bc9ba6dc438 (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 b68f71ee30e13cd2a1e7ed1cd1381a224e7133bb
Author: Simon Josefsson <address@hidden>
Date:   Mon May 21 08:23:59 2012 +0200

    Need gnulib for saml20/openid20 examples.

commit 3ad7ce5e00588e651c5b5016b7dee9de0cd1681a
Author: Simon Josefsson <address@hidden>
Date:   Mon May 21 08:23:57 2012 +0200

    Indent.

commit b53a74d30a45d2014ab99f7c6c960d12006b0bae
Author: Simon Josefsson <address@hidden>
Date:   Wed May 16 13:32:34 2012 +0200

    Typo

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

Summary of changes:
 examples/openid20/Makefile.am |    5 +++--
 examples/saml20/Makefile.am   |    6 ++++--
 examples/saml20/README        |    3 ++-
 src/Makefile.am               |    2 +-
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/examples/openid20/Makefile.am b/examples/openid20/Makefile.am
index ec3844a..a307df0 100644
--- a/examples/openid20/Makefile.am
+++ b/examples/openid20/Makefile.am
@@ -17,9 +17,10 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 AM_CFLAGS = $(WERROR_CFLAGS) $(WARN_CFLAGS)
-AM_CPPFLAGS = -I$(top_srcdir)/lib/src -I$(top_builddir)/lib/src
+AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_builddir)/gl \
+       -I$(top_srcdir)/lib/src -I$(top_builddir)/lib/src
 AM_LDFLAGS = -no-install
-LDADD = $(top_builddir)/lib/src/libgsasl.la
+LDADD = $(top_builddir)/lib/src/libgsasl.la $(top_builddir)/gl/libgl.la
 
 EXTRA_DIST = README gsasl-openid20-redirect.php gsasl-openid20-rp.php
 
diff --git a/examples/saml20/Makefile.am b/examples/saml20/Makefile.am
index 408e0fe..f81c768 100644
--- a/examples/saml20/Makefile.am
+++ b/examples/saml20/Makefile.am
@@ -17,10 +17,12 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 AM_CFLAGS = $(WERROR_CFLAGS) $(WARN_CFLAGS)
-AM_CPPFLAGS = -I$(top_srcdir)/lib/src -I$(top_builddir)/lib/src \
+AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_builddir)/gl \
+       -I$(top_srcdir)/lib/src -I$(top_builddir)/lib/src \
        $(LASSO_CFLAGS)
 AM_LDFLAGS = -no-install
-LDADD = $(top_builddir)/lib/src/libgsasl.la $(LASSO_LIBS)
+LDADD = $(top_builddir)/lib/src/libgsasl.la $(top_builddir)/gl/libgl.la \
+       $(LASSO_LIBS)
 
 EXTRA_DIST = README
 EXTRA_DIST += gsasl-saml20-sp.php
diff --git a/examples/saml20/README b/examples/saml20/README
index 0eed5bc..32e4391 100644
--- a/examples/saml20/README
+++ b/examples/saml20/README
@@ -141,7 +141,8 @@ Here is the normal process:
    The client sends the Identity Provider Identifier.  You may use the
    gsasl command line tool to act as a client.  For example:
 
address@hidden:~$ gsasl --smtp -m SAML20 interop.josefsson.org 2001Trying 
‘interop.josefsson.org’...
address@hidden:~$ gsasl --smtp -m SAML20 interop.josefsson.org 2001
+Trying ‘interop.josefsson.org’...
 220 localhost ESMTP GNU SASL smtp-server
 EHLO [127.0.0.1]
 250-localhost
diff --git a/src/Makefile.am b/src/Makefile.am
index bbc5eeb..ef3e9b6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -18,7 +18,7 @@
 
 AM_CFLAGS = $(WERROR_CFLAGS) $(WARN_CFLAGS)
 AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_builddir)/gl \
-        -I$(top_srcdir)/lib/src -I$(top_builddir)/lib/src
+       -I$(top_srcdir)/lib/src -I$(top_builddir)/lib/src
 AM_CPPFLAGS += -DLOCALEDIR=\"$(datadir)/locale\"
 
 bin_PROGRAMS = gsasl


hooks/post-receive
-- 
GNU gsasl