Re: Zabbix package's RC bugs fixed - ready for Squeeze

To: debian-release@lists.debian.org
Subject: Re: Zabbix package's RC bugs fixed - ready for Squeeze
From: Christoph Haas <haas@debian.org>
Date: Sat, 15 Jan 2011 01:02:57 +0100
Message-id: <[🔎] 4D30E431.1080308@debian.org>
In-reply-to: <[🔎] 1295049163.14391.1249.camel@hathi.jungle.funky-badger.org>
References: <[🔎] 4D30D766.30302@debian.org> <[🔎] 1295048271.14391.1186.camel@hathi.jungle.funky-badger.org> <[🔎] 4D30E13D.5080905@debian.org> <[🔎] 1295049163.14391.1249.camel@hathi.jungle.funky-badger.org>

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Am 15.01.2011 00:52, schrieb Adam D. Barratt:
> On Sat, 2011-01-15 at 00:50 +0100, Christoph Haas wrote:
>> -----BEGIN PGP SIGNED MESSAGE-----
>> Hash: SHA1
>>
>> Am 15.01.2011 00:37, schrieb Adam D. Barratt:
>>> Please could you provide a debdiff between the current package in
>>> testing and your proposed upload?
>>
> Sorry for not being clearer; I meant a source debdiff. :-)

Now that you mention it... that actually makes sense. Sorry. :)

Please find the source debdiff attached.

Basically the changes are:

1.) Putting the database upgrade scripts into
    /usr/share/doc/zabbix-server-(pg|my)sql/examples/1.(6|8)/...

    The upstream developers failed to send me proper SQL to
    upgrade the database from 1.4->1.6->1.8 and pointed out that
    users of Zabbix have to run their SQL queries and ignore any
    error or even run the upgrade shell script.

    The README.Debian of the zabbix-server-mysql and
    zabbix-server-pgsql packages reflect that.

2.) The debian/patches/zbx-2329 quilt patch has been added
    to deal with a problem in Zabbix 1.8.2 that caused data
    loss and had been fixed upstream in Zabbix 1.8.3.
    I asked for a proper patch to fix this very issue and
    this quilt patch fixed it (I verified that).

Let me know if there are further issues that need explanation. And
thanks for your effort.

Cheers
 Christoph
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEUEARECAAYFAk0w5DEACgkQCV53xXnMZYaq+wCY5Fcu2cm48A6++mpXfAjYWPCi
eQCgsb2ZAtE/t0WVHiL9xCZH5cNAF40=
=iiVc
-----END PGP SIGNATURE-----

diff -Nru zabbix-1.8.2/debian/changelog zabbix-1.8.2/debian/changelog
--- zabbix-1.8.2/debian/changelog	2010-10-26 22:24:45.000000000 +0200
+++ zabbix-1.8.2/debian/changelog	2011-01-14 22:50:46.000000000 +0100
@@ -1,8 +1,23 @@
+zabbix (1:1.8.2-1squeeze2) testing-proposed-updates; urgency=high
+
+  * Fixed database schema upgrade from Zabbix 1.4 (Lenny) to 1.8 (Squeeze)
+    by adding proper upgrade scripts and SQL statements in
+    /usr/share/doc/zabbix-*/examples/
+    Closes: #609726
+  * Removed recommends for a database server from zabbix-frontend-php
+    package to prevent automatic installation since recommenations are
+    automatically installed.
+  * Included fix for issue https://support.zabbix.com/browse/ZBX-2329
+    which would destroy a screen's contents after renaming.
+    Closes: #610015
+
+ -- Christoph Haas <haas@debian.org>  Wed, 05 Jan 2011 23:44:17 +0100
+
 zabbix (1:1.8.2-1squeeze1) testing-proposed-updates; urgency=high
 
