From dea543841bb1f1c46586a68da21d55b44c6bf158 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sat, 26 Mar 2011 19:16:55 +0100 Subject: Imported Upstream version 5.7.9 --- configure | 85 +++++++++++++++++++++++++++++++++++++++++++++------------------ 1 file changed, 61 insertions(+), 24 deletions(-) (limited to 'configure') diff --git a/configure b/configure index e8a594b..a90434e 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65 for rsyslog 5.7.8. +# Generated by GNU Autoconf 2.65 for rsyslog 5.7.9. # # Report bugs to . # @@ -701,8 +701,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='rsyslog' PACKAGE_TARNAME='rsyslog' -PACKAGE_VERSION='5.7.8' -PACKAGE_STRING='rsyslog 5.7.8' +PACKAGE_VERSION='5.7.9' +PACKAGE_STRING='rsyslog 5.7.9' PACKAGE_BUGREPORT='rsyslog@lists.adiscon.com' PACKAGE_URL='' @@ -802,6 +802,8 @@ ENABLE_IMDIAG_FALSE ENABLE_IMDIAG_TRUE ENABLE_MAIL_FALSE ENABLE_MAIL_TRUE +ENABLE_MYSQL_TESTS_FALSE +ENABLE_MYSQL_TESTS_TRUE ENABLE_EXTENDED_TESTS_FALSE ENABLE_EXTENDED_TESTS_TRUE ENABLE_RSYSLOGD_FALSE @@ -1019,6 +1021,7 @@ enable_gnutls enable_rsyslogrt enable_rsyslogd enable_extended_tests +enable_mysql_tests enable_mail enable_imdiag enable_relp @@ -1602,7 +1605,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 5.7.8 to adapt to many kinds of systems. +\`configure' configures rsyslog 5.7.9 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1672,7 +1675,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of rsyslog 5.7.8:";; + short | recursive ) echo "Configuration of rsyslog 5.7.9:";; esac cat <<\_ACEOF @@ -1715,6 +1718,8 @@ Optional Features: --enable-rsyslogrt Build rsyslogrt [default=yes] --enable-rsyslogd Build rsyslogd [default=yes] --enable-extended-tests extended testbench [default=no] + --enable-mysql-tests enable MySQL specific tests in testbench + [default=no] --enable-mail Enable mail support [default=no] --enable-imdiag Enable imdiag [default=yes] --enable-relp Enable RELP support [default=no] @@ -1839,7 +1844,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -rsyslog configure 5.7.8 +rsyslog configure 5.7.9 generated by GNU Autoconf 2.65 Copyright (C) 2009 Free Software Foundation, Inc. @@ -2414,7 +2419,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 5.7.8, which was +It was created by rsyslog $as_me 5.7.9, which was generated by GNU Autoconf 2.65. Invocation command line was $ $0 $@ @@ -3222,7 +3227,7 @@ fi # Define the identity of the package. PACKAGE='rsyslog' - VERSION='5.7.8' + VERSION='5.7.9' cat >>confdefs.h <<_ACEOF @@ -6191,13 +6196,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:6194: $ac_compile\"" >&5) + (eval echo "\"\$as_me:6199: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:6197: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:6202: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:6200: output\"" >&5) + (eval echo "\"\$as_me:6205: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -7402,7 +7407,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 7405 "configure"' > conftest.$ac_ext + echo '#line 7410 "configure"' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -8634,11 +8639,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:8637: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8642: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8641: \$? = $ac_status" >&5 + echo "$as_me:8646: \$? = $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. @@ -8973,11 +8978,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:8976: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8981: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8980: \$? = $ac_status" >&5 + echo "$as_me:8985: \$? = $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. @@ -9078,11 +9083,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:9081: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9086: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9085: \$? = $ac_status" >&5 + echo "$as_me:9090: \$? = $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 @@ -9133,11 +9138,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:9136: $lt_compile\"" >&5) + (eval echo "\"\$as_me:9141: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:9140: \$? = $ac_status" >&5 + echo "$as_me:9145: \$? = $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 @@ -11503,7 +11508,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11506 "configure" +#line 11511 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -11599,7 +11604,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 11602 "configure" +#line 11607 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -15502,6 +15507,33 @@ fi +# capability to enable MySQL testbench tests. This requries that a Syslog database +# with the default schema has been created on the local (127.0.0.1) MySQL server and +# a user "rsyslog" with password "testbench" exists, is able to login with default +# parameters and has sufficient (read: all) privileges on that database. +# rgerhards, 2011-03-09 +# Check whether --enable-mysql_tests was given. +if test "${enable_mysql_tests+set}" = set; then : + enableval=$enable_mysql_tests; case "${enableval}" in + yes) enable_mysql_tests="yes" ;; + no) enable_mysql_tests="no" ;; + *) as_fn_error "bad value ${enableval} for --enable-mysql-tests" "$LINENO" 5 ;; + esac +else + enable_mysql_tests=no + +fi + + if test x$enable_mysql_tests = xyes; then + ENABLE_MYSQL_TESTS_TRUE= + ENABLE_MYSQL_TESTS_FALSE='#' +else + ENABLE_MYSQL_TESTS_TRUE='#' + ENABLE_MYSQL_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 : @@ -16564,6 +16596,10 @@ if test -z "${ENABLE_EXTENDED_TESTS_TRUE}" && test -z "${ENABLE_EXTENDED_TESTS_F as_fn_error "conditional \"ENABLE_EXTENDED_TESTS\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${ENABLE_MYSQL_TESTS_TRUE}" && test -z "${ENABLE_MYSQL_TESTS_FALSE}"; then + as_fn_error "conditional \"ENABLE_MYSQL_TESTS\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${ENABLE_MAIL_TRUE}" && test -z "${ENABLE_MAIL_FALSE}"; then as_fn_error "conditional \"ENABLE_MAIL\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -17072,7 +17108,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=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 5.7.8, which was +This file was extended by rsyslog $as_me 5.7.9, which was generated by GNU Autoconf 2.65. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17138,7 +17174,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -rsyslog config.status 5.7.8 +rsyslog config.status 5.7.9 configured by $0, generated by GNU Autoconf 2.65, with options \\"\$ac_cs_config\\" @@ -18970,6 +19006,7 @@ echo echo "---{ debugging support }---" echo " Testbench enabled: $enable_testbench" echo " Extended Testbench enabled: $enable_extended_tests" +echo " MySQL Tests enabled: $enable_mysql_tests" echo " Debug mode enabled: $enable_debug" echo " Runtime Instrumentation enabled: $enable_rtinst" echo " Diagnostic tools enabled: $enable_diagtools" -- cgit v1.2.3