summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2008-06-11 16:35:34 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2008-06-11 17:02:11 +0200
commit34054198fede73e43c834fe5f031b2637fbd166d (patch)
tree6b8a50fe1d516f664169cc9f1d3ff3f1dd231f5d
parent8c0ac28fd9ff006154e78ffabd75a088cb8fe087 (diff)
downloadrsyslog-34054198fede73e43c834fe5f031b2637fbd166d.tar.gz
rsyslog-34054198fede73e43c834fe5f031b2637fbd166d.tar.xz
rsyslog-34054198fede73e43c834fe5f031b2637fbd166d.zip
Fix linker flags for librsyslog and rsyslogd
Use $(dl_libs) and $(rt_libs) instead of -ldl and -lrt. This ensures that rsyslog can be successfully built on *BSD. Don't like rsyslogd against $(dl_libs) and $(rt_libs) anymore. This functionality is now in librsyslog. Signed-off-by: Rainer Gerhards <rgerhards@adiscon.com>
-rw-r--r--runtime/Makefile.am2
-rw-r--r--tools/Makefile.am2
2 files changed, 2 insertions, 2 deletions
diff --git a/runtime/Makefile.am b/runtime/Makefile.am
index 4a72eed8..79783bd6 100644
--- a/runtime/Makefile.am
+++ b/runtime/Makefile.am
@@ -67,7 +67,7 @@ librsyslog_la_SOURCES = \
librsyslog_la_CPPFLAGS = -D_PATH_MODDIR=\"$(pkglibdir)/\" -I$(top_srcdir) $(pthreads_cflags)
#librsyslog_la_LDFLAGS = -module -avoid-version
-librsyslog_la_LIBADD = -ldl -lrt
+librsyslog_la_LIBADD = $(dl_libs) $(rt_libs)
#
# regular expression support
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 7fe420b0..1eb017d4 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -38,7 +38,7 @@ rsyslogd_SOURCES = \
../conf.h
rsyslogd_CPPFLAGS = $(pthreads_cflags) $(rsrt_cflags)
-rsyslogd_LDADD = $(zlib_libs) $(pthreads_libs) $(dl_libs) $(rt_libs) $(rsrt_libs)
+rsyslogd_LDADD = $(zlib_libs) $(pthreads_libs) $(rsrt_libs)
rsyslogd_LDFLAGS = -export-dynamic
EXTRA_DIST = $(man_MANS)