diff --git a/Makefile.in b/Makefile.in
index ef182fa2f..e7d3befdf 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -216,6 +216,8 @@ ZM_DB_HOST = @ZM_DB_HOST@
 ZM_DB_NAME = @ZM_DB_NAME@
 ZM_DB_PASS = @ZM_DB_PASS@
 ZM_DB_USER = @ZM_DB_USER@
+ZM_HAS_GNUTLS = @ZM_HAS_GNUTLS@
+ZM_HAS_GNUTLS_OPENSSL = @ZM_HAS_GNUTLS_OPENSSL@
 ZM_HAS_V4L = @ZM_HAS_V4L@
 ZM_HAS_V4L1 = @ZM_HAS_V4L1@
 ZM_HAS_V4L2 = @ZM_HAS_V4L2@
diff --git a/aclocal.m4 b/aclocal.m4
index 61989b26c..bf5bfb06d 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -13,8 +13,8 @@
 
 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.68],,
+[m4_warning([this file was generated for autoconf 2.68.
 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'.])])
diff --git a/config.h.in b/config.h.in
index 4831ff9aa..f036d4f4b 100644
--- a/config.h.in
+++ b/config.h.in
@@ -25,6 +25,10 @@
    don't. */
 #undef HAVE_DECL_BACKTRACE
 
+/* Define to 1 if you have the declaration of `gnutls_fingerprint', and to 0
+   if you don't. */
+#undef HAVE_DECL_GNUTLS_FINGERPRINT
+
 /* Define to 1 if you have the declaration of `MD5', and to 0 if you don't. */
 #undef HAVE_DECL_MD5
 
@@ -59,6 +63,12 @@
 /* Define to 1 if you have the <glob.h> header file. */
 #undef HAVE_GLOB_H
 
+/* Define to 1 if you have the <gnutls/gnutls.h> header file. */
+#undef HAVE_GNUTLS_GNUTLS_H
+
+/* Define to 1 if you have the <gnutls/openssl.h> header file. */
+#undef HAVE_GNUTLS_OPENSSL_H
+
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
@@ -107,8 +117,8 @@
 /* Define to 1 if you have the `gcrypt' library (-lgcrypt). */
 #undef HAVE_LIBGCRYPT
 
-/* Define to 1 if you have the `gnutls-openssl' library (-lgnutls-openssl). */
-#undef HAVE_LIBGNUTLS_OPENSSL
+/* Define to 1 if you have the `gnutls' library (-lgnutls). */
+#undef HAVE_LIBGNUTLS
 
 /* Define to 1 if you have the `jpeg' library (-ljpeg). */
 #undef HAVE_LIBJPEG
@@ -174,6 +184,9 @@
 /* Define to 1 if you have the <netinet/in.h> header file. */
 #undef HAVE_NETINET_IN_H
 
+/* Define to 1 if you have the <openssl/md5.h> header file. */
+#undef HAVE_OPENSSL_MD5_H
+
 /* Define to 1 if you have the <pcre.h> header file. */
 #undef HAVE_PCRE_H
 
diff --git a/configure b/configure
index e5fa01dea..89a056a4b 100755
--- a/configure
+++ b/configure
@@ -1,13 +1,13 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for zm 1.25.0.
+# Generated by GNU Autoconf 2.68 for zm 1.25.0.
 #
 # Report bugs to <http://www.zoneminder.com/forums/ - Please check FAQ first>.
 #
 #
 # 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
@@ -91,6 +91,7 @@ fi
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
 case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -216,11 +217,18 @@ IFS=$as_save_IFS
   # We cannot yet assume a decent shell, so we have to provide a
 	# neutralization value for shells without unset; and this also
 	# works around shells that cannot unset nonexistent variables.
+	# Preserve -v and -x to the replacement shell.
 	BASH_ENV=/dev/null
 	ENV=/dev/null
 	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
 	export CONFIG_SHELL
-	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+	case $- in # ((((
+	  *v*x* | *x*v* ) as_opts=-vx ;;
+	  *v* ) as_opts=-v ;;
+	  *x* ) as_opts=-x ;;
+	  * ) as_opts= ;;
+	esac
+	exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
 fi
 
     if test x$as_have_required = xno; then :
@@ -320,7 +328,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
@@ -360,19 +368,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
 