-  * Security-related bug fixed (#594304)
-  * Binary-only clock applet removed (#591967)
-  * init.d scripts fixed (#578879)
+  * Security-related bug fixed (closes: #594304)
+  * Binary-only clock applet removed (closes: #591967)
+  * init.d scripts fixed (closes: #578879)
 
  -- Christoph Haas <haas@debian.org>  Tue, 26 Oct 2010 22:21:28 +0200
 
diff -Nru zabbix-1.8.2/debian/control zabbix-1.8.2/debian/control
--- zabbix-1.8.2/debian/control	2010-10-26 22:01:09.000000000 +0200
+++ zabbix-1.8.2/debian/control	2011-01-12 22:36:19.000000000 +0100
@@ -73,7 +73,6 @@
 Package: zabbix-frontend-php
 Architecture: all
 Depends: ${misc:Depends}, apache2 | httpd, php5, php5-mysql | php5-pgsql, php5-gd, ucf, dbconfig-common (>= 1.8.19), libjs-prototype (>= 1.6.0.3), libjs-scriptaculous (>= 1.8.2), ttf-dejavu-core
-Recommends: zabbix-server-mysql | zabbix-server-pgsql, mysql-server (>= 4.0.16-2) | postgresql
 Description: network monitoring solution - PHP front-end
  Zabbix is a server/client network monitoring system with many features.
  It can be used for:
diff -Nru zabbix-1.8.2/debian/patches/debian-changes-1:1.8.2-1squeeze2 zabbix-1.8.2/debian/patches/debian-changes-1:1.8.2-1squeeze2
--- zabbix-1.8.2/debian/patches/debian-changes-1:1.8.2-1squeeze2	1970-01-01 01:00:00.000000000 +0100
+++ zabbix-1.8.2/debian/patches/debian-changes-1:1.8.2-1squeeze2	2011-01-14 23:25:57.000000000 +0100
@@ -0,0 +1,2556 @@
+Description: Upstream changes introduced in version 1:1.8.2-1squeeze2
+ This patch has been created by dpkg-source during the package build.
+ Here's the last changelog entry, hopefully it gives details on why
+ those changes were made:
+ .
+ zabbix (1:1.8.2-1squeeze2) testing-proposed-updates; urgency=high
+ .
+   * Fixed database schema upgrade from Zabbix 1.4 (Lenny) to 1.8 (Squeeze)
+     by adding proper upgrade scripts and SQL statements in
+     /usr/share/doc/zabbix-*/examples/
+     Closes: #609726
+   * Removed recommends for a database server from zabbix-frontend-php
+     package to prevent automatic installation since recommenations are
+     automatically installed.
+   * Included fix for issue https://support.zabbix.com/browse/ZBX-2329
+     which would destroy a screen's contents after renaming.
+     Closes: #610015
+ .
+ The person named in the Author field signed this changelog entry.
+Author: Christoph Haas <haas@debian.org>
+Bug-Debian: http://bugs.debian.org/609726
+Bug-Debian: http://bugs.debian.org/610015
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- zabbix-1.8.2.orig/configure
++++ zabbix-1.8.2/configure
+@@ -1,11 +1,11 @@
+ #! /bin/sh
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by GNU Autoconf 2.65.
++# Generated by GNU Autoconf 2.67.
+ #
+ #
+ # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
+-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
+-# Inc.
++# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
++# Foundation, Inc.
+ #
+ #
+ # This configure script is free software; the Free Software Foundation
+@@ -316,7 +316,7 @@ $as_echo X"$as_dir" |
+       test -d "$as_dir" && break
+     done
+     test -z "$as_dirs" || eval "mkdir $as_dirs"
+-  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
++  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+ 
+ 
+ } # as_fn_mkdir_p
+@@ -356,19 +356,19 @@ else
+ fi # as_fn_arith
+ 
+ 
+-# as_fn_error ERROR [LINENO LOG_FD]
+-# ---------------------------------
++# as_fn_error STATUS ERROR [LINENO LOG_FD]
++# ----------------------------------------
+ # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+ # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+-# script with status $?, using 1 if that was 0.
++# script with STATUS, using 1 if that was 0.
+ as_fn_error ()
+ {
+-  as_status=$?; test $as_status -eq 0 && as_status=1
+-  if test "$3"; then
+-    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
++  as_status=$1; test $as_status -eq 0 && as_status=1
++  if test "$4"; then
++    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+   fi
+-  $as_echo "$as_me: error: $1" >&2
++  $as_echo "$as_me: error: $2" >&2
+   as_fn_exit $as_status
+ } # as_fn_error
+ 
+@@ -530,7 +530,7 @@ test -n "$DJDIR" || exec 7<&0 </dev/null
+ exec 6>&1
+ 
+ # Name of the host.
+-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
++# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
+ # so uname gets run too.
+ ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
+ 
+@@ -637,6 +637,8 @@ JABBER_LDFLAGS
+ JABBER_CPPFLAGS
+ IKSEMEL_LIBS
+ IKSEMEL_CFLAGS
++PKG_CONFIG_LIBDIR
++PKG_CONFIG_PATH
+ PKG_CONFIG
+ DB_LIBS
+ DB_LDFLAGS
+@@ -791,6 +793,8 @@ LIBS
+ CPPFLAGS
+ CPP
+ PKG_CONFIG
++PKG_CONFIG_PATH
++PKG_CONFIG_LIBDIR
+ IKSEMEL_CFLAGS
+ IKSEMEL_LIBS'
+ 
+@@ -855,8 +859,9 @@ do
+   fi
+ 
+   case $ac_option in
+-  *=*)	ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
+-  *)	ac_optarg=yes ;;
++  *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;;
++  *=)   ac_optarg= ;;
++  *)    ac_optarg=yes ;;
+   esac
+ 
+   # Accept the important Cygnus configure options, so we can diagnose typos.
+@@ -901,7 +906,7 @@ do
+     ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
+     # Reject names that are not valid shell variable names.
+     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+-      as_fn_error "invalid feature name: $ac_useropt"
++      as_fn_error $? "invalid feature name: $ac_useropt"
+     ac_useropt_orig=$ac_useropt
+     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+     case $ac_user_opts in
+@@ -927,7 +932,7 @@ do
+     ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
+     # Reject names that are not valid shell variable names.
+     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+-      as_fn_error "invalid feature name: $ac_useropt"
++      as_fn_error $? "invalid feature name: $ac_useropt"
+     ac_useropt_orig=$ac_useropt
+     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+     case $ac_user_opts in
+@@ -1131,7 +1136,7 @@ do
+     ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
+     # Reject names that are not valid shell variable names.
+     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+-      as_fn_error "invalid package name: $ac_useropt"
++      as_fn_error $? "invalid package name: $ac_useropt"
+     ac_useropt_orig=$ac_useropt
+     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+     case $ac_user_opts in
+@@ -1147,7 +1152,7 @@ do
+     ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'`
+     # Reject names that are not valid shell variable names.
+     expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
+-      as_fn_error "invalid package name: $ac_useropt"
++      as_fn_error $? "invalid package name: $ac_useropt"
+     ac_useropt_orig=$ac_useropt
+     ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'`
+     case $ac_user_opts in
+@@ -1177,8 +1182,8 @@ do
+   | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
+     x_libraries=$ac_optarg ;;
+ 
+-  -*) as_fn_error "unrecognized option: \`$ac_option'
+-Try \`$0 --help' for more information."
++  -*) as_fn_error $? "unrecognized option: \`$ac_option'
++Try \`$0 --help' for more information"
+     ;;
+ 
+   *=*)
+@@ -1186,7 +1191,7 @@ Try \`$0 --help' for more information."
+     # Reject names that are not valid shell variable names.
+     case $ac_envvar in #(
+       '' | [0-9]* | *[!_$as_cr_alnum]* )
+-      as_fn_error "invalid variable name: \`$ac_envvar'" ;;
++      as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
+     esac
+     eval $ac_envvar=\$ac_optarg
+     export $ac_envvar ;;
+@@ -1204,13 +1209,13 @@ done
+ 
+ if test -n "$ac_prev"; then
+   ac_option=--`echo $ac_prev | sed 's/_/-/g'`
+-  as_fn_error "missing argument to $ac_option"
++  as_fn_error $? "missing argument to $ac_option"
+ fi
+ 
+ if test -n "$ac_unrecognized_opts"; then
+   case $enable_option_checking in
+     no) ;;
+-    fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;;
++    fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
+     *)     $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
+   esac
+ fi
+@@ -1233,7 +1238,7 @@ do
+     [\\/$]* | ?:[\\/]* )  continue;;
+     NONE | '' ) case $ac_var in *prefix ) continue;; esac;;
+   esac
+-  as_fn_error "expected an absolute directory name for --$ac_var: $ac_val"
++  as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
+ done
+ 
+ # There might be people who depend on the old broken behavior: `$host'
+@@ -1247,8 +1252,8 @@ target=$target_alias
+ if test "x$host_alias" != x; then
+   if test "x$build_alias" = x; then
+     cross_compiling=maybe
+-    $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
+-    If a cross compiler is detected then cross compile mode will be used." >&2
++    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
++    If a cross compiler is detected then cross compile mode will be used" >&2
+   elif test "x$build_alias" != "x$host_alias"; then
+     cross_compiling=yes
+   fi
+@@ -1263,9 +1268,9 @@ test "$silent" = yes && exec 6>/dev/null
+ ac_pwd=`pwd` && test -n "$ac_pwd" &&
+ ac_ls_di=`ls -di .` &&
+ ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` ||
+-  as_fn_error "working directory cannot be determined"
++  as_fn_error $? "working directory cannot be determined"
+ test "X$ac_ls_di" = "X$ac_pwd_ls_di" ||
+-  as_fn_error "pwd does not report name of working directory"
++  as_fn_error $? "pwd does not report name of working directory"
+ 
+ 
+ # Find the source files, if location was not specified.
+@@ -1304,11 +1309,11 @@ else
+ fi
+ if test ! -r "$srcdir/$ac_unique_file"; then
+   test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
+-  as_fn_error "cannot find sources ($ac_unique_file) in $srcdir"
++  as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
+ fi
+ ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
+ ac_abs_confdir=`(
+-	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg"
++	cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg"
+ 	pwd)`
+ # When building in place, set srcdir=.
+ if test "$ac_abs_confdir" = "$ac_pwd"; then
+@@ -1348,7 +1353,7 @@ Configuration:
+       --help=short        display options specific to this package
+       --help=recursive    display the short help of all the included packages
+   -V, --version           display version information and exit
+-  -q, --quiet, --silent   do not print \`checking...' messages
++  -q, --quiet, --silent   do not print \`checking ...' messages
+       --cache-file=FILE   cache test results in FILE [disabled]
+   -C, --config-cache      alias for \`--cache-file=config.cache'
+   -n, --no-create         do not create output files
+@@ -1485,6 +1490,10 @@ Some influential environment variables:
+               you have headers in a nonstandard directory <include dir>
+   CPP         C preprocessor
+   PKG_CONFIG  path to pkg-config utility
++  PKG_CONFIG_PATH
++              directories to add to pkg-config's search path
++  PKG_CONFIG_LIBDIR
++              path overriding pkg-config's built-in search path
+   IKSEMEL_CFLAGS
+               C compiler flags for IKSEMEL, overriding pkg-config
+   IKSEMEL_LIBS
+@@ -1557,9 +1566,9 @@ test -n "$ac_init_help" && exit $ac_stat
+ if $ac_init_version; then
+   cat <<\_ACEOF
+ configure
+-generated by GNU Autoconf 2.65
++generated by GNU Autoconf 2.67
+ 
+-Copyright (C) 2009 Free Software Foundation, Inc.
++Copyright (C) 2010 Free Software Foundation, Inc.
+ This configure script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it.
+ _ACEOF
+@@ -1629,7 +1638,7 @@ $as_echo "$ac_try_echo"; } >&5
+     mv -f conftest.er1 conftest.err
+   fi
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+-  test $ac_status = 0; } >/dev/null && {
++  test $ac_status = 0; } > conftest.i && {
+ 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ 	 test ! -s conftest.err
+        }; then :
+@@ -1695,10 +1704,10 @@ fi
+ ac_fn_c_check_header_mongrel ()
+ {
+   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+-  if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
++  if eval "test \"\${$3+set}\"" = set; then :
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+ $as_echo_n "checking for $2... " >&6; }
+-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
++if eval "test \"\${$3+set}\"" = set; then :
+   $as_echo_n "(cached) " >&6
+ fi
+ eval ac_res=\$$3
+@@ -1734,7 +1743,7 @@ if ac_fn_c_try_cpp "$LINENO"; then :
+ else
+   ac_header_preproc=no
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
+ $as_echo "$ac_header_preproc" >&6; }
+ 
+@@ -1761,7 +1770,7 @@ $as_echo "$as_me: WARNING: $2: proceedin
+ esac
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+ $as_echo_n "checking for $2... " >&6; }
+-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
++if eval "test \"\${$3+set}\"" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   eval "$3=\$ac_header_compiler"
+@@ -1783,7 +1792,7 @@ ac_fn_c_check_header_compile ()
+   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+ $as_echo_n "checking for $2... " >&6; }
+-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
++if eval "test \"\${$3+set}\"" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -1814,7 +1823,7 @@ ac_fn_c_check_type ()
+   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+ $as_echo_n "checking for $2... " >&6; }
+-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
++if eval "test \"\${$3+set}\"" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   eval "$3=no"
+@@ -1913,7 +1922,7 @@ ac_fn_c_check_func ()
+   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
+ $as_echo_n "checking for $2... " >&6; }
+-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
++if eval "test \"\${$3+set}\"" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -1976,7 +1985,7 @@ This file contains any messages produced
+ running configure, to aid debugging if configure makes a mistake.
+ 
+ It was created by $as_me, which was
+-generated by GNU Autoconf 2.65.  Invocation command line was
++generated by GNU Autoconf 2.67.  Invocation command line was
+ 
+   $ $0 $@
+ 
+@@ -2086,11 +2095,9 @@ trap 'exit_status=$?
+   {
+     echo
+ 
+-    cat <<\_ASBOX
+-## ---------------- ##
++    $as_echo "## ---------------- ##
+ ## Cache variables. ##
+-## ---------------- ##
+-_ASBOX
++## ---------------- ##"
+     echo
+     # The following way of writing the cache mishandles newlines in values,
+ (
+@@ -2124,11 +2131,9 @@ $as_echo "$as_me: WARNING: cache variabl
+ )
+     echo
+ 
+-    cat <<\_ASBOX
+-## ----------------- ##
++    $as_echo "## ----------------- ##
+ ## Output variables. ##
+-## ----------------- ##
+-_ASBOX
++## ----------------- ##"
+     echo
+     for ac_var in $ac_subst_vars
+     do
+@@ -2141,11 +2146,9 @@ _ASBOX
+     echo
+ 
+     if test -n "$ac_subst_files"; then
+-      cat <<\_ASBOX
+-## ------------------- ##
++      $as_echo "## ------------------- ##
+ ## File substitutions. ##
+-## ------------------- ##
+-_ASBOX
++## ------------------- ##"
+       echo
+       for ac_var in $ac_subst_files
+       do
+@@ -2159,11 +2162,9 @@ _ASBOX
+     fi
+ 
+     if test -s confdefs.h; then
+-      cat <<\_ASBOX
+-## ----------- ##
++      $as_echo "## ----------- ##
+ ## confdefs.h. ##
+-## ----------- ##
+-_ASBOX
++## ----------- ##"
+       echo
+       cat confdefs.h
+       echo
+@@ -2218,7 +2219,12 @@ _ACEOF
+ ac_site_file1=NONE
+ ac_site_file2=NONE
+ if test -n "$CONFIG_SITE"; then
+-  ac_site_file1=$CONFIG_SITE
++  # We do not want a PATH search for config.site.
++  case $CONFIG_SITE in #((
++    -*)  ac_site_file1=./$CONFIG_SITE;;
++    */*) ac_site_file1=$CONFIG_SITE;;
++    *)   ac_site_file1=./$CONFIG_SITE;;
++  esac
+ elif test "x$prefix" != xNONE; then
+   ac_site_file1=$prefix/share/config.site
+   ac_site_file2=$prefix/etc/config.site
+@@ -2233,7 +2239,11 @@ do
+     { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
+ $as_echo "$as_me: loading site script $ac_site_file" >&6;}
+     sed 's/^/| /' "$ac_site_file" >&5
+-    . "$ac_site_file"
++    . "$ac_site_file" \
++      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++as_fn_error $? "failed to load site script $ac_site_file
++See \`config.log' for more details" "$LINENO" 5 ; }
+   fi
+ done
+ 
+@@ -2309,7 +2319,7 @@ if $ac_cache_corrupted; then
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+   { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
+ $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
+-  as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
++  as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
+ fi
+ ## -------------------- ##
+ ## Main body of script. ##
+@@ -2326,16 +2336,22 @@ am__api_version='1.11'
+ 
+ ac_aux_dir=
+ for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
+-  for ac_t in install-sh install.sh shtool; do
+-    if test -f "$ac_dir/$ac_t"; then
+-      ac_aux_dir=$ac_dir
+-      ac_install_sh="$ac_aux_dir/$ac_t -c"
+-      break 2
+-    fi
+-  done
++  if test -f "$ac_dir/install-sh"; then
++    ac_aux_dir=$ac_dir
++    ac_install_sh="$ac_aux_dir/install-sh -c"
++    break
++  elif test -f "$ac_dir/install.sh"; then
++    ac_aux_dir=$ac_dir
++    ac_install_sh="$ac_aux_dir/install.sh -c"
++    break
++  elif test -f "$ac_dir/shtool"; then
++    ac_aux_dir=$ac_dir
++    ac_install_sh="$ac_aux_dir/shtool install -c"
++    break
++  fi
+ done
+ if test -z "$ac_aux_dir"; then
+-  as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
++  as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
+ fi
+ 
+ # These three variables are undocumented and unsupported,
+@@ -2451,11 +2467,11 @@ am_lf='
+ '
+ case `pwd` in
+   *[\\\"\#\$\&\'\`$am_lf]*)
+-    as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
++    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;;
+ esac
+ case $srcdir in
+   *[\\\"\#\$\&\'\`$am_lf\ \	]*)
+-    as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
++    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;;
+ esac
+ 
+ # Do `set' in a subshell so we don't clobber the current shell's
+@@ -2477,7 +2493,7 @@ if (
+       # if, for instance, CONFIG_SHELL is bash and it inherits a
+       # broken ls alias from the environment.  This has actually
+       # happened.  Such a system could not be considered "sane".
+-      as_fn_error "ls -t appears to fail.  Make sure there is not a broken
++      as_fn_error $? "ls -t appears to fail.  Make sure there is not a broken
+ alias in your environment" "$LINENO" 5
+    fi
+ 
+@@ -2487,7 +2503,7 @@ then
+    # Ok.
+    :
+ else
+-   as_fn_error "newly created file is older than distributed files!
++   as_fn_error $? "newly created file is older than distributed files!
+ Check your system clock" "$LINENO" 5
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+@@ -2725,7 +2741,7 @@ done
+ $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+ set x ${MAKE-make}
+ ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
++if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat >conftest.make <<\_ACEOF
+@@ -2733,7 +2749,7 @@ SHELL = /bin/sh
+ all:
+ 	@echo '@@@%%%=$(MAKE)=@@@%%%'
+ _ACEOF
+-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
++# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
+ case `${MAKE-make} -f conftest.make 2>/dev/null` in
+   *@@@%%%=?*=@@@%%%*)
+     eval ac_cv_prog_make_${ac_make}_set=yes;;
+@@ -2767,7 +2783,7 @@ if test "`cd $srcdir && pwd`" != "`pwd`"
+   am__isrc=' -I$(srcdir)'
+   # test to see if srcdir already configured
+   if test -f $srcdir/config.status; then
+-    as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
++    as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
+   fi
+ fi
+ 
+@@ -2831,7 +2847,7 @@ $as_echo "$as_me: Configuring $PACKAGE_N
+ $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
+ set x ${MAKE-make}
+ ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
+-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
++if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat >conftest.make <<\_ACEOF
+@@ -2839,7 +2855,7 @@ SHELL = /bin/sh
+ all:
+ 	@echo '@@@%%%=$(MAKE)=@@@%%%'
+ _ACEOF
+-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
++# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
+ case `${MAKE-make} -f conftest.make 2>/dev/null` in
+   *@@@%%%=?*=@@@%%%*)
+     eval ac_cv_prog_make_${ac_make}_set=yes;;
+@@ -2864,7 +2880,7 @@ ac_config_headers="$ac_config_headers in
+ 
+ # Make sure we can run config.sub.
+ $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
+-  as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
++  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
+ $as_echo_n "checking build system type... " >&6; }
+@@ -2875,16 +2891,16 @@ else
+ test "x$ac_build_alias" = x &&
+   ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`
+ test "x$ac_build_alias" = x &&
+-  as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5
++  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5
+ ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||
+-  as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
++  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5
+ 
+ fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5
+ $as_echo "$ac_cv_build" >&6; }
+ case $ac_cv_build in
+ *-*-*) ;;
+-*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;
++*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
+ esac
+ build=$ac_cv_build
+ ac_save_IFS=$IFS; IFS='-'
+@@ -2909,7 +2925,7 @@ else
+   ac_cv_host=$ac_cv_build
+ else
+   ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||
+-    as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
++    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5
+ fi
+ 
+ fi
+@@ -2917,7 +2933,7 @@ fi
+ $as_echo "$ac_cv_host" >&6; }
+ case $ac_cv_host in
+ *-*-*) ;;
+-*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;
++*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
+ esac
+ host=$ac_cv_host
+ ac_save_IFS=$IFS; IFS='-'
+@@ -3234,8 +3250,8 @@ fi
+ 
+ test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error "no acceptable C compiler found in \$PATH
+-See \`config.log' for more details." "$LINENO" 5; }
++as_fn_error $? "no acceptable C compiler found in \$PATH
++See \`config.log' for more details" "$LINENO" 5 ; }
+ 
+ # Provide some information about the compiler.
+ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
+@@ -3349,9 +3365,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-{ as_fn_set_status 77
+-as_fn_error "C compiler cannot create executables
+-See \`config.log' for more details." "$LINENO" 5; }; }
++as_fn_error 77 "C compiler cannot create executables
++See \`config.log' for more details" "$LINENO" 5 ; }
+ else
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+@@ -3393,8 +3408,8 @@ done
+ 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 "cannot compute suffix of executables: cannot compile and link
+-See \`config.log' for more details." "$LINENO" 5; }
++as_fn_error $? "cannot compute suffix of executables: cannot compile and link
++See \`config.log' for more details" "$LINENO" 5 ; }
+ fi
+ rm -f conftest conftest$ac_cv_exeext
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
+@@ -3451,9 +3466,9 @@ $as_echo "$ac_try_echo"; } >&5
+     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 "cannot run C compiled programs.
++as_fn_error $? "cannot run C compiled programs.
+ If you meant to cross compile, use \`--host'.
+-See \`config.log' for more details." "$LINENO" 5; }
++See \`config.log' for more details" "$LINENO" 5 ; }
+     fi
+   fi
+ fi
+@@ -3504,8 +3519,8 @@ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error "cannot compute suffix of object files: cannot compile
+-See \`config.log' for more details." "$LINENO" 5; }
++as_fn_error $? "cannot compute suffix of object files: cannot compile
++See \`config.log' for more details" "$LINENO" 5 ; }
+ fi
+ rm -f conftest.$ac_cv_objext conftest.$ac_ext
+ fi
+@@ -3923,7 +3938,7 @@ $as_echo_n "checking whether cc understa
+ fi
+ set dummy $CC; ac_cc=`$as_echo "$2" |
+ 		      sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
+-if { as_var=ac_cv_prog_cc_${ac_cc}_c_o; eval "test \"\${$as_var+set}\" = set"; }; then :
++if eval "test \"\${ac_cv_prog_cc_${ac_cc}_c_o+set}\"" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+@@ -4084,7 +4099,7 @@ else
+   # Broken: fails on valid input.
+ continue
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+ 
+   # OK, works on sane cases.  Now check whether nonexistent headers
+   # can be detected and how.
+@@ -4100,11 +4115,11 @@ else
+ ac_preproc_ok=:
+ break
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+ 
+ done
+ # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.i conftest.err conftest.$ac_ext
+ if $ac_preproc_ok; then :
+   break
+ fi
+@@ -4143,7 +4158,7 @@ else
+   # Broken: fails on valid input.
+ continue
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+ 
+   # OK, works on sane cases.  Now check whether nonexistent headers
+   # can be detected and how.
+@@ -4159,18 +4174,18 @@ else
+ ac_preproc_ok=:
+ break
+ fi
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.err conftest.i conftest.$ac_ext
+ 
+ done
+ # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+-rm -f conftest.err conftest.$ac_ext
++rm -f conftest.i conftest.err conftest.$ac_ext
+ if $ac_preproc_ok; then :
+ 
+ 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 "C preprocessor \"$CPP\" fails sanity check
+-See \`config.log' for more details." "$LINENO" 5; }
++as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
++See \`config.log' for more details" "$LINENO" 5 ; }
+ fi
+ 
+ ac_ext=c
+@@ -4231,7 +4246,7 @@ esac
+   done
+ IFS=$as_save_IFS
+   if test -z "$ac_cv_path_GREP"; then
+-    as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
++    as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+   fi
+ else
+   ac_cv_path_GREP=$GREP
+@@ -4297,7 +4312,7 @@ esac
+   done
+ IFS=$as_save_IFS
+   if test -z "$ac_cv_path_EGREP"; then
+-    as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
++    as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
+   fi
+ else
+   ac_cv_path_EGREP=$EGREP
+@@ -4429,8 +4444,7 @@ do :
+   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
+ "
+-eval as_val=\$$as_ac_Header
+-   if test "x$as_val" = x""yes; then :
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+   cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+@@ -4459,8 +4473,7 @@ for ac_header in stdio.h stdlib.h string
+ 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"
+-eval as_val=\$$as_ac_Header
+-   if test "x$as_val" = x""yes; then :
++if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+   cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+ _ACEOF
+@@ -5200,7 +5213,7 @@ $as_echo "$found_resolv" >&6; }
+ 
+ 
+ if test "x$found_resolv" != "xyes"; then
+-	as_fn_error "Unable to DNS lookup functions \"${found_resolv}\"" "$LINENO" 5
++	as_fn_error $? "Unable to DNS lookup functions \"${found_resolv}\"" "$LINENO" 5
+ fi
+ LIBS="${LIBS} ${RESOLV_LIBS}"
+ 
+@@ -5238,8 +5251,8 @@ $as_echo_n "checking for long long forma
+ if test "$cross_compiling" = yes; 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 "cannot run test program while cross compiling
+-See \`config.log' for more details." "$LINENO" 5; }
++as_fn_error $? "cannot run test program while cross compiling
++See \`config.log' for more details" "$LINENO" 5 ; }
+ else
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+@@ -6403,31 +6416,25 @@ _ACEOF
+ 
+ 
+ #AC_FUNC_GETLOADAVG
+-for ac_func in getloadavg
+-do :
+-  ac_fn_c_check_func "$LINENO" "getloadavg" "ac_cv_func_getloadavg"
++ac_fn_c_check_func "$LINENO" "getloadavg" "ac_cv_func_getloadavg"
+ if test "x$ac_cv_func_getloadavg" = x""yes; then :
+-  cat >>confdefs.h <<_ACEOF
+-#define HAVE_GETLOADAVG 1
+-_ACEOF
++  $as_echo "#define HAVE_GETLOADAVG 1" >>confdefs.h
+ 
+ else
+   case " $LIBOBJS " in
+-  *" $ac_func.$ac_objext "* ) ;;
+-  *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext"
++  *" getloadavg.$ac_objext "* ) ;;
++  *) LIBOBJS="$LIBOBJS getloadavg.$ac_objext"
+  ;;
+ esac
+ 
+ fi
+-done
+ 
+ 
+ for ac_func in socket strtod
+ do :
+   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+-eval as_val=\$$as_ac_var
+-   if test "x$as_val" = x""yes; then :
++if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
+   cat >>confdefs.h <<_ACEOF
+ #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
+@@ -6558,7 +6565,7 @@ if test "${enable_server+set}" = set; th
+   enableval=$enable_server; case "${enableval}" in
+   yes) server=yes ;;
+   no)  server=no ;;
+-  *) as_fn_error "bad value ${enableval} for --enable-server" "$LINENO" 5 ;;
++  *) as_fn_error $? "bad value ${enableval} for --enable-server" "$LINENO" 5  ;;
+ esac
+ else
+   server=no
+@@ -6578,7 +6585,7 @@ if test "${enable_proxy+set}" = set; the
+   enableval=$enable_proxy; case "${enableval}" in
+   yes) proxy=yes ;;
+   no)  proxy=no ;;
+-  *) as_fn_error "bad value ${enableval} for --enable-proxy" "$LINENO" 5 ;;
++  *) as_fn_error $? "bad value ${enableval} for --enable-proxy" "$LINENO" 5  ;;
+ esac
+ else
+   proxy=no
+@@ -6598,7 +6605,7 @@ if test "${enable_agent+set}" = set; the
+   enableval=$enable_agent; case "${enableval}" in
+   yes) agent=yes ;;
+   no)  agent=no ;;
+-  *) as_fn_error "bad value ${enableval} for --enable-agent" "$LINENO" 5 ;;
++  *) as_fn_error $? "bad value ${enableval} for --enable-agent" "$LINENO" 5  ;;
+ esac
+ else
+   agent=no
+@@ -6618,7 +6625,7 @@ if test "${enable_ipv6+set}" = set; then
+   enableval=$enable_ipv6; case "${enableval}" in
+   yes) ipv6=yes ;;
+   no)  ipv6=no ;;
+-  *) as_fn_error "bad value ${enableval} for --enable-ipv6" "$LINENO" 5 ;;
++  *) as_fn_error $? "bad value ${enableval} for --enable-ipv6" "$LINENO" 5  ;;
+ esac
+ else
+   ipv6=no
+@@ -6848,7 +6855,7 @@ $as_echo "yes" >&6; }
+                         oracle_version_checked="no"
+                         { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+-                        as_fn_error "Oracle $ORACLE_OCI_VERSION found, but required version is $oracle_version_req" "$LINENO" 5
++                        as_fn_error $? "Oracle $ORACLE_OCI_VERSION found, but required version is $oracle_version_req" "$LINENO" 5
+                     fi
+                 else
+                     ORACLE_OCI_VERSION="UNKNOWN"
+@@ -6952,7 +6959,7 @@ $as_echo "$HAVE_ORACLE_OCI" >&6; }
+ 
+ 	if test "x$WANT_ORACLE_OCI" = "xyes"; then
+ 		if test "x$have_db" != "xno"; then
+-			as_fn_error "You can configure for only one database." "$LINENO" 5
++			as_fn_error $? "You can configure for only one database." "$LINENO" 5
+ 		fi
+ 
+ 		if test "x$HAVE_ORACLE_OCI" = "xyes"; then
+@@ -6970,7 +6977,7 @@ $as_echo "$HAVE_ORACLE_OCI" >&6; }
+ $as_echo "#define HAVE_ORACLE 1" >>confdefs.h
+ 
+ 		else
+-			as_fn_error "Oracle OCI library not found" "$LINENO" 5
++			as_fn_error $? "Oracle OCI library not found" "$LINENO" 5
+ 		fi
+ 	fi
+ 
+@@ -7107,7 +7114,7 @@ $as_echo "#define HAVE_SQLITE3 1" >>conf
+ 
+ 	if test "x$WANT_SQLITE3" = "xyes"; then
+ 		if test "x$have_db" != "xno"; then
+-			as_fn_error "You can configure for only one database." "$LINENO" 5
++			as_fn_error $? "You can configure for only one database." "$LINENO" 5
+ 		fi
+ 
+ 		if test "x$found_sqlite3" = "xyes"; then
+@@ -7146,7 +7153,7 @@ rm -f core conftest.err conftest.$ac_obj
+ 
+ 			CPPFLAGS="$saved_CPPFLAGS"
+ 		else
+-			as_fn_error "SQLite3 library not found" "$LINENO" 5
++			as_fn_error $? "SQLite3 library not found" "$LINENO" 5
+ 		fi
+ 	fi
+ 
+@@ -7251,7 +7258,7 @@ fi
+ 				as_ac_Lib=`$as_echo "ac_cv_lib_$_lib_name ''_main" | $as_tr_sh`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -l$_lib_name " >&5
+ $as_echo_n "checking for main in -l$_lib_name ... " >&6; }
+-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
++if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -7280,14 +7287,13 @@ fi
+ eval ac_res=\$$as_ac_Lib
+ 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ $as_echo "$ac_res" >&6; }
+-eval as_val=\$$as_ac_Lib
+-   if test "x$as_val" = x""yes; then :
++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
+ 
+ 						MYSQL_LIBS="$MYSQL_LIBS $i"
+ 
+ else
+ 
+-						as_fn_error "Not found $_lib_name library" "$LINENO" 5
++						as_fn_error $? "Not found $_lib_name library" "$LINENO" 5
+ 
+ fi
+ 
+@@ -7303,9 +7309,10 @@ fi
+ 		LDFLAGS="${LDFLAGS} ${MYSQL_LDFLAGS}"
+ 		CFLAGS="${CFLAGS} ${MYSQL_CFLAGS}"
+ 
+-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lmysqlclient " >&5
++		as_ac_Lib=`$as_echo "ac_cv_lib_mysqlclient ''_main" | $as_tr_sh`
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lmysqlclient " >&5
+ $as_echo_n "checking for main in -lmysqlclient ... " >&6; }
+-if test "${ac_cv_lib_mysqlclient__main+set}" = set; then :
++if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -7323,23 +7330,24 @@ return main ();
+ }
+ _ACEOF
+ if ac_fn_c_try_link "$LINENO"; then :
+-  ac_cv_lib_mysqlclient__main=yes
++  eval "$as_ac_Lib=yes"
+ else
+-  ac_cv_lib_mysqlclient__main=no
++  eval "$as_ac_Lib=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_mysqlclient__main" >&5
+-$as_echo "$ac_cv_lib_mysqlclient__main" >&6; }
+-if test "x$ac_cv_lib_mysqlclient__main" = x""yes; then :
++eval ac_res=\$$as_ac_Lib
++	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
++$as_echo "$ac_res" >&6; }
++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
+ 
+ 			MYSQL_LIBS="-lmysqlclient ${MYSQL_LIBS}"
+ 
+ else
+ 
+-			as_fn_error "Not found mysqlclient library" "$LINENO" 5
++			as_fn_error $? "Not found mysqlclient library" "$LINENO" 5
+ 
+ fi
+ 
+@@ -7411,13 +7419,13 @@ $as_echo "no" >&6; }
+ 
+ 	if test "x$want_mysql" = "xyes"; then
+ 		if test "x$have_db" != "xno"; then
+-			as_fn_error "You can configure for only one database." "$LINENO" 5
++			as_fn_error $? "You can configure for only one database." "$LINENO" 5
+ 		fi
+ 
+ 		if test "x$found_mysql" = "xyes"; then
+ 			have_db="MySQL"
+ 		else
+-			as_fn_error "MySQL library not found" "$LINENO" 5
++			as_fn_error $? "MySQL library not found" "$LINENO" 5
+ 		fi
+ 	fi
+ 
+@@ -7606,7 +7614,7 @@ $as_echo "no" >&6; }
+ 
+ 	if test "x$want_postgresql" = "xyes"; then
+ 		if test "x$have_db" != "xno"; then
+-			as_fn_error "You can configure for only one database." "$LINENO" 5
++			as_fn_error $? "You can configure for only one database." "$LINENO" 5
+ 		fi
+ 
+ 		if test "x$found_postgresql" = "xyes"; then
+@@ -7614,7 +7622,7 @@ $as_echo "no" >&6; }
+ 			have_db="PostgreSQL"
+ 
+ 											else
+-			as_fn_error "PostgreSQL library not found" "$LINENO" 5
++			as_fn_error $? "PostgreSQL library not found" "$LINENO" 5
+ 		fi
+ 	fi
+ 
+@@ -7623,7 +7631,7 @@ $as_echo_n "checking for Zabbix server d
+ 	if test "x$have_db" = "xno"; then
+ 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: error" >&5
+ $as_echo "error" >&6; }
+-		as_fn_error "No database selected for Zabbix server. Use --with-mysql or --with-oracle or --with-pgsql or --with-sqlite3." "$LINENO" 5
++		as_fn_error $? "No database selected for Zabbix server. Use --with-mysql or --with-oracle or --with-pgsql or --with-sqlite3." "$LINENO" 5
+ 	else
+ 		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+ $as_echo "ok" >&6; }
+@@ -7646,6 +7654,10 @@ $as_echo "ok" >&6; }
+ 
+ 
+ 
++
++
++
++
+ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+ 	if test -n "$ac_tool_prefix"; then
+   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+@@ -7758,7 +7770,6 @@ $as_echo "yes" >&6; }
+ $as_echo "no" >&6; }
+ 		PKG_CONFIG=""
+ 	fi
+-
+ fi
+ 
+ 
+@@ -7788,11 +7799,10 @@ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IKSEMEL" >&5
+ $as_echo_n "checking for IKSEMEL... " >&6; }
+ 
+-if test -n "$PKG_CONFIG"; then
+-    if test -n "$IKSEMEL_CFLAGS"; then
+-        pkg_cv_IKSEMEL_CFLAGS="$IKSEMEL_CFLAGS"
+-    else
+-        if test -n "$PKG_CONFIG" && \
++if test -n "$IKSEMEL_CFLAGS"; then
++    pkg_cv_IKSEMEL_CFLAGS="$IKSEMEL_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++    if test -n "$PKG_CONFIG" && \
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"iksemel\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "iksemel") 2>&5
+   ac_status=$?
+@@ -7802,15 +7812,13 @@ if test -n "$PKG_CONFIG"; then
+ else
+   pkg_failed=yes
+ fi
+-    fi
+-else
+-	pkg_failed=untried
++ else
++    pkg_failed=untried
+ fi
+-if test -n "$PKG_CONFIG"; then
+-    if test -n "$IKSEMEL_LIBS"; then
+-        pkg_cv_IKSEMEL_LIBS="$IKSEMEL_LIBS"
+-    else
+-        if test -n "$PKG_CONFIG" && \
++if test -n "$IKSEMEL_LIBS"; then
++    pkg_cv_IKSEMEL_LIBS="$IKSEMEL_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++    if test -n "$PKG_CONFIG" && \
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"iksemel\""; } >&5
+   ($PKG_CONFIG --exists --print-errors "iksemel") 2>&5
+   ac_status=$?
+@@ -7820,14 +7828,15 @@ if test -n "$PKG_CONFIG"; then
+ else
+   pkg_failed=yes
+ fi
+-    fi
+-else
+-	pkg_failed=untried
++ 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
+@@ -7835,20 +7844,20 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        IKSEMEL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "iksemel"`
++	        IKSEMEL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "iksemel" 2>&1`
+         else
+-	        IKSEMEL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "iksemel"`
++	        IKSEMEL_PKG_ERRORS=`$PKG_CONFIG --print-errors "iksemel" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$IKSEMEL_PKG_ERRORS" >&5
+ 
+-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+ 
+ 			 found_iksemel="no"
+ 			 found_jabber="no"
+ 
+ elif test $pkg_failed = untried; then
++     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ 
+ 			 found_iksemel="no"
+ 			 found_jabber="no"
+@@ -7909,7 +7918,7 @@ done
+ 						as_ac_Lib=`$as_echo "ac_cv_lib_$_lib_name ''_main" | $as_tr_sh`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -l$_lib_name " >&5
+ $as_echo_n "checking for main in -l$_lib_name ... " >&6; }
+-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
++if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -7938,14 +7947,13 @@ fi
+ eval ac_res=\$$as_ac_Lib
+ 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ $as_echo "$ac_res" >&6; }
+-eval as_val=\$$as_ac_Lib
+-   if test "x$as_val" = x""yes; then :
++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
+ 
+ 							JABBER_LIBS="$JABBER_LIBS $i"
+ 
+ else
+ 
+-							as_fn_error "Not found $_lib_name library" "$LINENO" 5
++							as_fn_error $? "Not found $_lib_name library" "$LINENO" 5
+ 
+ fi
+ 
+@@ -7973,7 +7981,7 @@ $as_echo "#define HAVE_JABBER 1" >>confd
+ 
+ 	if test "x$want_jabber" = "xyes"; then
+ 		if test "x$found_jabber" != "xyes"; then
+-			as_fn_error "Jabber library not found" "$LINENO" 5
++			as_fn_error $? "Jabber library not found" "$LINENO" 5
+ 		else
+ 			have_jabber="yes"
+ 		fi
+@@ -8178,7 +8186,7 @@ $as_echo "$libcurl_cv_lib_version_ok" >&
+ 						as_ac_Lib=`$as_echo "ac_cv_lib_$_lib_name ''_main" | $as_tr_sh`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -l$_lib_name " >&5
+ $as_echo_n "checking for main in -l$_lib_name ... " >&6; }
+-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
++if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -8207,14 +8215,13 @@ fi
+ eval ac_res=\$$as_ac_Lib
+ 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ $as_echo "$ac_res" >&6; }
+-eval as_val=\$$as_ac_Lib
+-   if test "x$as_val" = x""yes; then :
++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
+ 
+ 								LIBCURL_LIBS="$LIBCURL_LIBS $i"
+ 
+ else
+ 
+-								as_fn_error "Not found $_lib_name library" "$LINENO" 5
++								as_fn_error $? "Not found $_lib_name library" "$LINENO" 5
+ 
+ fi
+ 
+@@ -8267,7 +8274,7 @@ if test "x$ac_cv_lib_curl_main" = x""yes
+ 
+ else
+ 
+-				as_fn_error "Not found libcurl library" "$LINENO" 5
++				as_fn_error $? "Not found libcurl library" "$LINENO" 5
+ 
+ fi
+ 
+@@ -8462,7 +8469,7 @@ _ACEOF
+ 
+ 	if test "x$want_curl" = "xyes"; then
+ 		if test "x$found_curl" != "xyes"; then
+-			as_fn_error "Curl library not found" "$LINENO" 5
++			as_fn_error $? "Curl library not found" "$LINENO" 5
+ 		fi
+ 	fi
+ 	if test "x$found_curl" = "xyes"; then
+@@ -8562,7 +8569,7 @@ if test "x$ac_cv_lib_iodbc_main" = x""ye
+ 
+ else
+ 
+-				as_fn_error "Not found libiodbc library" "$LINENO" 5
++				as_fn_error $? "Not found libiodbc library" "$LINENO" 5
+ 
+ fi
+ 
+@@ -8599,7 +8606,7 @@ $as_echo "no" >&6; }
+ 		if test "x$found_iodbc" = "xyes"; then
+ 			have_odbc="iODBC"
+ 		else
+-			as_fn_error "iODBC library not found" "$LINENO" 5
++			as_fn_error $? "iODBC library not found" "$LINENO" 5
+ 		fi
+ 	fi
+ 
+@@ -8720,7 +8727,7 @@ if test "x$ac_cv_lib_odbc_main" = x""yes
+ 
+ else
+ 
+-				as_fn_error "Not found libodbc library" "$LINENO" 5
++				as_fn_error $? "Not found libodbc library" "$LINENO" 5
+ 
+ fi
+ 
+@@ -8772,7 +8779,7 @@ $as_echo "$_libunixodbc_usable" >&6; }
+ 		unset _save_unixodbc_cflags
+ 
+ 		if test "$_libunixodbc_usable" != "yes"; then
+-			as_fn_error "Can't use libodbc library" "$LINENO" 5
++			as_fn_error $? "Can't use libodbc library" "$LINENO" 5
+ 		fi
+ 
+ 
+@@ -8790,13 +8797,13 @@ $as_echo "#define HAVE_UNIXODBC 1" >>con
+ 
+ 	if test "x$want_unixodbc" = "xyes"; then
+ 		if test "x$have_odbc" != "xno"; then
+-			as_fn_error "You can configure for only one ODBC driver." "$LINENO" 5
++			as_fn_error $? "You can configure for only one ODBC driver." "$LINENO" 5
+ 		fi
+ 
+ 		if test "x$found_unixodbc" = "xyes"; then
+ 			have_odbc="unixODBC"
+ 		else
+-			as_fn_error "unixODBC library not found" "$LINENO" 5
++			as_fn_error $? "unixODBC library not found" "$LINENO" 5
+ 		fi
+ 	fi
+ 
+@@ -8927,7 +8934,7 @@ fi
+ 						as_ac_Lib=`$as_echo "ac_cv_lib_$_lib_name ''_main" | $as_tr_sh`
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -l$_lib_name " >&5
+ $as_echo_n "checking for main in -l$_lib_name ... " >&6; }
+-if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then :
++if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -8956,14 +8963,13 @@ fi
+ eval ac_res=\$$as_ac_Lib
+ 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
+ $as_echo "$ac_res" >&6; }
+-eval as_val=\$$as_ac_Lib
+-   if test "x$as_val" = x""yes; then :
++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
+ 
+ 								SNMP_LIBS="$SNMP_LIBS $i"
+ 
+ else
+ 
+-								as_fn_error "Not found $_lib_name library" "$LINENO" 5
++								as_fn_error $? "Not found $_lib_name library" "$LINENO" 5
+ 
+ fi
+ 
+@@ -8980,9 +8986,10 @@ fi
+ 		LDFLAGS="${LDFLAGS} ${SNMP_LDFLAGS}"
+ 		CFLAGS="${CFLAGS} ${SNMP_CFLAGS}"
+ 
+-		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lnetsnmp " >&5
++		as_ac_Lib=`$as_echo "ac_cv_lib_netsnmp ''_main" | $as_tr_sh`
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lnetsnmp " >&5
+ $as_echo_n "checking for main in -lnetsnmp ... " >&6; }
+-if test "${ac_cv_lib_netsnmp__main+set}" = set; then :
++if eval "test \"\${$as_ac_Lib+set}\"" = set; then :
+   $as_echo_n "(cached) " >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+@@ -9000,23 +9007,24 @@ return main ();
+ }
+ _ACEOF
+ if ac_fn_c_try_link "$LINENO"; then :
+-  ac_cv_lib_netsnmp__main=yes
++  eval "$as_ac_Lib=yes"
+ else
+-  ac_cv_lib_netsnmp__main=no
++  eval "$as_ac_Lib=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_netsnmp__main" >&5
+-$as_echo "$ac_cv_lib_netsnmp__main" >&6; }
+-if test "x$ac_cv_lib_netsnmp__main" = x""yes; then :
++eval ac_res=\$$as_ac_Lib
++	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
++$as_echo "$ac_res" >&6; }
++if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
+ 
+ 			SNMP_LIBS="-lnetsnmp ${SNMP_LIBS}"
+ 
+ else
+ 
+-		       	as_fn_error "Not found NET-SNMP library" "$LINENO" 5
++		       	as_fn_error $? "Not found NET-SNMP library" "$LINENO" 5
+ 
+ fi
+ 
+@@ -9079,7 +9087,7 @@ $as_echo "#define SNMP_NO_DEBUGGING /**/
+ 
+ 	if test "x$want_netsnmp" = "xyes"; then
+ 		if test "x$found_netsnmp" != "xyes"; then
+-			as_fn_error "Invalid NET-SNMP directory - unable to find net-snmp-config" "$LINENO" 5
++			as_fn_error $? "Invalid NET-SNMP directory - unable to find net-snmp-config" "$LINENO" 5
+ 		else
+ 			have_snmp="net-snmp"
+ 		fi
+@@ -9251,13 +9259,13 @@ $as_echo "#define HAVE_SNMP 1" >>confdef
+ 
+ 	if test "x$want_snmp" = "xyes"; then
+ 		if test "x$found_snmp" != "xyes"; then
+-			as_fn_error "Invalid UCD-SNMP directory - unable to find ucd-snmp-config.h" "$LINENO" 5
++			as_fn_error $? "Invalid UCD-SNMP directory - unable to find ucd-snmp-config.h" "$LINENO" 5
+ 		else
+ 			have_snmp="ucd-snmp"
+ 		fi
+ 
+ 		if test  "x$found_netsnmp" = "xyes"; then
+-			as_fn_error "You can configure for only one SNMP library." "$LINENO" 5
++			as_fn_error $? "You can configure for only one SNMP library." "$LINENO" 5
+ 		fi
+ 	fi
+ 	CFLAGS="${CFLAGS} ${SNMP_CPPFLAGS}"
+@@ -9480,9 +9488,9 @@ $as_echo "no" >&6; }
+ 
+ 	if test "x$want_ssh2" = "xyes"; then
+ 		if test "x$found_ssh2" != "xyes"; then
+-			as_fn_error "SSH2 library not found" "$LINENO" 5
++			as_fn_error $? "SSH2 library not found" "$LINENO" 5
+ 		elif test "x$accept_ssh2_version" != "xyes"; then
+-			as_fn_error "SSH2 library version requirement not met (>= 1.0.0)" "$LINENO" 5
++			as_fn_error $? "SSH2 library version requirement not met (>= 1.0.0)" "$LINENO" 5
+ 		else
+ 			have_ssh2="yes"
+ 		fi
+@@ -9634,7 +9642,7 @@ _ACEOF
+   LIBS="-lgnutls $LIBS"
+ 
+ else
+-  as_fn_error "Not found GnuTLS library" "$LINENO" 5
++  as_fn_error $? "Not found GnuTLS library" "$LINENO" 5
+ fi
+ 
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lpthread" >&5
+@@ -9675,7 +9683,7 @@ _ACEOF
+   LIBS="-lpthread $LIBS"
+ 
+ else
+-  as_fn_error "Not found Pthread library" "$LINENO" 5
++  as_fn_error $? "Not found Pthread library" "$LINENO" 5
+ fi
+ 
+                        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lsasl2" >&5
+@@ -9716,7 +9724,7 @@ _ACEOF
+   LIBS="-lsasl2 $LIBS"
+ 
+ else
+-  as_fn_error "Not found SASL2 library" "$LINENO" 5
++  as_fn_error $? "Not found SASL2 library" "$LINENO" 5
+ fi
+ 
+                fi
+@@ -9731,7 +9739,7 @@ fi
+ 
+ if test "x$want_ldap" = "xyes"; then
+ 	if test "x$found_ldap" != "xyes"; then
+-		as_fn_error "Invalid LDAP directory - unable to find ldap.h" "$LINENO" 5
++		as_fn_error $? "Invalid LDAP directory - unable to find ldap.h" "$LINENO" 5
+ 	fi
+ fi
+ CFLAGS="${CFLAGS} ${LDAP_CPPFLAGS}"
+@@ -9842,7 +9850,7 @@ $as_echo "yes" >&6; }
+ 
+ 
+ if test "x$found_iconv" != "xyes"; then
+-	as_fn_error "Unable to find iconv.h \"${found_iconv}\"" "$LINENO" 5
++	as_fn_error $? "Unable to find iconv.h \"${found_iconv}\"" "$LINENO" 5
+ fi
+ CFLAGS="${CFLAGS} ${ICONV_CFLAGS}"
+ LDFLAGS="${LDFLAGS} ${ICONV_LDFLAGS}"
+@@ -9934,7 +9942,7 @@ $as_echo "yes" >&6; }
+ 
+ if test "x$want_openipmi" = "xyes"; then
+ 	if test "x$found_openipmi" != "xyes"; then
+-		as_fn_error "Invalid OPENIPMI directory - unable to find ipmiif.h" "$LINENO" 5
++		as_fn_error $? "Invalid OPENIPMI directory - unable to find ipmiif.h" "$LINENO" 5
+ 	else
+ 		have_ipmi="openipmi"
+ 	fi
+@@ -10132,6 +10140,7 @@ DEFS=-DHAVE_CONFIG_H
+ 
+ ac_libobjs=
+ ac_ltlibobjs=
++U=
+ for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
+   # 1. Remove the extension, and $U if already installed.
+   ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
+@@ -10155,31 +10164,31 @@ else
+ fi
+ 
+ if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
+-  as_fn_error "conditional \"AMDEP\" was never defined.
++  as_fn_error $? "conditional \"AMDEP\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
+-  as_fn_error "conditional \"am__fastdepCC\" was never defined.
++  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${SERVER_TRUE}" && test -z "${SERVER_FALSE}"; then
+-  as_fn_error "conditional \"SERVER\" was never defined.
++  as_fn_error $? "conditional \"SERVER\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${PROXY_TRUE}" && test -z "${PROXY_FALSE}"; then
+-  as_fn_error "conditional \"PROXY\" was never defined.
++  as_fn_error $? "conditional \"PROXY\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${AGENT_TRUE}" && test -z "${AGENT_FALSE}"; then
+-  as_fn_error "conditional \"AGENT\" was never defined.
++  as_fn_error $? "conditional \"AGENT\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${JABBER_TRUE}" && test -z "${JABBER_FALSE}"; then
+-  as_fn_error "conditional \"JABBER\" was never defined.
++  as_fn_error $? "conditional \"JABBER\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ if test -z "${WITH_ODBC_TRUE}" && test -z "${WITH_ODBC_FALSE}"; then
+-  as_fn_error "conditional \"WITH_ODBC\" was never defined.
++  as_fn_error $? "conditional \"WITH_ODBC\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
+ 
+@@ -10329,19 +10338,19 @@ export LANGUAGE
+ (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+ 
+ 
+-# as_fn_error ERROR [LINENO LOG_FD]
+-# ---------------------------------
++# as_fn_error STATUS ERROR [LINENO LOG_FD]
++# ----------------------------------------
+ # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+ # provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+-# script with status $?, using 1 if that was 0.
++# script with STATUS, using 1 if that was 0.
+ as_fn_error ()
+ {
+-  as_status=$?; test $as_status -eq 0 && as_status=1
+-  if test "$3"; then
+-    as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+-    $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3
++  as_status=$1; test $as_status -eq 0 && as_status=1
++  if test "$4"; then
++    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
++    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+   fi
+-  $as_echo "$as_me: error: $1" >&2
++  $as_echo "$as_me: error: $2" >&2
+   as_fn_exit $as_status
+ } # as_fn_error
+ 
+@@ -10537,7 +10546,7 @@ $as_echo X"$as_dir" |
+       test -d "$as_dir" && break
+     done
+     test -z "$as_dirs" || eval "mkdir $as_dirs"
+-  } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir"
++  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+ 
+ 
+ } # as_fn_mkdir_p
+@@ -10591,7 +10600,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
+ # values after options handling.
+ ac_log="
+ This file was extended by $as_me, which was
+-generated by GNU Autoconf 2.65.  Invocation command line was
++generated by GNU Autoconf 2.67.  Invocation command line was
+ 
+   CONFIG_FILES    = $CONFIG_FILES
+   CONFIG_HEADERS  = $CONFIG_HEADERS
+@@ -10657,10 +10666,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
+ ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
+ ac_cs_version="\\
+ config.status
+-configured by $0, generated by GNU Autoconf 2.65,
++configured by $0, generated by GNU Autoconf 2.67,
+   with options \\"\$ac_cs_config\\"
+ 
+-Copyright (C) 2009 Free Software Foundation, Inc.
++Copyright (C) 2010 Free Software Foundation, Inc.
+ This config.status script is free software; the Free Software Foundation
+ gives unlimited permission to copy, distribute and modify it."
+ 
+@@ -10678,11 +10687,16 @@ ac_need_defaults=:
+ while test $# != 0
+ do
+   case $1 in
+-  --*=*)
++  --*=?*)
+     ac_option=`expr "X$1" : 'X\([^=]*\)='`
+     ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
+     ac_shift=:
+     ;;
++  --*=)
++    ac_option=`expr "X$1" : 'X\([^=]*\)='`
++    ac_optarg=
++    ac_shift=:
++    ;;
+   *)
+     ac_option=$1
+     ac_optarg=$2
+@@ -10704,6 +10718,7 @@ do
+     $ac_shift
+     case $ac_optarg in
+     *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
++    '') as_fn_error $? "missing file argument" ;;
+     esac
+     as_fn_append CONFIG_FILES " '$ac_optarg'"
+     ac_need_defaults=false;;
+@@ -10716,7 +10731,7 @@ do
+     ac_need_defaults=false;;
+   --he | --h)
+     # Conflict between --help and --header
+-    as_fn_error "ambiguous option: \`$1'
++    as_fn_error $? "ambiguous option: \`$1'
+ Try \`$0 --help' for more information.";;
+   --help | --hel | -h )
+     $as_echo "$ac_cs_usage"; exit ;;
+@@ -10725,7 +10740,7 @@ Try \`$0 --help' for more information.";
+     ac_cs_silent=: ;;
+ 
+   # This is an error.
+-  -*) as_fn_error "unrecognized option: \`$1'
++  -*) as_fn_error $? "unrecognized option: \`$1'
+ Try \`$0 --help' for more information." ;;
+ 
+   *) as_fn_append ac_config_targets " $1"
+@@ -10842,7 +10857,7 @@ do
+     "upgrades/Makefile") CONFIG_FILES="$CONFIG_FILES upgrades/Makefile" ;;
+     "man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
+ 
+-  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
++  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
+   esac
+ done
+ 
+@@ -10880,7 +10895,7 @@ $debug ||
+ {
+   tmp=./conf$$-$RANDOM
+   (umask 077 && mkdir "$tmp")
+-} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5
++} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+ 
+ # Set up the scripts for CONFIG_FILES section.
+ # No need to generate them if there are no CONFIG_FILES.
+@@ -10897,7 +10912,7 @@ if test "x$ac_cr" = x; then
+ fi
+ ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+ if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+-  ac_cs_awk_cr='\r'
++  ac_cs_awk_cr='\\r'
+ else
+   ac_cs_awk_cr=$ac_cr
+ fi
+@@ -10911,18 +10926,18 @@ _ACEOF
+   echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' &&
+   echo "_ACEOF"
+ } >conf$$subs.sh ||
+-  as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
+-ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'`
++  as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
++ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'`
+ ac_delim='%!_!# '
+ for ac_last_try in false false false false false :; do
+   . ./conf$$subs.sh ||
+-    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
++    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+ 
+   ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X`
+   if test $ac_delim_n = $ac_delim_num; then
+     break
+   elif $ac_last_try; then
+-    as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5
++    as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
+   else
+     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+   fi
+@@ -11011,20 +11026,28 @@ if sed "s/$ac_cr//" < /dev/null > /dev/n
+ else
+   cat
+ fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+-  || as_fn_error "could not setup config files machinery" "$LINENO" 5
++  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
+ _ACEOF
+ 
+-# VPATH may cause trouble with some makes, so we remove $(srcdir),
+-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
++# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
++# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
+ # trailing colons and then remove the whole line if VPATH becomes empty
+ # (actually we leave an empty line to preserve line numbers).
+ if test "x$srcdir" = x.; then
+-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
+-s/:*\$(srcdir):*/:/
+-s/:*\${srcdir}:*/:/
+-s/:*@srcdir@:*/:/
+-s/^\([^=]*=[	 ]*\):*/\1/
++  ac_vpsub='/^[	 ]*VPATH[	 ]*=[	 ]*/{
++h
++s///
++s/^/:/
++s/[	 ]*$/:/
++s/:\$(srcdir):/:/g
++s/:\${srcdir}:/:/g
++s/:@srcdir@:/:/g
++s/^:*//
+ s/:*$//
++x
++s/\(=[	 ]*\).*/\1/
++G
++s/\n//
+ s/^[^=]*=[	 ]*$//
+ }'
+ fi
+@@ -11052,7 +11075,7 @@ for ac_last_try in false false :; do
+   if test -z "$ac_t"; then
+     break
+   elif $ac_last_try; then
+-    as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5
++    as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
+   else
+     ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
+   fi
+@@ -11137,7 +11160,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
+ _ACAWK
+ _ACEOF
+ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
+-  as_fn_error "could not setup config headers machinery" "$LINENO" 5
++  as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
+ fi # test -n "$CONFIG_HEADERS"
+ 
+ 
+@@ -11150,7 +11173,7 @@ do
+   esac
+   case $ac_mode$ac_tag in
+   :[FHL]*:*);;
+-  :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;;
++  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
+   :[FH]-) ac_tag=-:-;;
+   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
+   esac
+@@ -11178,7 +11201,7 @@ do
+ 	   [\\/$]*) false;;
+ 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
+ 	   esac ||
+-	   as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;;
++	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
+       esac
+       case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+       as_fn_append ac_file_inputs " '$ac_f'"
+@@ -11205,7 +11228,7 @@ $as_echo "$as_me: creating $ac_file" >&6
+ 
+     case $ac_tag in
+     *:-:* | *:-) cat >"$tmp/stdin" \
+-      || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
++      || as_fn_error $? "could not create $ac_file" "$LINENO" 5  ;;
+     esac
+     ;;
+   esac
+@@ -11342,22 +11365,22 @@ s&@MKDIR_P@&$ac_MKDIR_P&;t t
+ $ac_datarootdir_hack
+ "
+ eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
+-  || as_fn_error "could not create $ac_file" "$LINENO" 5
++  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ 
+ test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
+   { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
+   { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
+   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+-which seems to be undefined.  Please make sure it is defined." >&5
++which seems to be undefined.  Please make sure it is defined" >&5
+ $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+-which seems to be undefined.  Please make sure it is defined." >&2;}
++which seems to be undefined.  Please make sure it is defined" >&2;}
+ 
+   rm -f "$tmp/stdin"
+   case $ac_file in
+   -) cat "$tmp/out" && rm -f "$tmp/out";;
+   *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+   esac \
+-  || as_fn_error "could not create $ac_file" "$LINENO" 5
++  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+  ;;
+   :H)
+   #
+@@ -11368,19 +11391,19 @@ which seems to be undefined.  Please mak
+       $as_echo "/* $configure_input  */" \
+       && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
+     } >"$tmp/config.h" \
+-      || as_fn_error "could not create $ac_file" "$LINENO" 5
++      || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+     if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
+       { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
+ $as_echo "$as_me: $ac_file is unchanged" >&6;}
+     else
+       rm -f "$ac_file"
+       mv "$tmp/config.h" "$ac_file" \
+-	|| as_fn_error "could not create $ac_file" "$LINENO" 5
++	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
+     fi
+   else
+     $as_echo "/* $configure_input  */" \
+       && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
+-      || as_fn_error "could not create -" "$LINENO" 5
++      || as_fn_error $? "could not create -" "$LINENO" 5
+   fi
+ # Compute "$ac_file"'s index in $config_headers.
+ _am_arg="$ac_file"
+@@ -11530,7 +11553,7 @@ _ACEOF
+ ac_clean_files=$ac_clean_files_save
+ 
+ test $ac_write_fail = 0 ||
+-  as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5
++  as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
+ 
+ 
+ # configure is writing to config.log, and then calls config.status.
+@@ -11551,7 +11574,7 @@ if test "$no_create" != yes; then
+   exec 5>>config.log
+   # Use ||, not &&, to avoid exiting from the if with $? = 1, which
+   # would make configure fail if this is the last instruction.
+-  $ac_cs_success || as_fn_exit $?
++  $ac_cs_success || as_fn_exit 1
+ fi
+ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
+   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
+--- zabbix-1.8.2.orig/aclocal.m4
++++ zabbix-1.8.2/aclocal.m4
+@@ -13,13 +13,14 @@
+ 
+ m4_ifndef([AC_AUTOCONF_VERSION],
+   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],,
+-[m4_warning([this file was generated for autoconf 2.65.
++m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],,
++[m4_warning([this file was generated for autoconf 2.67.
+ You have another version of autoconf.  It may work, but is not guaranteed to.
+ If you have problems, you may need to regenerate the build system entirely.
+ To do so, use the procedure documented by the package, typically `autoreconf'.])])
+ 
+ # pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
++# serial 1 (pkg-config-0.24)
+ # 
+ # Copyright Â© 2004 Scott James Remnant <scott@netsplit.com>.
+ #
+@@ -47,7 +48,10 @@ To do so, use the procedure documented b
+ AC_DEFUN([PKG_PROG_PKG_CONFIG],
+ [m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+ m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
+-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
++AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
++AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
++AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
++
+ if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+ 	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+ fi
+@@ -60,7 +64,6 @@ if test -n "$PKG_CONFIG"; then
+ 		AC_MSG_RESULT([no])
+ 		PKG_CONFIG=""
+ 	fi
+-		
+ fi[]dnl
+ ])# PKG_PROG_PKG_CONFIG
+ 
+@@ -69,34 +72,31 @@ fi[]dnl
+ # Check to see whether a particular set of modules exists.  Similar
+ # to PKG_CHECK_MODULES(), but does not set variables or print errors.
+ #
+-#
+-# Similar to PKG_CHECK_MODULES, make sure that the first instance of
+-# this or PKG_CHECK_MODULES is called, or make sure to call
+-# PKG_CHECK_EXISTS manually
++# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
++# only at the first occurence in configure.ac, so if the first place
++# it's called might be skipped (such as if it is within an "if", you
++# have to call PKG_CHECK_EXISTS manually
+ # --------------------------------------------------------------
+ AC_DEFUN([PKG_CHECK_EXISTS],
+ [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+ if test -n "$PKG_CONFIG" && \
+     AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
+-  m4_ifval([$2], [$2], [:])
++  m4_default([$2], [:])
+ m4_ifvaln([$3], [else
+   $3])dnl
+ fi])
+ 
+-
+ # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+ # ---------------------------------------------
+ m4_define([_PKG_CONFIG],
+-[if test -n "$PKG_CONFIG"; then
+-    if test -n "$$1"; then
+-        pkg_cv_[]$1="$$1"
+-    else
+-        PKG_CHECK_EXISTS([$3],
+-                         [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+-			 [pkg_failed=yes])
+-    fi
+-else
+-	pkg_failed=untried
++[if test -n "$$1"; then
++    pkg_cv_[]$1="$$1"
++ elif test -n "$PKG_CONFIG"; then
++    PKG_CHECK_EXISTS([$3],
++                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
++		     [pkg_failed=yes])
++ else
++    pkg_failed=untried
+ fi[]dnl
+ ])# _PKG_CONFIG
+ 
+@@ -138,16 +138,17 @@ and $1[]_LIBS to avoid the need to call
+ See the pkg-config man page for more details.])
+ 
+ if test $pkg_failed = yes; then
++   	AC_MSG_RESULT([no])
+         _PKG_SHORT_ERRORS_SUPPORTED
+         if test $_pkg_short_errors_supported = yes; then
+-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
++	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
+         else 
+-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
++	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+ 
+-	ifelse([$4], , [AC_MSG_ERROR(dnl
++	m4_default([$4], [AC_MSG_ERROR(
+ [Package requirements ($2) were not met:
+ 
+ $$1_PKG_ERRORS
+@@ -155,25 +156,24 @@ $$1_PKG_ERRORS
+ Consider adjusting the PKG_CONFIG_PATH environment variable if you
+ installed software in a non-standard prefix.
+ 
+-_PKG_TEXT
+-])],
+-		[AC_MSG_RESULT([no])
+-                $4])
++_PKG_TEXT])[]dnl
++        ])
+ elif test $pkg_failed = untried; then
+-	ifelse([$4], , [AC_MSG_FAILURE(dnl
++     	AC_MSG_RESULT([no])
++	m4_default([$4], [AC_MSG_FAILURE(
+ [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.
+ 
+ _PKG_TEXT
+ 
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
+-		[$4])
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
++        ])
+ else
+ 	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+ 	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+         AC_MSG_RESULT([yes])
+-	ifelse([$3], , :, [$3])
++	$3
+ fi[]dnl
+ ])# PKG_CHECK_MODULES
+ 
+--- zabbix-1.8.2.orig/Makefile.in
++++ zabbix-1.8.2/Makefile.in
+@@ -189,6 +189,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PG_CONFIG = @PG_CONFIG@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
+ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
+ POSTGRESQL_VERSION = @POSTGRESQL_VERSION@
+--- zabbix-1.8.2.orig/upgrades/Makefile.in
++++ zabbix-1.8.2/upgrades/Makefile.in
+@@ -133,6 +133,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PG_CONFIG = @PG_CONFIG@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
+ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
+ POSTGRESQL_VERSION = @POSTGRESQL_VERSION@
+--- zabbix-1.8.2.orig/create/Makefile.in
++++ zabbix-1.8.2/create/Makefile.in
+@@ -133,6 +133,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PG_CONFIG = @PG_CONFIG@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
+ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
+ POSTGRESQL_VERSION = @POSTGRESQL_VERSION@
+--- zabbix-1.8.2.orig/misc/Makefile.in
++++ zabbix-1.8.2/misc/Makefile.in
+@@ -133,6 +133,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PG_CONFIG = @PG_CONFIG@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
+ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
+ POSTGRESQL_VERSION = @POSTGRESQL_VERSION@
+--- zabbix-1.8.2.orig/src/Makefile.in
++++ zabbix-1.8.2/src/Makefile.in
+@@ -172,6 +172,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PG_CONFIG = @PG_CONFIG@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
+ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
+ POSTGRESQL_VERSION = @POSTGRESQL_VERSION@
+--- zabbix-1.8.2.orig/src/zabbix_get/Makefile.in
++++ zabbix-1.8.2/src/zabbix_get/Makefile.in
+@@ -156,6 +156,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PG_CONFIG = @PG_CONFIG@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
+ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
+ POSTGRESQL_VERSION = @POSTGRESQL_VERSION@
+--- zabbix-1.8.2.orig/src/zabbix_agent/Makefile.in
++++ zabbix-1.8.2/src/zabbix_agent/Makefile.in
+@@ -167,6 +167,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PG_CONFIG = @PG_CONFIG@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
+ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
+ POSTGRESQL_VERSION = @POSTGRESQL_VERSION@
+--- zabbix-1.8.2.orig/src/zabbix_proxy/Makefile.in
++++ zabbix-1.8.2/src/zabbix_proxy/Makefile.in
+@@ -220,6 +220,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PG_CONFIG = @PG_CONFIG@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
+ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
+ POSTGRESQL_VERSION = @POSTGRESQL_VERSION@
+--- zabbix-1.8.2.orig/src/zabbix_proxy/proxyconfig/Makefile.in
++++ zabbix-1.8.2/src/zabbix_proxy/proxyconfig/Makefile.in
+@@ -151,6 +151,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PG_CONFIG = @PG_CONFIG@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
+ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
+ POSTGRESQL_VERSION = @POSTGRESQL_VERSION@
+--- zabbix-1.8.2.orig/src/zabbix_proxy/heart/Makefile.in
++++ zabbix-1.8.2/src/zabbix_proxy/heart/Makefile.in
+@@ -151,6 +151,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PG_CONFIG = @PG_CONFIG@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
+ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
+ POSTGRESQL_VERSION = @POSTGRESQL_VERSION@
+--- zabbix-1.8.2.orig/src/zabbix_proxy/housekeeper/Makefile.in
++++ zabbix-1.8.2/src/zabbix_proxy/housekeeper/Makefile.in
+@@ -151,6 +151,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PG_CONFIG = @PG_CONFIG@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
+ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
+ POSTGRESQL_VERSION = @POSTGRESQL_VERSION@
+--- zabbix-1.8.2.orig/src/zabbix_proxy/datasender/Makefile.in
++++ zabbix-1.8.2/src/zabbix_proxy/datasender/Makefile.in
+@@ -151,6 +151,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PG_CONFIG = @PG_CONFIG@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
+ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
+ POSTGRESQL_VERSION = @POSTGRESQL_VERSION@
+--- zabbix-1.8.2.orig/src/zabbix_sender/Makefile.in
++++ zabbix-1.8.2/src/zabbix_sender/Makefile.in
+@@ -157,6 +157,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PG_CONFIG = @PG_CONFIG@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
+ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
+ POSTGRESQL_VERSION = @POSTGRESQL_VERSION@
+--- zabbix-1.8.2.orig/src/libs/Makefile.in
++++ zabbix-1.8.2/src/libs/Makefile.in
+@@ -172,6 +172,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PG_CONFIG = @PG_CONFIG@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
+ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
+ POSTGRESQL_VERSION = @POSTGRESQL_VERSION@
+--- zabbix-1.8.2.orig/src/libs/zbxsys/Makefile.in
++++ zabbix-1.8.2/src/libs/zbxsys/Makefile.in
+@@ -151,6 +151,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PG_CONFIG = @PG_CONFIG@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
+ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
+ POSTGRESQL_VERSION = @POSTGRESQL_VERSION@
+--- zabbix-1.8.2.orig/src/libs/zbxcomms/Makefile.in
++++ zabbix-1.8.2/src/libs/zbxcomms/Makefile.in
+@@ -151,6 +151,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PG_CONFIG = @PG_CONFIG@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
+ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
+ POSTGRESQL_VERSION = @POSTGRESQL_VERSION@
+--- zabbix-1.8.2.orig/src/libs/zbxplugin/Makefile.in
++++ zabbix-1.8.2/src/libs/zbxplugin/Makefile.in
+@@ -151,6 +151,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PG_CONFIG = @PG_CONFIG@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
+ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
+ POSTGRESQL_VERSION = @POSTGRESQL_VERSION@
+--- zabbix-1.8.2.orig/src/libs/zbxcommon/Makefile.in
++++ zabbix-1.8.2/src/libs/zbxcommon/Makefile.in
+@@ -153,6 +153,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PG_CONFIG = @PG_CONFIG@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
+ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
+ POSTGRESQL_VERSION = @POSTGRESQL_VERSION@
+--- zabbix-1.8.2.orig/src/libs/zbxdbcache/Makefile.in
++++ zabbix-1.8.2/src/libs/zbxdbcache/Makefile.in
+@@ -152,6 +152,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PG_CONFIG = @PG_CONFIG@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
+ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
+ POSTGRESQL_VERSION = @POSTGRESQL_VERSION@
+--- zabbix-1.8.2.orig/src/libs/zbxjson/Makefile.in
++++ zabbix-1.8.2/src/libs/zbxjson/Makefile.in
+@@ -151,6 +151,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PG_CONFIG = @PG_CONFIG@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
+ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
+ POSTGRESQL_VERSION = @POSTGRESQL_VERSION@
+--- zabbix-1.8.2.orig/src/libs/zbxdbhigh/Makefile.in
++++ zabbix-1.8.2/src/libs/zbxdbhigh/Makefile.in
+@@ -157,6 +157,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PG_CONFIG = @PG_CONFIG@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
+ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
+ POSTGRESQL_VERSION = @POSTGRESQL_VERSION@
+--- zabbix-1.8.2.orig/src/libs/zbxserver/Makefile.in
++++ zabbix-1.8.2/src/libs/zbxserver/Makefile.in
+@@ -152,6 +152,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PG_CONFIG = @PG_CONFIG@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
+ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
+ POSTGRESQL_VERSION = @POSTGRESQL_VERSION@
+--- zabbix-1.8.2.orig/src/libs/zbxconf/Makefile.in
++++ zabbix-1.8.2/src/libs/zbxconf/Makefile.in
+@@ -151,6 +151,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PG_CONFIG = @PG_CONFIG@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
+ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
+ POSTGRESQL_VERSION = @POSTGRESQL_VERSION@
+--- zabbix-1.8.2.orig/src/libs/zbxsms/Makefile.in
++++ zabbix-1.8.2/src/libs/zbxsms/Makefile.in
+@@ -151,6 +151,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PG_CONFIG = @PG_CONFIG@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
+ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
+ POSTGRESQL_VERSION = @POSTGRESQL_VERSION@
+--- zabbix-1.8.2.orig/src/libs/zbxlog/Makefile.in
++++ zabbix-1.8.2/src/libs/zbxlog/Makefile.in
+@@ -151,6 +151,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PG_CONFIG = @PG_CONFIG@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
+ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
+ POSTGRESQL_VERSION = @POSTGRESQL_VERSION@
+--- zabbix-1.8.2.orig/src/libs/zbxnix/Makefile.in
++++ zabbix-1.8.2/src/libs/zbxnix/Makefile.in
+@@ -151,6 +151,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PG_CONFIG = @PG_CONFIG@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
+ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
+ POSTGRESQL_VERSION = @POSTGRESQL_VERSION@
+--- zabbix-1.8.2.orig/src/libs/zbxicmpping/Makefile.in
++++ zabbix-1.8.2/src/libs/zbxicmpping/Makefile.in
+@@ -151,6 +151,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PG_CONFIG = @PG_CONFIG@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
+ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
+ POSTGRESQL_VERSION = @POSTGRESQL_VERSION@
+--- zabbix-1.8.2.orig/src/libs/zbxsysinfo/Makefile.in
++++ zabbix-1.8.2/src/libs/zbxsysinfo/Makefile.in
+@@ -197,6 +197,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PG_CONFIG = @PG_CONFIG@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
+ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
+ POSTGRESQL_VERSION = @POSTGRESQL_VERSION@
+--- zabbix-1.8.2.orig/src/libs/zbxsysinfo/osf/Makefile.in
++++ zabbix-1.8.2/src/libs/zbxsysinfo/osf/Makefile.in
+@@ -160,6 +160,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PG_CONFIG = @PG_CONFIG@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
+ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
+ POSTGRESQL_VERSION = @POSTGRESQL_VERSION@
+--- zabbix-1.8.2.orig/src/libs/zbxsysinfo/linux/Makefile.in
++++ zabbix-1.8.2/src/libs/zbxsysinfo/linux/Makefile.in
+@@ -161,6 +161,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PG_CONFIG = @PG_CONFIG@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
+ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
+ POSTGRESQL_VERSION = @POSTGRESQL_VERSION@
+--- zabbix-1.8.2.orig/src/libs/zbxsysinfo/netbsd/Makefile.in
++++ zabbix-1.8.2/src/libs/zbxsysinfo/netbsd/Makefile.in
+@@ -161,6 +161,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PG_CONFIG = @PG_CONFIG@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
+ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
+ POSTGRESQL_VERSION = @POSTGRESQL_VERSION@
+--- zabbix-1.8.2.orig/src/libs/zbxsysinfo/common/Makefile.in
++++ zabbix-1.8.2/src/libs/zbxsysinfo/common/Makefile.in
+@@ -152,6 +152,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PG_CONFIG = @PG_CONFIG@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
+ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
+ POSTGRESQL_VERSION = @POSTGRESQL_VERSION@
+--- zabbix-1.8.2.orig/src/libs/zbxsysinfo/osx/Makefile.in
++++ zabbix-1.8.2/src/libs/zbxsysinfo/osx/Makefile.in
+@@ -160,6 +160,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PG_CONFIG = @PG_CONFIG@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
+ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
+ POSTGRESQL_VERSION = @POSTGRESQL_VERSION@
+--- zabbix-1.8.2.orig/src/libs/zbxsysinfo/openbsd/Makefile.in
++++ zabbix-1.8.2/src/libs/zbxsysinfo/openbsd/Makefile.in
+@@ -161,6 +161,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PG_CONFIG = @PG_CONFIG@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
+ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
+ POSTGRESQL_VERSION = @POSTGRESQL_VERSION@
+--- zabbix-1.8.2.orig/src/libs/zbxsysinfo/simple/Makefile.in
++++ zabbix-1.8.2/src/libs/zbxsysinfo/simple/Makefile.in
+@@ -151,6 +151,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PG_CONFIG = @PG_CONFIG@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
+ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
+ POSTGRESQL_VERSION = @POSTGRESQL_VERSION@
+--- zabbix-1.8.2.orig/src/libs/zbxsysinfo/solaris/Makefile.in
++++ zabbix-1.8.2/src/libs/zbxsysinfo/solaris/Makefile.in
+@@ -161,6 +161,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PG_CONFIG = @PG_CONFIG@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
+ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
+ POSTGRESQL_VERSION = @POSTGRESQL_VERSION@
+--- zabbix-1.8.2.orig/src/libs/zbxsysinfo/unknown/Makefile.in
++++ zabbix-1.8.2/src/libs/zbxsysinfo/unknown/Makefile.in
+@@ -160,6 +160,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PG_CONFIG = @PG_CONFIG@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
+ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
+ POSTGRESQL_VERSION = @POSTGRESQL_VERSION@
+--- zabbix-1.8.2.orig/src/libs/zbxsysinfo/aix/Makefile.in
++++ zabbix-1.8.2/src/libs/zbxsysinfo/aix/Makefile.in
+@@ -161,6 +161,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PG_CONFIG = @PG_CONFIG@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
+ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
+ POSTGRESQL_VERSION = @POSTGRESQL_VERSION@
+--- zabbix-1.8.2.orig/src/libs/zbxsysinfo/freebsd/Makefile.in
++++ zabbix-1.8.2/src/libs/zbxsysinfo/freebsd/Makefile.in
+@@ -161,6 +161,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PG_CONFIG = @PG_CONFIG@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
+ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
+ POSTGRESQL_VERSION = @POSTGRESQL_VERSION@
+--- zabbix-1.8.2.orig/src/libs/zbxsysinfo/hpux/Makefile.in
++++ zabbix-1.8.2/src/libs/zbxsysinfo/hpux/Makefile.in
+@@ -160,6 +160,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PG_CONFIG = @PG_CONFIG@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
+ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
+ POSTGRESQL_VERSION = @POSTGRESQL_VERSION@
+--- zabbix-1.8.2.orig/src/libs/zbxcrypto/Makefile.in
++++ zabbix-1.8.2/src/libs/zbxcrypto/Makefile.in
+@@ -151,6 +151,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PG_CONFIG = @PG_CONFIG@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
+ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
+ POSTGRESQL_VERSION = @POSTGRESQL_VERSION@
+--- zabbix-1.8.2.orig/src/libs/zbxdb/Makefile.in
++++ zabbix-1.8.2/src/libs/zbxdb/Makefile.in
+@@ -151,6 +151,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PG_CONFIG = @PG_CONFIG@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
+ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
+ POSTGRESQL_VERSION = @POSTGRESQL_VERSION@
+--- zabbix-1.8.2.orig/src/libs/zbxemail/Makefile.in
++++ zabbix-1.8.2/src/libs/zbxemail/Makefile.in
+@@ -151,6 +151,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PG_CONFIG = @PG_CONFIG@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
+ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
+ POSTGRESQL_VERSION = @POSTGRESQL_VERSION@
+--- zabbix-1.8.2.orig/src/libs/zbxjabber/Makefile.in
++++ zabbix-1.8.2/src/libs/zbxjabber/Makefile.in
+@@ -151,6 +151,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PG_CONFIG = @PG_CONFIG@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
+ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
+ POSTGRESQL_VERSION = @POSTGRESQL_VERSION@
+--- zabbix-1.8.2.orig/src/zabbix_server/Makefile.in
++++ zabbix-1.8.2/src/zabbix_server/Makefile.in
+@@ -219,6 +219,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PG_CONFIG = @PG_CONFIG@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
+ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
+ POSTGRESQL_VERSION = @POSTGRESQL_VERSION@
+--- zabbix-1.8.2.orig/src/zabbix_server/dbconfig/Makefile.in
++++ zabbix-1.8.2/src/zabbix_server/dbconfig/Makefile.in
+@@ -151,6 +151,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PG_CONFIG = @PG_CONFIG@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
+ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
+ POSTGRESQL_VERSION = @POSTGRESQL_VERSION@
+--- zabbix-1.8.2.orig/src/zabbix_server/utils/Makefile.in
++++ zabbix-1.8.2/src/zabbix_server/utils/Makefile.in
+@@ -151,6 +151,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PG_CONFIG = @PG_CONFIG@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
+ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
+ POSTGRESQL_VERSION = @POSTGRESQL_VERSION@
+--- zabbix-1.8.2.orig/src/zabbix_server/watchdog/Makefile.in
++++ zabbix-1.8.2/src/zabbix_server/watchdog/Makefile.in
+@@ -151,6 +151,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PG_CONFIG = @PG_CONFIG@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
+ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
+ POSTGRESQL_VERSION = @POSTGRESQL_VERSION@
+--- zabbix-1.8.2.orig/src/zabbix_server/pinger/Makefile.in
++++ zabbix-1.8.2/src/zabbix_server/pinger/Makefile.in
+@@ -151,6 +151,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PG_CONFIG = @PG_CONFIG@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
+ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
+ POSTGRESQL_VERSION = @POSTGRESQL_VERSION@
+--- zabbix-1.8.2.orig/src/zabbix_server/escalator/Makefile.in
++++ zabbix-1.8.2/src/zabbix_server/escalator/Makefile.in
+@@ -151,6 +151,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PG_CONFIG = @PG_CONFIG@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
+ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
+ POSTGRESQL_VERSION = @POSTGRESQL_VERSION@
+--- zabbix-1.8.2.orig/src/zabbix_server/trapper/Makefile.in
++++ zabbix-1.8.2/src/zabbix_server/trapper/Makefile.in
+@@ -155,6 +155,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PG_CONFIG = @PG_CONFIG@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
+ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
+ POSTGRESQL_VERSION = @POSTGRESQL_VERSION@
+--- zabbix-1.8.2.orig/src/zabbix_server/dbsyncer/Makefile.in
++++ zabbix-1.8.2/src/zabbix_server/dbsyncer/Makefile.in
+@@ -151,6 +151,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PG_CONFIG = @PG_CONFIG@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
+ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
+ POSTGRESQL_VERSION = @POSTGRESQL_VERSION@
+--- zabbix-1.8.2.orig/src/zabbix_server/housekeeper/Makefile.in
++++ zabbix-1.8.2/src/zabbix_server/housekeeper/Makefile.in
+@@ -151,6 +151,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PG_CONFIG = @PG_CONFIG@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
+ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
+ POSTGRESQL_VERSION = @POSTGRESQL_VERSION@
+--- zabbix-1.8.2.orig/src/zabbix_server/httppoller/Makefile.in
++++ zabbix-1.8.2/src/zabbix_server/httppoller/Makefile.in
+@@ -152,6 +152,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PG_CONFIG = @PG_CONFIG@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
+ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
+ POSTGRESQL_VERSION = @POSTGRESQL_VERSION@
+--- zabbix-1.8.2.orig/src/zabbix_server/timer/Makefile.in
++++ zabbix-1.8.2/src/zabbix_server/timer/Makefile.in
+@@ -151,6 +151,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PG_CONFIG = @PG_CONFIG@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
+ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
+ POSTGRESQL_VERSION = @POSTGRESQL_VERSION@
+--- zabbix-1.8.2.orig/src/zabbix_server/nodewatcher/Makefile.in
++++ zabbix-1.8.2/src/zabbix_server/nodewatcher/Makefile.in
+@@ -153,6 +153,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PG_CONFIG = @PG_CONFIG@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
+ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
+ POSTGRESQL_VERSION = @POSTGRESQL_VERSION@
+--- zabbix-1.8.2.orig/src/zabbix_server/discoverer/Makefile.in
++++ zabbix-1.8.2/src/zabbix_server/discoverer/Makefile.in
+@@ -151,6 +151,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PG_CONFIG = @PG_CONFIG@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
+ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
+ POSTGRESQL_VERSION = @POSTGRESQL_VERSION@
+--- zabbix-1.8.2.orig/src/zabbix_server/poller/Makefile.in
++++ zabbix-1.8.2/src/zabbix_server/poller/Makefile.in
+@@ -157,6 +157,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PG_CONFIG = @PG_CONFIG@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
+ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
+ POSTGRESQL_VERSION = @POSTGRESQL_VERSION@
+--- zabbix-1.8.2.orig/src/zabbix_server/alerter/Makefile.in
++++ zabbix-1.8.2/src/zabbix_server/alerter/Makefile.in
+@@ -151,6 +151,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PG_CONFIG = @PG_CONFIG@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
+ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
+ POSTGRESQL_VERSION = @POSTGRESQL_VERSION@
+--- zabbix-1.8.2.orig/man/Makefile.in
++++ zabbix-1.8.2/man/Makefile.in
+@@ -159,6 +159,8 @@ PACKAGE_VERSION = @PACKAGE_VERSION@
+ PATH_SEPARATOR = @PATH_SEPARATOR@
+ PG_CONFIG = @PG_CONFIG@
+ PKG_CONFIG = @PKG_CONFIG@
++PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
++PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+ POSTGRESQL_CPPFLAGS = @POSTGRESQL_CPPFLAGS@
+ POSTGRESQL_LDFLAGS = @POSTGRESQL_LDFLAGS@
+ POSTGRESQL_VERSION = @POSTGRESQL_VERSION@
diff -Nru zabbix-1.8.2/debian/patches/series zabbix-1.8.2/debian/patches/series
--- zabbix-1.8.2/debian/patches/series	2010-10-26 22:34:04.000000000 +0200
+++ zabbix-1.8.2/debian/patches/series	2011-01-14 22:18:54.000000000 +0100
@@ -2,3 +2,5 @@
 cve-2010-2790
 no-swf-clock
 debian-changes-1:1.8.2-1
+debian-changes-1:1.8.2-1squeeze2
+zbx-2329
diff -Nru zabbix-1.8.2/debian/patches/zbx-2329 zabbix-1.8.2/debian/patches/zbx-2329
--- zabbix-1.8.2/debian/patches/zbx-2329	1970-01-01 01:00:00.000000000 +0100
+++ zabbix-1.8.2/debian/patches/zbx-2329	2011-01-14 22:19:55.000000000 +0100
@@ -0,0 +1,88 @@
+Index: zabbix-1.8.2/frontends/php/api/classes/class.cscreen.php
+===================================================================
+--- zabbix-1.8.2.orig/frontends/php/api/classes/class.cscreen.php	2011-01-14 22:19:26.305915158 +0100
++++ zabbix-1.8.2/frontends/php/api/classes/class.cscreen.php	2011-01-14 22:19:40.893915202 +0100
+@@ -479,8 +479,7 @@
+ 				$screen_db_fields = array(
+ 					'name' => null,
+ 					'hsize' => 2,
+-					'vsize' => 2,
+-					'screenitems' => array()
++					'vsize' => 2
+ 				);
+ 
+ 				if(!check_db_fields($screen_db_fields, $screen)){
+@@ -510,21 +509,23 @@
+ 						' VALUES ('.implode(',',array_values($values)).')';
+ 				$result = DBexecute($sql);
+ 
+-				if(!$result) throw new APIException(ZBX_API_ERROR_INTERNAL, 'Failed on screen['.$screen['name'].'] creation');
++				if(!$result) self::exception(ZBX_API_ERROR_INTERNAL, 'Failed on screen['.$screen['name'].'] creation');
+ 
+-				$data = array(
+-					'screenids' => array($screenid),
+-					'screenitems' => $screen['screenitems']
+-				);
++				if(isset($screen['screenitems'])){
++					$data = array(
++						'screenids' => array($screenid),
++						'screenitems' => $screen['screenitems']
++					);
+ 
+-				$result = self::addItems($data);
+-				if(!$result) throw new APIException(ZBX_API_ERROR_INTERNAL, 'Failed on screen['.$screen['name'].'] creation');
++					$result = self::addItems($data);
++					if(!$result) self::exception(ZBX_API_ERROR_INTERNAL, 'Failed on screen['.$screen['name'].'] creation');
++				}
+ 
+ 				$screenids[] = $screenid;
+ 			}
+ 
+ 			$result = self::EndTransaction($result, __METHOD__);
+-			if(!$result) throw new APIException(ZBX_API_ERROR_INTERNAL, 'Transaction failed on screens creation');
++			if(!$result) self::exception(ZBX_API_ERROR_INTERNAL, 'Transaction failed on screens creation');
+ 
+ 			return array('screenids' => $screenids);
+ 		}
+@@ -575,7 +576,6 @@
+ 				throw new APIException(ZBX_API_ERROR_PERMISSIONS, 'No permisssions for screen update');
+ 			}
+ 
+-			$upd_screens[$screen['screenid']]['screenitems'] = array();
+ 			$screenids[] = $screen['screenid'];
+ 		}
+ 
+@@ -612,19 +612,21 @@
+ 				$result = DBexecute($sql);
+ 
+ // Screen items
+-				$data = array(
+-					'screenids' => array($screen['screenid']),
+-				);
+-				$result = self::deleteItems($data);
+-				if(!$result) throw new APIException(ZBX_API_ERROR_INTERNAL, 'Failed on screen['.$screen['name'].'] update');
++				if(isset($screen['screenitems'])){
++					$data = array(
++						'screenids' => array($screen['screenid']),
++					);
++					$result = self::deleteItems($data);
++					if(!$result) throw new APIException(ZBX_API_ERROR_INTERNAL, 'Failed on screen['.$screen['name'].'] update');
++
++					$data = array(
++						'screenids' => array($screen['screenid']),
++						'screenitems' => $screen['screenitems']
++					);
+ 
+-				$data = array(
+-					'screenids' => array($screen['screenid']),
+-					'screenitems' => $screen['screenitems']
+-				);
+-
+-				$result = self::addItems($data);
+-				if(!$result) throw new APIException(ZBX_API_ERROR_INTERNAL, 'Failed on screen['.$screen['name'].'] update');
++					$result = self::addItems($data);
++					if(!$result) throw new APIException(ZBX_API_ERROR_INTERNAL, 'Failed on screen['.$screen['name'].'] update');
++				}
+ 			}
+ 
+ 			$result = self::EndTransaction($result, __METHOD__);
diff -Nru zabbix-1.8.2/debian/README.source zabbix-1.8.2/debian/README.source
--- zabbix-1.8.2/debian/README.source	2009-12-30 21:15:29.000000000 +0100
+++ zabbix-1.8.2/debian/README.source	2011-01-14 22:18:20.000000000 +0100
@@ -1,24 +1,12 @@
-This package uses 'dpatch' to add patches. See
-/usr/share/doc/dpatch/README.source.gz on how this works.
+This package uses 'quilt' to handle patches.
+See http://wiki.debian.org/Projects/DebSrc3.0
 
 Currently we use it to avoid building with libssl. The libssl license is not
 GPL compatible and thus linking against it is a GPL violation.
 
