denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bus: Build syslog logger depending on syslog() availability

Browse Source
This commit is contained in:
Martin Willi
2014-06-04 15:53:05 +02:00
parent 89e46c41f1
commit ee2498e3d6
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.ac
+7 -1
View File
@@ -569,7 +569,13 @@ AC_CHECK_FUNC(
) )
AC_CHECK_FUNCS(prctl mallinfo getpass closefrom getpwnam_r getgrnam_r getpwuid_r) AC_CHECK_FUNCS(prctl mallinfo getpass closefrom getpwnam_r getgrnam_r getpwuid_r)
AC_CHECK_FUNCS(fmemopen funopen mmap memrchr syslog setlinebuf) AC_CHECK_FUNCS(fmemopen funopen mmap memrchr setlinebuf)
AC_CHECK_FUNC([syslog], [
AC_DEFINE([HAVE_SYSLOG], [], [have syslog(3) and friends])
syslog=true
])
AM_CONDITIONAL(USE_SYSLOG, [test "x$syslog" = xtrue])
AC_CHECK_HEADERS(sys/sockio.h glob.h net/if_tun.h linux/fib_rules.h) AC_CHECK_HEADERS(sys/sockio.h glob.h net/if_tun.h linux/fib_rules.h)
AC_CHECK_HEADERS(net/pfkeyv2.h netipsec/ipsec.h netinet6/ipsec.h linux/udp.h) AC_CHECK_HEADERS(net/pfkeyv2.h netipsec/ipsec.h netinet6/ipsec.h linux/udp.h)
src/libcharon/Makefile.am
+4 -3
View File
@@ -124,6 +124,10 @@ processing/jobs/dpd_timeout_job.c processing/jobs/dpd_timeout_job.h \
processing/jobs/adopt_children_job.c processing/jobs/adopt_children_job.h processing/jobs/adopt_children_job.c processing/jobs/adopt_children_job.h
endif endif
if USE_SYSLOG
libcharon_la_SOURCES += \
bus/listeners/sys_logger.c bus/listeners/sys_logger.h
endif
daemon.lo : $(top_builddir)/config.status daemon.lo : $(top_builddir)/config.status
@@ -145,9 +149,6 @@ libcharon_la_LIBADD = \
if USE_WINDOWS if USE_WINDOWS
libcharon_la_LIBADD += -lws2_32 libcharon_la_LIBADD += -lws2_32
else
libcharon_la_SOURCES += \
bus/listeners/sys_logger.c bus/listeners/sys_logger.h
endif endif
EXTRA_DIST = Android.mk EXTRA_DIST = Android.mk