@@ -534,7 +542,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`
 
@@ -612,6 +620,8 @@ ZM_HAS_V4L
 ZM_HAS_V4L2
 ZM_HAS_V4L1
 ALLOCA
+ZM_HAS_GNUTLS
+ZM_HAS_GNUTLS_OPENSSL
 PATH_NETPBM
 OPT_NETPBM
 PATH_FFMPEG
@@ -831,8 +841,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.
@@ -877,7 +888,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
@@ -903,7 +914,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
@@ -1107,7 +1118,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
@@ -1123,7 +1134,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
@@ -1153,8 +1164,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"
     ;;
 
   *=*)
@@ -1162,7 +1173,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 ;;
@@ -1172,7 +1183,7 @@ Try \`$0 --help' for more information."
     $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
       $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
+    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
     ;;
 
   esac
@@ -1180,13 +1191,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
@@ -1209,7 +1220,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'
@@ -1223,8 +1234,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
@@ -1239,9 +1250,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.
@@ -1280,11 +1291,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
@@ -1324,7 +1335,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
@@ -1493,9 +1504,9 @@ test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
 zm configure 1.25.0
-generated by GNU Autoconf 2.65
+generated by GNU Autoconf 2.68
 
-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
@@ -1539,7 +1550,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_retval=1
 fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_cxx_try_compile
@@ -1577,7 +1588,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
 	ac_retval=1
 fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_compile
@@ -1591,7 +1602,7 @@ ac_fn_cxx_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 \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   eval "$3=no"
@@ -1632,7 +1643,7 @@ fi
 eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_cxx_check_type
 
@@ -1657,7 +1668,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_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
 	 test ! -s conftest.err
        }; then :
@@ -1668,7 +1679,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 
     ac_retval=1
 fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_cxx_try_cpp
@@ -1710,7 +1721,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
        ac_retval=$ac_status
 fi
   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_cxx_try_run
@@ -1724,7 +1735,7 @@ ac_fn_cxx_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 \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -1742,7 +1753,7 @@ fi
 eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_cxx_check_header_compile
 
@@ -1755,7 +1766,7 @@ ac_fn_cxx_check_member ()
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
 $as_echo_n "checking for $2.$3... " >&6; }
-if { as_var=$4; eval "test \"\${$as_var+set}\" = set"; }; then :
+if eval \${$4+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -1799,7 +1810,7 @@ fi
 eval ac_res=\$$4
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_cxx_check_member
 
@@ -1811,10 +1822,10 @@ $as_echo "$ac_res" >&6; }
 ac_fn_cxx_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 \${$3+:} false; 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 \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 fi
 eval ac_res=\$$3
@@ -1850,7 +1861,7 @@ if ac_fn_cxx_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; }
 
@@ -1873,17 +1884,15 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
 $as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-( cat <<\_ASBOX
-## ------------------------------------------------------------------------- ##
+( $as_echo "## ------------------------------------------------------------------------- ##
 ## Report this to http://www.zoneminder.com/forums/ - Please check FAQ first ##
-## ------------------------------------------------------------------------- ##
-_ASBOX
+## ------------------------------------------------------------------------- ##"
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 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 \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   eval "$3=\$ac_header_compiler"
@@ -1892,7 +1901,7 @@ eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_cxx_check_header_mongrel
 
@@ -1937,7 +1946,7 @@ fi
   # interfere with the next link command; also delete a directory that is
   # left behind by Apple's compiler.  We do this before executing the actions.
   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_cxx_try_link
@@ -1950,7 +1959,7 @@ ac_fn_cxx_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 \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2005,19 +2014,22 @@ fi
 eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_cxx_check_func
 
-# ac_fn_cxx_check_decl LINENO SYMBOL VAR
-# --------------------------------------
-# Tests whether SYMBOL is declared, setting cache variable VAR accordingly.
+# ac_fn_cxx_check_decl LINENO SYMBOL VAR INCLUDES
+# -----------------------------------------------
+# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR
+# accordingly.
 ac_fn_cxx_check_decl ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $2 is declared" >&5
-$as_echo_n "checking whether $2 is declared... " >&6; }
-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :
+  as_decl_name=`echo $2|sed 's/ *(.*//'`
+  as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
+$as_echo_n "checking whether $as_decl_name is declared... " >&6; }
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2026,8 +2038,12 @@ $4
 int
 main ()
 {
-#ifndef $2
-  (void) $2;
+#ifndef $as_decl_name
+#ifdef __cplusplus
+  (void) $as_decl_use;
+#else
+  (void) $as_decl_name;
+#endif
 #endif
 
   ;
@@ -2044,7 +2060,7 @@ fi
 eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_cxx_check_decl
 cat >config.log <<_ACEOF
@@ -2052,7 +2068,7 @@ This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
 It was created by zm $as_me 1.25.0, which was
-generated by GNU Autoconf 2.65.  Invocation command line was
+generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
 
@@ -2162,11 +2178,9 @@ trap 'exit_status=$?
   {
     echo
 
-    cat <<\_ASBOX
-## ---------------- ##
+    $as_echo "## ---------------- ##
 ## Cache variables. ##
-## ---------------- ##
-_ASBOX
+## ---------------- ##"
     echo
     # The following way of writing the cache mishandles newlines in values,
 (
@@ -2200,11 +2214,9 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
 )
     echo
 
-    cat <<\_ASBOX
-## ----------------- ##
+    $as_echo "## ----------------- ##
 ## Output variables. ##
-## ----------------- ##
-_ASBOX
+## ----------------- ##"
     echo
     for ac_var in $ac_subst_vars
     do
@@ -2217,11 +2229,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
@@ -2235,11 +2245,9 @@ _ASBOX
     fi
 
     if test -s confdefs.h; then
-      cat <<\_ASBOX
-## ----------- ##
+      $as_echo "## ----------- ##
 ## confdefs.h. ##
-## ----------- ##
-_ASBOX
+## ----------- ##"
       echo
       cat confdefs.h
       echo
@@ -2294,7 +2302,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
@@ -2309,7 +2322,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
 
@@ -2388,7 +2405,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. ##
@@ -2405,16 +2422,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,
@@ -2443,7 +2466,7 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
 $as_echo_n "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then :
+if ${ac_cv_path_install+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -2530,11 +2553,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
@@ -2556,7 +2579,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
 
@@ -2566,7 +2589,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
@@ -2620,7 +2643,7 @@ if test "$cross_compiling" != no; then
 set dummy ${ac_tool_prefix}strip; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then :
+if ${ac_cv_prog_STRIP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$STRIP"; then
@@ -2660,7 +2683,7 @@ if test -z "$ac_cv_prog_STRIP"; then
 set dummy strip; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
+if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_STRIP"; then
@@ -2713,7 +2736,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
 $as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
 if test -z "$MKDIR_P"; then
-  if test "${ac_cv_path_mkdir+set}" = set; then :
+  if ${ac_cv_path_mkdir+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -2764,7 +2787,7 @@ do
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AWK+set}" = set; then :
+if ${ac_cv_prog_AWK+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$AWK"; then
@@ -2804,7 +2827,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 \${ac_cv_prog_make_${ac_make}_set+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.make <<\_ACEOF
@@ -2812,7 +2835,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;;
@@ -2846,7 +2869,7 @@ if test "`cd $srcdir && pwd`" != "`pwd`"; then
   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
 
@@ -3065,7 +3088,7 @@ LDFLAGS="$LDFLAGS ${EXTRA_LIBS}"
 if test "${with_webdir+set}" = set; then :
   withval=$with_webdir; WEB_PREFIX=$with_webdir
 else
-  as_fn_error "You must call configure with the --with-webdir option.
+  as_fn_error $? "You must call configure with the --with-webdir option.
     This tells configure where to install PHP and web files and scripts.
     e.g. --with-webdir=/var/www/html or --with-webdir=/www/vhtdocs/<site>" "$LINENO" 5
 
@@ -3078,7 +3101,7 @@ fi
 if test "${with_cgidir+set}" = set; then :
   withval=$with_cgidir; CGI_PREFIX=$with_cgidir
 else
-  as_fn_error "You must call configure with the --with-cgidir option.
+  as_fn_error $? "You must call configure with the --with-cgidir option.
     This tells configure where to install cgi files and scripts.
     e.g. --with-cgidir=/var/www/cgi-bin or --with-webdir=/www/vhtdocs/<site>/cgi-bin" "$LINENO" 5
 
@@ -3249,7 +3272,7 @@ if test -z "$CXX"; then
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CXX+set}" = set; then :
+if ${ac_cv_prog_CXX+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CXX"; then
@@ -3293,7 +3316,7 @@ do
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CXX+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CXX"; then
@@ -3456,9 +3479,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; }
@@ -3500,8 +3522,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
@@ -3558,9 +3580,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
@@ -3571,7 +3593,7 @@ rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
 ac_clean_files=$ac_clean_files_save
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
 $as_echo_n "checking for suffix of object files... " >&6; }
-if test "${ac_cv_objext+set}" = set; then :
+if ${ac_cv_objext+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -3611,8 +3633,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
@@ -3622,7 +3644,7 @@ OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
 $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
+if ${ac_cv_cxx_compiler_gnu+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -3659,7 +3681,7 @@ ac_test_CXXFLAGS=${CXXFLAGS+set}
 ac_save_CXXFLAGS=$CXXFLAGS
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
 $as_echo_n "checking whether $CXX accepts -g... " >&6; }
-if test "${ac_cv_prog_cxx_g+set}" = set; then :
+if ${ac_cv_prog_cxx_g+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_save_cxx_werror_flag=$ac_cxx_werror_flag
@@ -3807,7 +3829,7 @@ depcc="$CXX"  am_compiler_list=
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
 $as_echo_n "checking dependency style of $depcc... " >&6; }
-if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then :
+if ${am_cv_CXX_dependencies_compiler_type+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
@@ -3940,7 +3962,7 @@ if test -n "$ac_tool_prefix"; then
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -3980,7 +4002,7 @@ if test -z "$ac_cv_prog_CC"; then
 set dummy gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -4033,7 +4055,7 @@ if test -z "$CC"; then
 set dummy ${ac_tool_prefix}cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -4073,7 +4095,7 @@ if test -z "$CC"; then
 set dummy cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -4132,7 +4154,7 @@ if test -z "$CC"; then
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -4176,7 +4198,7 @@ do
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -4230,8 +4252,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
@@ -4260,7 +4282,7 @@ done
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
+if ${ac_cv_c_compiler_gnu+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -4297,7 +4319,7 @@ ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
 $as_echo_n "checking whether $CC accepts -g... " >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then :
+if ${ac_cv_prog_cc_g+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
@@ -4375,7 +4397,7 @@ else
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then :
+if ${ac_cv_prog_cc_c89+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c89=no
@@ -4474,7 +4496,7 @@ depcc="$CC"   am_compiler_list=
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
 $as_echo_n "checking dependency style of $depcc... " >&6; }
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
+if ${am_cv_CC_dependencies_compiler_type+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
@@ -4614,7 +4636,7 @@ if test -n "$ac_tool_prefix"; then
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_RANLIB+set}" = set; then :
+if ${ac_cv_prog_RANLIB+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$RANLIB"; then
@@ -4654,7 +4676,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
 set dummy ranlib; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
+if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_RANLIB"; then
@@ -4705,7 +4727,7 @@ fi
 $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 \${ac_cv_prog_make_${ac_make}_set+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.make <<\_ACEOF
@@ -4713,7 +4735,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;;
@@ -4743,7 +4765,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
 $as_echo_n "checking how to run the C++ preprocessor... " >&6; }
 if test -z "$CXXCPP"; then
-  if test "${ac_cv_prog_CXXCPP+set}" = set; then :
+  if ${ac_cv_prog_CXXCPP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
       # Double quotes because CXXCPP needs to be expanded
@@ -4773,7 +4795,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.
@@ -4789,11 +4811,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
@@ -4832,7 +4854,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.
@@ -4848,18 +4870,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 \"$CXXCPP\" fails sanity check
-See \`config.log' for more details." "$LINENO" 5; }
+as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 
 ac_ext=cpp
@@ -4871,7 +4893,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
 $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then :
+if ${ac_cv_path_GREP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$GREP"; then
@@ -4920,7 +4942,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
@@ -4934,7 +4956,7 @@ $as_echo "$ac_cv_path_GREP" >&6; }
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
 $as_echo_n "checking for egrep... " >&6; }
-if test "${ac_cv_path_EGREP+set}" = set; then :
+if ${ac_cv_path_EGREP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
@@ -4986,7 +5008,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
@@ -5001,7 +5023,7 @@ $as_echo "$ac_cv_path_EGREP" >&6; }
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
 $as_echo_n "checking for ANSI C header files... " >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then :
+if ${ac_cv_header_stdc+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -5118,8 +5140,7 @@ do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_cxx_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
@@ -5131,7 +5152,7 @@ done
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdbool.h that conforms to C99" >&5
 $as_echo_n "checking for stdbool.h that conforms to C99... " >&6; }
-if test "${ac_cv_header_stdbool_h+set}" = set; then :
+if ${ac_cv_header_stdbool_h+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -5163,7 +5184,7 @@ else
 	char b[false == 0 ? 1 : -1];
 	char c[__bool_true_false_are_defined == 1 ? 1 : -1];
 	char d[(bool) 0.5 == true ? 1 : -1];
-	bool e = &s;
+	/* See body of main program for 'e'.  */
 	char f[(_Bool) 0.0 == false ? 1 : -1];
 	char g[true];
 	char h[sizeof (_Bool)];
@@ -5174,25 +5195,6 @@ else
 	_Bool n[m];
 	char o[sizeof n == m * sizeof n[0] ? 1 : -1];
 	char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1];
-#	if defined __xlc__ || defined __GNUC__
-	 /* Catch a bug in IBM AIX xlc compiler version 6.0.0.0
-	    reported by James Lemley on 2005-10-05; see
-	    http://lists.gnu.org/archive/html/bug-coreutils/2005-10/msg00086.html
-	    This test is not quite right, since xlc is allowed to
-	    reject this program, as the initializer for xlcbug is
-	    not one of the forms that C requires support for.
-	    However, doing the test right would require a runtime
-	    test, and that would make cross-compilation harder.
-	    Let us hope that IBM fixes the xlc bug, and also adds
-	    support for this kind of constant expression.  In the
-	    meantime, this test will reject xlc, which is OK, since
-	    our stdbool.h substitute should suffice.  We also test
-	    this with GCC, where it should work, to detect more
-	    quickly whether someone messes up the test in the
-	    future.  */
-	 char digs[] = "0123456789";
-	 int xlcbug = 1 / (&(digs + 5)[-2 + (bool) 1] == &digs[4] ? 1 : -1);
-#	endif
 	/* Catch a bug in an HP-UX C compiler.  See
 	   http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html
 	   http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html
@@ -5204,6 +5206,7 @@ int
 main ()
 {
 
+	bool e = &s;
 	*pq |= q;
 	*pq |= ! q;
 	/* Refer to every declared value, to avoid compiler optimizations.  */
@@ -5224,7 +5227,7 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdbool_h" >&5
 $as_echo "$ac_cv_header_stdbool_h" >&6; }
 ac_fn_cxx_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "$ac_includes_default"
-if test "x$ac_cv_type__Bool" = x""yes; then :
+if test "x$ac_cv_type__Bool" = xyes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE__BOOL 1
@@ -5241,7 +5244,7 @@ fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
 $as_echo_n "checking for an ANSI C-conforming const... " >&6; }
-if test "${ac_cv_c_const+set}" = set; then :
+if ${ac_cv_c_const+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -5321,7 +5324,7 @@ fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uid_t in sys/types.h" >&5
 $as_echo_n "checking for uid_t in sys/types.h... " >&6; }
-if test "${ac_cv_type_uid_t+set}" = set; then :
+if ${ac_cv_type_uid_t+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -5351,7 +5354,7 @@ fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
 $as_echo_n "checking for inline... " >&6; }
-if test "${ac_cv_c_inline+set}" = set; then :
+if ${ac_cv_c_inline+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_c_inline=no
@@ -5392,7 +5395,7 @@ _ACEOF
 esac
 
 ac_fn_cxx_check_type "$LINENO" "mode_t" "ac_cv_type_mode_t" "$ac_includes_default"
-if test "x$ac_cv_type_mode_t" = x""yes; then :
+if test "x$ac_cv_type_mode_t" = xyes; then :
 
 else
 
@@ -5403,7 +5406,7 @@ _ACEOF
 fi
 
 ac_fn_cxx_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
-if test "x$ac_cv_type_size_t" = x""yes; then :
+if test "x$ac_cv_type_size_t" = xyes; then :
 
 else
 
@@ -5415,7 +5418,7 @@ fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5
 $as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
-if test "${ac_cv_header_time+set}" = set; then :
+if ${ac_cv_header_time+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -5450,7 +5453,7 @@ fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5
 $as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; }
-if test "${ac_cv_struct_tm+set}" = set; then :
+if ${ac_cv_struct_tm+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -5485,7 +5488,7 @@ fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5
 $as_echo_n "checking return type of signal handlers... " >&6; }
-if test "${ac_cv_type_signal+set}" = set; then :
+if ${ac_cv_type_signal+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -5519,7 +5522,7 @@ _ACEOF
 
 ac_fn_cxx_check_type "$LINENO" "siginfo_t" "ac_cv_type_siginfo_t" "#include <signal.h>
 "
-if test "x$ac_cv_type_siginfo_t" = x""yes; then :
+if test "x$ac_cv_type_siginfo_t" = xyes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_SIGINFO_T 1
@@ -5530,7 +5533,7 @@ fi
 
 ac_fn_cxx_check_type "$LINENO" "struct sigcontext" "ac_cv_type_struct_sigcontext" "#include <signal.h>
 "
-if test "x$ac_cv_type_struct_sigcontext" = x""yes; then :
+if test "x$ac_cv_type_struct_sigcontext" = xyes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUCT_SIGCONTEXT 1
@@ -5541,7 +5544,7 @@ fi
 
 ac_fn_cxx_check_member "$LINENO" "struct sigcontext" "eip" "ac_cv_member_struct_sigcontext_eip" "#include <signal.h>
 "
-if test "x$ac_cv_member_struct_sigcontext_eip" = x""yes; then :
+if test "x$ac_cv_member_struct_sigcontext_eip" = xyes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUCT_SIGCONTEXT_EIP 1
@@ -5552,7 +5555,7 @@ fi
 
 ac_fn_cxx_check_type "$LINENO" "ucontext_t" "ac_cv_type_ucontext_t" "#include <signal.h>
 "
-if test "x$ac_cv_type_ucontext_t" = x""yes; then :
+if test "x$ac_cv_type_ucontext_t" = xyes; then :
 
 cat >>confdefs.h <<_ACEOF
 #define HAVE_UCONTEXT_T 1
@@ -5566,7 +5569,7 @@ fi
 if test $ac_cv_c_compiler_gnu = yes; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC needs -traditional" >&5
 $as_echo_n "checking whether $CC needs -traditional... " >&6; }
-if test "${ac_cv_prog_gcc_traditional+set}" = set; then :
+if ${ac_cv_prog_gcc_traditional+:} false; then :
   $as_echo_n "(cached) " >&6
 else
     ac_pattern="Autoconf.*'x'"
@@ -5608,7 +5611,7 @@ fi
 for ac_header in stdlib.h
 do :
   ac_fn_cxx_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default"
-if test "x$ac_cv_header_stdlib_h" = x""yes; then :
+if test "x$ac_cv_header_stdlib_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_STDLIB_H 1
 _ACEOF
@@ -5619,7 +5622,7 @@ done
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible malloc" >&5
 $as_echo_n "checking for GNU libc compatible malloc... " >&6; }
-if test "${ac_cv_func_malloc_0_nonnull+set}" = set; then :
+if ${ac_cv_func_malloc_0_nonnull+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then :
@@ -5680,8 +5683,7 @@ do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_cxx_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
@@ -5700,7 +5702,7 @@ done
 for ac_func in getpagesize
 do :
   ac_fn_cxx_check_func "$LINENO" "getpagesize" "ac_cv_func_getpagesize"
-if test "x$ac_cv_func_getpagesize" = x""yes; then :
+if test "x$ac_cv_func_getpagesize" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GETPAGESIZE 1
 _ACEOF
@@ -5710,7 +5712,7 @@ done
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mmap" >&5
 $as_echo_n "checking for working mmap... " >&6; }
-if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then :
+if ${ac_cv_func_mmap_fixed_mapped+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then :
@@ -5878,8 +5880,7 @@ for ac_header in sys/select.h sys/socket.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_cxx_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
@@ -5890,7 +5891,7 @@ done
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking types of arguments for select" >&5
 $as_echo_n "checking types of arguments for select... " >&6; }
-if test "${ac_cv_func_select_args+set}" = set; then :
+if ${ac_cv_func_select_args+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   for ac_arg234 in 'fd_set *' 'int *' 'void *'; do
@@ -5924,7 +5925,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
  done
 done
 # Provide a safe default value.
-: ${ac_cv_func_select_args='int,int *,struct timeval *'}
+: "${ac_cv_func_select_args=int,int *,struct timeval *}"
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_select_args" >&5
@@ -5952,7 +5953,7 @@ rm -f conftest*
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether lstat correctly handles trailing slash" >&5
 $as_echo_n "checking whether lstat correctly handles trailing slash... " >&6; }
-if test "${ac_cv_func_lstat_dereferences_slashed_symlink+set}" = set; then :
+if ${ac_cv_func_lstat_dereferences_slashed_symlink+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   rm -f conftest.sym conftest.file
@@ -6014,7 +6015,7 @@ fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat accepts an empty string" >&5
 $as_echo_n "checking whether stat accepts an empty string... " >&6; }
-if test "${ac_cv_func_stat_empty_string_bug+set}" = set; then :
+if ${ac_cv_func_stat_empty_string_bug+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then :
@@ -6061,7 +6062,7 @@ fi
 for ac_func in strftime
 do :
   ac_fn_cxx_check_func "$LINENO" "strftime" "ac_cv_func_strftime"
-if test "x$ac_cv_func_strftime" = x""yes; then :
+if test "x$ac_cv_func_strftime" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_STRFTIME 1
 _ACEOF
@@ -6070,7 +6071,7 @@ else
   # strftime is in -lintl on SCO UNIX.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for strftime in -lintl" >&5
 $as_echo_n "checking for strftime in -lintl... " >&6; }
-if test "${ac_cv_lib_intl_strftime+set}" = set; then :
+if ${ac_cv_lib_intl_strftime+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -6104,7 +6105,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_strftime" >&5
 $as_echo "$ac_cv_lib_intl_strftime" >&6; }
-if test "x$ac_cv_lib_intl_strftime" = x""yes; then :
+if test "x$ac_cv_lib_intl_strftime" = xyes; then :
   $as_echo "#define HAVE_STRFTIME 1" >>confdefs.h
 
 LIBS="-lintl $LIBS"
@@ -6115,7 +6116,7 @@ done
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working strtod" >&5
 $as_echo_n "checking for working strtod... " >&6; }
-if test "${ac_cv_func_strtod+set}" = set; then :
+if ${ac_cv_func_strtod+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then :
@@ -6174,14 +6175,14 @@ if test $ac_cv_func_strtod = no; then
 esac
 
 ac_fn_cxx_check_func "$LINENO" "pow" "ac_cv_func_pow"
-if test "x$ac_cv_func_pow" = x""yes; then :
+if test "x$ac_cv_func_pow" = xyes; then :
 
 fi
 
 if test $ac_cv_func_pow = no; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pow in -lm" >&5
 $as_echo_n "checking for pow in -lm... " >&6; }
-if test "${ac_cv_lib_m_pow+set}" = set; then :
+if ${ac_cv_lib_m_pow+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -6215,7 +6216,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_pow" >&5
 $as_echo "$ac_cv_lib_m_pow" >&6; }
-if test "x$ac_cv_lib_m_pow" = x""yes; then :
+if test "x$ac_cv_lib_m_pow" = xyes; then :
   POW_LIB=-lm
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot find library containing definition of pow" >&5
@@ -6229,13 +6230,13 @@ fi
 for ac_func in vprintf
 do :
   ac_fn_cxx_check_func "$LINENO" "vprintf" "ac_cv_func_vprintf"
-if test "x$ac_cv_func_vprintf" = x""yes; then :
+if test "x$ac_cv_func_vprintf" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_VPRINTF 1
 _ACEOF
 
 ac_fn_cxx_check_func "$LINENO" "_doprnt" "ac_cv_func__doprnt"
-if test "x$ac_cv_func__doprnt" = x""yes; then :
+if test "x$ac_cv_func__doprnt" = xyes; then :
 
 $as_echo "#define HAVE_DOPRNT 1" >>confdefs.h
 
@@ -6249,8 +6250,7 @@ for ac_func in gethostbyname gethostname gettimeofday memmove memset mkdir munma
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_cxx_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
@@ -6262,8 +6262,7 @@ for ac_func in syscall sleep usleep ioctl ioctlsocket sigaction
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_cxx_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
@@ -6277,7 +6276,7 @@ done
 set dummy ffmpeg; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_OPT_FFMPEG+set}" = set; then :
+if ${ac_cv_prog_OPT_FFMPEG+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$OPT_FFMPEG"; then
@@ -6315,7 +6314,7 @@ fi
 set dummy ffmpeg; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PATH_FFMPEG+set}" = set; then :
+if ${ac_cv_path_PATH_FFMPEG+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $PATH_FFMPEG in
@@ -6355,7 +6354,7 @@ fi
 set dummy pnmscale; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_OPT_NETPBM+set}" = set; then :
+if ${ac_cv_prog_OPT_NETPBM+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$OPT_NETPBM"; then
@@ -6393,7 +6392,7 @@ fi
 set dummy pnmscale; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PATH_NETPBM+set}" = set; then :
+if ${ac_cv_path_PATH_NETPBM+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $PATH_NETPBM in
@@ -6436,7 +6435,7 @@ fi
 # Checks for libraries.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mysql_init in -lmysqlclient" >&5
 $as_echo_n "checking for mysql_init in -lmysqlclient... " >&6; }
-if test "${ac_cv_lib_mysqlclient_mysql_init+set}" = set; then :
+if ${ac_cv_lib_mysqlclient_mysql_init+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -6470,7 +6469,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mysqlclient_mysql_init" >&5
 $as_echo "$ac_cv_lib_mysqlclient_mysql_init" >&6; }
-if test "x$ac_cv_lib_mysqlclient_mysql_init" = x""yes; then :
+if test "x$ac_cv_lib_mysqlclient_mysql_init" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBMYSQLCLIENT 1
 _ACEOF
@@ -6478,12 +6477,12 @@ _ACEOF
   LIBS="-lmysqlclient $LIBS"
 
 else
-  as_fn_error "zm requires libmysqlclient.a" "$LINENO" 5
+  as_fn_error $? "zm requires libmysqlclient.a" "$LINENO" 5
 fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jpeg_start_compress in -ljpeg" >&5
 $as_echo_n "checking for jpeg_start_compress in -ljpeg... " >&6; }
-if test "${ac_cv_lib_jpeg_jpeg_start_compress+set}" = set; then :
+if ${ac_cv_lib_jpeg_jpeg_start_compress+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -6517,7 +6516,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jpeg_jpeg_start_compress" >&5
 $as_echo "$ac_cv_lib_jpeg_jpeg_start_compress" >&6; }
-if test "x$ac_cv_lib_jpeg_jpeg_start_compress" = x""yes; then :
+if test "x$ac_cv_lib_jpeg_jpeg_start_compress" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBJPEG 1
 _ACEOF
@@ -6525,12 +6524,12 @@ _ACEOF
   LIBS="-ljpeg $LIBS"
 
 else
-  as_fn_error "zm requires libjpeg.a" "$LINENO" 5
+  as_fn_error $? "zm requires libjpeg.a" "$LINENO" 5
 fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lpthread" >&5
 $as_echo_n "checking for pthread_create in -lpthread... " >&6; }
-if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then :
+if ${ac_cv_lib_pthread_pthread_create+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -6564,7 +6563,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5
 $as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
-if test "x$ac_cv_lib_pthread_pthread_create" = x""yes; then :
+if test "x$ac_cv_lib_pthread_pthread_create" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBPTHREAD 1
 _ACEOF
@@ -6572,12 +6571,12 @@ _ACEOF
   LIBS="-lpthread $LIBS"
 
 else
-  as_fn_error "zm requires libpthread.a" "$LINENO" 5
+  as_fn_error $? "zm requires libpthread.a" "$LINENO" 5
 fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlsym in -ldl" >&5
 $as_echo_n "checking for dlsym in -ldl... " >&6; }
-if test "${ac_cv_lib_dl_dlsym+set}" = set; then :
+if ${ac_cv_lib_dl_dlsym+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -6611,7 +6610,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlsym" >&5
 $as_echo "$ac_cv_lib_dl_dlsym" >&6; }
-if test "x$ac_cv_lib_dl_dlsym" = x""yes; then :
+if test "x$ac_cv_lib_dl_dlsym" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBDL 1
 _ACEOF
@@ -6619,13 +6618,28 @@ _ACEOF
   LIBS="-ldl $LIBS"
 
 else
-  as_fn_error "zm requires libdl.a" "$LINENO" 5
+  as_fn_error $? "zm requires libdl.a" "$LINENO" 5
 fi
 
 if test "$ZM_SSL_LIB" == "openssl"; then
+for ac_header in openssl/md5.h
+do :
+  ac_fn_cxx_check_header_mongrel "$LINENO" "openssl/md5.h" "ac_cv_header_openssl_md5_h" "$ac_includes_default"
+if test "x$ac_cv_header_openssl_md5_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_OPENSSL_MD5_H 1
+_ACEOF
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: zm requires openssl/md5.h header to be installed for openssl" >&5
+$as_echo "$as_me: WARNING: zm requires openssl/md5.h header to be installed for openssl" >&2;}
+fi
+
+done
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MD5 in -lcrypto" >&5
 $as_echo_n "checking for MD5 in -lcrypto... " >&6; }
-if test "${ac_cv_lib_crypto_MD5+set}" = set; then :
+if ${ac_cv_lib_crypto_MD5+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -6659,7 +6673,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_MD5" >&5
 $as_echo "$ac_cv_lib_crypto_MD5" >&6; }
-if test "x$ac_cv_lib_crypto_MD5" = x""yes; then :
+if test "x$ac_cv_lib_crypto_MD5" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBCRYPTO 1
 _ACEOF
@@ -6672,24 +6686,60 @@ $as_echo "$as_me: WARNING: libcrypto.a is required for authenticated streaming -
 fi
 
 else
+for ac_header in gnutls/openssl.h
+do :
+  ac_fn_cxx_check_header_mongrel "$LINENO" "gnutls/openssl.h" "ac_cv_header_gnutls_openssl_h" "$ac_includes_default"
+if test "x$ac_cv_header_gnutls_openssl_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_GNUTLS_OPENSSL_H 1
+_ACEOF
+ ZM_HAS_GNUTLS_OPENSSL=1
+
+else
+  ZM_HAS_GNUTLS_OPENSSL=0
+
+fi
+
+done
+
+for ac_header in gnutls/gnutls.h
+do :
+  ac_fn_cxx_check_header_mongrel "$LINENO" "gnutls/gnutls.h" "ac_cv_header_gnutls_gnutls_h" "$ac_includes_default"
+if test "x$ac_cv_header_gnutls_gnutls_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_GNUTLS_GNUTLS_H 1
+_ACEOF
+ ZM_HAS_GNUTLS=1
+
+else
+  ZM_HAS_GNUTLS=0
+
+fi
+
+done
+
+if test "$ZM_HAS_GNUTLS_OPENSSL" == "0" && test "$ZM_HAS_GNUTLS" == "0"; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: gnutls is required for authenticated streaming - use ZM_SSL_LIB option to select openssl instead" >&5
+$as_echo "$as_me: WARNING: gnutls is required for authenticated streaming - use ZM_SSL_LIB option to select openssl instead" >&2;}
+fi
 for ac_header in gcrypt.h
 do :
   ac_fn_cxx_check_header_mongrel "$LINENO" "gcrypt.h" "ac_cv_header_gcrypt_h" "$ac_includes_default"
-if test "x$ac_cv_header_gcrypt_h" = x""yes; then :
+if test "x$ac_cv_header_gcrypt_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_GCRYPT_H 1
 _ACEOF
 
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: zm requires libgcrypt headers to be installed for gnutls" >&5
-$as_echo "$as_me: WARNING: zm requires libgcrypt headers to be installed for gnutls" >&2;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: zm requires libgcrypt header to be installed for gnutls" >&5
+$as_echo "$as_me: WARNING: zm requires libgcrypt header to be installed for gnutls" >&2;}
 fi
 
 done
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gcry_check_version in -lgcrypt" >&5
 $as_echo_n "checking for gcry_check_version in -lgcrypt... " >&6; }
-if test "${ac_cv_lib_gcrypt_gcry_check_version+set}" = set; then :
+if ${ac_cv_lib_gcrypt_gcry_check_version+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -6723,7 +6773,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gcrypt_gcry_check_version" >&5
 $as_echo "$ac_cv_lib_gcrypt_gcry_check_version" >&6; }
-if test "x$ac_cv_lib_gcrypt_gcry_check_version" = x""yes; then :
+if test "x$ac_cv_lib_gcrypt_gcry_check_version" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBGCRYPT 1
 _ACEOF
@@ -6735,13 +6785,13 @@ else
 $as_echo "$as_me: WARNING: libgcrypt.a is required for authenticated streaming - use ZM_SSL_LIB option to select openssl instead" >&2;}
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for MD5 in -lgnutls-openssl" >&5
-$as_echo_n "checking for MD5 in -lgnutls-openssl... " >&6; }
-if test "${ac_cv_lib_gnutls_openssl_MD5+set}" = set; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gnutls_fingerprint in -lgnutls" >&5
+$as_echo_n "checking for gnutls_fingerprint in -lgnutls... " >&6; }
+if ${ac_cv_lib_gnutls_gnutls_fingerprint+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lgnutls-openssl  $LIBS"
+LIBS="-lgnutls  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -6751,42 +6801,42 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #ifdef __cplusplus
 extern "C"
 #endif
-char MD5 ();
+char gnutls_fingerprint ();
 int
 main ()
 {
-return MD5 ();
+return gnutls_fingerprint ();
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_cxx_try_link "$LINENO"; then :
-  ac_cv_lib_gnutls_openssl_MD5=yes
+  ac_cv_lib_gnutls_gnutls_fingerprint=yes
 else
-  ac_cv_lib_gnutls_openssl_MD5=no
+  ac_cv_lib_gnutls_gnutls_fingerprint=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_gnutls_openssl_MD5" >&5
-$as_echo "$ac_cv_lib_gnutls_openssl_MD5" >&6; }
-if test "x$ac_cv_lib_gnutls_openssl_MD5" = x""yes; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gnutls_gnutls_fingerprint" >&5
+$as_echo "$ac_cv_lib_gnutls_gnutls_fingerprint" >&6; }
+if test "x$ac_cv_lib_gnutls_gnutls_fingerprint" = xyes; then :
   cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBGNUTLS_OPENSSL 1
+#define HAVE_LIBGNUTLS 1
 _ACEOF
 
-  LIBS="-lgnutls-openssl $LIBS"
+  LIBS="-lgnutls $LIBS"
 
 else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: gnutls-openssl.a is required for authenticated streaming - use ZM_SSL_LIB option to select openssl instead" >&5
-$as_echo "$as_me: WARNING: gnutls-openssl.a is required for authenticated streaming - use ZM_SSL_LIB option to select openssl instead" >&2;}
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: libgnutls.a is required for authenticated streaming - use ZM_SSL_LIB option to select openssl instead" >&5
+$as_echo "$as_me: WARNING: libgnutls.a is required for authenticated streaming - use ZM_SSL_LIB option to select openssl instead" >&2;}
 fi
 
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pcre_compile in -lpcre" >&5
 $as_echo_n "checking for pcre_compile in -lpcre... " >&6; }
-if test "${ac_cv_lib_pcre_pcre_compile+set}" = set; then :
+if ${ac_cv_lib_pcre_pcre_compile+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -6820,7 +6870,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pcre_pcre_compile" >&5
 $as_echo "$ac_cv_lib_pcre_pcre_compile" >&6; }
-if test "x$ac_cv_lib_pcre_pcre_compile" = x""yes; then :
+if test "x$ac_cv_lib_pcre_pcre_compile" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBPCRE 1
 _ACEOF
@@ -6834,7 +6884,7 @@ fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for zlibVersion in -lz" >&5
 $as_echo_n "checking for zlibVersion in -lz... " >&6; }
-if test "${ac_cv_lib_z_zlibVersion+set}" = set; then :
+if ${ac_cv_lib_z_zlibVersion+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -6868,7 +6918,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_zlibVersion" >&5
 $as_echo "$ac_cv_lib_z_zlibVersion" >&6; }
-if test "x$ac_cv_lib_z_zlibVersion" = x""yes; then :
+if test "x$ac_cv_lib_z_zlibVersion" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBZ 1
 _ACEOF
@@ -6879,7 +6929,7 @@ fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for x264_predict_16x16_init in -lx264" >&5
 $as_echo_n "checking for x264_predict_16x16_init in -lx264... " >&6; }
-if test "${ac_cv_lib_x264_x264_predict_16x16_init+set}" = set; then :
+if ${ac_cv_lib_x264_x264_predict_16x16_init+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -6913,7 +6963,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_x264_x264_predict_16x16_init" >&5
 $as_echo "$ac_cv_lib_x264_x264_predict_16x16_init" >&6; }
-if test "x$ac_cv_lib_x264_x264_predict_16x16_init" = x""yes; then :
+if test "x$ac_cv_lib_x264_x264_predict_16x16_init" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBX264 1
 _ACEOF
@@ -6924,7 +6974,7 @@ fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for av_malloc in -lavutil" >&5
 $as_echo_n "checking for av_malloc in -lavutil... " >&6; }
-if test "${ac_cv_lib_avutil_av_malloc+set}" = set; then :
+if ${ac_cv_lib_avutil_av_malloc+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -6958,7 +7008,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avutil_av_malloc" >&5
 $as_echo "$ac_cv_lib_avutil_av_malloc" >&6; }
-if test "x$ac_cv_lib_avutil_av_malloc" = x""yes; then :
+if test "x$ac_cv_lib_avutil_av_malloc" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBAVUTIL 1
 _ACEOF
@@ -6973,7 +7023,7 @@ fi
 # Don't bother to warn about this one
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for av_image_copy in -lavcore" >&5
 $as_echo_n "checking for av_image_copy in -lavcore... " >&6; }
-if test "${ac_cv_lib_avcore_av_image_copy+set}" = set; then :
+if ${ac_cv_lib_avcore_av_image_copy+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -7007,7 +7057,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avcore_av_image_copy" >&5
 $as_echo "$ac_cv_lib_avcore_av_image_copy" >&6; }
-if test "x$ac_cv_lib_avcore_av_image_copy" = x""yes; then :
+if test "x$ac_cv_lib_avcore_av_image_copy" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBAVCORE 1
 _ACEOF
@@ -7018,7 +7068,7 @@ fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for avcodec_init in -lavcodec" >&5
 $as_echo_n "checking for avcodec_init in -lavcodec... " >&6; }
-if test "${ac_cv_lib_avcodec_avcodec_init+set}" = set; then :
+if ${ac_cv_lib_avcodec_avcodec_init+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -7052,7 +7102,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avcodec_avcodec_init" >&5
 $as_echo "$ac_cv_lib_avcodec_avcodec_init" >&6; }
-if test "x$ac_cv_lib_avcodec_avcodec_init" = x""yes; then :
+if test "x$ac_cv_lib_avcodec_avcodec_init" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBAVCODEC 1
 _ACEOF
@@ -7066,7 +7116,7 @@ fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for av_new_stream in -lavformat" >&5
 $as_echo_n "checking for av_new_stream in -lavformat... " >&6; }
-if test "${ac_cv_lib_avformat_av_new_stream+set}" = set; then :
+if ${ac_cv_lib_avformat_av_new_stream+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -7100,7 +7150,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avformat_av_new_stream" >&5
 $as_echo "$ac_cv_lib_avformat_av_new_stream" >&6; }
-if test "x$ac_cv_lib_avformat_av_new_stream" = x""yes; then :
+if test "x$ac_cv_lib_avformat_av_new_stream" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBAVFORMAT 1
 _ACEOF
@@ -7114,7 +7164,7 @@ fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for avdevice_register_all in -lavdevice" >&5
 $as_echo_n "checking for avdevice_register_all in -lavdevice... " >&6; }
-if test "${ac_cv_lib_avdevice_avdevice_register_all+set}" = set; then :
+if ${ac_cv_lib_avdevice_avdevice_register_all+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -7148,7 +7198,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_avdevice_avdevice_register_all" >&5
 $as_echo "$ac_cv_lib_avdevice_avdevice_register_all" >&6; }
-if test "x$ac_cv_lib_avdevice_avdevice_register_all" = x""yes; then :
+if test "x$ac_cv_lib_avdevice_avdevice_register_all" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBAVDEVICE 1
 _ACEOF
@@ -7162,7 +7212,7 @@ fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sws_scale in -lswscale" >&5
 $as_echo_n "checking for sws_scale in -lswscale... " >&6; }
-if test "${ac_cv_lib_swscale_sws_scale+set}" = set; then :
+if ${ac_cv_lib_swscale_sws_scale+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -7196,7 +7246,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_swscale_sws_scale" >&5
 $as_echo "$ac_cv_lib_swscale_sws_scale" >&6; }
-if test "x$ac_cv_lib_swscale_sws_scale" = x""yes; then :
+if test "x$ac_cv_lib_swscale_sws_scale" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBSWSCALE 1
 _ACEOF
@@ -7207,7 +7257,7 @@ fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BZ2_bzCompress in -lbz2" >&5
 $as_echo_n "checking for BZ2_bzCompress in -lbz2... " >&6; }
-if test "${ac_cv_lib_bz2_BZ2_bzCompress+set}" = set; then :
+if ${ac_cv_lib_bz2_BZ2_bzCompress+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -7241,7 +7291,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bz2_BZ2_bzCompress" >&5
 $as_echo "$ac_cv_lib_bz2_BZ2_bzCompress" >&6; }
-if test "x$ac_cv_lib_bz2_BZ2_bzCompress" = x""yes; then :
+if test "x$ac_cv_lib_bz2_BZ2_bzCompress" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBBZ2 1
 _ACEOF
@@ -7255,7 +7305,7 @@ fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for compress in -lz" >&5
 $as_echo_n "checking for compress in -lz... " >&6; }
-if test "${ac_cv_lib_z_compress+set}" = set; then :
+if ${ac_cv_lib_z_compress+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -7289,7 +7339,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_compress" >&5
 $as_echo "$ac_cv_lib_z_compress" >&6; }
-if test "x$ac_cv_lib_z_compress" = x""yes; then :
+if test "x$ac_cv_lib_z_compress" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBZ 1
 _ACEOF
@@ -7304,7 +7354,7 @@ fi
 # for constant arguments.  Useless!
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5
 $as_echo_n "checking for working alloca.h... " >&6; }
-if test "${ac_cv_working_alloca_h+set}" = set; then :
+if ${ac_cv_working_alloca_h+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -7337,7 +7387,7 @@ fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5
 $as_echo_n "checking for alloca... " >&6; }
-if test "${ac_cv_func_alloca_works+set}" = set; then :
+if ${ac_cv_func_alloca_works+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -7356,7 +7406,7 @@ else
  #pragma alloca
 #   else
 #    ifndef alloca /* predefined by HP cc +Olibcalls */
-char *alloca ();
+void *alloca (size_t);
 #    endif
 #   endif
 #  endif
@@ -7400,7 +7450,7 @@ $as_echo "#define C_ALLOCA 1" >>confdefs.h
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5
 $as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; }
-if test "${ac_cv_os_cray+set}" = set; then :
+if ${ac_cv_os_cray+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -7427,8 +7477,7 @@ if test $ac_cv_os_cray = yes; then
   for ac_func in _getb67 GETB67 getb67; do
     as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_cxx_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 CRAY_STACKSEG_END $ac_func
@@ -7442,7 +7491,7 @@ fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5
 $as_echo_n "checking stack direction for C alloca... " >&6; }
-if test "${ac_cv_c_stack_direction+set}" = set; then :
+if ${ac_cv_c_stack_direction+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "$cross_compiling" = yes; then :
@@ -7492,7 +7541,7 @@ fi
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
 $as_echo_n "checking for ANSI C header files... " >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then :
+if ${ac_cv_header_stdc+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -7606,8 +7655,7 @@ for ac_header in fcntl.h limits.h memory.h stddef.h stdlib.h string.h strings.h
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_cxx_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
@@ -7620,8 +7668,7 @@ for ac_header in netdb.h netinet/in.h arpa/inet.h sys/ioctl.h sys/socket.h sys/u
 do :
   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 ac_fn_cxx_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
@@ -7633,7 +7680,7 @@ done
 for ac_header in execinfo.h
 do :
   ac_fn_cxx_check_header_mongrel "$LINENO" "execinfo.h" "ac_cv_header_execinfo_h" "$ac_includes_default"
-if test "x$ac_cv_header_execinfo_h" = x""yes; then :
+if test "x$ac_cv_header_execinfo_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_EXECINFO_H 1
 _ACEOF
@@ -7645,7 +7692,7 @@ done
 for ac_header in syscall.h
 do :
   ac_fn_cxx_check_header_mongrel "$LINENO" "syscall.h" "ac_cv_header_syscall_h" "$ac_includes_default"
-if test "x$ac_cv_header_syscall_h" = x""yes; then :
+if test "x$ac_cv_header_syscall_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_SYSCALL_H 1
 _ACEOF
@@ -7657,7 +7704,7 @@ done
 for ac_header in pthread.h
 do :
   ac_fn_cxx_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default"
-if test "x$ac_cv_header_pthread_h" = x""yes; then :
+if test "x$ac_cv_header_pthread_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_PTHREAD_H 1
 _ACEOF
@@ -7669,7 +7716,7 @@ done
 for ac_header in linux/videodev.h
 do :
   ac_fn_cxx_check_header_mongrel "$LINENO" "linux/videodev.h" "ac_cv_header_linux_videodev_h" "$ac_includes_default"
-if test "x$ac_cv_header_linux_videodev_h" = x""yes; then :
+if test "x$ac_cv_header_linux_videodev_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LINUX_VIDEODEV_H 1
 _ACEOF
@@ -7685,7 +7732,7 @@ done
 for ac_header in linux/videodev2.h
 do :
   ac_fn_cxx_check_header_mongrel "$LINENO" "linux/videodev2.h" "ac_cv_header_linux_videodev2_h" "$ac_includes_default"
-if test "x$ac_cv_header_linux_videodev2_h" = x""yes; then :
+if test "x$ac_cv_header_linux_videodev2_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LINUX_VIDEODEV2_H 1
 _ACEOF
@@ -7710,13 +7757,13 @@ fi
 for ac_header in jpeglib.h
 do :
   ac_fn_cxx_check_header_mongrel "$LINENO" "jpeglib.h" "ac_cv_header_jpeglib_h" "$ac_includes_default"
-if test "x$ac_cv_header_jpeglib_h" = x""yes; then :
+if test "x$ac_cv_header_jpeglib_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_JPEGLIB_H 1
 _ACEOF
 
 else
-  as_fn_error "zm requires libjpeg headers to be installed" "$LINENO" 5
+  as_fn_error $? "zm requires libjpeg headers to be installed" "$LINENO" 5
 fi
 
 done
@@ -7724,13 +7771,13 @@ done
 for ac_header in mysql/mysql.h
 do :
   ac_fn_cxx_check_header_mongrel "$LINENO" "mysql/mysql.h" "ac_cv_header_mysql_mysql_h" "$ac_includes_default"
-if test "x$ac_cv_header_mysql_mysql_h" = x""yes; then :
+if test "x$ac_cv_header_mysql_mysql_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_MYSQL_MYSQL_H 1
 _ACEOF
 
 else
-  as_fn_error "zm requires MySQL headers - check that MySQL development packages are installed" "$LINENO" 5
+  as_fn_error $? "zm requires MySQL headers - check that MySQL development packages are installed" "$LINENO" 5
 fi
 
 done
@@ -7738,7 +7785,7 @@ done
 for ac_header in libavutil/avutil.h
 do :
   ac_fn_cxx_check_header_mongrel "$LINENO" "libavutil/avutil.h" "ac_cv_header_libavutil_avutil_h" "$ac_includes_default"
-if test "x$ac_cv_header_libavutil_avutil_h" = x""yes; then :
+if test "x$ac_cv_header_libavutil_avutil_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBAVUTIL_AVUTIL_H 1
 _ACEOF
@@ -7750,7 +7797,7 @@ done
 for ac_header in libavcodec/avcodec.h
 do :
   ac_fn_cxx_check_header_mongrel "$LINENO" "libavcodec/avcodec.h" "ac_cv_header_libavcodec_avcodec_h" "$ac_includes_default"
-if test "x$ac_cv_header_libavcodec_avcodec_h" = x""yes; then :
+if test "x$ac_cv_header_libavcodec_avcodec_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBAVCODEC_AVCODEC_H 1
 _ACEOF
@@ -7762,7 +7809,7 @@ done
 for ac_header in libavformat/avformat.h
 do :
   ac_fn_cxx_check_header_mongrel "$LINENO" "libavformat/avformat.h" "ac_cv_header_libavformat_avformat_h" "$ac_includes_default"
-if test "x$ac_cv_header_libavformat_avformat_h" = x""yes; then :
+if test "x$ac_cv_header_libavformat_avformat_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBAVFORMAT_AVFORMAT_H 1
 _ACEOF
@@ -7774,7 +7821,7 @@ done
 for ac_header in libswscale/swscale.h
 do :
   ac_fn_cxx_check_header_mongrel "$LINENO" "libswscale/swscale.h" "ac_cv_header_libswscale_swscale_h" "$ac_includes_default"
-if test "x$ac_cv_header_libswscale_swscale_h" = x""yes; then :
+if test "x$ac_cv_header_libswscale_swscale_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBSWSCALE_SWSCALE_H 1
 _ACEOF
@@ -7786,7 +7833,7 @@ done
 for ac_header in pcre/pcre.h
 do :
   ac_fn_cxx_check_header_mongrel "$LINENO" "pcre/pcre.h" "ac_cv_header_pcre_pcre_h" "$ac_includes_default"
-if test "x$ac_cv_header_pcre_pcre_h" = x""yes; then :
+if test "x$ac_cv_header_pcre_pcre_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_PCRE_PCRE_H 1
 _ACEOF
@@ -7799,7 +7846,7 @@ done
 for ac_header in pcre.h
 do :
   ac_fn_cxx_check_header_mongrel "$LINENO" "pcre.h" "ac_cv_header_pcre_h" "$ac_includes_default"
-if test "x$ac_cv_header_pcre_h" = x""yes; then :
+if test "x$ac_cv_header_pcre_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_PCRE_H 1
 _ACEOF
@@ -7813,7 +7860,7 @@ if test "$ENABLE_MMAP" == "yes"; then
 for ac_header in sys/mman.h
 do :
   ac_fn_cxx_check_header_mongrel "$LINENO" "sys/mman.h" "ac_cv_header_sys_mman_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_mman_h" = x""yes; then :
+if test "x$ac_cv_header_sys_mman_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_SYS_MMAN_H 1
 _ACEOF
@@ -7825,7 +7872,7 @@ done
 for ac_header in fcntl.h
 do :
   ac_fn_cxx_check_header_mongrel "$LINENO" "fcntl.h" "ac_cv_header_fcntl_h" "$ac_includes_default"
-if test "x$ac_cv_header_fcntl_h" = x""yes; then :
+if test "x$ac_cv_header_fcntl_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_FCNTL_H 1
 _ACEOF
@@ -7838,7 +7885,7 @@ else
 for ac_header in sys/ipc.h
 do :
   ac_fn_cxx_check_header_mongrel "$LINENO" "sys/ipc.h" "ac_cv_header_sys_ipc_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_ipc_h" = x""yes; then :
+if test "x$ac_cv_header_sys_ipc_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_SYS_IPC_H 1
 _ACEOF
@@ -7850,7 +7897,7 @@ done
 for ac_header in sys/shm.h
 do :
   ac_fn_cxx_check_header_mongrel "$LINENO" "sys/shm.h" "ac_cv_header_sys_shm_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_shm_h" = x""yes; then :
+if test "x$ac_cv_header_sys_shm_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_SYS_SHM_H 1
 _ACEOF
@@ -7863,7 +7910,7 @@ fi
 for ac_header in zlib.h
 do :
   ac_fn_cxx_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default"
-if test "x$ac_cv_header_zlib_h" = x""yes; then :
+if test "x$ac_cv_header_zlib_h" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_ZLIB_H 1
 _ACEOF
@@ -7875,7 +7922,7 @@ done
 
 ac_fn_cxx_check_decl "$LINENO" "round" "ac_cv_have_decl_round" "#include <math.h>
 "
-if test "x$ac_cv_have_decl_round" = x""yes; then :
+if test "x$ac_cv_have_decl_round" = xyes; then :
   ac_have_decl=1
 else
   ac_have_decl=0
@@ -7889,7 +7936,7 @@ if test "$ZM_SSL_LIB" == "openssl"; then
 ac_fn_cxx_check_decl "$LINENO" "MD5" "ac_cv_have_decl_MD5" "#include <stdlib.h>
 #include <openssl/md5.h>
 "
-if test "x$ac_cv_have_decl_MD5" = x""yes; then :
+if test "x$ac_cv_have_decl_MD5" = xyes; then :
   ac_have_decl=1
 else
   ac_have_decl=0
@@ -7901,14 +7948,15 @@ _ACEOF
 if test $ac_have_decl = 1; then :
 
 else
-  as_fn_error "zm requires openssl/md5.h - use ZM_SSL_LIB option to select gnutls instead" "$LINENO" 5
+  as_fn_error $? "zm requires openssl/md5.h - use ZM_SSL_LIB option to select gnutls instead" "$LINENO" 5
 fi
 
 else
+if test "$ZM_HAS_GNUTLS_OPENSSL" == "1"; then
 ac_fn_cxx_check_decl "$LINENO" "MD5" "ac_cv_have_decl_MD5" "#include <stdlib.h>
 #include <gnutls/openssl.h>
 "
-if test "x$ac_cv_have_decl_MD5" = x""yes; then :
+if test "x$ac_cv_have_decl_MD5" = xyes; then :
   ac_have_decl=1
 else
   ac_have_decl=0
@@ -7920,13 +7968,33 @@ _ACEOF
 if test $ac_have_decl = 1; then :
 
 else
-  as_fn_error "zm requires gnutls/openssl.h - use ZM_SSL_LIB option to select openssl instead" "$LINENO" 5
+  as_fn_error $? "zm requires gnutls/openssl.h - use ZM_SSL_LIB option to select openssl instead" "$LINENO" 5
+fi
+
+else
+ac_fn_cxx_check_decl "$LINENO" "gnutls_fingerprint" "ac_cv_have_decl_gnutls_fingerprint" "#include <stdlib.h>
+#include <gnutls/gnutls.h>
+"
+if test "x$ac_cv_have_decl_gnutls_fingerprint" = xyes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_GNUTLS_FINGERPRINT $ac_have_decl
+_ACEOF
+if test $ac_have_decl = 1; then :
+
+else
+  as_fn_error $? "zm requires gnutls/gnutls.h - use ZM_SSL_LIB option to select openssl instead" "$LINENO" 5
 fi
 
+fi
 fi
 ac_fn_cxx_check_decl "$LINENO" "backtrace" "ac_cv_have_decl_backtrace" "#include <execinfo.h>
 "
-if test "x$ac_cv_have_decl_backtrace" = x""yes; then :
+if test "x$ac_cv_have_decl_backtrace" = xyes; then :
   ac_have_decl=1
 else
   ac_have_decl=0
@@ -7945,7 +8013,7 @@ if test -z "$PERL"; then
 set dummy perl; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_PERL+set}" = set; then :
+if ${ac_cv_prog_PERL+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$PERL"; then
@@ -8012,7 +8080,7 @@ if test -z "$PERL"; then
 set dummy perl; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_PERL+set}" = set; then :
+if ${ac_cv_prog_PERL+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$PERL"; then
@@ -8071,7 +8139,7 @@ $as_echo "ok" >&6; };
 
   else
     :
-    as_fn_error "zm requires SYS:Syslog" "$LINENO" 5
+    as_fn_error $? "zm requires SYS:Syslog" "$LINENO" 5
   fi
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: could not find perl" >&5
@@ -8084,7 +8152,7 @@ if test -z "$PERL"; then
 set dummy perl; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_PERL+set}" = set; then :
+if ${ac_cv_prog_PERL+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$PERL"; then
@@ -8143,7 +8211,7 @@ $as_echo "ok" >&6; };
 
   else
     :
-    as_fn_error "zm requires DBI" "$LINENO" 5
+    as_fn_error $? "zm requires DBI" "$LINENO" 5
   fi
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: could not find perl" >&5
@@ -8156,7 +8224,7 @@ if test -z "$PERL"; then
 set dummy perl; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_PERL+set}" = set; then :
+if ${ac_cv_prog_PERL+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$PERL"; then
@@ -8215,7 +8283,7 @@ $as_echo "ok" >&6; };
 
   else
     :
-    as_fn_error "zm requires DBD::mysql" "$LINENO" 5
+    as_fn_error $? "zm requires DBD::mysql" "$LINENO" 5
   fi
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: could not find perl" >&5
@@ -8228,7 +8296,7 @@ if test -z "$PERL"; then
 set dummy perl; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_PERL+set}" = set; then :
+if ${ac_cv_prog_PERL+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$PERL"; then
@@ -8287,7 +8355,7 @@ $as_echo "ok" >&6; };
 
   else
     :
-    as_fn_error "zm requires Getopt::Long" "$LINENO" 5
+    as_fn_error $? "zm requires Getopt::Long" "$LINENO" 5
   fi
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: could not find perl" >&5
@@ -8300,7 +8368,7 @@ if test -z "$PERL"; then
 set dummy perl; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_PERL+set}" = set; then :
+if ${ac_cv_prog_PERL+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$PERL"; then
@@ -8359,7 +8427,7 @@ $as_echo "ok" >&6; };
 
   else
     :
-    as_fn_error "zm requires Time::HiRes" "$LINENO" 5
+    as_fn_error $? "zm requires Time::HiRes" "$LINENO" 5
   fi
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: could not find perl" >&5
@@ -8372,7 +8440,7 @@ if test -z "$PERL"; then
 set dummy perl; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_PERL+set}" = set; then :
+if ${ac_cv_prog_PERL+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$PERL"; then
@@ -8431,7 +8499,7 @@ $as_echo "ok" >&6; };
 
   else
     :
-    as_fn_error "zm requires Date::Manip" "$LINENO" 5
+    as_fn_error $? "zm requires Date::Manip" "$LINENO" 5
   fi
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: could not find perl" >&5
@@ -8444,7 +8512,7 @@ if test -z "$PERL"; then
 set dummy perl; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_PERL+set}" = set; then :
+if ${ac_cv_prog_PERL+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$PERL"; then
@@ -8503,7 +8571,7 @@ $as_echo "ok" >&6; };
 
   else
     :
-    as_fn_error "zm requires LWP::UserAgent" "$LINENO" 5
+    as_fn_error $? "zm requires LWP::UserAgent" "$LINENO" 5
   fi
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: could not find perl" >&5
@@ -8516,7 +8584,7 @@ if test -z "$PERL"; then
 set dummy perl; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_PERL+set}" = set; then :
+if ${ac_cv_prog_PERL+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$PERL"; then
@@ -8575,7 +8643,7 @@ $as_echo "ok" >&6; };
 
   else
     :
-    as_fn_error "zm requires ExtUtils::MakeMaker" "$LINENO" 5
+    as_fn_error $? "zm requires ExtUtils::MakeMaker" "$LINENO" 5
   fi
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: could not find perl" >&5
@@ -8589,7 +8657,7 @@ if test -z "$PERL"; then
 set dummy perl; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_PERL+set}" = set; then :
+if ${ac_cv_prog_PERL+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$PERL"; then
@@ -8648,7 +8716,7 @@ $as_echo "ok" >&6; };
 
   else
     :
-    as_fn_error "zm requires Sys::Mmap for mapped memory - set --enable-mmap=no to use IPC shared memory instead" "$LINENO" 5
+    as_fn_error $? "zm requires Sys::Mmap for mapped memory - set --enable-mmap=no to use IPC shared memory instead" "$LINENO" 5
   fi
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: could not find perl" >&5
@@ -8664,7 +8732,7 @@ if test -z "$PERL"; then
 set dummy perl; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_PERL+set}" = set; then :
+if ${ac_cv_prog_PERL+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$PERL"; then
@@ -8737,7 +8805,7 @@ if test -z "$PERL"; then
 set dummy perl; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_PERL+set}" = set; then :
+if ${ac_cv_prog_PERL+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$PERL"; then
@@ -8810,7 +8878,7 @@ if test -z "$PERL"; then
 set dummy perl; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_PERL+set}" = set; then :
+if ${ac_cv_prog_PERL+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$PERL"; then
@@ -8883,7 +8951,7 @@ if test -z "$PERL"; then
 set dummy perl; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_PERL+set}" = set; then :
+if ${ac_cv_prog_PERL+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$PERL"; then
@@ -8956,7 +9024,7 @@ if test -z "$PERL"; then
 set dummy perl; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_PERL+set}" = set; then :
+if ${ac_cv_prog_PERL+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$PERL"; then
@@ -9029,7 +9097,7 @@ if test -z "$PERL"; then
 set dummy perl; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_PERL+set}" = set; then :
+if ${ac_cv_prog_PERL+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$PERL"; then
@@ -9102,7 +9170,7 @@ if test -z "$PERL"; then
 set dummy perl; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_PERL+set}" = set; then :
+if ${ac_cv_prog_PERL+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$PERL"; then
@@ -9175,7 +9243,7 @@ if test -z "$PERL"; then
 set dummy perl; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_PERL+set}" = set; then :
+if ${ac_cv_prog_PERL+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$PERL"; then
@@ -9248,7 +9316,7 @@ if test -z "$PERL"; then
 set dummy perl; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_PERL+set}" = set; then :
+if ${ac_cv_prog_PERL+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$PERL"; then
@@ -9321,7 +9389,7 @@ if test -z "$PERL"; then
 set dummy perl; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_PERL+set}" = set; then :
+if ${ac_cv_prog_PERL+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$PERL"; then
@@ -9394,7 +9462,7 @@ if test -z "$PERL"; then
 set dummy perl; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_PERL+set}" = set; then :
+if ${ac_cv_prog_PERL+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$PERL"; then
@@ -9605,10 +9673,21 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
      :end' >>confcache
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
-    test "x$cache_file" != "x/dev/null" &&
+    if test "x$cache_file" != "x/dev/null"; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
 $as_echo "$as_me: updating cache $cache_file" >&6;}
-    cat confcache >$cache_file
+      if test ! -f "$cache_file" || test -h "$cache_file"; then
+	cat confcache >"$cache_file"
+      else
+        case $cache_file in #(
+        */* | ?:*)
+	  mv -f confcache "$cache_file"$$ &&
+	  mv -f "$cache_file"$$ "$cache_file" ;; #(
+        *)
+	  mv -f confcache "$cache_file" ;;
+	esac
+      fi
+    fi
   else
     { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
@@ -9624,6 +9703,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$//'
@@ -9647,19 +9727,19 @@ 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__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
-  as_fn_error "conditional \"am__fastdepCXX\" was never defined.
+  as_fn_error $? "conditional \"am__fastdepCXX\" 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
 
-: ${CONFIG_STATUS=./config.status}
+: "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
@@ -9760,6 +9840,7 @@ fi
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
 case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -9805,19 +9886,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
 
@@ -10013,7 +10094,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
@@ -10067,7 +10148,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # values after options handling.
 ac_log="
 This file was extended by zm $as_me 1.25.0, which was
-generated by GNU Autoconf 2.65.  Invocation command line was
+generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -10134,10 +10215,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
 zm config.status 1.25.0
-configured by $0, generated by GNU Autoconf 2.65,
+configured by $0, generated by GNU Autoconf 2.68,
   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."
 
@@ -10155,11 +10236,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
@@ -10181,6 +10267,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;;
@@ -10193,7 +10280,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 ;;
@@ -10202,7 +10289,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"
@@ -10327,7 +10414,7 @@ do
     "src/zm_config_defines.h") CONFIG_COMMANDS="$CONFIG_COMMANDS src/zm_config_defines.h" ;;
     "scripts/ZoneMinder/Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS scripts/ZoneMinder/Makefile" ;;
 
-  *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
 done
 
@@ -10350,9 +10437,10 @@ fi
 # after its creation but before its name has been assigned to `$tmp'.
 $debug ||
 {
-  tmp=
+  tmp= ac_tmp=
   trap 'exit_status=$?
-  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
+  : "${ac_tmp:=$tmp}"
+  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
 ' 0
   trap 'as_fn_exit 1' 1 2 13 15
 }