-Major todos for 1.8 package:
-
-[ ] Find a way to upgrade the database from 1.6 to 1.8.  Upstream delivers a
-    script but says to "ignore any errors".  But dbconfig-common exits on the
-    first error.
-
-[X] init.d script sometimes fails to restart the server.  Maybe a timing issue.
-    We should use start-stop-daemon where possible.
-
 Minor todos:
 
 [ ] ucf complains about not using "--debconf-ok"
 
-[ ] refactor debian/rules (e.g. 3.0 packaging, dh)
-
 [ ] currently the resulting .diff.gz is huge due to the relibtoolizing
 
-[X] use the font from the appropriate Debian package (lintian warning)
diff -Nru zabbix-1.8.2/debian/rules zabbix-1.8.2/debian/rules
--- zabbix-1.8.2/debian/rules	2010-04-10 12:32:06.000000000 +0200
+++ zabbix-1.8.2/debian/rules	2011-01-13 00:23:24.000000000 +0100
@@ -172,7 +172,7 @@
 	rm -r $(TMP_FRONTEND)/usr/share/zabbix/js/scriptaculous*
 	rm -f $(TMP_FRONTEND)/usr/share/zabbix/conf/COPYING
 	# disable installation frontend for now.
-	chmod 000 $(TMP_FRONTEND)/usr/share/zabbix/setup.php
+	rm $(TMP_FRONTEND)/usr/share/zabbix/setup.php
 	chmod a-x $(TMP_FRONTEND)/usr/share/zabbix/images/general/tick.png
 	# link config file to /etc/zabbix/..
 	dh_link -pzabbix-frontend-php etc/zabbix/dbconfig.php usr/share/zabbix/conf/zabbix.conf.php
