summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--Makefile.am7
-rw-r--r--configure.ac2
3 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 15de452f..7aefd39f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
---------------------------------------------------------------------------
Version 3.17.0 (rgerhards), 2008-04-??
- FEATURE FOCUS for 3.17 is TLS over plain TCP syslog
+- bugfix: rsyslogd was no longer build by default; man pages are
+ only installed if corresponding option is selected. Thanks to
+ Michael Biebl for pointing these problems out.
---------------------------------------------------------------------------
Version 3.13.0-dev0 (rgerhards), 2008-03-31
- bugfix: accidently set debug option in 3.12.5 reset to production
diff --git a/Makefile.am b/Makefile.am
index 99f542fb..eb0497a6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,6 @@
#sbin_PROGRAMS = rfc3195d rsyslogd
sbin_PROGRAMS =
+man_MANS =
if ENABLE_RSYSLOGD
sbin_PROGRAMS += rsyslogd
@@ -94,6 +95,9 @@ rsyslogd_SOURCES = \
rsyslogd_CPPFLAGS = -D_PATH_MODDIR=\"$(pkglibdir)/\" $(pthreads_cflags)
rsyslogd_LDADD = $(zlib_libs) $(pthreads_libs) $(dl_libs) $(rt_libs)
rsyslogd_LDFLAGS = -export-dynamic
+
+man_MANS += rsyslogd.8 rsyslog.conf.5
+
endif # if ENABLE_RSYSLOGD
# now come the library plugins
@@ -103,6 +107,7 @@ if ENABLE_RFC3195
# this does so far not work - a manual build is needed
sbin_PROGRAMS += rfc3195d
rfc3195d_SOURCES = rfc3195d.c rsyslog.h
+man_MANS += rfc3195d.8
endif
@@ -173,8 +178,6 @@ lmrelputil_la_LDFLAGS = -module -avoid-version
lmrelputil_la_LIBADD = $(relp_libs)
endif
-man_MANS = rfc3195d.8 rsyslogd.8 rsyslog.conf.5
-
EXTRA_DIST = \
redhat/rsyslog.conf \
redhat/rsyslog.init \
diff --git a/configure.ac b/configure.ac
index d09ee302..c45ba862 100644
--- a/configure.ac
+++ b/configure.ac
@@ -486,7 +486,7 @@ AC_ARG_ENABLE(rsyslogd,
no) enable_rsyslogd="no" ;;
*) AC_MSG_ERROR(bad value ${enableval} for --enable-rsyslogd) ;;
esac],
- [enable_rsyslogd=no]
+ [enable_rsyslogd=yes]
)
AM_CONDITIONAL(ENABLE_RSYSLOGD, test x$enable_rsyslogd = xyes)