@@ -10360,12 +10448,13 @@ $debug ||
 
 {
   tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
+  test -d "$tmp"
 }  ||
 {
   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
+ac_tmp=$tmp
 
 # Set up the scripts for CONFIG_FILES section.
 # No need to generate them if there are no CONFIG_FILES.
@@ -10382,12 +10471,12 @@ 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
 
-echo 'BEGIN {' >"$tmp/subs1.awk" &&
+echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
 _ACEOF
 
 
@@ -10396,18 +10485,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
@@ -10415,7 +10504,7 @@ done
 rm -f conf$$subs.sh
 
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
 _ACEOF
 sed -n '
 h
@@ -10463,7 +10552,7 @@ t delim
 rm -f conf$$subs.awk
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 _ACAWK
-cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
   for (key in S) S_is_set[key] = 1
   FS = ""
 
@@ -10495,21 +10584,29 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
   sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
 else
   cat
-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
-  || as_fn_error "could not setup config files machinery" "$LINENO" 5
+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
+  || 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
@@ -10521,7 +10618,7 @@ fi # test -n "$CONFIG_FILES"
 # No need to generate them if there are no CONFIG_HEADERS.
 # This happens for instance with `./config.status Makefile'.
 if test -n "$CONFIG_HEADERS"; then
-cat >"$tmp/defines.awk" <<\_ACAWK ||
+cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
 BEGIN {
 _ACEOF
 
@@ -10533,11 +10630,11 @@ _ACEOF
 # handling of long lines.
 ac_delim='%!_!# '
 for ac_last_try in false false :; do
-  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
-  if test -z "$ac_t"; then
+  ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
+  if test -z "$ac_tt"; 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
@@ -10622,7 +10719,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 _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"
 
 
@@ -10635,7 +10732,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
@@ -10654,7 +10751,7 @@ do
     for ac_f
     do
       case $ac_f in
-      -) ac_f="$tmp/stdin";;
+      -) ac_f="$ac_tmp/stdin";;
       *) # Look for the file first in the build tree, then in the source tree
 	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
 	 # because $ac_f cannot contain `:'.
