[PATCH 12/13] Simplify check for syslog.h
Ruben Kerkhof
ruben at rubenkerkhof.com
Sat Mar 18 17:25:42 CET 2017
---
configure.ac | 3 +--
sysdep/unix/log.c | 8 ++++----
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/configure.ac b/configure.ac
index d8f81d09..868b989b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -313,8 +313,7 @@ case $sysdesc in
;;
esac
-AC_CHECK_HEADER([syslog.h], [AC_DEFINE([HAVE_SYSLOG], [1], [Define to 1 if you have the <syslog.h> header file])])
-AC_CHECK_HEADERS_ONCE([alloca.h])
+AC_CHECK_HEADERS_ONCE([alloca.h syslog.h])
AC_MSG_CHECKING([whether 'struct sockaddr' has sa_len])
AC_COMPILE_IFELSE([
diff --git a/sysdep/unix/log.c b/sysdep/unix/log.c
index b89e6b7a..88a7188c 100644
--- a/sysdep/unix/log.c
+++ b/sysdep/unix/log.c
@@ -56,7 +56,7 @@ static int main_thread_self(void) { return 1; }
#endif
-#ifdef HAVE_SYSLOG
+#ifdef HAVE_SYSLOG_H
#include <sys/syslog.h>
static int syslog_priorities[] = {
@@ -127,7 +127,7 @@ log_commit(int class, buffer *buf)
fputc('\n', l->fh);
fflush(l->fh);
}
-#ifdef HAVE_SYSLOG
+#ifdef HAVE_SYSLOG_H
else
syslog(syslog_priorities[class], "%s", buf->start);
#endif
@@ -262,7 +262,7 @@ default_log_list(int debug, int init, char **syslog_name)
init_list(&init_log_list);
*syslog_name = NULL;
-#ifdef HAVE_SYSLOG
+#ifdef HAVE_SYSLOG_H
if (!debug)
{
static struct log_config lc_syslog = { .mask = ~0 };
@@ -287,7 +287,7 @@ log_switch(int debug, list *l, char *new_syslog_name)
current_log_list = l;
-#ifdef HAVE_SYSLOG
+#ifdef HAVE_SYSLOG_H
if (current_syslog_name && new_syslog_name &&
!strcmp(current_syslog_name, new_syslog_name))
return;
--
2.12.0
More information about the Bird-users
mailing list