Merge branch 'v4-devel' into master

Conflicts:
	ChangeLog
	Makefile.am
	configure.ac
	doc/manual.html
	runtime/debug.c
	runtime/rsyslog.h
	tests/Makefile.am
	tests/diag.sh
	tests/nettester.c
	tools/syslogd.c

1 files changed, 27 insertions, 9 deletions

diff --git a/configure.ac b/configure.ac
index 8fc70629..a2434b78 100644
--- a/configure.ac
+++ b/configure.ac
@@ -652,6 +652,23 @@ AC_ARG_ENABLE(rsyslogd,
 AM_CONDITIONAL(ENABLE_RSYSLOGD, test x$enable_rsyslogd = xyes)
 
 
+# capability to enable an extended testbench. By default, this is off. The reason
+# for this switch is that some test simply take too long to execute them on a regular
+# basis. So we enable to skip them, while the majority of tests can still be used. The
+# idea is that at least "make distcheck" executes the extended testbench, and also
+# developers should explicitely enable it after important changes. -- rgerhards, 2010-04-12
+AC_ARG_ENABLE(extended_tests,
+        [AS_HELP_STRING([--enable-extended-tests],[extended testbench @<:@default=no@:>@])],
+        [case "${enableval}" in
+         yes) enable_rsyslogd="yes" ;;
+          no) enable_rsyslogd="no" ;;
+           *) AC_MSG_ERROR(bad value ${enableval} for --enable-extended-tests) ;;
+         esac],
+        [enable_extended_tests=no]
+)
+AM_CONDITIONAL(ENABLE_EXTENDED_TESTS, test x$enable_extended_tests = xyes)
+
+
 # Mail support (so far we do not need a library, but we need to turn this on and off)
 AC_ARG_ENABLE(mail,
         [AS_HELP_STRING([--enable-mail],[Enable mail support @<:@default=no@:>@])],
@@ -751,16 +768,16 @@ AM_CONDITIONAL(ENABLE_IMFILE, test x$enable_imfile = xyes)
 
 
 # settings for the door input module (under solaris, thus default off)
-AC_ARG_ENABLE(imdoor,
-        [AS_HELP_STRING([--enable-imdoor],[door input module enabled @<:@default=no@:>@])],
+AC_ARG_ENABLE(imsolaris,
+        [AS_HELP_STRING([--enable-imsolaris],[door input module enabled @<:@default=no@:>@])],
         [case "${enableval}" in
-         yes) enable_imdoor="yes" ;;
-          no) enable_imdoor="no" ;;
-           *) AC_MSG_ERROR(bad value ${enableval} for --enable-imdoor) ;;
+         yes) enable_imsolaris="yes" ;;
+          no) enable_imsolaris="no" ;;
+           *) AC_MSG_ERROR(bad value ${enableval} for --enable-imsolaris) ;;
          esac],
-        [enable_imdoor=no]
+        [enable_imsolaris=no]
 )
-AM_CONDITIONAL(ENABLE_IMDOOR, test x$enable_imdoor = xyes)
+AM_CONDITIONAL(ENABLE_IMSOLARIS, test x$enable_imsolaris = xyes)
 
 
 # settings for the omprog output module
@@ -939,7 +956,7 @@ AC_CONFIG_FILES([Makefile \
 		plugins/omruleset/Makefile \
 		plugins/omdbalerting/Makefile \
 		plugins/imfile/Makefile \
-		plugins/imdoor/Makefile \
+		plugins/imsolaris/Makefile \
 		plugins/imrelp/Makefile \
 		plugins/imdiag/Makefile \
 		plugins/omtesting/Makefile \
@@ -974,7 +991,7 @@ echo "---{ input plugins }---"
 echo "    Klog functionality enabled:               $enable_klog ($os_type)"
 echo "    imdiag enabled:                           $enable_imdiag"
 echo "    file input module enabled:                $enable_imfile"
-echo "    Solaris door input module enabled:        $enable_imdoor"
+echo "    Solaris input module enabled:             $enable_imsolaris"
 echo "    input template module will be compiled:   $enable_imtemplate"
 echo
 echo "---{ output plugins }---"
@@ -1000,6 +1017,7 @@ echo "    SNMP support enabled:                     $enable_snmp"
 echo
 echo "---{ debugging support }---"
 echo "    Testbench enabled:                        $enable_testbench"
+echo "    Extended Testbench enabled:               $enable_extended_tests"
 echo "    Debug mode enabled:                       $enable_debug"
 echo "    Runtime Instrumentation enabled:          $enable_rtinst"
 echo "    Diagnostic tools enabled:                 $enable_diagtools"