@@ -10663,7 +10760,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'"
@@ -10689,8 +10786,8 @@ $as_echo "$as_me: creating $ac_file" >&6;}
     esac
 
     case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin" \
-      || as_fn_error "could not create $ac_file" "$LINENO" 5 ;;
+    *:-:* | *:-) cat >"$ac_tmp/stdin" \
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
     esac
     ;;
   esac
@@ -10826,23 +10923,24 @@ s&@INSTALL@&$ac_INSTALL&;t t
 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
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
+  >$ac_tmp/out || 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"; } &&
+  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
+      "$ac_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"
+  rm -f "$ac_tmp/stdin"
   case $ac_file in
-  -) cat "$tmp/out" && rm -f "$tmp/out";;
-  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
+  *) rm -f "$ac_file" && mv "$ac_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)
   #
@@ -10851,21 +10949,21 @@ which seems to be undefined.  Please make sure it is defined." >&2;}
   if test x"$ac_file" != x-; then
     {
       $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
-    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
+      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
+    } >"$ac_tmp/config.h" \
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+    if diff "$ac_file" "$ac_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
+      mv "$ac_tmp/config.h" "$ac_file" \
+	|| 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
+      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
+      || as_fn_error $? "could not create -" "$LINENO" 5
   fi
 # Compute "$ac_file"'s index in $config_headers.
 _am_arg="$ac_file"
