From 05fd4c0e657f409ea50a032686758049731f75c8 Mon Sep 17 00:00:00 2001
From: Rainer Gerhards <rgerhards@adiscon.com>
Date: Tue, 4 Dec 2007 14:16:38 +0000
Subject: applied patch from Michael Biebl for an even cleaner autotools config
 in     regard to -ldl.

---
 Makefile.am  | 5 +----
 configure.ac | 5 ++---
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index d4cf4bd8..2a316337 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -63,10 +63,7 @@ rsyslogd_SOURCES = \
 	gss-misc.h
 
 rsyslogd_CPPFLAGS = -D_PATH_MODDIR=\"$(pkglibdir)/\" $(pthreads_cflags)
-rsyslogd_LDADD = $(zlib_libs) $(pthreads_libs) $(gss_libs)
-if HAVE_LIBDL
-rsyslogd_LDADD += -ldl
-endif
+rsyslogd_LDADD = $(zlib_libs) $(pthreads_libs) $(gss_libs) $(dl_libs) $(rt_libs)
 rsyslogd_LDFLAGS = -export-dynamic
 
 man_MANS = rfc3195d.8 rklogd.8 rsyslogd.8 rsyslog.conf.5 
diff --git a/configure.ac b/configure.ac
index 5f57de5a..a0ef204e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,9 +30,8 @@ case "${host}" in
 esac
 
 # Checks for libraries.
-AC_CHECK_LIB(rt,clock_gettime,,,)
-AC_CHECK_LIB(dl,dlopen,[have_libdl=yes],[have_libdl=no],)
-AM_CONDITIONAL(HAVE_LIBDL, test x$have_libdl=xyes)
+AC_CHECK_LIB(rt,clock_gettime,[dl_libs="-ldl" AC_SUBST(dl_libs)],,)
+AC_CHECK_LIB(dl,dlopen,[rt_libs="-lrt" AC_SUBST(rt_libs)],,)
 
 # Checks for header files.
 AC_HEADER_RESOLV
-- 
cgit v1.2.3