@@ -216,6 +216,8 @@
 	$(INSTALL_DIR) $(TMP_SERVER_MYSQL)/usr/share/dbconfig-common/data/$(PKG_SERVER_MYSQL)/install/
 	$(INSTALL_DIR) $(TMP_SERVER_MYSQL)/usr/share/dbconfig-common/data/$(PKG_SERVER_MYSQL)/upgrade/mysql/
 	$(INSTALL_DIR) $(TMP_SERVER_MYSQL)/usr/share/doc/zabbix-server-mysql/
+	$(INSTALL_DIR) $(TMP_SERVER_MYSQL)/usr/share/doc/zabbix-server-mysql/examples/1.6
+	$(INSTALL_DIR) $(TMP_SERVER_MYSQL)/usr/share/doc/zabbix-server-mysql/examples/1.8
 	chmod 750 $(TMP_SERVER_MYSQL)/var/log/zabbix-server/
 	$(INSTALL_PROGRAM) src/zabbix_server/zabbix_server $(TMP_SERVER_MYSQL)/usr/sbin
 	$(INSTALL_PROGRAM) src/zabbix_get/zabbix_get $(TMP_SERVER_MYSQL)/usr/bin
@@ -223,6 +225,10 @@
 	$(INSTALL_FILE) create/data/data.sql $(TMP_SERVER_MYSQL)/usr/share/zabbix-server/
 	$(INSTALL_FILE) debian/zabbix-server-mysql.logrotate $(TMP_SERVER_MYSQL)/etc/logrotate.d/zabbix-server-mysql
 	$(INSTALL_FILE) debian/templates/zabbix_server.conf.in $(TMP_SERVER_MYSQL)/usr/share/doc/zabbix-server-mysql/zabbix_server.conf