@@ -11017,7 +11115,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.
@@ -11038,7 +11136,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
diff --git a/db/Makefile.in b/db/Makefile.in
index 852fa211d..09f26dea8 100644
--- a/db/Makefile.in
+++ b/db/Makefile.in
@@ -128,6 +128,8 @@ ZM_DB_HOST = @ZM_DB_HOST@
 ZM_DB_NAME = @ZM_DB_NAME@
 ZM_DB_PASS = @ZM_DB_PASS@
 ZM_DB_USER = @ZM_DB_USER@
+ZM_HAS_GNUTLS = @ZM_HAS_GNUTLS@
+ZM_HAS_GNUTLS_OPENSSL = @ZM_HAS_GNUTLS_OPENSSL@
 ZM_HAS_V4L = @ZM_HAS_V4L@
 ZM_HAS_V4L1 = @ZM_HAS_V4L1@
 ZM_HAS_V4L2 = @ZM_HAS_V4L2@
diff --git a/misc/Makefile.in b/misc/Makefile.in
index 58731c26f..946c28e7a 100644
--- a/misc/Makefile.in
+++ b/misc/Makefile.in
@@ -129,6 +129,8 @@ ZM_DB_HOST = @ZM_DB_HOST@
 ZM_DB_NAME = @ZM_DB_NAME@
 ZM_DB_PASS = @ZM_DB_PASS@
 ZM_DB_USER = @ZM_DB_USER@
