[SCM] GNU Mailutils branch, master, updated. release-2.2-308-g2a4b7ae

[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=2a4b7ae3830b57341e29c0fd80545b6ed12b68fa

The branch, master has been updated
       via  2a4b7ae3830b57341e29c0fd80545b6ed12b68fa (commit)
       via  f055372d64373ee24823e5789e23f902f48011b0 (commit)
       via  c522de119a265c25c7ea6a269c02eaa80cdc9e49 (commit)
       via  e3a1f604594d74373fe72eae10b386a7f9d5eb36 (commit)
       via  11557b860143069f31cbd5adcb2e7f21a8670bae (commit)
      from  cff44776a11f31dcbaa0445fbddf02e7cd8284c0 (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 2a4b7ae3830b57341e29c0fd80545b6ed12b68fa
Author: Sergey Poznyakoff <address@hidden>
Date:   Wed Dec 22 14:33:40 2010 +0200

    Minor fixes
    
    * libmu_sieve/extensions/pipe.c: Include sys/wait.h
    * testsuite/Makefile.am: Distribute testsuite.inc

commit f055372d64373ee24823e5789e23f902f48011b0
Author: Sergey Poznyakoff <address@hidden>
Date:   Wed Dec 22 14:10:56 2010 +0200

    filter stream: make sure all input data get processed.
    
    * include/mailutils/filter.h (MU_FILTER_MAX_AGAIN): Add a comment.
    * libmailutils/stream/fltstream.c (filter_read): Use
    mu_debug on the filter.error level, instead of plain mu_error.
    If the xcoder returns OK and does not consume all input when
    processing the last buffer, assume mu_filter_again.
    Fix loop condition.
    (filter_write_internal): Use
    mu_debug on the filter.error level, instead of plain mu_error.

commit c522de119a265c25c7ea6a269c02eaa80cdc9e49
Author: Sergey Poznyakoff <address@hidden>
Date:   Wed Dec 22 12:45:40 2010 +0200

    sieve: bugfixes
    
    * include/mailutils/sieve.h (mu_sieve_debug_handle): New declaration.
    (mu_sieve_debug_init): New prototype.
    * libmu_sieve/conf.c (mu_sieve_debug_handle): New global.
    (mu_sieve_module_init): Call mu_sieve_debug_init.
    * libmu_sieve/extensions/spamd.c (spamd_connect_tcp)
    (spamd_connect_socket): Fix stream creation.
    (spamd_send_message): Switch to full buffering on the transport
    stream and indicate it is a payload (in case transcript is enabled),
    before copying data.  Restore things to their original state afterwards.
    (spamd_read_line): Rewrite using mu_stream_getline.
    (decode_float): Additional argument endp. Unless NULL, store there the
    position in the input string where the parsing has stopped.
    (parse_response_line): New function.
    (spamd_test): Rewrite using new API.
    * sieve/sieve.c (parser): --dry-run implies --verbose.
    
    * libmailutils/filter/base64.c (_base64_decoder): when not enough data
    are available and cmd is not mu_filter_lastbuf, return mu_filter_lastbuf.
    * libmailutils/stream/stream.c (mu_stream_shutdown): Flush the buffers 
before
    shutting the transport down.
    
    * libmailutils/tests/fltst.c (main): New option bufsize=

commit e3a1f604594d74373fe72eae10b386a7f9d5eb36
Author: Sergey Poznyakoff <address@hidden>
Date:   Tue Dec 21 13:43:21 2010 +0200

    Set library version to 4:0:0

commit 11557b860143069f31cbd5adcb2e7f21a8670bae
Author: Sergey Poznyakoff <address@hidden>
Date:   Tue Dec 21 13:27:40 2010 +0200

    sieve: implement an option to add directory to the head of the library 
search path.
    
    * TODO: Update.
    * include/mailutils/sieve.h (mu_sieve_library_path_prefix): New variable.
    * libmu_argp/sieve.c (sieve_argp_option): New option --libdir-prefix.
    (sieve_argp_parser): Handle --libdir-prefix.
    * libmu_cfg/sieve.c (cb_library_path_prefix): New callback.
    (mu_sieve_param): New statement "library-path-prefix".
    * libmu_sieve/conf.c (mu_sieve_library_path_prefix): New variable.
    (mu_sieve_module_init): Process prefix paths.
    Do not call mu_sv_load_add_path.
    * libmu_sieve/load.c (sieve_init_load_path): Rewrite.
    (mu_sv_load_add_path): Remove.
    * libmu_sieve/sieve-priv.h (mu_sv_load_add_path): Remove declaration.
    (sieve_searchpath): Remove the unused "add" parameter.
    * sieve/tests/moderator.at: Use MUT_SIEVE_OPTIONS in all tests.
    * sieve/tests/testsuite.at (MUT_SIEVE_EXT_TEST): Use --libdir-prefix
    option to ensure that our version of the extension appears first in
    the path.

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

Summary of changes:
 TODO                            |    6 +---
 configure.ac                    |    6 ++--
 include/mailutils/filter.h      |    2 +
 include/mailutils/sieve.h       |    3 ++
 libmailutils/stream/fltstream.c |   44 +++++++++++++++++++++++++++++++--------
 libmailutils/tests/fltst.c      |   13 +++++++++-
 libmu_argp/sieve.c              |   10 ++++++++-
 libmu_cfg/sieve.c               |   11 +++++++++
 libmu_sieve/conf.c              |   10 +++++++-
 libmu_sieve/extensions/pipe.c   |    1 +
 libmu_sieve/load.c              |   18 ++-------------
 libmu_sieve/sieve-priv.h        |    2 +-
 libmu_sieve/sieve.l             |    7 ------
 sieve/tests/moderator.at        |    6 +---
 sieve/tests/testsuite.at        |    2 +-
 testsuite/Makefile.am           |   12 +++++++++-
 16 files changed, 103 insertions(+), 50 deletions(-)

diff --git a/TODO b/TODO
index 54c1c81..c044ba6 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,4 @@
-GNU mailutils TODO list. 2010-12-19
+GNU mailutils TODO list. 2010-12-21
 Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2010 Free
 Software Foundation, Inc.
 
@@ -42,9 +42,7 @@ See frm/common.c (near line 425).
 
 See guimb/scm/Makefile.am for a discussion.
 
-* sieve: needs an option to add directory at the head of the search path
-
-* sieve: extension tests
+* sieve: extension tests [in progress]
 
 * mu_address_createv: pass hints as in mu_address_create_hint?
 
diff --git a/configure.ac b/configure.ac
index d9b1cf2..de48675 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,9 +31,9 @@ dnl Autobuild stuff
 AB_INIT
 
 dnl Library versioning
-AC_SUBST(VI_CURRENT,  3)
-AC_SUBST(VI_REVISION, 2)
-AC_SUBST(VI_AGE,      1)
+AC_SUBST(VI_CURRENT,  4)
+AC_SUBST(VI_REVISION, 0)
+AC_SUBST(VI_AGE,      0)
 
 dnl Library paths
 AC_SUBST(MU_LIB_AUTH,'${top_builddir}/libmu_auth/libmu_auth.la')
diff --git a/include/mailutils/filter.h b/include/mailutils/filter.h
index 4649968..187aad0 100644
--- a/include/mailutils/filter.h
+++ b/include/mailutils/filter.h
@@ -62,6 +62,8 @@ enum mu_filter_result
     mu_filter_again
   };
 
+/* An xcode function is not allowed to return mu_filter_again more
+   than MU_FILTER_MAX_AGAIN times in a sequence. */
 #define MU_FILTER_MAX_AGAIN 5
 
 typedef int (*mu_filter_new_data_t) (void **, int, int argc,
diff --git a/include/mailutils/sieve.h b/include/mailutils/sieve.h
index 9c2ea04..833dc9f 100644
--- a/include/mailutils/sieve.h
+++ b/include/mailutils/sieve.h
@@ -122,6 +122,7 @@ typedef struct
 extern int mu_sieve_yydebug;
 extern mu_list_t mu_sieve_include_path;
 extern mu_list_t mu_sieve_library_path;
+extern mu_list_t mu_sieve_library_path_prefix;
 
 /* Memory allocation functions */
 void *mu_sieve_alloc (size_t size);
@@ -258,7 +259,9 @@ int mu_sieve_disass (mu_sieve_machine_t mach);
 struct mu_gocs_sieve
 {
   int clearflags;
+  /*  mu_list_t include_path_prefix;*/
   mu_list_t include_path;
+  mu_list_t library_path_prefix;
   mu_list_t library_path;
 };
 
diff --git a/libmailutils/stream/fltstream.c b/libmailutils/stream/fltstream.c
index bdb5717..e9a4198 100644
--- a/libmailutils/stream/fltstream.c
+++ b/libmailutils/stream/fltstream.c
@@ -172,18 +172,13 @@ filter_read (mu_stream_t stream, char *buf, size_t size, 
size_t *pret)
              if (++again > MU_FILTER_MAX_AGAIN)
                {
                  /* FIXME: What filter? Need some id. */
-                 mu_error (_("filter returned `again' too many times"));
+                 mu_debug (MU_DEBCAT_FILTER, MU_DEBUG_ERROR,
+                           (_("filter returned `again' too many times")));
                  again = 0;
                }
              break;
              
            case mu_filter_ok:
-             again = 0;
-             if (cmd == mu_filter_lastbuf || iobuf.eof)
-               {
-                 fs->fltflag |= _MU_FILTER_EOF;
-                 stop = 1;
-               }
              break;
          
            case mu_filter_failure:
@@ -207,6 +202,36 @@ filter_read (mu_stream_t stream, char *buf, size_t size, 
size_t *pret)
          
          /* iobuf.isize contains number of bytes read from input */
          MFB_advance_pos (&fs->inbuf, iobuf.isize);
+
+         if (res == mu_filter_ok)
+           {
+             if (iobuf.eof)
+               {
+                 fs->fltflag |= _MU_FILTER_EOF;
+                 stop = 1;
+               }
+             else if (cmd == mu_filter_lastbuf)
+               {
+                 if (MFB_RDBYTES (fs->inbuf))
+                   {
+                     /* If xcoder has not consumed all input, try again */
+                     if (++again > MU_FILTER_MAX_AGAIN)
+                       {
+                         /* FIXME: What filter? Need some id. */
+                         mu_debug (MU_DEBCAT_FILTER, MU_DEBUG_ERROR,
+                                   (_("filter returned `again' too many 
times")));
+                         stop = 1;
+                       }
+                   }
+                 else
+                   {
+                     fs->fltflag |= _MU_FILTER_EOF;
+                     stop = 1;
+                   }
+               }
+             else
+               again = 0;
+           }
        }
 
       rdsize = size - total;
@@ -217,7 +242,7 @@ filter_read (mu_stream_t stream, char *buf, size_t size, 
size_t *pret)
       total += rdsize;
 
     }
-  while (!stop && (total < size || again));
+  while (!stop && total < size);
   
   *pret = total;
   return 0;
@@ -278,7 +303,8 @@ filter_write_internal (mu_stream_t stream, enum 
mu_filter_command cmd,
          if (++again > MU_FILTER_MAX_AGAIN)
            {
              /* FIXME: What filter? Need some id. */
-             mu_error (_("filter returned `again' too many times"));
+             mu_debug (MU_DEBCAT_FILTER, MU_DEBUG_ERROR,
+                       (_("filter returned `again' too many times")));
              again = 0;
            }
          break;
diff --git a/libmailutils/tests/fltst.c b/libmailutils/tests/fltst.c
index b639445..53ed36e 100644
--- a/libmailutils/tests/fltst.c
+++ b/libmailutils/tests/fltst.c
@@ -82,7 +82,7 @@ usage (const char *diag)
     fp = stdout;
 
   fprintf (fp, "%s",
-          "usage: fltst FILTER {encode|decode} {read|write} [shift=N] 
[verbose] [printable] [nl] [-- args]\n");
+          "usage: fltst FILTER {encode|decode} {read|write} [shift=N] 
[verbose] [printable] [nl] [bufsize=N] [-- args]\n");
   exit (diag ? 1 : 0);
 }
 
@@ -96,6 +96,7 @@ main (int argc, char * argv [])
   char *fltname;
   mu_off_t shift = 0;
   int newline_option = 0;
+  size_t bufsize = 0;
   
   if (argc == 1)
     usage (NULL);
@@ -121,7 +122,9 @@ main (int argc, char * argv [])
   for (i = 4; i < argc; i++)
     {
       if (strncmp (argv[i], "shift=", 6) == 0)
-       shift = strtoul (argv[i] + 6, NULL, 0); 
+       shift = strtoul (argv[i] + 6, NULL, 0);
+      else if (strncmp (argv[i], "bufsize=", 8) == 0)
+       bufsize = strtoul (argv[i] + 8, NULL, 0);
       else if (strcmp (argv[i], "verbose") == 0)
        verbose++;
       else if (strcmp (argv[i], "printable") == 0)
@@ -141,6 +144,8 @@ main (int argc, char * argv [])
   argv += i;
   
   MU_ASSERT (mu_stdio_stream_create (&in, MU_STDIN_FD, 0));
+  if (bufsize)
+    mu_stream_set_buffer (in, mu_buffer_full, bufsize);
   MU_ASSERT (mu_stdio_stream_create (&out, MU_STDOUT_FD, 0));
 
   if (flags == MU_STREAM_READ)
@@ -150,6 +155,8 @@ main (int argc, char * argv [])
                                        mode,
                                        MU_STREAM_READ|MU_STREAM_SEEK));
       mu_stream_unref (in);
+      if (bufsize)
+       mu_stream_set_buffer (flt, mu_buffer_full, bufsize);
       if (shift)
        MU_ASSERT (mu_stream_seek (flt, shift, MU_SEEK_SET, NULL));
       c_copy (out, flt);
@@ -160,6 +167,8 @@ main (int argc, char * argv [])
                                        argc, (const char **)argv,
                                        mode,
                                        MU_STREAM_WRITE));
+      if (bufsize)
+       mu_stream_set_buffer (flt, mu_buffer_full, bufsize);
       if (shift)
        MU_ASSERT (mu_stream_seek (in, shift, MU_SEEK_SET, NULL));
       c_copy (flt, in);
diff --git a/libmu_argp/sieve.c b/libmu_argp/sieve.c
index 5a39c31..a291d82 100644
--- a/libmu_argp/sieve.c
+++ b/libmu_argp/sieve.c
@@ -24,7 +24,8 @@
 
 enum {
   OPT_CLEAR_INCLUDE_PATH = 256,
-  OPT_CLEAR_LIBRARY_PATH
+  OPT_CLEAR_LIBRARY_PATH,
+  OPT_PREFIX_LIBRARY_PATH
 };  
 
 static struct argp_option sieve_argp_option[] = {
@@ -32,6 +33,9 @@ static struct argp_option sieve_argp_option[] = {
     N_("append DIR to the list of directories searched for include files"), 0 
},
   { "libdir", 'L', N_("DIR"), 0,
     N_("append DIR to the list of directories searched for library files"), 0 
},
+  { "libdir-prefix", OPT_PREFIX_LIBRARY_PATH, N_("DIR"), 0,
+    N_("add DIR to the beginning of the list of directories searched for "
+       "library files"), 0 },
   { "clear-include-path", OPT_CLEAR_INCLUDE_PATH, NULL, 0,
     N_("clear Sieve include path"), 0 },
   { "clear-library-path", OPT_CLEAR_LIBRARY_PATH, NULL, 0,
@@ -55,6 +59,10 @@ sieve_argp_parser (int key, char *arg, struct argp_state 
*state)
       mu_argp_node_list_new (lst, "library-path", arg);
       break;
 
+    case OPT_PREFIX_LIBRARY_PATH:
+      mu_argp_node_list_new (lst, "library-path-prefix", arg);
+      break;
+      
     case OPT_CLEAR_INCLUDE_PATH:
       mu_argp_node_list_new (lst, "clear-include-path", "yes");
       break;
diff --git a/libmu_cfg/sieve.c b/libmu_cfg/sieve.c
index c2999d3..7324b2b 100644
--- a/libmu_cfg/sieve.c
+++ b/libmu_cfg/sieve.c
@@ -90,6 +90,13 @@ cb_library_path (void *data, mu_config_value_t *val)
                                 &sieve_settings.library_path);
 }
 
+static int
+cb_library_path_prefix (void *data, mu_config_value_t *val)
+{
+  return mu_cfg_string_value_cb (val, _add_path,
+                                &sieve_settings.library_path_prefix);
+}
+
 static struct mu_cfg_param mu_sieve_param[] = {
   { "clear-library-path", mu_cfg_callback, NULL, 0, cb_clear_library_path,
      N_("Clear library search path.") },
@@ -99,6 +106,10 @@ static struct mu_cfg_param mu_sieve_param[] = {
     N_("Add directories to the library search path.  Argument is a "
        "colon-separated list of directories."),
     N_("list") },
+  { "library-path-prefix", mu_cfg_callback, NULL, 0, cb_library_path_prefix,
+    N_("Add directories to the beginning of the library search path.  "
+       "Argument is a colon-separated list of directories."),
+    N_("list") },
   { "include-path", mu_cfg_callback, NULL, 0, cb_include_path,
     N_("Add directories to the include search path.  Argument is a "
        "colon-separated list of directories."),
diff --git a/libmu_sieve/conf.c b/libmu_sieve/conf.c
index dc9c050..7c322a5 100644
--- a/libmu_sieve/conf.c
+++ b/libmu_sieve/conf.c
@@ -24,6 +24,7 @@
 
 mu_list_t mu_sieve_include_path = NULL;
 mu_list_t mu_sieve_library_path = NULL;
+mu_list_t mu_sieve_library_path_prefix = NULL;
 
 static int
 _path_append (void *item, void *data)
@@ -54,10 +55,15 @@ mu_sieve_module_init (enum mu_gocs_op op, void *data)
     mu_list_destroy (&mu_sieve_include_path);
   mu_list_do (p->include_path, _path_append, &mu_sieve_include_path);
   if (p->clearflags & MU_SIEVE_CLEAR_LIBRARY_PATH)
-    mu_list_destroy (&mu_sieve_library_path);
+    {
+      mu_list_destroy (&mu_sieve_library_path);
+      mu_list_destroy (&mu_sieve_library_path_prefix);
+    }
+  mu_list_do (p->library_path_prefix, _path_append,
+             &mu_sieve_library_path_prefix);
   mu_list_do (p->library_path, _path_append, &mu_sieve_library_path);
-  mu_sv_load_add_path (mu_sieve_library_path);
   mu_list_destroy (&p->library_path);
+  mu_list_destroy (&p->library_path_prefix);
   mu_list_destroy (&p->include_path);
   return 0;
 }
diff --git a/libmu_sieve/extensions/pipe.c b/libmu_sieve/extensions/pipe.c
index 751a17e..7544d53 100644
--- a/libmu_sieve/extensions/pipe.c
+++ b/libmu_sieve/extensions/pipe.c
@@ -35,6 +35,7 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <sys/types.h>
+#include <sys/wait.h>
 #include <string.h>
 #include <signal.h>
 #include <regex.h>
diff --git a/libmu_sieve/load.c b/libmu_sieve/load.c
index c35ae8b..c64e727 100644
--- a/libmu_sieve/load.c
+++ b/libmu_sieve/load.c
@@ -52,10 +52,12 @@ sieve_init_load_path ()
     {
       if (lt_dlinit ())
        return 1;
+      mu_list_do (mu_sieve_library_path_prefix, _add_load_dir, NULL);
 #ifdef MU_SIEVE_MODDIR
       _add_load_dir (MU_SIEVE_MODDIR, NULL);
-      inited = 1;
 #endif
+      mu_list_do (mu_sieve_library_path, _add_load_dir, NULL);
+      inited = 1;
     }
   return 0;
 }
@@ -134,14 +136,6 @@ _add_load_dir (void *item, void *unused)
 }
 
 int