+	# install upgrade scripts for database schema upgrades
+	$(INSTALL_FILE) upgrades/dbpatches/1.6/mysql/patch.sql $(TMP_SERVER_MYSQL)/usr/share/doc/zabbix-server-mysql/examples/1.6/
+	$(INSTALL_SCRIPT) upgrades/dbpatches/1.8/mysql/upgrade $(TMP_SERVER_MYSQL)/usr/share/doc/zabbix-server-mysql/examples/1.8/
+	$(INSTALL_FILE) upgrades/dbpatches/1.8/mysql/patch.sql $(TMP_SERVER_MYSQL)/usr/share/doc/zabbix-server-mysql/examples/1.8/
 	# install schema + data sql files for dbc_config
 	$(INSTALL_FILE) create/schema/mysql.sql $(TMP_SERVER_MYSQL)/usr/share/dbconfig-common/data/$(PKG_SERVER_MYSQL)/install/mysql
 	cat create/data/data.sql >> $(TMP_SERVER_MYSQL)/usr/share/dbconfig-common/data/$(PKG_SERVER_MYSQL)/install/mysql
@@ -247,6 +253,8 @@
 	$(INSTALL_DIR) $(TMP_SERVER_PGSQL)/usr/share/dbconfig-common/data/$(PKG_SERVER_PGSQL)/install/
 	$(INSTALL_DIR) $(TMP_SERVER_PGSQL)/usr/share/dbconfig-common/data/$(PKG_SERVER_PGSQL)/upgrade/pgsql/
 	$(INSTALL_DIR) $(TMP_SERVER_PGSQL)/usr/share/doc/zabbix-server-pgsql/
