Imported Upstream version 7.3.11upstream/7.3.11

1 files changed, 271 insertions, 19 deletions

diff --git a/configure b/configure
index e990e34..bcf3056 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.69 for rsyslog 7.3.10.
+# Generated by GNU Autoconf 2.69 for rsyslog 7.3.11.
 #
 # Report bugs to <rsyslog@lists.adiscon.com>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='rsyslog'
 PACKAGE_TARNAME='rsyslog'
-PACKAGE_VERSION='7.3.10'
-PACKAGE_STRING='rsyslog 7.3.10'
+PACKAGE_VERSION='7.3.11'
+PACKAGE_STRING='rsyslog 7.3.11'
 PACKAGE_BUGREPORT='rsyslog@lists.adiscon.com'
 PACKAGE_URL=''
 
@@ -673,8 +673,6 @@ ENABLE_PMLASTMSG_FALSE
 ENABLE_PMLASTMSG_TRUE
 ENABLE_OMJOURNAL_FALSE
 ENABLE_OMJOURNAL_TRUE
-LIBSYSTEMD_JOURNAL_LIBS
-LIBSYSTEMD_JOURNAL_CFLAGS
 ENABLE_OMSTDOUT_FALSE
 ENABLE_OMSTDOUT_TRUE
 UDPSPOOF_LIBS
@@ -733,6 +731,9 @@ RSRT_LIBS1
 RSRT_CFLAGS1
 ENABLE_RSYSLOGRT_FALSE
 ENABLE_RSYSLOGRT_TRUE
+ENABLE_LIBGCRYPT_FALSE
+ENABLE_LIBGCRYPT_TRUE
+HAVE_LIBGCRYPT_CONFIG
 ENABLE_GNUTLS_FALSE
 ENABLE_GNUTLS_TRUE
 GNUTLS_LIBS
@@ -778,6 +779,10 @@ HAVE_SYSTEMD_TRUE
 systemdsystemunitdir
 ENABLE_INET_FALSE
 ENABLE_INET_TRUE
+ENABLE_IMJOURNAL_FALSE
+ENABLE_IMJOURNAL_TRUE
+LIBSYSTEMD_JOURNAL_LIBS
+LIBSYSTEMD_JOURNAL_CFLAGS
 ENABLE_IMKMSG_FALSE
 ENABLE_IMKMSG_TRUE
 ENABLE_IMKLOG_SOLARIS_FALSE
@@ -955,6 +960,7 @@ enable_zlib
 enable_gssapi_krb5
 enable_klog
 enable_kmsg
+enable_imjournal
 enable_inet
 enable_fsstnd
 enable_unlimited_select
@@ -974,6 +980,7 @@ enable_snmp
 enable_uuid
 enable_elasticsearch
 enable_gnutls
+enable_libgcrypt
 enable_rsyslogrt
 enable_rsyslogd
 enable_extended_tests
@@ -1033,6 +1040,8 @@ LIBEE_CFLAGS
 LIBEE_LIBS
 JSON_C_CFLAGS
 JSON_C_LIBS
+LIBSYSTEMD_JOURNAL_CFLAGS
+LIBSYSTEMD_JOURNAL_LIBS
 LIBUUID_CFLAGS
 LIBUUID_LIBS
 CURL_CFLAGS
@@ -1047,8 +1056,6 @@ GUARDTIME_CFLAGS
 GUARDTIME_LIBS
 LIBLOGGING_CFLAGS
 LIBLOGGING_LIBS
-LIBSYSTEMD_JOURNAL_CFLAGS
-LIBSYSTEMD_JOURNAL_LIBS
 LIBMONGO_CLIENT_CFLAGS
 LIBMONGO_CLIENT_LIBS
 CZMQ_CFLAGS
