Ported r1556 from branches/gmach.

* src/gram.y (DELETE string): Initialize hdr.value.
* src/drivers.c (code_type_header): Value can be NULL.

Fix compatibility with MU CVS:

* src/main.c: Use mu_log_facility.
* src/mtasim.c [MAILUTILS_VERSION_NUMBER > 1290]: Include
gettext.h, define _ and N_.
* configure.ac: Check for mu_log_facility.


git-svn-id: file:///svnroot/mailfromd/trunk@1569 7a8a7f39-df28-0410-adc6-e0d955640f24

1 files changed, 6 insertions, 3 deletions

diff --git a/src/main.c b/src/main.c
index 23df6e54..4741dba4 100644
--- a/src/main.c
+++ b/src/main.c
@@ -37,12 +37,15 @@
 #include <mailutils/mailutils.h>
 #if MAILUTILS_VERSION_NUMBER < 1290
 # include <mailutils/argp.h>
 #else
 # include <mailutils/libargp.h>
 #endif
+#ifdef HAVE_MAILUTILS_SYSLOG_H
+# include <mailutils/syslog.h>
+#endif
 #include "mailfromd.h"
 
 
 /* Configurable options */
 
 int mode = MAILFROMD_DAEMON; /* Default operation mode */
@@ -2053,18 +2056,18 @@ void
 log_setup(int want_stderr)
 {
 	/* Set up logging */
 	if (!want_stderr) {
 #ifdef USE_SYSLOG_ASYNC		
 		if (use_syslog_async) {
-			openlog_async(syslog_tag, LOG_PID, log_facility);
+			openlog_async(syslog_tag, LOG_PID, mu_log_facility);
 			gacopyz_set_logger(mf_gacopyz_syslog_async_log_printer);
 		} else
 #endif
 			{
-			openlog(syslog_tag, LOG_PID, log_facility);
+			openlog(syslog_tag, LOG_PID, mu_log_facility);
 			gacopyz_set_logger(gacopyz_syslog_log_printer);
 		}
 		mu_error_set_print(syslog_error_printer);
 	} else {
 		gacopyz_set_logger(gacopyz_stderr_log_printer);
 		mu_error_set_print(stderr_error_printer);
@@ -2106,13 +2109,13 @@ main(int argc, char **argv)
 	if (!program_invocation_short_name)
 		program_invocation_short_name = argv[0];
 	argp_program_version_hook = version;
 	yy_flex_debug = 0;
 
 	/* Set default logging */
-  	log_facility = DEFAULT_LOG_FACILITY;
+  	mu_log_facility = DEFAULT_LOG_FACILITY;
 	log_setup(!stderr_closed_p());
 
 	init_names();
 	init_string_space();
 	builtin_setup();
 	db_format_setup();