+	$(INSTALL_DIR) $(TMP_SERVER_PGSQL)/usr/share/doc/zabbix-server-pgsql/examples/1.6
+	$(INSTALL_DIR) $(TMP_SERVER_PGSQL)/usr/share/doc/zabbix-server-pgsql/examples/1.8
 	chmod 750 $(TMP_SERVER_PGSQL)/var/log/zabbix-server/
 	$(INSTALL_PROGRAM) src/zabbix_server/zabbix_server $(TMP_SERVER_PGSQL)/usr/sbin
 	$(INSTALL_PROGRAM) src/zabbix_get/zabbix_get $(TMP_SERVER_PGSQL)/usr/bin
@@ -254,6 +262,9 @@
 	$(INSTALL_FILE) create/data/data.sql $(TMP_SERVER_PGSQL)/usr/share/zabbix-server/
 	$(INSTALL_FILE) debian/zabbix-server-mysql.logrotate $(TMP_SERVER_PGSQL)/etc/logrotate.d/zabbix-server-pgsql
 	$(INSTALL_FILE) debian/templates/zabbix_server.conf.in $(TMP_SERVER_PGSQL)/usr/share/doc/zabbix-server-pgsql/zabbix_server.conf
+	# install upgrade scripts for database schema upgrades
+	$(INSTALL_FILE) upgrades/dbpatches/1.6/postgresql/patch.sql $(TMP_SERVER_PGSQL)/usr/share/doc/zabbix-server-pgsql/examples/1.6/
+	$(INSTALL_FILE) upgrades/dbpatches/1.8/postgresql/patch.sql $(TMP_SERVER_PGSQL)/usr/share/doc/zabbix-server-pgsql/examples/1.8/
 	#install schema + data sql files for dbc_config
 	$(INSTALL_FILE) create/schema/postgresql.sql $(TMP_SERVER_PGSQL)/usr/share/dbconfig-common/data/$(PKG_SERVER_PGSQL)/install/pgsql
 	cat create/data/data.sql >> $(TMP_SERVER_PGSQL)/usr/share/dbconfig-common/data/$(PKG_SERVER_PGSQL)/install/pgsql