@@ -1595,7 +1602,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 7.3.10 to adapt to many kinds of systems.
+\`configure' configures rsyslog 7.3.11 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1665,7 +1672,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of rsyslog 7.3.10:";;
+     short | recursive ) echo "Configuration of rsyslog 7.3.11:";;
    esac
   cat <<\_ACEOF
 
@@ -1691,6 +1698,7 @@ Optional Features:
   --enable-klog           Integrated klog functionality [default=yes]
   --enable-kmsg           Kmsg structured kernel logs functionality
                           [default=no]
+  --enable-imjournal      Systemd journal message import [default=no]
   --enable-inet           Enable networking support [default=yes]
   --disable-fsstnd        Disable support for FSSTND
   --enable-unlimited-select
@@ -1711,6 +1719,7 @@ Optional Features:
   --enable-uuid           Enable support for uuid generation [default=yes]
   --enable-elasticsearch  Enable elasticsearch output module [default=no]
   --enable-gnutls         Enable GNU TLS support [default=no]
+  --enable-libgcrypt      Enable libgcrypt support [default=yes]
   --enable-rsyslogrt      Build rsyslogrt [default=yes]
   --enable-rsyslogd       Build rsyslogd [default=yes]
   --enable-extended-tests extended testbench [default=no]
@@ -1796,6 +1805,10 @@ Some influential environment variables:
   JSON_C_CFLAGS
               C compiler flags for JSON_C, overriding pkg-config
   JSON_C_LIBS linker flags for JSON_C, overriding pkg-config
+  LIBSYSTEMD_JOURNAL_CFLAGS
+              C compiler flags for LIBSYSTEMD_JOURNAL, overriding pkg-config
+  LIBSYSTEMD_JOURNAL_LIBS
+              linker flags for LIBSYSTEMD_JOURNAL, overriding pkg-config
   LIBUUID_CFLAGS
               C compiler flags for LIBUUID, overriding pkg-config
   LIBUUID_LIBS
@@ -1819,10 +1832,6 @@ Some influential environment variables:
               C compiler flags for LIBLOGGING, overriding pkg-config
   LIBLOGGING_LIBS
               linker flags for LIBLOGGING, overriding pkg-config
-  LIBSYSTEMD_JOURNAL_CFLAGS
-              C compiler flags for LIBSYSTEMD_JOURNAL, overriding pkg-config
-  LIBSYSTEMD_JOURNAL_LIBS
-              linker flags for LIBSYSTEMD_JOURNAL, overriding pkg-config
   LIBMONGO_CLIENT_CFLAGS
               C compiler flags for LIBMONGO_CLIENT, overriding pkg-config
   LIBMONGO_CLIENT_LIBS
@@ -1900,7 +1909,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-rsyslog configure 7.3.10
+rsyslog configure 7.3.11
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2480,7 +2489,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 7.3.10, which was
+It was created by rsyslog $as_me 7.3.11, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3304,7 +3313,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='rsyslog'
- VERSION='7.3.10'
+ VERSION='7.3.11'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -16105,6 +16114,120 @@ else
 fi
 
 
+# imjournal
+# Check whether --enable-imjournal was given.
+if test "${enable_imjournal+set}" = set; then :
+  enableval=$enable_imjournal; case "${enableval}" in
+         yes) enable_imjournal="yes" ;;
+          no) enable_imjournal="no" ;;
+           *) as_fn_error $? "bad value ${enableval} for --enable-imjournal" "$LINENO" 5 ;;
+         esac
+else
+  enable_imjournal="no"
+
+fi
+
+if test "x$enable_imjournal" = "xyes"; then
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBSYSTEMD_JOURNAL" >&5
+$as_echo_n "checking for LIBSYSTEMD_JOURNAL... " >&6; }
+
+if test -n "$LIBSYSTEMD_JOURNAL_CFLAGS"; then
+    pkg_cv_LIBSYSTEMD_JOURNAL_CFLAGS="$LIBSYSTEMD_JOURNAL_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-journal >= 197\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libsystemd-journal >= 197") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_LIBSYSTEMD_JOURNAL_CFLAGS=`$PKG_CONFIG --cflags "libsystemd-journal >= 197" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$LIBSYSTEMD_JOURNAL_LIBS"; then
+    pkg_cv_LIBSYSTEMD_JOURNAL_LIBS="$LIBSYSTEMD_JOURNAL_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-journal >= 197\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libsystemd-journal >= 197") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_LIBSYSTEMD_JOURNAL_LIBS=`$PKG_CONFIG --libs "libsystemd-journal >= 197" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        LIBSYSTEMD_JOURNAL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd-journal >= 197" 2>&1`
+        else
+	        LIBSYSTEMD_JOURNAL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd-journal >= 197" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$LIBSYSTEMD_JOURNAL_PKG_ERRORS" >&5
+
+	as_fn_error $? "Package requirements (libsystemd-journal >= 197) were not met:
+
+$LIBSYSTEMD_JOURNAL_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+Alternatively, you may set the environment variables LIBSYSTEMD_JOURNAL_CFLAGS
+and LIBSYSTEMD_JOURNAL_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details." "$LINENO" 5
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively, you may set the environment variables LIBSYSTEMD_JOURNAL_CFLAGS
+and LIBSYSTEMD_JOURNAL_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+See \`config.log' for more details" "$LINENO" 5; }
+else
+	LIBSYSTEMD_JOURNAL_CFLAGS=$pkg_cv_LIBSYSTEMD_JOURNAL_CFLAGS
+	LIBSYSTEMD_JOURNAL_LIBS=$pkg_cv_LIBSYSTEMD_JOURNAL_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+fi
+fi
+ if test x$enable_imjournal = xyes; then
+  ENABLE_IMJOURNAL_TRUE=
+  ENABLE_IMJOURNAL_FALSE='#'
+else
+  ENABLE_IMJOURNAL_TRUE='#'
+  ENABLE_IMJOURNAL_FALSE=
+fi
+
 
 # inet
 # Check whether --enable-inet was given.
@@ -17604,6 +17727,124 @@ else
 fi
 
 
+# libgcrypt support
+# Check whether --enable-libgcrypt was given.
+if test "${enable_libgcrypt+set}" = set; then :
+  enableval=$enable_libgcrypt; case "${enableval}" in
+         yes) enable_libgcrypt="yes" ;;
+          no) enable_libgcrypt="no" ;;
+           *) as_fn_error $? "bad value ${enableval} for --enable-libgcrypt" "$LINENO" 5 ;;
+         esac
+else
+  enable_libgcrypt=yes
+
+fi
+
+if test "x$enable_libgcrypt" = "xyes"; then
+        # Extract the first word of "libgcrypt-config", so it can be a program name with args.
+set dummy libgcrypt-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_HAVE_LIBGCRYPT_CONFIG+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$HAVE_LIBGCRYPT_CONFIG"; then
+  ac_cv_prog_HAVE_LIBGCRYPT_CONFIG="$HAVE_LIBGCRYPT_CONFIG" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_HAVE_LIBGCRYPT_CONFIG="yes"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+HAVE_LIBGCRYPT_CONFIG=$ac_cv_prog_HAVE_LIBGCRYPT_CONFIG
+if test -n "$HAVE_LIBGCRYPT_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAVE_LIBGCRYPT_CONFIG" >&5
+$as_echo "$HAVE_LIBGCRYPT_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+        if test "x${HAVE_LIBGCRYPT_CONFIG}" != "xyes"; then
+           { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "libgcrypt-config not found in PATH
+See \`config.log' for more details" "$LINENO" 5; }
+        fi
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gcry_cipher_open in -lgcrypt" >&5
+$as_echo_n "checking for gcry_cipher_open in -lgcrypt... " >&6; }
+if ${ac_cv_lib_gcrypt_gcry_cipher_open+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lgcrypt `libgcrypt-config --libs --cflags`
+        	 $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char gcry_cipher_open ();
+int
+main ()
+{
+return gcry_cipher_open ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_gcrypt_gcry_cipher_open=yes
+else
+  ac_cv_lib_gcrypt_gcry_cipher_open=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gcrypt_gcry_cipher_open" >&5
+$as_echo "$ac_cv_lib_gcrypt_gcry_cipher_open" >&6; }
+if test "x$ac_cv_lib_gcrypt_gcry_cipher_open" = xyes; then :
+  LIBGCRYPT_CFLAGS="`libgcrypt-config --cflags`"
+        	LIBGCRYPT_LIBS="`libgcrypt-config --libs`"
+
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "libgrypt is missing
+See \`config.log' for more details" "$LINENO" 5; }
+fi
+
+
+$as_echo "#define ENABLE_LIBGCRYPT 1" >>confdefs.h
+
+fi
+ if test x$enable_libgcrypt = xyes; then
+  ENABLE_LIBGCRYPT_TRUE=
+  ENABLE_LIBGCRYPT_FALSE='#'
+else
+  ENABLE_LIBGCRYPT_TRUE='#'
+  ENABLE_LIBGCRYPT_FALSE=
+fi
+
+
 
 # support for building the rsyslogd runtime
 # Check whether --enable-rsyslogrt was given.
@@ -19609,7 +19850,7 @@ fi
 
 # END HIREDIS SUPPORT
 
-ac_config_files="$ac_config_files Makefile runtime/Makefile compat/Makefile grammar/Makefile tools/Makefile doc/Makefile plugins/imudp/Makefile plugins/imtcp/Makefile plugins/im3195/Makefile plugins/imgssapi/Makefile plugins/imuxsock/Makefile plugins/immark/Makefile plugins/imklog/Makefile plugins/imkmsg/Makefile plugins/omhdfs/Makefile plugins/omprog/Makefile plugins/omstdout/Makefile plugins/omjournal/Makefile plugins/pmrfc3164sd/Makefile plugins/pmlastmsg/Makefile plugins/pmcisconames/Makefile plugins/pmsnare/Makefile plugins/pmaixforwardedfrom/Makefile plugins/omruleset/Makefile plugins/omuxsock/Makefile plugins/imfile/Makefile plugins/imsolaris/Makefile plugins/imptcp/Makefile plugins/imttcp/Makefile plugins/impstats/Makefile plugins/imrelp/Makefile plugins/imdiag/Makefile plugins/imzmq3/Makefile plugins/omtesting/Makefile plugins/omgssapi/Makefile plugins/ommysql/Makefile plugins/ompgsql/Makefile plugins/omrelp/Makefile plugins/omlibdbi/Makefile plugins/ommail/Makefile plugins/omsnmp/Makefile plugins/omoracle/Makefile plugins/omudpspoof/Makefile plugins/ommongodb/Makefile plugins/omhiredis/Makefile plugins/omzmq3/Makefile plugins/mmnormalize/Makefile plugins/mmjsonparse/Makefile plugins/mmaudit/Makefile plugins/mmanon/Makefile plugins/omelasticsearch/Makefile plugins/sm_cust_bindcdr/Makefile plugins/mmsnmptrapd/Makefile java/Makefile tests/Makefile"
+ac_config_files="$ac_config_files Makefile runtime/Makefile compat/Makefile grammar/Makefile tools/Makefile doc/Makefile plugins/imudp/Makefile plugins/imtcp/Makefile plugins/im3195/Makefile plugins/imgssapi/Makefile plugins/imuxsock/Makefile plugins/imjournal/Makefile plugins/immark/Makefile plugins/imklog/Makefile plugins/imkmsg/Makefile plugins/omhdfs/Makefile plugins/omprog/Makefile plugins/omstdout/Makefile plugins/omjournal/Makefile plugins/pmrfc3164sd/Makefile plugins/pmlastmsg/Makefile plugins/pmcisconames/Makefile plugins/pmsnare/Makefile plugins/pmaixforwardedfrom/Makefile plugins/omruleset/Makefile plugins/omuxsock/Makefile plugins/imfile/Makefile plugins/imsolaris/Makefile plugins/imptcp/Makefile plugins/imttcp/Makefile plugins/impstats/Makefile plugins/imrelp/Makefile plugins/imdiag/Makefile plugins/imzmq3/Makefile plugins/omtesting/Makefile plugins/omgssapi/Makefile plugins/ommysql/Makefile plugins/ompgsql/Makefile plugins/omrelp/Makefile plugins/omlibdbi/Makefile plugins/ommail/Makefile plugins/omsnmp/Makefile plugins/omoracle/Makefile plugins/omudpspoof/Makefile plugins/ommongodb/Makefile plugins/omhiredis/Makefile plugins/omzmq3/Makefile plugins/mmnormalize/Makefile plugins/mmjsonparse/Makefile plugins/mmaudit/Makefile plugins/mmanon/Makefile plugins/omelasticsearch/Makefile plugins/sm_cust_bindcdr/Makefile plugins/mmsnmptrapd/Makefile java/Makefile tests/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -19788,6 +20029,10 @@ if test -z "${ENABLE_IMKMSG_TRUE}" && test -z "${ENABLE_IMKMSG_FALSE}"; then
   as_fn_error $? "conditional \"ENABLE_IMKMSG\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${ENABLE_IMJOURNAL_TRUE}" && test -z "${ENABLE_IMJOURNAL_FALSE}"; then
+  as_fn_error $? "conditional \"ENABLE_IMJOURNAL\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${ENABLE_INET_TRUE}" && test -z "${ENABLE_INET_FALSE}"; then
   as_fn_error $? "conditional \"ENABLE_INET\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -19836,6 +20081,10 @@ if test -z "${ENABLE_GNUTLS_TRUE}" && test -z "${ENABLE_GNUTLS_FALSE}"; then
   as_fn_error $? "conditional \"ENABLE_GNUTLS\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${ENABLE_LIBGCRYPT_TRUE}" && test -z "${ENABLE_LIBGCRYPT_FALSE}"; then
+  as_fn_error $? "conditional \"ENABLE_LIBGCRYPT\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${ENABLE_RSYSLOGRT_TRUE}" && test -z "${ENABLE_RSYSLOGRT_FALSE}"; then
   as_fn_error $? "conditional \"ENABLE_RSYSLOGRT\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -20385,7 +20634,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 7.3.10, which was
+This file was extended by rsyslog $as_me 7.3.11, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -20451,7 +20700,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 7.3.10
+rsyslog config.status 7.3.11
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -20871,6 +21120,7 @@ do
     "plugins/im3195/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/im3195/Makefile" ;;
     "plugins/imgssapi/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/imgssapi/Makefile" ;;
     "plugins/imuxsock/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/imuxsock/Makefile" ;;
+    "plugins/imjournal/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/imjournal/Makefile" ;;
     "plugins/immark/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/immark/Makefile" ;;
     "plugins/imklog/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/imklog/Makefile" ;;
     "plugins/imkmsg/Makefile") CONFIG_FILES="$CONFIG_FILES plugins/imkmsg/Makefile" ;;
@@ -22285,6 +22535,7 @@ echo "    GUI components will be built:             $enable_gui"
 echo "    Unlimited select() support enabled:       $enable_unlimited_select"
 echo "    uuid support enabled:                     $enable_uuid"
 echo "    GuardTime signature support enabled:      $enable_guardtime"
+echo "    libgcrypt support enabled:                $enable_libgcrypt"
 echo "    anonymization support enabled:            $enable_mmanon"
 echo
 echo "---{ input plugins }---"
@@ -22297,6 +22548,7 @@ echo "    file input module enabled:                $enable_imfile"
 echo "    Solaris input module enabled:             $enable_imsolaris"
 echo "    periodic statistics module enabled:       $enable_impstats"
 echo "    imzmq3 input module enabled:              $enable_imzmq3"
+echo "    imjournal input module enabled:           $enable_imjournal"
 echo
 echo "---{ output plugins }---"
 echo "    Mail support enabled:                     $enable_mail"