+ZM_HAS_GNUTLS = @ZM_HAS_GNUTLS@
+ZM_HAS_GNUTLS_OPENSSL = @ZM_HAS_GNUTLS_OPENSSL@
 ZM_HAS_V4L = @ZM_HAS_V4L@
 ZM_HAS_V4L1 = @ZM_HAS_V4L1@
 ZM_HAS_V4L2 = @ZM_HAS_V4L2@
diff --git a/scripts/Makefile.in b/scripts/Makefile.in
index 1200dd309..6597278f6 100644
--- a/scripts/Makefile.in
+++ b/scripts/Makefile.in
@@ -202,6 +202,8 @@ ZM_DB_HOST = @ZM_DB_HOST@
 ZM_DB_NAME = @ZM_DB_NAME@
 ZM_DB_PASS = @ZM_DB_PASS@
 ZM_DB_USER = @ZM_DB_USER@
+ZM_HAS_GNUTLS = @ZM_HAS_GNUTLS@
+ZM_HAS_GNUTLS_OPENSSL = @ZM_HAS_GNUTLS_OPENSSL@
 ZM_HAS_V4L = @ZM_HAS_V4L@
 ZM_HAS_V4L1 = @ZM_HAS_V4L1@
 ZM_HAS_V4L2 = @ZM_HAS_V4L2@
diff --git a/src/Makefile.in b/src/Makefile.in
index b8a76ebdb..d499f2f95 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -188,6 +188,8 @@ ZM_DB_HOST = @ZM_DB_HOST@
 ZM_DB_NAME = @ZM_DB_NAME@
 ZM_DB_PASS = @ZM_DB_PASS@
 ZM_DB_USER = @ZM_DB_USER@
+ZM_HAS_GNUTLS = @ZM_HAS_GNUTLS@
+ZM_HAS_GNUTLS_OPENSSL = @ZM_HAS_GNUTLS_OPENSSL@
 ZM_HAS_V4L = @ZM_HAS_V4L@
 ZM_HAS_V4L1 = @ZM_HAS_V4L1@
 ZM_HAS_V4L2 = @ZM_HAS_V4L2@
@@ -242,7 +244,7 @@ top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = gnu
-AM_CPPFLAGS = @MYSQL_CFLAGS@ @FFMPEG_CFLAGS@ -Wall -Wno-sign-compare -fno-inline
+AM_CPPFLAGS = @MYSQL_CFLAGS@ @FFMPEG_CFLAGS@ -Wall -Wno-sign-compare
 #AM_CXXFLAGS = -frepo
 CLEANFILES = *.rpo
 
diff --git a/web/Makefile.in b/web/Makefile.in
index f2232e433..34547baf3 100644
--- a/web/Makefile.in
+++ b/web/Makefile.in
@@ -192,6 +192,8 @@ ZM_DB_HOST = @ZM_DB_HOST@
 ZM_DB_NAME = @ZM_DB_NAME@
 ZM_DB_PASS = @ZM_DB_PASS@
 ZM_DB_USER = @ZM_DB_USER@
+ZM_HAS_GNUTLS = @ZM_HAS_GNUTLS@
+ZM_HAS_GNUTLS_OPENSSL = @ZM_HAS_GNUTLS_OPENSSL@
 ZM_HAS_V4L = @ZM_HAS_V4L@
 ZM_HAS_V4L1 = @ZM_HAS_V4L1@
 ZM_HAS_V4L2 = @ZM_HAS_V4L2@
diff --git a/web/ajax/Makefile.in b/web/ajax/Makefile.in
index 7bbb478b7..45d615c11 100644
--- a/web/ajax/Makefile.in
+++ b/web/ajax/Makefile.in
@@ -152,6 +152,8 @@ ZM_DB_HOST = @ZM_DB_HOST@
 ZM_DB_NAME = @ZM_DB_NAME@
 ZM_DB_PASS = @ZM_DB_PASS@
 ZM_DB_USER = @ZM_DB_USER@
+ZM_HAS_GNUTLS = @ZM_HAS_GNUTLS@
+ZM_HAS_GNUTLS_OPENSSL = @ZM_HAS_GNUTLS_OPENSSL@
 ZM_HAS_V4L = @ZM_HAS_V4L@
 ZM_HAS_V4L1 = @ZM_HAS_V4L1@
 ZM_HAS_V4L2 = @ZM_HAS_V4L2@
diff --git a/web/css/Makefile.in b/web/css/Makefile.in
index e3c58b2af..b49a73f02 100644
--- a/web/css/Makefile.in
+++ b/web/css/Makefile.in
@@ -152,6 +152,8 @@ ZM_DB_HOST = @ZM_DB_HOST@
 ZM_DB_NAME = @ZM_DB_NAME@
 ZM_DB_PASS = @ZM_DB_PASS@
 ZM_DB_USER = @ZM_DB_USER@
+ZM_HAS_GNUTLS = @ZM_HAS_GNUTLS@
+ZM_HAS_GNUTLS_OPENSSL = @ZM_HAS_GNUTLS_OPENSSL@
 ZM_HAS_V4L = @ZM_HAS_V4L@
 ZM_HAS_V4L1 = @ZM_HAS_V4L1@
 ZM_HAS_V4L2 = @ZM_HAS_V4L2@
diff --git a/web/graphics/Makefile.in b/web/graphics/Makefile.in
index b31d1e11e..20f56f3b7 100644
--- a/web/graphics/Makefile.in
+++ b/web/graphics/Makefile.in
@@ -152,6 +152,8 @@ ZM_DB_HOST = @ZM_DB_HOST@
 ZM_DB_NAME = @ZM_DB_NAME@
 ZM_DB_PASS = @ZM_DB_PASS@
 ZM_DB_USER = @ZM_DB_USER@
