diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2007-12-04 14:16:38 +0000 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2007-12-04 14:16:38 +0000 |
| commit | 05fd4c0e657f409ea50a032686758049731f75c8 (patch) | |
| tree | aff2a75f6b70bd02d0599ccec9b9cf0ff0a7db02 | |
| parent | 87433db66fa8ea0c822290dd017f3f248192e1b2 (diff) | |
| download | rsyslog-05fd4c0e657f409ea50a032686758049731f75c8.tar.gz rsyslog-05fd4c0e657f409ea50a032686758049731f75c8.tar.xz rsyslog-05fd4c0e657f409ea50a032686758049731f75c8.zip | |
applied patch from Michael Biebl for an even cleaner autotools config in
regard to -ldl.
| -rw-r--r-- | Makefile.am | 5 | ||||
| -rw-r--r-- | 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 |