Imported Upstream version 7.3.15upstream/7.3.15

1 files changed, 66 insertions, 53 deletions

diff --git a/configure b/configure
index c4ed546..99a3ddf 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.68 for rsyslog 7.3.14.
+# Generated by GNU Autoconf 2.68 for rsyslog 7.3.15.
 #
 # Report bugs to <rsyslog@lists.adiscon.com>.
 #
@@ -570,8 +570,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='rsyslog'
 PACKAGE_TARNAME='rsyslog'
-PACKAGE_VERSION='7.3.14'
-PACKAGE_STRING='rsyslog 7.3.14'
+PACKAGE_VERSION='7.3.15'
+PACKAGE_STRING='rsyslog 7.3.15'
 PACKAGE_BUGREPORT='rsyslog@lists.adiscon.com'
 PACKAGE_URL=''
 
@@ -681,6 +681,7 @@ ENABLE_RFC3195_FALSE
 ENABLE_RFC3195_TRUE
 LIBLOGGING_LIBS
 LIBLOGGING_CFLAGS
+RST2MAN
 ENABLE_GUARDTIME_FALSE
 ENABLE_GUARDTIME_TRUE
 GUARDTIME_LIBS
@@ -806,7 +807,6 @@ LIBESTR_CFLAGS
 PKG_CONFIG_LIBDIR
 PKG_CONFIG_PATH
 PKG_CONFIG
-RST2MAN
 OTOOL64
 OTOOL
 LIPO
@@ -1593,7 +1593,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.14 to adapt to many kinds of systems.
+\`configure' configures rsyslog 7.3.15 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1663,7 +1663,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of rsyslog 7.3.14:";;
+     short | recursive ) echo "Configuration of rsyslog 7.3.15:";;
    esac
   cat <<\_ACEOF
 
@@ -1905,7 +1905,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-rsyslog configure 7.3.14
+rsyslog configure 7.3.15
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2484,7 +2484,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.14, which was
+It was created by rsyslog $as_me 7.3.15, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -3299,7 +3299,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='rsyslog'
- VERSION='7.3.14'
+ VERSION='7.3.15'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -13075,46 +13075,6 @@ CC="$lt_save_CC"
 
 
 
-# Extract the first word of "rst2man", so it can be a program name with args.
-set dummy rst2man; 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_path_RST2MAN+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $RST2MAN in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_RST2MAN="$RST2MAN" # Let the user override the test with a path.
-  ;;
-  *)
-  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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_path_RST2MAN="$as_dir/$ac_word$ac_exec_ext"
-    $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
-
-  ;;
-esac
-fi
-RST2MAN=$ac_cv_path_RST2MAN
-if test -n "$RST2MAN"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RST2MAN" >&5
-$as_echo "$RST2MAN" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
 
 
 
@@ -17863,8 +17823,8 @@ else
   ENABLE_RSYSLOGRT_FALSE=
 fi
 
-RSRT_CFLAGS="\$(RSRT_CFLAGS1) \$(LIBESTR_CFLAGS) \$(JSON_C_FLAGS)"
-RSRT_LIBS="\$(RSRT_LIBS1) \$(LIBESTR_LIBS) \$(JSON_C_LIBS)"
+RSRT_CFLAGS="\$(RSRT_CFLAGS1) \$(LIBEE_CFLAGS) \$(LIBESTR_CFLAGS) \$(JSON_C_FLAGS)"
+RSRT_LIBS="\$(RSRT_LIBS1) \$(LIBEE_LIBS) \$(LIBESTR_LIBS) \$(JSON_C_LIBS)"
 
 
 
@@ -18600,6 +18560,59 @@ else
 fi
 
 
+
+# obtain path for rst2man
+if test "x$enable_libgcrypt" = "xyes" || \
+        "x$enable_guardtime" = "xyes"; then
+        # Extract the first word of "rst2man", so it can be a program name with args.
+set dummy rst2man; 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_path_RST2MAN+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $RST2MAN in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_RST2MAN="$RST2MAN" # Let the user override the test with a path.
+  ;;
+  *)
+  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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_RST2MAN="$as_dir/$ac_word$ac_exec_ext"
+    $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
+
+  ;;
+esac
+fi
+RST2MAN=$ac_cv_path_RST2MAN
+if test -n "$RST2MAN"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RST2MAN" >&5
+$as_echo "$RST2MAN" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+        if test "x${RST2MAN}" == "x"; 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 $? "rst2man not found in PATH
+See \`config.log' for more details" "$LINENO" 5; }
+        fi
+fi
+
+
 # RFC 3195 support
 # Check whether --enable-rfc3195 was given.
 if test "${enable_rfc3195+set}" = set; then :
@@ -20754,7 +20767,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.14, which was
+This file was extended by rsyslog $as_me 7.3.15, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -20820,7 +20833,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.14
+rsyslog config.status 7.3.15
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"