+ZM_HAS_GNUTLS = @ZM_HAS_GNUTLS@
+ZM_HAS_GNUTLS_OPENSSL = @ZM_HAS_GNUTLS_OPENSSL@
 ZM_HAS_V4L = @ZM_HAS_V4L@
 ZM_HAS_V4L1 = @ZM_HAS_V4L1@
 ZM_HAS_V4L2 = @ZM_HAS_V4L2@
diff --git a/web/includes/Makefile.in b/web/includes/Makefile.in
index fa41d860e..1ed1136b3 100644
--- a/web/includes/Makefile.in
+++ b/web/includes/Makefile.in
@@ -152,6 +152,8 @@ ZM_DB_HOST = @ZM_DB_HOST@
 ZM_DB_NAME = @ZM_DB_NAME@
 ZM_DB_PASS = @ZM_DB_PASS@
 ZM_DB_USER = @ZM_DB_USER@
+ZM_HAS_GNUTLS = @ZM_HAS_GNUTLS@
+ZM_HAS_GNUTLS_OPENSSL = @ZM_HAS_GNUTLS_OPENSSL@
 ZM_HAS_V4L = @ZM_HAS_V4L@
 ZM_HAS_V4L1 = @ZM_HAS_V4L1@
 ZM_HAS_V4L2 = @ZM_HAS_V4L2@
diff --git a/web/js/Makefile.in b/web/js/Makefile.in
index 2fb8c630a..18a8f4e4f 100644
--- a/web/js/Makefile.in
+++ b/web/js/Makefile.in
@@ -152,6 +152,8 @@ ZM_DB_HOST = @ZM_DB_HOST@
 ZM_DB_NAME = @ZM_DB_NAME@
 ZM_DB_PASS = @ZM_DB_PASS@
 ZM_DB_USER = @ZM_DB_USER@
+ZM_HAS_GNUTLS = @ZM_HAS_GNUTLS@
+ZM_HAS_GNUTLS_OPENSSL = @ZM_HAS_GNUTLS_OPENSSL@
 ZM_HAS_V4L = @ZM_HAS_V4L@
 ZM_HAS_V4L1 = @ZM_HAS_V4L1@
 ZM_HAS_V4L2 = @ZM_HAS_V4L2@
diff --git a/web/lang/Makefile.in b/web/lang/Makefile.in
index 15d749acf..7430df13b 100644
--- a/web/lang/Makefile.in
+++ b/web/lang/Makefile.in
@@ -152,6 +152,8 @@ ZM_DB_HOST = @ZM_DB_HOST@
 ZM_DB_NAME = @ZM_DB_NAME@
 ZM_DB_PASS = @ZM_DB_PASS@
 ZM_DB_USER = @ZM_DB_USER@
+ZM_HAS_GNUTLS = @ZM_HAS_GNUTLS@
+ZM_HAS_GNUTLS_OPENSSL = @ZM_HAS_GNUTLS_OPENSSL@
 ZM_HAS_V4L = @ZM_HAS_V4L@
 ZM_HAS_V4L1 = @ZM_HAS_V4L1@
 ZM_HAS_V4L2 = @ZM_HAS_V4L2@
diff --git a/web/skins/Makefile.in b/web/skins/Makefile.in
index e9f70f781..7903f43c3 100644
--- a/web/skins/Makefile.in
+++ b/web/skins/Makefile.in
@@ -167,6 +167,8 @@ ZM_DB_HOST = @ZM_DB_HOST@
 ZM_DB_NAME = @ZM_DB_NAME@
 ZM_DB_PASS = @ZM_DB_PASS@
 ZM_DB_USER = @ZM_DB_USER@
+ZM_HAS_GNUTLS = @ZM_HAS_GNUTLS@
+ZM_HAS_GNUTLS_OPENSSL = @ZM_HAS_GNUTLS_OPENSSL@
 ZM_HAS_V4L = @ZM_HAS_V4L@
 ZM_HAS_V4L1 = @ZM_HAS_V4L1@
 ZM_HAS_V4L2 = @ZM_HAS_V4L2@
diff --git a/web/skins/classic/Makefile.in b/web/skins/classic/Makefile.in
index b4f9bc6a9..7e9d2b14c 100644
--- a/web/skins/classic/Makefile.in
+++ b/web/skins/classic/Makefile.in
@@ -192,6 +192,8 @@ ZM_DB_HOST = @ZM_DB_HOST@
 ZM_DB_NAME = @ZM_DB_NAME@
 ZM_DB_PASS = @ZM_DB_PASS@
 ZM_DB_USER = @ZM_DB_USER@
+ZM_HAS_GNUTLS = @ZM_HAS_GNUTLS@
+ZM_HAS_GNUTLS_OPENSSL = @ZM_HAS_GNUTLS_OPENSSL@
 ZM_HAS_V4L = @ZM_HAS_V4L@
 ZM_HAS_V4L1 = @ZM_HAS_V4L1@
 ZM_HAS_V4L2 = @ZM_HAS_V4L2@
diff --git a/web/skins/classic/ajax/Makefile.in b/web/skins/classic/ajax/Makefile.in
index b0b1f9e52..7c4d6846b 100644
--- a/web/skins/classic/ajax/Makefile.in
+++ b/web/skins/classic/ajax/Makefile.in
@@ -152,6 +152,8 @@ ZM_DB_HOST = @ZM_DB_HOST@
 ZM_DB_NAME = @ZM_DB_NAME@
 ZM_DB_PASS = @ZM_DB_PASS@
 ZM_DB_USER = @ZM_DB_USER@
+ZM_HAS_GNUTLS = @ZM_HAS_GNUTLS@
+ZM_HAS_GNUTLS_OPENSSL = @ZM_HAS_GNUTLS_OPENSSL@
 ZM_HAS_V4L = @ZM_HAS_V4L@
 ZM_HAS_V4L1 = @ZM_HAS_V4L1@
 ZM_HAS_V4L2 = @ZM_HAS_V4L2@
diff --git a/web/skins/classic/css/Makefile.in b/web/skins/classic/css/Makefile.in
index 86027c506..7957ce9fe 100644
--- a/web/skins/classic/css/Makefile.in
+++ b/web/skins/classic/css/Makefile.in
@@ -152,6 +152,8 @@ ZM_DB_HOST = @ZM_DB_HOST@
 ZM_DB_NAME = @ZM_DB_NAME@
 ZM_DB_PASS = @ZM_DB_PASS@
 ZM_DB_USER = @ZM_DB_USER@
+ZM_HAS_GNUTLS = @ZM_HAS_GNUTLS@
+ZM_HAS_GNUTLS_OPENSSL = @ZM_HAS_GNUTLS_OPENSSL@
 ZM_HAS_V4L = @ZM_HAS_V4L@
 ZM_HAS_V4L1 = @ZM_HAS_V4L1@
 ZM_HAS_V4L2 = @ZM_HAS_V4L2@
diff --git a/web/skins/classic/graphics/Makefile.in b/web/skins/classic/graphics/Makefile.in
index bdeeb7cc3..b6e3df726 100644
--- a/web/skins/classic/graphics/Makefile.in
+++ b/web/skins/classic/graphics/Makefile.in
@@ -152,6 +152,8 @@ ZM_DB_HOST = @ZM_DB_HOST@
 ZM_DB_NAME = @ZM_DB_NAME@
 ZM_DB_PASS = @ZM_DB_PASS@
 ZM_DB_USER = @ZM_DB_USER@
+ZM_HAS_GNUTLS = @ZM_HAS_GNUTLS@
+ZM_HAS_GNUTLS_OPENSSL = @ZM_HAS_GNUTLS_OPENSSL@
 ZM_HAS_V4L = @ZM_HAS_V4L@
 ZM_HAS_V4L1 = @ZM_HAS_V4L1@
 ZM_HAS_V4L2 = @ZM_HAS_V4L2@
diff --git a/web/skins/classic/includes/Makefile.in b/web/skins/classic/includes/Makefile.in
index 2ff71d10b..fbb2b6908 100644
--- a/web/skins/classic/includes/Makefile.in
+++ b/web/skins/classic/includes/Makefile.in
@@ -152,6 +152,8 @@ ZM_DB_HOST = @ZM_DB_HOST@
 ZM_DB_NAME = @ZM_DB_NAME@
 ZM_DB_PASS = @ZM_DB_PASS@
 ZM_DB_USER = @ZM_DB_USER@
+ZM_HAS_GNUTLS = @ZM_HAS_GNUTLS@
+ZM_HAS_GNUTLS_OPENSSL = @ZM_HAS_GNUTLS_OPENSSL@
 ZM_HAS_V4L = @ZM_HAS_V4L@
 ZM_HAS_V4L1 = @ZM_HAS_V4L1@
 ZM_HAS_V4L2 = @ZM_HAS_V4L2@
diff --git a/web/skins/classic/js/Makefile.in b/web/skins/classic/js/Makefile.in
index 7c3f5a50c..39eadd389 100644
--- a/web/skins/classic/js/Makefile.in
+++ b/web/skins/classic/js/Makefile.in
@@ -152,6 +152,8 @@ ZM_DB_HOST = @ZM_DB_HOST@
 ZM_DB_NAME = @ZM_DB_NAME@
 ZM_DB_PASS = @ZM_DB_PASS@
 ZM_DB_USER = @ZM_DB_USER@
+ZM_HAS_GNUTLS = @ZM_HAS_GNUTLS@
+ZM_HAS_GNUTLS_OPENSSL = @ZM_HAS_GNUTLS_OPENSSL@
 ZM_HAS_V4L = @ZM_HAS_V4L@
 ZM_HAS_V4L1 = @ZM_HAS_V4L1@
 ZM_HAS_V4L2 = @ZM_HAS_V4L2@
diff --git a/web/skins/classic/lang/Makefile.in b/web/skins/classic/lang/Makefile.in
index 7aa721691..657a340cd 100644
--- a/web/skins/classic/lang/Makefile.in
+++ b/web/skins/classic/lang/Makefile.in
@@ -152,6 +152,8 @@ ZM_DB_HOST = @ZM_DB_HOST@
 ZM_DB_NAME = @ZM_DB_NAME@
 ZM_DB_PASS = @ZM_DB_PASS@
 ZM_DB_USER = @ZM_DB_USER@
+ZM_HAS_GNUTLS = @ZM_HAS_GNUTLS@
+ZM_HAS_GNUTLS_OPENSSL = @ZM_HAS_GNUTLS_OPENSSL@
 ZM_HAS_V4L = @ZM_HAS_V4L@
 ZM_HAS_V4L1 = @ZM_HAS_V4L1@
 ZM_HAS_V4L2 = @ZM_HAS_V4L2@
diff --git a/web/skins/classic/views/Makefile.in b/web/skins/classic/views/Makefile.in
index 1cde4efba..fb45159b7 100644
--- a/web/skins/classic/views/Makefile.in
+++ b/web/skins/classic/views/Makefile.in
@@ -192,6 +192,8 @@ ZM_DB_HOST = @ZM_DB_HOST@
 ZM_DB_NAME = @ZM_DB_NAME@
 ZM_DB_PASS = @ZM_DB_PASS@
 ZM_DB_USER = @ZM_DB_USER@
+ZM_HAS_GNUTLS = @ZM_HAS_GNUTLS@
+ZM_HAS_GNUTLS_OPENSSL = @ZM_HAS_GNUTLS_OPENSSL@
 ZM_HAS_V4L = @ZM_HAS_V4L@
 ZM_HAS_V4L1 = @ZM_HAS_V4L1@
 ZM_HAS_V4L2 = @ZM_HAS_V4L2@
diff --git a/web/skins/classic/views/css/Makefile.in b/web/skins/classic/views/css/Makefile.in
index bfbf9e4a0..efd9f1195 100644
--- a/web/skins/classic/views/css/Makefile.in
+++ b/web/skins/classic/views/css/Makefile.in
@@ -152,6 +152,8 @@ ZM_DB_HOST = @ZM_DB_HOST@
 ZM_DB_NAME = @ZM_DB_NAME@
 ZM_DB_PASS = @ZM_DB_PASS@
 ZM_DB_USER = @ZM_DB_USER@
+ZM_HAS_GNUTLS = @ZM_HAS_GNUTLS@
+ZM_HAS_GNUTLS_OPENSSL = @ZM_HAS_GNUTLS_OPENSSL@
 ZM_HAS_V4L = @ZM_HAS_V4L@
 ZM_HAS_V4L1 = @ZM_HAS_V4L1@
 ZM_HAS_V4L2 = @ZM_HAS_V4L2@
diff --git a/web/skins/classic/views/js/Makefile.in b/web/skins/classic/views/js/Makefile.in
index c476c5adc..fd02da63b 100644
--- a/web/skins/classic/views/js/Makefile.in
+++ b/web/skins/classic/views/js/Makefile.in
@@ -152,6 +152,8 @@ ZM_DB_HOST = @ZM_DB_HOST@
 ZM_DB_NAME = @ZM_DB_NAME@
 ZM_DB_PASS = @ZM_DB_PASS@
 ZM_DB_USER = @ZM_DB_USER@