-mu_sv_load_add_path (mu_list_t path)
-{
-  if (sieve_init_load_path ())
-    return 1;
-  return mu_list_do (path, _add_load_dir, NULL);
-}
-
-int
 mu_sv_load_add_dir (mu_sieve_machine_t mach, const char *name)
 {
   if (sieve_init_load_path ())
@@ -161,12 +155,6 @@ mu_sieve_load_ext (mu_sieve_machine_t mach, const char 
*name)
 }
 
 int
-mu_sv_load_add_path (mu_list_t path)
-{
-  return 1;
-}
-
-int
 mu_sv_load_add_dir (mu_sieve_machine_t mach, const char *name)
 {
   return 1;
diff --git a/libmu_sieve/sieve-priv.h b/libmu_sieve/sieve-priv.h
index e201583..8bbaf40 100644
--- a/libmu_sieve/sieve-priv.h
+++ b/libmu_sieve/sieve-priv.h
@@ -125,5 +125,5 @@ void _mu_sv_instr_nop (mu_sieve_machine_t mach);
 void _mu_sv_instr_source (mu_sieve_machine_t mach);
 void _mu_sv_instr_line (mu_sieve_machine_t mach);
 
-int mu_sv_load_add_path (mu_list_t path);
 int mu_sv_load_add_dir (mu_sieve_machine_t mach, const char *name);
+  
diff --git a/libmu_sieve/sieve.l b/libmu_sieve/sieve.l
index 7b45fc8..ff0dea6 100644
--- a/libmu_sieve/sieve.l
+++ b/libmu_sieve/sieve.l
@@ -397,18 +397,11 @@ sieve_include ()
 static void
 sieve_searchpath ()
 {
-  int append = 0;
   char *p, *endp = yytext + yyleng, *name;
   
   p = strstr (yytext, "searchpath");
   for (p += 10; p < endp && mu_isspace (*p); p++)
     ;
-  if (strcmp (p, "add") == 0)
-    {
-      append = 1;
-      for (p += 3; p < endp && mu_isspace (*p); p++)
-       ;
-    }
   name = get_file_name (p, endp, NULL);
   if (name)
     {
diff --git a/sieve/tests/moderator.at b/sieve/tests/moderator.at
index 73f1722..c3158b5 100644
--- a/sieve/tests/moderator.at
+++ b/sieve/tests/moderator.at
@@ -50,8 +50,7 @@ chmod +w mailbox
 
 MTA_DIAG=`pwd`/mta.diag
 export MTA_DIAG
-sieve MUT_SIEVE_CMDLINE dnl
- --clearpath -L "${abs_top_builddir}/libmu_sieve/extensions" -f ./mailbox prog 
|| exit 1
+sieve MUT_SIEVE_CMDLINE MUT_SIEVE_OPTIONS -f ./mailbox prog || exit 1
 cat ./mta.diag
 ],
 [ENVELOPE FROM: address@hidden
@@ -76,8 +75,7 @@ chmod +w mailbox
 
 MTA_DIAG=`pwd`/mta.diag
 export MTA_DIAG
-sieve MUT_SIEVE_CMDLINE dnl
- --clearpath -L "${abs_top_builddir}/libmu_sieve/extensions" -f ./mailbox prog 
|| exit $?
+sieve MUT_SIEVE_CMDLINE MUT_SIEVE_OPTIONS -f ./mailbox prog || exit $?
 test -f ./mta.diag && echo ./mta.diag
 exit 0
 ],
diff --git a/sieve/tests/testsuite.at b/sieve/tests/testsuite.at
index a675857..77aac98 100644
--- a/sieve/tests/testsuite.at
+++ b/sieve/tests/testsuite.at
@@ -88,7 +88,7 @@ m4_define([MUT_SIEVE_EXT_TEST],[
 AT_SETUP(MUT_SIEVE_EXT_NAME[: $1])
 AT_KEYWORDS([MUT_SIEVE_EXT_NAME $2])
 m4_pushdef([MUT_SIEVE_OPTIONS],
-           [--clearpath -L "${abs_top_builddir}/libmu_sieve/extensions"])
+           [--libdir-prefix "${abs_top_builddir}/libmu_sieve/extensions"])
 AT_CHECK([
 MUT_PREREQ_CAPA([HAVE_LIBLTDL])
 cwd=`pwd`
diff --git a/testsuite/Makefile.am b/testsuite/Makefile.am
index 0754a48..89e1737 100644
--- a/testsuite/Makefile.am
+++ b/testsuite/Makefile.am
@@ -14,9 +14,19 @@
 # You should have received a copy of the GNU General Public License
 # along with GNU Mailutils.  If not, see <http://www.gnu.org/licenses/>.
 
-EXTRA_DIST = $(TESTSUITE_AT) testsuite package.m4 lib etc spool folder maildir 
mh 
 DISTCLEANFILES       = atconfig $(check_SCRIPTS)
 MAINTAINERCLEANFILES = Makefile.in $(TESTSUITE)
+EXTRA_DIST = \
+ $(TESTSUITE_AT)\
+ testsuite\
+ testsuite.inc\
+ package.m4\
+ lib\
+ etc\
+ spool\
+ folder\
+ maildir\
+ mh 
 
 ## ------------ ##
 ## package.m4.  ##


hooks/post-receive
-- 
GNU Mailutils