added a --enable/disable-rsyslogd configure option so that source-based

    packaging systems can build plugins without the need to compile
    rsyslogd

3 files changed, 63 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index d51ff510..34c2dfac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,5 @@
 ---------------------------------------------------------------------------
-Version 3.12.6 (rgerhards), 2008-04-??
+Version 3.12.6 (rgerhards), 2008-03-31
 - bugfix: accidently set debug option in 3.12.5 reset to production
   This option prevented dlclose() to be called. It had no real bad effects,
   as the modules were otherwise correctly deinitialized and dlopen()
@@ -10,6 +10,9 @@ Version 3.12.6 (rgerhards), 2008-04-??
   threads to be correctly set
 - worked a bit on atomic memory operations to support problem-free
   threading (only at non-intrusive places)
+- added a --enable/disable-rsyslogd configure option so that
+  source-based packaging systems can build plugins without the need
+  to compile rsyslogd
 ---------------------------------------------------------------------------
 Version 3.12.5 (rgerhards), 2008-03-28
 - changed default for "last message repeated n times", which is now
diff --git a/Makefile.am b/Makefile.am
index 31737516..99f542fb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,8 @@
-sbin_PROGRAMS = rfc3195d rsyslogd
-
-rfc3195d_SOURCES = rfc3195d.c rsyslog.h
+#sbin_PROGRAMS = rfc3195d rsyslogd
+sbin_PROGRAMS =
 
+if ENABLE_RSYSLOGD
+sbin_PROGRAMS += rsyslogd
 rsyslogd_SOURCES = \
 	datetime.c \
 	datetime.h \
@@ -93,10 +94,18 @@ rsyslogd_SOURCES = \
 rsyslogd_CPPFLAGS =  -D_PATH_MODDIR=\"$(pkglibdir)/\" $(pthreads_cflags)
 rsyslogd_LDADD = $(zlib_libs) $(pthreads_libs) $(dl_libs) $(rt_libs)
 rsyslogd_LDFLAGS = -export-dynamic
+endif # if ENABLE_RSYSLOGD
 
 # now come the library plugins
 pkglib_LTLIBRARIES = 
 
+if ENABLE_RFC3195
+# this does so far not work - a manual build is needed
+sbin_PROGRAMS += rfc3195d
+rfc3195d_SOURCES = rfc3195d.c rsyslog.h
+endif
+
+
 if ENABLE_INET
 pkglib_LTLIBRARIES += lmnet.la lmtcpsrv.la lmtcpclt.la
 #
diff --git a/configure.ac b/configure.ac
index e87ca184..8fe70cba 100644
--- a/configure.ac
+++ b/configure.ac
@@ -442,6 +442,19 @@ AC_SUBST(snmp_cflags)
 AC_SUBST(snmp_libs)
 
 
+# support for NOT building rsyslogd (useful for source-based packaging systems)
+AC_ARG_ENABLE(rsyslogd,
+        [AS_HELP_STRING([--enable-rsyslogd],[Build rsyslogd @<:@default=yes@:>@])],
+        [case "${enableval}" in
+         yes) enable_rsyslogd="yes" ;;
+          no) enable_rsyslogd="no" ;;
+           *) AC_MSG_ERROR(bad value ${enableval} for --enable-rsyslogd) ;;
+         esac],
+        [enable_rsyslogd=no]
+)
+AM_CONDITIONAL(ENABLE_RSYSLOGD, test x$enable_rsyslogd = xyes)
+
+
 # RELP support
 AC_ARG_ENABLE(relp,
         [AS_HELP_STRING([--enable-relp],[Enable RELP support @<:@default=no@:>@])],
@@ -474,6 +487,39 @@ AC_SUBST(relp_cflags)
 AC_SUBST(relp_libs)
 
 
+# RFC 3195 support
+# WARNING: THIS IS NOT REALLY PRESENT YET - needs to be build manually!
+AC_ARG_ENABLE(rfc3195,
+        [AS_HELP_STRING([--enable-rfc3195],[Enable RFC3195 support @<:@default=no@:>@])],
+        [case "${enableval}" in
+         yes) enable_rfc3195="yes" ;;
+          no) enable_rfc3195="no" ;;
+           *) AC_MSG_ERROR(bad value ${enableval} for --enable-rfc3195) ;;
+         esac],
+        [enable_rfc3195=no]
+)
+if test "x$enable_rfc3195" = "xyes"; then
+  AC_CHECK_HEADERS(
+    [librfc3195.h],,
+    [AC_MSG_FAILURE([RFC3195 library is missing (no headers)])]
+  )
+# I don't know how to tell that librfc3195 needs -lrt, so I disable
+# this check for now - the header check should work well enough...
+# rgerhards, 2008-03-25
+#  AC_CHECK_LIB(
+#    [rfc3195],
+#    [rfc3195EngineGetVersion],
+#    [rfc3195_cflags=""
+     rfc3195_libs="-lrfc3195"
+#    ],
+#    [AC_MSG_FAILURE([RFC3195 library is missing])]
+#  )
+fi
+AM_CONDITIONAL(ENABLE_RFC3195, test x$enable_rfc3195 = xyes)
+AC_SUBST(rfc3195_cflags)
+AC_SUBST(rfc3195_libs)
+
+
 # settings for the template input module; copy and modify this code
 # if you intend to add your own module. Be sure to replace imtemplate
 # by the actual name of your module.
@@ -554,4 +600,5 @@ echo "Enable GSSAPI Kerberos 5 support:         $want_gssapi_krb5"
 echo "Debug mode enabled:                       $enable_debug"
 echo "Runtime Instrumentation enabled:          $enable_rtinst"
 echo "valgrind support settings enabled:        $enable_valgrind"
+echo "rsyslogd will be built:                   $enable_rsyslogd"