+ZM_HAS_GNUTLS = @ZM_HAS_GNUTLS@
+ZM_HAS_GNUTLS_OPENSSL = @ZM_HAS_GNUTLS_OPENSSL@
 ZM_HAS_V4L = @ZM_HAS_V4L@
 ZM_HAS_V4L1 = @ZM_HAS_V4L1@
 ZM_HAS_V4L2 = @ZM_HAS_V4L2@
diff --git a/web/skins/mobile/Makefile.in b/web/skins/mobile/Makefile.in
index 7d19be8c9..b1787e101 100644
--- a/web/skins/mobile/Makefile.in
+++ b/web/skins/mobile/Makefile.in
@@ -192,6 +192,8 @@ ZM_DB_HOST = @ZM_DB_HOST@
 ZM_DB_NAME = @ZM_DB_NAME@
 ZM_DB_PASS = @ZM_DB_PASS@
 ZM_DB_USER = @ZM_DB_USER@
+ZM_HAS_GNUTLS = @ZM_HAS_GNUTLS@
+ZM_HAS_GNUTLS_OPENSSL = @ZM_HAS_GNUTLS_OPENSSL@
 ZM_HAS_V4L = @ZM_HAS_V4L@
 ZM_HAS_V4L1 = @ZM_HAS_V4L1@
 ZM_HAS_V4L2 = @ZM_HAS_V4L2@
diff --git a/web/skins/mobile/ajax/Makefile.in b/web/skins/mobile/ajax/Makefile.in
index c671268df..8bad9a155 100644
--- a/web/skins/mobile/ajax/Makefile.in
+++ b/web/skins/mobile/ajax/Makefile.in
@@ -152,6 +152,8 @@ ZM_DB_HOST = @ZM_DB_HOST@
 ZM_DB_NAME = @ZM_DB_NAME@
 ZM_DB_PASS = @ZM_DB_PASS@
 ZM_DB_USER = @ZM_DB_USER@
+ZM_HAS_GNUTLS = @ZM_HAS_GNUTLS@
+ZM_HAS_GNUTLS_OPENSSL = @ZM_HAS_GNUTLS_OPENSSL@
 ZM_HAS_V4L = @ZM_HAS_V4L@
 ZM_HAS_V4L1 = @ZM_HAS_V4L1@
 ZM_HAS_V4L2 = @ZM_HAS_V4L2@
diff --git a/web/skins/mobile/css/Makefile.in b/web/skins/mobile/css/Makefile.in
index 77253d1f3..61af9c329 100644
--- a/web/skins/mobile/css/Makefile.in
+++ b/web/skins/mobile/css/Makefile.in
@@ -152,6 +152,8 @@ ZM_DB_HOST = @ZM_DB_HOST@
 ZM_DB_NAME = @ZM_DB_NAME@
 ZM_DB_PASS = @ZM_DB_PASS@
 ZM_DB_USER = @ZM_DB_USER@
+ZM_HAS_GNUTLS = @ZM_HAS_GNUTLS@
+ZM_HAS_GNUTLS_OPENSSL = @ZM_HAS_GNUTLS_OPENSSL@
 ZM_HAS_V4L = @ZM_HAS_V4L@
 ZM_HAS_V4L1 = @ZM_HAS_V4L1@
 ZM_HAS_V4L2 = @ZM_HAS_V4L2@
diff --git a/web/skins/mobile/graphics/Makefile.in b/web/skins/mobile/graphics/Makefile.in
index f252d137e..1a3891af3 100644
--- a/web/skins/mobile/graphics/Makefile.in
+++ b/web/skins/mobile/graphics/Makefile.in
@@ -152,6 +152,8 @@ ZM_DB_HOST = @ZM_DB_HOST@
 ZM_DB_NAME = @ZM_DB_NAME@
 ZM_DB_PASS = @ZM_DB_PASS@
 ZM_DB_USER = @ZM_DB_USER@
+ZM_HAS_GNUTLS = @ZM_HAS_GNUTLS@
+ZM_HAS_GNUTLS_OPENSSL = @ZM_HAS_GNUTLS_OPENSSL@
 ZM_HAS_V4L = @ZM_HAS_V4L@
 ZM_HAS_V4L1 = @ZM_HAS_V4L1@
 ZM_HAS_V4L2 = @ZM_HAS_V4L2@
diff --git a/web/skins/mobile/includes/Makefile.in b/web/skins/mobile/includes/Makefile.in
index 2f28d5381..d6bacfffd 100644
--- a/web/skins/mobile/includes/Makefile.in
+++ b/web/skins/mobile/includes/Makefile.in
@@ -152,6 +152,8 @@ ZM_DB_HOST = @ZM_DB_HOST@
 ZM_DB_NAME = @ZM_DB_NAME@
 ZM_DB_PASS = @ZM_DB_PASS@
 ZM_DB_USER = @ZM_DB_USER@
+ZM_HAS_GNUTLS = @ZM_HAS_GNUTLS@
+ZM_HAS_GNUTLS_OPENSSL = @ZM_HAS_GNUTLS_OPENSSL@
 ZM_HAS_V4L = @ZM_HAS_V4L@
 ZM_HAS_V4L1 = @ZM_HAS_V4L1@
 ZM_HAS_V4L2 = @ZM_HAS_V4L2@
diff --git a/web/skins/mobile/lang/Makefile.in b/web/skins/mobile/lang/Makefile.in
index dfb185444..eb2d81cc4 100644
--- a/web/skins/mobile/lang/Makefile.in
+++ b/web/skins/mobile/lang/Makefile.in
@@ -152,6 +152,8 @@ ZM_DB_HOST = @ZM_DB_HOST@
 ZM_DB_NAME = @ZM_DB_NAME@
 ZM_DB_PASS = @ZM_DB_PASS@
 ZM_DB_USER = @ZM_DB_USER@
+ZM_HAS_GNUTLS = @ZM_HAS_GNUTLS@
+ZM_HAS_GNUTLS_OPENSSL = @ZM_HAS_GNUTLS_OPENSSL@
 ZM_HAS_V4L = @ZM_HAS_V4L@
 ZM_HAS_V4L1 = @ZM_HAS_V4L1@
 ZM_HAS_V4L2 = @ZM_HAS_V4L2@
diff --git a/web/skins/mobile/views/Makefile.in b/web/skins/mobile/views/Makefile.in
index 39524acc4..6d60fb035 100644
--- a/web/skins/mobile/views/Makefile.in
+++ b/web/skins/mobile/views/Makefile.in
@@ -192,6 +192,8 @@ ZM_DB_HOST = @ZM_DB_HOST@
 ZM_DB_NAME = @ZM_DB_NAME@
 ZM_DB_PASS = @ZM_DB_PASS@
 ZM_DB_USER = @ZM_DB_USER@
+ZM_HAS_GNUTLS = @ZM_HAS_GNUTLS@
+ZM_HAS_GNUTLS_OPENSSL = @ZM_HAS_GNUTLS_OPENSSL@
 ZM_HAS_V4L = @ZM_HAS_V4L@
 ZM_HAS_V4L1 = @ZM_HAS_V4L1@
 ZM_HAS_V4L2 = @ZM_HAS_V4L2@
diff --git a/web/skins/mobile/views/css/Makefile.in b/web/skins/mobile/views/css/Makefile.in
index 2b07b4d4d..ceafc83fb 100644
--- a/web/skins/mobile/views/css/Makefile.in
+++ b/web/skins/mobile/views/css/Makefile.in
@@ -152,6 +152,8 @@ ZM_DB_HOST = @ZM_DB_HOST@
 ZM_DB_NAME = @ZM_DB_NAME@
 ZM_DB_PASS = @ZM_DB_PASS@
 ZM_DB_USER = @ZM_DB_USER@
+ZM_HAS_GNUTLS = @ZM_HAS_GNUTLS@
+ZM_HAS_GNUTLS_OPENSSL = @ZM_HAS_GNUTLS_OPENSSL@
 ZM_HAS_V4L = @ZM_HAS_V4L@
 ZM_HAS_V4L1 = @ZM_HAS_V4L1@
 ZM_HAS_V4L2 = @ZM_HAS_V4L2@
diff --git a/web/skins/xml/Makefile.in b/web/skins/xml/Makefile.in
index d735b6877..18e50c46f 100644
--- a/web/skins/xml/Makefile.in
+++ b/web/skins/xml/Makefile.in
@@ -192,6 +192,8 @@ ZM_DB_HOST = @ZM_DB_HOST@
 ZM_DB_NAME = @ZM_DB_NAME@
 ZM_DB_PASS = @ZM_DB_PASS@
 ZM_DB_USER = @ZM_DB_USER@
+ZM_HAS_GNUTLS = @ZM_HAS_GNUTLS@
+ZM_HAS_GNUTLS_OPENSSL = @ZM_HAS_GNUTLS_OPENSSL@
 ZM_HAS_V4L = @ZM_HAS_V4L@
 ZM_HAS_V4L1 = @ZM_HAS_V4L1@
 ZM_HAS_V4L2 = @ZM_HAS_V4L2@
diff --git a/web/skins/xml/includes/Makefile.in b/web/skins/xml/includes/Makefile.in
index fe872603b..5ee4e2487 100644
--- a/web/skins/xml/includes/Makefile.in
+++ b/web/skins/xml/includes/Makefile.in
@@ -152,6 +152,8 @@ ZM_DB_HOST = @ZM_DB_HOST@
 ZM_DB_NAME = @ZM_DB_NAME@
 ZM_DB_PASS = @ZM_DB_PASS@
 ZM_DB_USER = @ZM_DB_USER@
+ZM_HAS_GNUTLS = @ZM_HAS_GNUTLS@
+ZM_HAS_GNUTLS_OPENSSL = @ZM_HAS_GNUTLS_OPENSSL@
 ZM_HAS_V4L = @ZM_HAS_V4L@
 ZM_HAS_V4L1 = @ZM_HAS_V4L1@
 ZM_HAS_V4L2 = @ZM_HAS_V4L2@
diff --git a/web/skins/xml/views/Makefile.in b/web/skins/xml/views/Makefile.in
index 8516aecbc..b2971639d 100644
--- a/web/skins/xml/views/Makefile.in
+++ b/web/skins/xml/views/Makefile.in
@@ -192,6 +192,8 @@ ZM_DB_HOST = @ZM_DB_HOST@
 ZM_DB_NAME = @ZM_DB_NAME@
 ZM_DB_PASS = @ZM_DB_PASS@
 ZM_DB_USER = @ZM_DB_USER@
+ZM_HAS_GNUTLS = @ZM_HAS_GNUTLS@
+ZM_HAS_GNUTLS_OPENSSL = @ZM_HAS_GNUTLS_OPENSSL@
 ZM_HAS_V4L = @ZM_HAS_V4L@
 ZM_HAS_V4L1 = @ZM_HAS_V4L1@
 ZM_HAS_V4L2 = @ZM_HAS_V4L2@
diff --git a/web/tools/Makefile.in b/web/tools/Makefile.in
index aeddb0387..9fbe12461 100644
--- a/web/tools/Makefile.in
+++ b/web/tools/Makefile.in
@@ -167,6 +167,8 @@ ZM_DB_HOST = @ZM_DB_HOST@
 ZM_DB_NAME = @ZM_DB_NAME@
 ZM_DB_PASS = @ZM_DB_PASS@
 ZM_DB_USER = @ZM_DB_USER@
+ZM_HAS_GNUTLS = @ZM_HAS_GNUTLS@
+ZM_HAS_GNUTLS_OPENSSL = @ZM_HAS_GNUTLS_OPENSSL@
 ZM_HAS_V4L = @ZM_HAS_V4L@
 ZM_HAS_V4L1 = @ZM_HAS_V4L1@
 ZM_HAS_V4L2 = @ZM_HAS_V4L2@
diff --git a/web/tools/mootools/Makefile.in b/web/tools/mootools/Makefile.in
index b9422d533..a8f02968d 100644
--- a/web/tools/mootools/Makefile.in
+++ b/web/tools/mootools/Makefile.in
@@ -152,6 +152,8 @@ ZM_DB_HOST = @ZM_DB_HOST@
 ZM_DB_NAME = @ZM_DB_NAME@
 ZM_DB_PASS = @ZM_DB_PASS@
 ZM_DB_USER = @ZM_DB_USER@
+ZM_HAS_GNUTLS = @ZM_HAS_GNUTLS@
+ZM_HAS_GNUTLS_OPENSSL = @ZM_HAS_GNUTLS_OPENSSL@
 ZM_HAS_V4L = @ZM_HAS_V4L@
 ZM_HAS_V4L1 = @ZM_HAS_V4L1@
 ZM_HAS_V4L2 = @ZM_HAS_V4L2@
diff --git a/web/views/Makefile.in b/web/views/Makefile.in
index af5e16d6c..9e246a059 100644
--- a/web/views/Makefile.in
+++ b/web/views/Makefile.in
@@ -152,6 +152,8 @@ ZM_DB_HOST = @ZM_DB_HOST@
 ZM_DB_NAME = @ZM_DB_NAME@
 ZM_DB_PASS = @ZM_DB_PASS@
 ZM_DB_USER = @ZM_DB_USER@
+ZM_HAS_GNUTLS = @ZM_HAS_GNUTLS@
+ZM_HAS_GNUTLS_OPENSSL = @ZM_HAS_GNUTLS_OPENSSL@
 ZM_HAS_V4L = @ZM_HAS_V4L@
 ZM_HAS_V4L1 = @ZM_HAS_V4L1@
 ZM_HAS_V4L2 = @ZM_HAS_V4L2@