summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Lyman <jlyman2@gmail.com>2013-04-25 10:28:08 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2013-04-25 10:28:08 +0200
commit0b42cf3fdc8ccce019bf7fbb03b33bbf9904a999 (patch)
tree0a14953b3e13814a72923a14872366c571fcac11
parent100c3f8bf209754ee0d9aaae922515f9b0eb3f7b (diff)
downloadrsyslog-0b42cf3fdc8ccce019bf7fbb03b33bbf9904a999.tar.gz
rsyslog-0b42cf3fdc8ccce019bf7fbb03b33bbf9904a999.tar.bz2
rsyslog-0b42cf3fdc8ccce019bf7fbb03b33bbf9904a999.zip
bugfix: build problems on Solaris
closes: http://bugzilla.adiscon.com/show_bug.cgi?id=436
-rw-r--r--ChangeLog2
-rw-r--r--Makefile.am2
-rw-r--r--runtime/Makefile.am2
3 files changed, 4 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 18defb30..e7bcc047 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,8 @@ Version 7.3.12 [devel] 2013-04-??
affect startup, not actual operations. Came up during routine tests,
and can have no effect once the engine runs. Bug was introduced in
7.3.11.
+- bugfix: build problems on Solaris
+ closes: http://bugzilla.adiscon.com/show_bug.cgi?id=436
- bugfix: block size limit was not properly honored
- bugfix: potential segfault in guardtime signature provider
it could segfault if an error was reported by the GuardTime API, because
diff --git a/Makefile.am b/Makefile.am
index 663e15d1..b39b495a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -71,7 +71,7 @@ EXTRA_DIST = \
contrib/gnutls/key.pem \
rsyslog.service.in
-SUBDIRS = doc runtime grammar compat . plugins/immark plugins/imuxsock plugins/imtcp plugins/imudp plugins/omtesting
+SUBDIRS = doc compat runtime grammar . plugins/immark plugins/imuxsock plugins/imtcp plugins/imudp plugins/omtesting
if ENABLE_RSYSLOGD
SUBDIRS += tools
diff --git a/runtime/Makefile.am b/runtime/Makefile.am
index fd8dd3fd..3015c3ca 100644
--- a/runtime/Makefile.am
+++ b/runtime/Makefile.am
@@ -133,7 +133,7 @@ pkglib_LTLIBRARIES += lmnet.la lmnetstrms.la
#
lmnet_la_SOURCES = net.c net.h
lmnet_la_CPPFLAGS = $(PTHREADS_CFLAGS) $(RSRT_CFLAGS)
-lmnet_la_LDFLAGS = -module -avoid-version
+lmnet_la_LDFLAGS = -module -avoid-version ../compat/compat_la-getifaddrs.lo
lmnet_la_LIBADD =
# network stream master class and stream factory