Update grecs.

* Makefile.am (ChangeLog): Use git2chg.awk.
* bootstrap.conf (gnulib_modules): Don't access grecs/gnulib.modules.
* configure.ac (GRECS_SETUP): Add options.
* gnulib.modules (getopt,gitlog-to-changelog)
(hash,error,version-etc): Remove.
* src/Makefile.am: Remove getopt.m4, use one from grecs.
* src/getopt.m4: Remove.
* src/cmdline.opt: Rewrite.
* src/config.c: Update.

* src/wydawca.h (spool) <aliases>: Change data type.
(all_spool_aliases): Change data type.
(config_finish): New proto.

* src/wydawca.c: Use grecs functions.
* src/dictionary.c: Likewise.
* src/net.c: Likewise.
* src/process.c: Likewise.

* src/mail.c: Use grecs_symtab.
* src/timer.c: Likewise.
* src/triplet.c: Likewise.

13 files changed, 176 insertions, 733 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index a523a1a..b79e0ec 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -48,12 +48,12 @@ wydawca_SOURCES=\
  report.c
 
 BUILT_SOURCES=cmdline.h
-EXTRA_DIST=cmdline.opt getopt.m4 pp-setup update-2.0.awk
+EXTRA_DIST=cmdline.opt pp-setup update-2.0.awk
 
 SUFFIXES=.opt .c .h
 
 .opt.h:
-        m4 -s $(srcdir)/getopt.m4 $< | sed '1d' > $@
+        $(AM_V_GEN)m4 -s $(top_srcdir)/@GRECS_SUBDIR@/build-aux/getopt.m4 $< > $@
 
 incdir=$(pkgdatadir)/$(VERSION)/include
 inc_DATA = $(PP_SETUP_FILE)
