Imported Upstream version 8.4.1upstream/8.4.1upstream

1 files changed, 24 insertions, 15 deletions

diff --git a/configure b/configure
index b1dc315..391c02b 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 8.4.0.
+# Generated by GNU Autoconf 2.68 for rsyslog 8.4.1.
 #
 # Report bugs to <rsyslog@lists.adiscon.com>.
 #
@@ -570,8 +570,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='rsyslog'
 PACKAGE_TARNAME='rsyslog'
-PACKAGE_VERSION='8.4.0'
-PACKAGE_STRING='rsyslog 8.4.0'
+PACKAGE_VERSION='8.4.1'
+PACKAGE_STRING='rsyslog 8.4.1'
 PACKAGE_BUGREPORT='rsyslog@lists.adiscon.com'
 PACKAGE_URL=''
 
@@ -1621,7 +1621,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 8.4.0 to adapt to many kinds of systems.
+\`configure' configures rsyslog 8.4.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1691,7 +1691,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of rsyslog 8.4.0:";;
+     short | recursive ) echo "Configuration of rsyslog 8.4.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1949,7 +1949,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-rsyslog configure 8.4.0
+rsyslog configure 8.4.1
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2528,7 +2528,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 8.4.0, which was
+It was created by rsyslog $as_me 8.4.1, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -3343,7 +3343,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='rsyslog'
- VERSION='8.4.0'
+ VERSION='8.4.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -13571,8 +13571,6 @@ else
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
-$as_echo "#define HAVE_JSON_TOKENER_ERROR_DESC 1" >>confdefs.h
-
 fi
 
 elif test $pkg_failed = untried; then
@@ -13669,8 +13667,6 @@ else
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
 
-$as_echo "#define HAVE_JSON_TOKENER_ERROR_DESC 1" >>confdefs.h
-
 fi
 
 else
@@ -13739,6 +13735,19 @@ fi
 done
 
 
+# look for newer API
+for ac_func in json_tokener_error_desc
+do :
+  ac_fn_c_check_func "$LINENO" "json_tokener_error_desc" "ac_cv_func_json_tokener_error_desc"
+if test "x$ac_cv_func_json_tokener_error_desc" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_JSON_TOKENER_ERROR_DESC 1
+_ACEOF
+
+fi
+done
+
+
 case "${host}" in
   *-*-linux*)
 
@@ -14140,7 +14149,7 @@ $as_echo "#define HAVE_SYS_WAIT_H 1" >>confdefs.h
 
 fi
 
-for ac_header in arpa/inet.h libgen.h malloc.h fcntl.h locale.h netdb.h netinet/in.h paths.h stddef.h stdlib.h string.h sys/file.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h sys/stat.h sys/inotify.h syslog.h unistd.h utmp.h utmpx.h sys/epoll.h sys/prctl.h
+for ac_header in arpa/inet.h libgen.h malloc.h fcntl.h locale.h netdb.h netinet/in.h paths.h stddef.h stdlib.h string.h sys/file.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h sys/stat.h sys/inotify.h unistd.h utmp.h utmpx.h sys/epoll.h sys/prctl.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
@@ -21322,7 +21331,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 8.4.0, which was
+This file was extended by rsyslog $as_me 8.4.1, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -21388,7 +21397,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 8.4.0
+rsyslog config.status 8.4.1
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"