[SCM] GNU Mailutils branch, master, updated. release-2.2-707-gf572e5a

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

The branch, master has been updated
       via  f572e5ac7cbcbc8cdf2bdaef9a873f63ec6b6e6f (commit)
      from  db61713bca989ff30c8b37f4c1155c65ce652016 (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 f572e5ac7cbcbc8cdf2bdaef9a873f63ec6b6e6f
Author: Sergey Poznyakoff <address@hidden>
Date:   Tue Jun 23 08:07:43 2015 +0300

    Minor fixes in Scheme scripts
    
    * scheme/Makefile.am: set executable bit on guimb (fix a typo)
    Override the installcheck-binSCRIPTS rule to avoid spurious
    output from guile 2.0 when running the program.
    * scheme/guimb.scmi: Remove flags specific to guile 1.8

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

Summary of changes:
 scheme/Makefile.am |   16 +++++++++++++++-
 scheme/guimb.scmi  |    8 +-------
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/scheme/Makefile.am b/scheme/Makefile.am
index 9f1dd59..22e3792 100644
--- a/scheme/Makefile.am
+++ b/scheme/Makefile.am
@@ -31,7 +31,7 @@ sieve2scm: sieve2scm.scmi package.sed
 
 guimb: guimb.scmi package.sed
        $(AM_V_GEN)sed -f package.sed $(srcdir)/guimb.scmi > guimb
-       $(AM_V_at)chmod +w guimb
+       $(AM_V_at)chmod +x guimb
 
 package.sed: Makefile
        $(AM_V_GEN)echo 's,%GUILE_BINDIR%,@GUILE_BINDIR@,g' > package.sed
@@ -59,3 +59,17 @@ EXTRA_DIST=\
  sieve2scm.scmi\
  guimb.scmi
 
+installcheck-binSCRIPTS: $(bin_SCRIPTS)
+       bad=0; pid=$$$$; list="$(bin_SCRIPTS)"; for p in $$list; do \
+         case ' $(AM_INSTALLCHECK_STD_OPTIONS_EXEMPT) ' in \
+          *" $$p "* | *" $(srcdir)/$$p "*) continue;; \
+         esac; \
+         f=`echo "$$p" | sed 's,^.*/,,;$(transform)'`; \
+         for opt in --help --version; do \
+           if GUILE_AUTO_COMPILE=0 "$(DESTDIR)$(bindir)/$$f" $$opt 
>c$${pid}_.out \
+                2>c$${pid}_.err </dev/null \
+                && test -n "`cat c$${pid}_.out`" \
+                && test -z "`cat c$${pid}_.err`"; then :; \
+           else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \
+         done; \
+       done; rm -f c$${pid}_.???; exit $$bad
diff --git a/scheme/guimb.scmi b/scheme/guimb.scmi
index e8c74d2..b5af426 100644
--- a/scheme/guimb.scmi
+++ b/scheme/guimb.scmi
@@ -272,17 +272,11 @@ for any corresponding short options.
   (if (bound? guimb-end)
       (guimb-end)))
 
-(debug-enable 'debug)
 (debug-options '(show-file-name #t
                 stack 20000
-                debug
                 backtrace
                 depth 20
-                maxdepth 1000
-                frames 3
-                indent 10
-                width 79
-                procnames))
+                width 79))
 
 (define main guimb)
 


hooks/post-receive
-- 
GNU Mailutils