@@ -349,7 +360,7 @@
 	dh_installexamples -a
 	dh_link -a
 	dh_strip -a
-	dh_compress -a
+	dh_compress -a -X/examples/
 	dh_fixperms -a
 	dh_makeshlibs -a
 	dh_installdeb -a
diff -Nru zabbix-1.8.2/debian/zabbix-server-mysql.examples zabbix-1.8.2/debian/zabbix-server-mysql.examples
--- zabbix-1.8.2/debian/zabbix-server-mysql.examples	2009-12-30 21:15:30.000000000 +0100
+++ zabbix-1.8.2/debian/zabbix-server-mysql.examples	1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-upgrades/dbpatches/1.8/mysql/patch.sql
diff -Nru zabbix-1.8.2/debian/zabbix-server-mysql.README.Debian zabbix-1.8.2/debian/zabbix-server-mysql.README.Debian
--- zabbix-1.8.2/debian/zabbix-server-mysql.README.Debian	2009-12-30 21:54:11.000000000 +0100
+++ zabbix-1.8.2/debian/zabbix-server-mysql.README.Debian	2011-01-12 00:10:38.000000000 +0100
@@ -8,20 +8,39 @@
  so that Zabbix knows where to find the database.
 
 
-Upgrading from 1.6 to 1.8 manually
-----------------------------------
+Upgrading the database schema manually (MANDATORY!)
+---------------------------------------------------
 
