[SCM] GNU Mailutils branch, master, updated. release-2.2-746-ge13501a

[Sergey Poznyakoff]

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 Mailutils".

http://git.savannah.gnu.org/cgit/mailutils.git/commit/?id=e13501a191709a9495839db365ee25444ef4cd5e

The branch, master has been updated
       via  e13501a191709a9495839db365ee25444ef4cd5e (commit)
       via  c9e42006d2dd6eda19c0455c97e6e6e2f4b4a4f6 (commit)
      from  31e90a814915648fe37d1e579cfec4e407290396 (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 e13501a191709a9495839db365ee25444ef4cd5e
Author: Sergey Poznyakoff <address@hidden>
Date:   Tue Nov 10 14:17:19 2015 +0200

    Minor changes.
    
    * libmu_argp/mailutils.c: Include argp-namefrob.h
    * libproto/mailer/smtp_auth.c (get_ticket)
     (_mu_smtp_fixup_params): Protect with WITH_GSASL

commit c9e42006d2dd6eda19c0455c97e6e6e2f4b4a4f6
Author: Sergey Poznyakoff <address@hidden>
Date:   Tue Nov 10 14:15:06 2015 +0200

    Fix linking
    
    * configure.ac (MU_APP_LIBRARIES): Add libmuaux.la. This
    complements a41e62b9 and fixes linking on systems that are unable to track
    dynamic library dependencies.

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

Summary of changes:
 configure.ac                |    2 +-
 libmu_argp/mailutils.c      |    2 ++
 libproto/mailer/smtp_auth.c |    2 ++
 3 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/configure.ac b/configure.ac
index fa26b6e..cbd7291 100644
--- a/configure.ac
+++ b/configure.ac
@@ -57,7 +57,7 @@ AC_SUBST(mu_aux_dir,'$(top_srcdir)/mu-aux')
 AC_SUBST(MU_SIEVE_MODDIR,'$(libdir)/$(PACKAGE)')
 
 AC_SUBST(MU_COMMON_LIBRARIES,'$(LTLIBINTL) $(LTLIBICONV)')
-AC_SUBST(MU_APP_LIBRARIES,'${top_builddir}/libmu_argp/libmu_argp.la 
${top_builddir}/libmu_cfg/libmu_cfg.la')
+AC_SUBST(MU_APP_LIBRARIES,'${top_builddir}/libmu_argp/libmu_argp.la 
${top_builddir}/libmu_cfg/libmu_cfg.la ${top_builddir}/lib/libmuaux.la')
 
 # There are two sets of include directories: MU_LIB_COMMON_INCLUDES, used
 # by the libraries, and MU_APP_COMMON_INCLUDES, which is used by applications.
diff --git a/libmu_argp/mailutils.c b/libmu_argp/mailutils.c
index 5606236..fee67e1 100644
--- a/libmu_argp/mailutils.c
+++ b/libmu_argp/mailutils.c
@@ -21,6 +21,8 @@
 #include "cmdline.h"
 #include <unistd.h>
 #include <stdlib.h>
+/* Provide declaration of __argp_base_name: */
+#include <argp-namefrob.h> 
 
 
 /* ************************************************************************* */
diff --git a/libproto/mailer/smtp_auth.c b/libproto/mailer/smtp_auth.c
index 72c4250..c0e9c28 100644
--- a/libproto/mailer/smtp_auth.c
+++ b/libproto/mailer/smtp_auth.c
@@ -29,6 +29,7 @@
 #include <mailutils/auth.h>
 #include <mailutils/url.h>
 
+#if defined(WITH_GSASL)
 static int
 get_ticket (mu_ticket_t *pticket)
 {
@@ -99,6 +100,7 @@ _mu_smtp_fixup_params (mu_smtp_t smtp)
 
   return 0;
 }
+#endif
 
 int
 mu_smtp_auth (mu_smtp_t smtp)


hooks/post-receive
-- 
GNU Mailutils