Switch to the latest Grecs.

* Makefile.am (ChangeLog): Use git2chg.awk to build it.
* NEWS: Update.
* bootstrap.conf (gnulib_modules): Grecs does not depend on gnulib any more.
* configure.ac: Version 1.2.90.
Define GRECS_HOST_PROJECT_INCLUDES, remove grecs Makefiles from
AC_CONFIG_FILES: it is now done by GRECS_SETUP itself.
* gnulib.modules (gitlog-to-changelog,argp): Remove.
(configmake): New module.
* grecs: Update to a52ab6c6.
* lib/libpies.h: Remove redefinitions of _() and N_().
* src/Makefile.am: Update for the recent grecs.
* src/acl.c: Rewrite using Grecs support for lists and symtabs.
* src/acl.h: Likewise.
* src/diag.c: Likewise.
* src/inetd.c: Likewise.
* src/meta1gram.y: Likewise.
* src/meta1lex.h: Likewise.
* src/meta1lex.l: Likewise.
* src/pies.c: Likewise.
* src/pies.h: Likewise.
* src/progman.c: Likewise.
* src/userprivs.c: Likewise.

1 files changed, 193 insertions, 0 deletions

diff --git a/src/cmdline.opt b/src/cmdline.opt
new file mode 100644
index 0000000..31fcf20
--- /dev/null
+++ b/src/cmdline.opt
@@ -0,0 +1,193 @@
+/* This file is part of GNU Pies. -*- c -*-
+   Copyright (C) 2008, 2009, 2010, 2011 Sergey Poznyakoff
+
+   GNU Pies 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 Pies 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 Pies.  If not, see <http://www.gnu.org/licenses/>. */
+
+OPTIONS_BEGIN("pies",
+              [<process invocation and execution supervisor>],
+	      [<>],
+	      [<gnu>],
+              [<copyright_year=2011>],
+              [<copyright_holder=Sergey Poznyakoff>])
+
+GROUP(Operation Mode)
+
+OPTION(config-file,c,FILE,
+       [<use FILE instead of the default configuration>])
+BEGIN
+  add_config (current_syntax, optarg);
+END
+
+OPTION(config-help,,,
+       [<show configuration file summary>])
+BEGIN
+  config_help ();
+  exit (0);
+END
+
+OPTION(,E,,
+       [<preprocess config and exit>])
+BEGIN
+  preprocess_only = 1;
+END       
+
+OPTION(force,,,
+       [<force startup even if another instance may be running>])
+BEGIN
+  force_option = 1;
+END
+
+OPTION(foreground,,,
+       [<remain in foreground>])
+BEGIN
+  log_to_stderr_only = 1;
+  foreground = 1;
+END
+
+OPTION(inetd,i,,
+       [<run in inetd mode>])
+BEGIN
+  if (!instance)
+    instance = "inetd";
+  current_syntax = CONF_INETD;
+  inetd_mode = 1;
+END
+       
+OPTION(instance,,NAME,
+       [<set instance name>])
+BEGIN
+  instance = optarg;
+END
+       
+OPTION(rate,,NUMBER,
+       [<set default maximum rate for inetd-style components>])
+BEGIN
+  char *p;
+  default_max_rate = strtoul (optarg, &p, 10);
+  if (*p)
+    {
+      logmsg (LOG_ERR, _("not a number: %s"), optarg);
+      exit (EX_USAGE);
+    }
+END
+       
+OPTION(stderr,,,
+       [<log to stderr>])
+BEGIN
+  log_to_stderr_only = 1;
+END
+       
+OPTION(syntax,,[<{pies|inetd|meta1}>],
+       [<expect configuration files in the given syntax>])
+BEGIN
+  if (str_to_config_syntax (optarg, &current_syntax))
+    {
+      logmsg (LOG_ERR, _("unknown syntax type: %s"), optarg);
+      exit (EX_USAGE);
+    }
+END
+       
+OPTION(syslog,,,
+       [<log to syslog>])
+BEGIN
+  log_to_stderr_only = 0;
+END
+       
+OPTION(lint,t,,
+       [<parse configuration file and exit>])
+BEGIN
+  log_to_stderr_only = 1;
+  lint_mode = 1;
+END
+       
+GROUP(Preprocessor)
+
+OPTION(define,D,[<NAME[=VALUE]>],
+       [<define a preprocessor symbol NAME as having VALUE or empty>])
+BEGIN
+  add_pp_option ("-D", optarg);
+END
+       
+OPTION(undefine,U,NAME,
+       [<undefine a preprocessor symbol NAME>])
+BEGIN
+  add_pp_option ("-U", optarg);
+END
+       
+GROUP(Component Management)
+
+OPTION(reload,r,,
+       [<reload the running instance of pies>])
+ALIAS(hup)
+BEGIN
+  log_to_stderr_only = 1;
+  command = COM_RELOAD;
+END
+
+OPTION(restart-component,R,,
+       [<restart components named in the command line>])
+BEGIN
+  log_to_stderr_only = 1;
+  command = COM_RESTART;
+END
+       
+OPTION(status,s,,
+       [<display info about the running instance>])
+BEGIN
+  log_to_stderr_only = 1;
+  command = COM_STATUS;
+END
+       
+OPTION(stop,S,,
+       [<stop the running instance>])
+BEGIN
+  log_to_stderr_only = 1;
+  command = COM_STOP;
+END
+       
+GROUP(Debugging and Additional Diagnostics)
+
+OPTION(dump-depmap,,,
+       [<dump dependency map>])
+BEGIN
+  log_to_stderr_only = 1;
+  command = COM_DUMP_DEPMAP;
+END
+       
+OPTION(dump-prereq,,,
+       [<dump prerequisite charts>])
+BEGIN
+  log_to_stderr_only = 1;
+  command = COM_DUMP_PREREQ;
+END
+
+OPTION(source-info,,,
+       [<show source info with debugging messages>])
+BEGIN
+  source_info_option = 1;
+END
+       
+OPTION(debug,x,LEVEL,
+       [<set debug verbosity level>])
+BEGIN
+  debug_level = strtoul (optarg, NULL, 0);
+END
+       
+OPTIONS_END
+
+void
+parse_options(int argc, char *argv[], int *index)
+{
+  GETOPT(argc, argv, *index)
+}