- THIS STEP IS IMPORTANT FOR EVERYBODY WHO UPGRADES FROM <1.8 to 1.8!
+ THIS STEP IS MANDATORY FOR EVERYBODY WHO UPGRADES FROM <1.8 to 1.8.
+ ZABBIX 1.8 WILL NOT WORK PROPERLY IF YOU IGNORE THIS SECTION.
 
  Unfortunately the database can not be upgraded automatically from
  Zabbix server installations earlier than 1.8 to version 1.8.
- Please run the necessary SQL queries manually. They are found in
- the /usr/share/doc/zabbix-server-mysql/examples directory.
+ If you are upgrading from Debian Lenny (Zabbix version 1.4) you will
+ need to update from 1.4 to 1.6 first. Then do the upgrade from 1.6 to
+ 1.8. Sorry for the inconvenience. We tried hard to spare you this step.
 
- It is a good idea to stop the Zabbix server while you apply the SQL
- commands to prevent locks on the table. You will also want to backup
- the database before doing the upgrade.
+ Upgrade 1.4 -> 1.6
+ ~~~~~~~~~~~~~~~~~~
 
- Sorry for the inconvenience. Due to several possible database schemas
- it was not possible to offer you a more convenient way.
+ $> /etc/init.d/zabbix-server stop
+
+ $> cd /usr/share/doc/zabbix-server-mysql/examples/1.6
+
+ $> mysql -pPASSWORD zabbix < patch.sql
+ (use your actual MySQL root password instead of 'PASSWORD' here)
+ 
+ $> /etc/init.d/zabbix-server start
+
+ Upgrade 1.6 -> 1.8
+ ~~~~~~~~~~~~~~~~~~
+
+ $> /etc/init.d/zabbix-server stop
+
+ $> cd /usr/share/doc/zabbix-server-mysql/examples/1.8
+
+ $> ./upgrade -pPASSWORD zabbix
+ (use your actual MySQL root password instead of 'PASSWORD' here)
+ 
+ $> /etc/init.d/zabbix-server start
 
diff -Nru zabbix-1.8.2/debian/zabbix-server-pgsql.README.Debian zabbix-1.8.2/debian/zabbix-server-pgsql.README.Debian
--- zabbix-1.8.2/debian/zabbix-server-pgsql.README.Debian	2009-12-30 21:56:45.000000000 +0100
+++ zabbix-1.8.2/debian/zabbix-server-pgsql.README.Debian	2011-01-13 23:08:31.000000000 +0100
@@ -8,20 +8,35 @@
  so that Zabbix knows where to find the database.
 
 
-Upgrading from 1.6 to 1.8 manually
-----------------------------------
+Upgrading the database schema manually (MANDATORY!)
+---------------------------------------------------
 
- THIS STEP IS IMPORTANT FOR EVERYBODY WHO UPGRADES FROM <1.8 to 1.8!
+ THIS STEP IS MANDATORY FOR EVERYBODY WHO UPGRADES FROM <1.8 to 1.8.
+ ZABBIX 1.8 WILL NOT WORK PROPERLY IF YOU IGNORE THIS SECTION.
 
  Unfortunately the database can not be upgraded automatically from
  Zabbix server installations earlier than 1.8 to version 1.8.
- Please run the necessary SQL queries manually. They are found in
- the /usr/share/doc/zabbix-server-pgsql/examples directory.
+ If you are upgrading from Debian Lenny (Zabbix version 1.4) you will
+ need to update from 1.4 to 1.6 first. Then do the upgrade from 1.6 to
+ 1.8. Sorry for the inconvenience. We tried hard to spare you this step.
 
- It is a good idea to stop the Zabbix server while you apply the SQL
- commands to prevent locks on the table. You will also want to backup
- the database before doing the upgrade.
+ Upgrade 1.4 -> 1.6
+ ~~~~~~~~~~~~~~~~~~
 
- Sorry for the inconvenience. Due to several possible database schemas
- it was not possible to offer you a more convenient way.
+ $> /etc/init.d/zabbix-server stop
+
+ $> psql -h localhost zabbix zabbix \
+    < /usr/share/doc/zabbix-server-pgsql/examples/1.6/patch.sql
+
+ $> /etc/init.d/zabbix-server start
+
+ Upgrade 1.6 -> 1.8
+ ~~~~~~~~~~~~~~~~~~
+
+ $> /etc/init.d/zabbix-server stop
+
+ $> psql -h localhost zabbix zabbix \
+    < /usr/share/doc/zabbix-server-pgsql/examples/1.8/patch.sql
+ 
+ $> /etc/init.d/zabbix-server start

Reply to:

Follow-Ups:
- Re: Zabbix package's RC bugs fixed - ready for Squeeze
  - From: "Adam D. Barratt" <adam@adam-barratt.org.uk>

References:
- Zabbix package's RC bugs fixed - ready for Squeeze
  - From: Christoph Haas <haas@debian.org>
- Re: Zabbix package's RC bugs fixed - ready for Squeeze
  - From: "Adam D. Barratt" <adam@adam-barratt.org.uk>
- Re: Zabbix package's RC bugs fixed - ready for Squeeze
  - From: Christoph Haas <haas@debian.org>
- Re: Zabbix package's RC bugs fixed - ready for Squeeze
  - From: "Adam D. Barratt" <adam@adam-barratt.org.uk>

Prev by Date: Re: Zabbix package's RC bugs fixed - ready for Squeeze
Next by Date: Processed: retitle 608658 to RM: clive -- RoM; no longer works with any site ...
Previous by thread: Re: Zabbix package's RC bugs fixed - ready for Squeeze
Next by thread: Re: Zabbix package's RC bugs fixed - ready for Squeeze
Index(es):
- Date
- Thread