[SCM] GNU Mailutils branch, master, updated. release-3.1.1-7-g8ce3063

[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=8ce3063351c0139d8f1fa1c30d5c8de28050883e

The branch, master has been updated
       via  8ce3063351c0139d8f1fa1c30d5c8de28050883e (commit)
       via  ed9454c6df05b870395376ae5a200121f1755fdc (commit)
      from  eed8a3dcd60e0bede0df3bd8e867a8eff62a7be6 (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 8ce3063351c0139d8f1fa1c30d5c8de28050883e
Author: Sergey Poznyakoff <address@hidden>
Date:   Mon Dec 19 14:53:10 2016 +0200

    Minor changes to configure
    
    * configure.ac: Assume tokyo|kyoto cabinet will pull the
    necessary dependencies.
    Add GINT_LDADD if necessary
    * gint: Upgrade

commit ed9454c6df05b870395376ae5a200121f1755fdc
Author: Sergey Poznyakoff <address@hidden>
Date:   Mon Dec 19 14:37:23 2016 +0200

    New example
    
    * configure.ac (MU_PRI_OFF_T): Define to the printf
    format spec suitable for printing mu_off_t.
    Don't use [ ] instead of test.
    * include/mailutils/types.hin (MU_PRI_OFF_T): New define.
    * include/mailutils/Makefile.am (type.h): Pass MU_PRI_OFF_T
    
    * examples/mboxsize.c: New file.
    * examples/Makefile.am: Build mboxsize

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

Summary of changes:
 configure.ac                  |   10 ++++--
 examples/.gitignore           |    1 +
 examples/Makefile.am          |   13 +++++++
 examples/mboxsize.c           |   80 +++++++++++++++++++++++++++++++++++++++++
 gint                          |    2 +-
 include/mailutils/Makefile.am |    5 ++-
 include/mailutils/types.hin   |    3 +-
 7 files changed, 108 insertions(+), 6 deletions(-)
 create mode 100644 examples/mboxsize.c

diff --git a/configure.ac b/configure.ac
index 00fc7a1..c7ce55a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -567,7 +567,6 @@ check_dbm_impl() {
                        [AC_CHECK_HEADERS(tchdb.h,
                                          AC_DEFINE(WITH_TOKYOCABINET,1,
                                                  [Enable use of Tokyo 
Cabinet]))
-                      DBMLIB_DEPENDENCY="$DBMLIB_DEPENDENCY -lz -lbz2 -lrt"
                        DBMLIBS="$DBMLIBS -ltokyocabinet"
                        status_dbm="$status_dbm,Tokyo Cabinet"]);;
 
@@ -576,7 +575,6 @@ check_dbm_impl() {
                        [AC_CHECK_HEADERS(kclangc.h,
                                          AC_DEFINE(WITH_KYOTOCABINET,1,
                                                  [Enable use of Kyoto 
Cabinet]))
-                      DBMLIB_DEPENDENCY="$DBMLIB_DEPENDENCY -lz -lbz2 -lrt"
                        DBMLIBS="$DBMLIBS -lkyotocabinet"
                        status_dbm="$status_dbm,Kyoto Cabinet"]);;
   esac
@@ -691,10 +689,13 @@ AC_CHECK_SIZEOF(off_t)
 AC_CHECK_SIZEOF(long)
 AC_CHECK_SIZEOF(long long)
 AC_SUBST(MU_OFF_TYPE)
+AC_SUBST(MU_PRI_OFF_T)
 if test $ac_cv_sizeof_off_t -eq $ac_cv_sizeof_long; then
   MU_OFF_TYPE=long
+  MU_PRI_OFF_T='ld'
 elif test $ac_cv_sizeof_off_t -eq $ac_cv_sizeof_long_long; then
   MU_OFF_TYPE="long long"
+  MU_PRI_OFF_T='lld'
 else
   AC_MSG_ERROR([Cannot find ${ac_cv_sizeof_off_t}-byte type, suitable for 
mu_off_t])
 fi
@@ -1159,13 +1160,16 @@ GINT_INIT([gint],[1.8 with-guile],
          [useguile=yes
           AC_DEFINE([WITH_GUILE],1,[Enable Guile support])
            GUILE_BINDIR=`guile-config info bindir`
-          if [ -z "$GUILE_BINDIR" ]; then
+          if test -z "$GUILE_BINDIR"; then
               GUILE_BINDIR="`guile-config info prefix`/bin"
           fi
            LIBMU_SCM=../libmu_scm/libmu_scm.la
            LIBMU_SCM_DEPS='${MU_LIB_MBOX} ${MU_LIB_IMAP} ${MU_LIB_POP} 
${MU_LIB_MH} ${MU_LIB_MAILDIR} ${MU_LIB_MAILER}'
            MU_GUILE_SIEVE_MOD_DIR='$(GUILE_SITE)/$(PACKAGE)/sieve-modules'
            GINT_INCLUDES='${MU_APP_COMMON_INCLUDES}'
+           if test $REPLACE_STRERROR = 1; then
+               GINT_LDADD='${top_builddir}/lib/gnu/libgnu.la'
+           fi
           ],[useguile=no])
 
 AM_CONDITIONAL([MU_COND_LIBMU_SCM],[test "$useguile" = "yes"])
diff --git a/examples/.gitignore b/examples/.gitignore
index d4792a3..faf9e43 100644
--- a/examples/.gitignore
+++ b/examples/.gitignore
@@ -16,6 +16,7 @@ lsf
 mailcap
 mblconv
 mboxidx
+mboxsize
 mimetest
 msg-send
 mta
diff --git a/examples/Makefile.am b/examples/Makefile.am
index fa63b66..97e3d79 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -39,6 +39,7 @@ noinst_PROGRAMS = \
  lsf\
  mblconv\
  mboxidx\
+ mboxsize\
  msg-send\
  mta\
  mucat\
@@ -95,6 +96,18 @@ sfrom_LDADD =\
  @address@hidden
  ${MU_LIB_MAILUTILS}
 
+mboxsize_LDADD =\
+ ../lib/libmuaux.la\
+ ${MU_LIB_MBOX}\
+ ${MU_LIB_IMAP}\
+ ${MU_LIB_POP}\
+ ${MU_LIB_NNTP}\
+ ${MU_LIB_MH}\
+ ${MU_LIB_MAILDIR}\
+ ${MU_LIB_AUTH}\
+ @address@hidden
+ ${MU_LIB_MAILUTILS}
+
 nntpclient_LDADD = \
  ../lib/libmuaux.la\
  ${MU_LIB_NNTP}\
diff --git a/examples/mboxsize.c b/examples/mboxsize.c
new file mode 100644
index 0000000..6ca71b8
--- /dev/null
+++ b/examples/mboxsize.c
@@ -0,0 +1,80 @@
+/* GNU Mailutils -- a suite of utilities for electronic mail
+   Copyright (C) 1999-2005, 2007, 2010-2012, 2014-2016 Free Software
+   Foundation, Inc.
+
+   GNU Mailutils is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3, or (at your option)
+   any later version.
+
+   GNU Mailutils is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with GNU Mailutils.  If not, see <http://www.gnu.org/licenses/>. */
+
+#include <mailutils/mailutils.h>
+
+struct mu_cli_setup cli = {
+  NULL,
+  NULL,
+  "compute mailbox size",
+  "MBOX"
+};
+
+static char *capa[] = {
+  "debug",
+  NULL
+};
+
+int
+main (int argc, char **argv)
+{
+  int rc;
+  mu_mailbox_t mbox;
+  mu_off_t size;
+  char *name;
+  
+  mu_register_all_mbox_formats ();
+
+  mu_cli (argc, argv, &cli, capa, NULL, &argc, &argv);
+
+  if (argc != 1)
+    {
+      mu_error ("wrong number of arguments");
+      return 1;
+    }
+  name = argv[0];
+  
+  rc = mu_mailbox_create_default (&mbox, name);
+  if (rc)
+    {
+      mu_diag_funcall (MU_DIAG_ERROR, "mu_mailbox_create_default",
+                      name, rc);
+      return 1;
+    }
+
+  rc = mu_mailbox_open (mbox, MU_STREAM_READ);
+  if (rc)
+    {
+      mu_diag_funcall (MU_DIAG_ERROR, "mu_mailbox_open", name, rc);
+      return 1;
+    }
+
+  rc = mu_mailbox_get_size (mbox, &size);
+  if (rc)
+    {
+      mu_diag_funcall (MU_DIAG_ERROR, "mu_mailbox_get_size", name, rc);
+      return 1;
+    }
+
+  mu_printf ("%" MU_PRI_OFF_T "\n", size);
+
+  return 0;
+}
+
+  
+
+      
diff --git a/gint b/gint
index 42f4712..acb32e8 160000
--- a/gint
+++ b/gint
@@ -1 +1 @@
-Subproject commit 42f4712085b40173eaea58e14b1a579291a6fe3a
+Subproject commit acb32e84269f1c00b5f1cdd03a920420dcdfa2bc
diff --git a/include/mailutils/Makefile.am b/include/mailutils/Makefile.am
index 7b9425b..f2d3afd 100644
--- a/include/mailutils/Makefile.am
+++ b/include/mailutils/Makefile.am
@@ -21,7 +21,10 @@ errno.h: $(top_srcdir)/libmailutils/diag/errors errno.hin
        $(AM_V_GEN)$(AWK) -f $(mu_aux_dir)/generr.awk 
$(top_srcdir)/libmailutils/diag/errors errno.hin > errno.h
 
 types.h: $(top_srcdir)/include/mailutils/types.hin Makefile
-       $(AM_V_GEN)sed 
's/_MU_OFF_TYPE_/$(MU_OFF_TYPE)/;s/_MU_DEFAULT_RECORD_/$(MU_DEFAULT_RECORD)/' 
$(top_srcdir)/include/mailutils/types.hin > $@
+       $(AM_V_GEN)sed -e 's/_MU_OFF_TYPE_/$(MU_OFF_TYPE)/' \
+                       -e 's/_MU_DEFAULT_RECORD_/$(MU_DEFAULT_RECORD)/' \
+                       -e 's/_MU_PRI_OFF_T_/$(MU_PRI_OFF_T)/' \
+                   $(top_srcdir)/include/mailutils/types.hin > $@
 DISTCLEANFILES = types.h
 
 pkginclude_HEADERS = \
diff --git a/include/mailutils/types.hin b/include/mailutils/types.hin
index 1057239..045c140 100644
--- a/include/mailutils/types.hin
+++ b/include/mailutils/types.hin
@@ -83,7 +83,8 @@ struct mu_sockaddr; /* defined in mailutils/sockaddr.h */
 struct mu_cidr;     /* defined in mailutils/cidr.h */  
   
 typedef _MU_OFF_TYPE_ mu_off_t;
-
+#define MU_PRI_OFF_T "_MU_PRI_OFF_T_"
+  
 typedef struct mu_address *mu_address_t;
 typedef struct _mu_attribute *mu_attribute_t;
 typedef struct _mu_authority *mu_authority_t;


hooks/post-receive
-- 
GNU Mailutils