Cleanup.

* po/POTFILES.in: Remove appinit.c (See e473ab7d).
* src/Makefile.am: Restore incdir, needed for AM_CPPFLAGS. Was
accidentally removed in 01ad06fca.
* src/builtin/sa.bi (sa): Restore initialization of msize. Accidentally
removed in bcd64af9.
* src/main.c: Call mf_server_log_setup after compiling the sources, so
that --lint spits out its diagnostics on stderr (initially placed here
in e75c9a39).

1 files changed, 2 insertions, 1 deletions

diff --git a/src/main.c b/src/main.c
index 3d0264c9..b16a554f 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1179,25 +1179,24 @@ main(int argc, char **argv)
         srvman_init();
         mf_srvcfg_init(argv[0], N_("(milter | callout)"));
         
         mu_argp_init(program_version, "<" PACKAGE_BUGREPORT ">");
         mu_site_rcfile = DEFAULT_CONFIG_FILE;
         init_arguments(&args);
         rc = mu_app_init(&argp, capa, mf_cfg_param, argc, argv,
                          argpflag(argc, argv), &index, &args);
         if (rc)
                 exit(EX_CONFIG);
         flush_arguments(&args);
         mf_srvcfg_flush();
-        mf_server_log_setup();
         
         alloc_ext_pp();
 
         argv += index;
         argc -= index;
 
         if (need_script) {
                 char *new_script = NULL;
                 if (argc) {
                         int i, n = -1;
                         for (i = 0; i < argc; i++) {
                                 if (strchr(argv[i], '=') == 0) {
@@ -1245,24 +1244,26 @@ main(int argc, char **argv)
                 print_xref();
         
         if (script_dump_macros)
                 print_used_macros();
         
         fixup_code();
         
         if (script_check || script_dump_macros
             || script_dump_code || script_dump_tree || script_dump_xref
             || yy_flex_debug || script_ydebug)
                 exit(EX_OK);
 
+        mf_server_log_setup();
+        
         switch (mode) {
         case MAILFROMD_DAEMON:
                 provide_default_milter_server();
                 provide_default_callout_server();
                 break;
 
         case MAILFROMD_RUN: {
                 struct function *fun = function_lookup(main_function_name);
                 if (!fun) {
                         mu_error(_("function %s is not defined"),
                                  main_function_name);
                         exit(EX_CONFIG);