diff --git a/src/cmdline.opt b/src/cmdline.opt
index 29eff3a..4c3d22f 100644
--- a/src/cmdline.opt
+++ b/src/cmdline.opt
@@ -1,4 +1,4 @@
-/* wydawca - automatic release submission daemon
+/* wydawca - automatic release submission daemon -*- c -*-
    Copyright (C) 2007, 2009, 2010 Sergey Poznyakoff
 
    Wydawca is free software; you can redistribute it and/or modify it
@@ -17,13 +17,13 @@
 static struct obstack pp_cmd_stack;
 static int pp_cmd_stack_init;
 
-static gl_list_t source_list;
-static gl_list_t tag_list;
+static struct grecs_list *source_list;
+static struct grecs_list *tag_list;
 
-static bool
-string_eq (const void *elt1, const void *elt2)
+static int
+string_cmp (const void *elt1, const void *elt2)
 {
-  return strcmp ((const char *)elt1, (const char *)elt2) == 0;
+  return strcmp ((const char *)elt1, (const char *)elt2);
 }
 
 int
@@ -36,14 +36,17 @@ int
 enabled_spool_p (const struct spool *spool)
 {
   if (source_list || tag_list)
-    return (source_list && gl_list_search (source_list, spool->source_dir))
-            || (tag_list && gl_list_search (tag_list, spool->tag));
+    return (source_list && grecs_list_locate (source_list, spool->source_dir))
+            || (tag_list && grecs_list_locate (tag_list, spool->tag));
   return 1;     
 }
 
-OPTIONS_BEGIN(gnu, "wydawca",
+OPTIONS_BEGIN("wydawca",
               [<wydawca synchronizes files from a set of upload directories with the corresponding distribution sites>],
-              [<UID [UID...]>])
+              [<UID [UID...]>],
+              [<gnu>],
+              [<copyright_year=2011>],
+              [<copyright_holder=Sergey Poznyakoff>])
 
 GROUP(Selecting program mode)
 
@@ -104,20 +107,22 @@ OPTION(spool,S,TAG,
        [<process only spool with the given tag (may be used multiple times)>])
 BEGIN
         if (!tag_list)
-          tag_list = gl_list_create_empty (&gl_linked_list_implementation,
-                                           string_eq, NULL,
-                                           NULL, false);
-        gl_list_add_last (tag_list, optarg);   
+          {
+            tag_list = grecs_list_create ();
+            tag_list->cmp = string_cmp;
+          }
+        grecs_list_append (tag_list, optarg);   
 END
 
 OPTION(source,s,SOURCE-DIR,
        [<process only spool with the given source (may be used multiple times)>])
 BEGIN
         if (!source_list)
-          source_list = gl_list_create_empty (&gl_linked_list_implementation,
-                                              string_eq, NULL,
-                                              NULL, false);
-        gl_list_add_last (source_list, optarg);   
+          {
+            source_list = grecs_list_create ();
+            source_list->cmp = string_cmp;
+          }
+        grecs_list_append (source_list, optarg);   
 END       
 
 GROUP(Logging)
diff --git a/src/config.c b/src/config.c
index 9c75df6..7353f29 100644
--- a/src/config.c
+++ b/src/config.c
@@ -248,7 +248,7 @@ get_arg (grecs_locus_t *locus, grecs_value_t *value, unsigned n, int type)
       grecs_error (locus, 0, _("not enough arguments"));
       return NULL;
     }
-  value = value->v.arg.v + n;
+  value = value->v.arg.v[n];
   if (value->type != type)
     {
       grecs_error (locus, 0, _("argument %d has wrong type"), n);
@@ -300,12 +300,11 @@ cb_email_address (enum grecs_callback_command cmd,
 
     case GRECS_TYPE_LIST:
       {
-        const void *p;
-        gl_list_iterator_t itr = gl_list_iterator (value->v.list);
-        
-        while (gl_list_iterator_next (&itr, &p, NULL))
+        struct grecs_list_entry *ep;
+
+        for (ep = value->v.list->head; ep; ep = ep->next)
           {
-            const grecs_value_t *vp = p;
+            const grecs_value_t *vp = ep->data;
             mu_address_t a;
             if (assert_string_arg (locus, cmd, vp))
               return 1;
@@ -500,7 +499,7 @@ parse_statmask (grecs_locus_t *loc, grecs_value_t *val, unsigned long *pmask)
         for (i = 0; i < val->v.arg.c; i++)
           {
             unsigned long x;
-            if (parse_single_statmask (loc, &val->v.arg.v[i], &x, &invert))
+            if (parse_single_statmask (loc, val->v.arg.v[i], &x, &invert))
               err = 1;
             else if (invert)
               mask &= ~x;
@@ -512,12 +511,11 @@ parse_statmask (grecs_locus_t *loc, grecs_value_t *val, unsigned long *pmask)
 
     case GRECS_TYPE_LIST:
       {
-        const void *p;
-        gl_list_iterator_t itr = gl_list_iterator (val->v.list);
+        struct grecs_list_entry *ep;
 
-        while (gl_list_iterator_next (&itr, &p, NULL))
+        for (ep = val->v.list->head; ep; ep = ep->next)
           {
-            const grecs_value_t *vp = p;
+            const grecs_value_t *vp = ep->data;
             unsigned long x;
 
             if (parse_single_statmask (loc, vp, &x, &invert))
@@ -686,20 +684,20 @@ cb_define_message (enum grecs_callback_command cmd,
       return 1;
     }
 
-  if (value->v.arg.v[0].type != GRECS_TYPE_STRING)
+  if (value->v.arg.v[0]->type != GRECS_TYPE_STRING)
     {
       grecs_error (locus, 0, _("first argument not a string"));
       return 1;
     }
-  ident = value->v.arg.v[0].v.string;
+  ident = value->v.arg.v[0]->v.string;
 
-  if (value->v.arg.v[1].type != GRECS_TYPE_STRING)
+  if (value->v.arg.v[1]->type != GRECS_TYPE_STRING)
     {
       grecs_error (locus, 0, _("second argument not a string"));
       return 1;
     }
 
-  register_message_template (ident, value->v.arg.v[1].v.string);
+  register_message_template (ident, value->v.arg.v[1]->v.string);
   return 0;
 }
 
@@ -992,10 +990,10 @@ cb_dictionary_type (enum grecs_callback_command cmd,
 
 static int
 cb_dictionary_params (enum grecs_callback_command cmd,
-                         grecs_locus_t *locus,
-                         void *varptr,
-                         grecs_value_t *value,
-                         void *cb_data)
+                      grecs_locus_t *locus,
+                      void *varptr,
+                      grecs_value_t *value,
+                      void *cb_data)
 {