diff options
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 89 |
1 files changed, 65 insertions, 24 deletions
@@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for rsyslog 4.6.2. +# Generated by GNU Autoconf 2.63 for rsyslog 4.6.3. # # Report bugs to <rsyslog@lists.adiscon.com>. # @@ -745,8 +745,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='rsyslog' PACKAGE_TARNAME='rsyslog' -PACKAGE_VERSION='4.6.2' -PACKAGE_STRING='rsyslog 4.6.2' +PACKAGE_VERSION='4.6.3' +PACKAGE_STRING='rsyslog 4.6.3' PACKAGE_BUGREPORT='rsyslog@lists.adiscon.com' ac_unique_file="ChangeLog" @@ -824,6 +824,8 @@ ENABLE_IMDIAG_FALSE ENABLE_IMDIAG_TRUE ENABLE_MAIL_FALSE ENABLE_MAIL_TRUE +ENABLE_EXTENDED_TESTS_FALSE +ENABLE_EXTENDED_TESTS_TRUE ENABLE_RSYSLOGD_FALSE ENABLE_RSYSLOGD_TRUE RSRT_LIBS @@ -1022,6 +1024,7 @@ enable_snmp enable_gnutls enable_rsyslogrt enable_rsyslogd +enable_extended_tests enable_mail enable_imdiag enable_relp @@ -1603,7 +1606,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures rsyslog 4.6.2 to adapt to many kinds of systems. +\`configure' configures rsyslog 4.6.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1673,7 +1676,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of rsyslog 4.6.2:";; + short | recursive ) echo "Configuration of rsyslog 4.6.3:";; esac cat <<\_ACEOF @@ -1709,6 +1712,7 @@ Optional Features: --enable-gnutls Enable GNU TLS support [default=no] --enable-rsyslogrt Build rsyslogrt [default=yes] --enable-rsyslogd Build rsyslogd [default=yes] + --enable-extended-tests extended testbench [default=no] --enable-mail Enable mail support [default=no] --enable-imdiag Enable imdiag [default=yes] --enable-relp Enable RELP support [default=no] @@ -1817,7 +1821,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -rsyslog configure 4.6.2 +rsyslog configure 4.6.3 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1831,7 +1835,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by rsyslog $as_me 4.6.2, which was +It was created by rsyslog $as_me 4.6.3, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2680,7 +2684,7 @@ fi # Define the identity of the package. PACKAGE='rsyslog' - VERSION='4.6.2' + VERSION='4.6.3' cat >>confdefs.h <<_ACEOF @@ -6293,13 +6297,13 @@ if test "${lt_cv_nm_interface+set}" = set; then else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:6296: $ac_compile\"" >&5) + (eval echo "\"\$as_me:6300: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:6299: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:6303: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:6302: output\"" >&5) + (eval echo "\"\$as_me:6306: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -7504,7 +7508,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 7507 "configure"' > conftest.$ac_ext + echo '#line 7511 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -8843,11 +8847,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8846: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8850: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8850: \$? = $ac_status" >&5 + echo "$as_me:8854: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -9182,11 +9186,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9185: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9189: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:9189: \$? = $ac_status" >&5 + echo "$as_me:9193: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -9287,11 +9291,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9290: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9294: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9294: \$? = $ac_status" >&5 + echo "$as_me:9298: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -9342,11 +9346,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:9345: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9349: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9349: \$? = $ac_status" >&5 + echo "$as_me:9353: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -12145,7 +12149,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12148 "configure" +#line 12152 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -12241,7 +12245,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 12244 "configure" +#line 12248 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -19725,6 +19729,35 @@ fi +# 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 +# Check whether --enable-extended_tests was given. +if test "${enable_extended_tests+set}" = set; then + enableval=$enable_extended_tests; case "${enableval}" in + yes) enable_rsyslogd="yes" ;; + no) enable_rsyslogd="no" ;; + *) { { $as_echo "$as_me:$LINENO: error: bad value ${enableval} for --enable-extended-tests" >&5 +$as_echo "$as_me: error: bad value ${enableval} for --enable-extended-tests" >&2;} + { (exit 1); exit 1; }; } ;; + esac +else + enable_extended_tests=no + +fi + + if test x$enable_extended_tests = xyes; then + ENABLE_EXTENDED_TESTS_TRUE= + ENABLE_EXTENDED_TESTS_FALSE='#' +else + ENABLE_EXTENDED_TESTS_TRUE='#' + ENABLE_EXTENDED_TESTS_FALSE= +fi + + + # Mail support (so far we do not need a library, but we need to turn this on and off) # Check whether --enable-mail was given. if test "${enable_mail+set}" = set; then @@ -20588,6 +20621,13 @@ $as_echo "$as_me: error: conditional \"ENABLE_RSYSLOGD\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi +if test -z "${ENABLE_EXTENDED_TESTS_TRUE}" && test -z "${ENABLE_EXTENDED_TESTS_FALSE}"; then + { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_EXTENDED_TESTS\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +$as_echo "$as_me: error: conditional \"ENABLE_EXTENDED_TESTS\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi if test -z "${ENABLE_MAIL_TRUE}" && test -z "${ENABLE_MAIL_FALSE}"; then { { $as_echo "$as_me:$LINENO: error: conditional \"ENABLE_MAIL\" was never defined. Usually this means the macro was only invoked conditionally." >&5 @@ -20987,7 +21027,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by rsyslog $as_me 4.6.2, which was +This file was extended by rsyslog $as_me 4.6.3, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -21050,7 +21090,7 @@ Report bugs to <bug-autoconf@gnu.org>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -rsyslog config.status 4.6.2 +rsyslog config.status 4.6.3 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" @@ -22966,6 +23006,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" |