@@ -1,3 +1,8 @@

+Mon Sep 20 14:16:59 CEST 2010 (acab)

+------------------------------------

+ * libclamav/nsis/bzlib.cld sys: port upstream fixes for CVE-2010-0405,

+				 check for buggy bzip2 (bb#2230, bb#2231)

+

 Mon Sep 20 14:50:34 EEST 2010 (edwin)

 -------------------------------------

  * libclamav/pdf.c: Add missing boundscheck to pdf code (bb #2226)

@@ -1,13 +1,13 @@

 #! /bin/sh

 # Guess values for system-dependent variables and create Makefiles.

-# Generated by GNU Autoconf 2.65 for ClamAV devel.

+# Generated by GNU Autoconf 2.67 for ClamAV devel.

 #

 # Report bugs to <http://bugs.clamav.net/>.

 #

 #

 # 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

@@ -319,7 +319,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

@@ -359,19 +359,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

@@ -684,7 +684,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`

@@ -1061,8 +1061,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.

@@ -1107,7 +1108,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

@@ -1133,7 +1134,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

@@ -1337,7 +1338,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

@@ -1353,7 +1354,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

@@ -1383,8 +1384,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"

     ;;

   *=*)

@@ -1392,7 +1393,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 ;;

@@ -1410,13 +1411,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

@@ -1439,7 +1440,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'

@@ -1453,8 +1454,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

@@ -1469,9 +1470,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.

@@ -1510,11 +1511,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

@@ -1554,7 +1555,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

@@ -1769,9 +1770,9 @@ test -n "$ac_init_help" && exit $ac_status

 if $ac_init_version; then

   cat <<\_ACEOF

 ClamAV configure devel

-generated by GNU Autoconf 2.65

+generated by GNU Autoconf 2.67

-Copyright (C) 2009 Free Software Foundation, Inc.

+Copyright (C) 2010 Free Software Foundation, Inc.

 This configure script is free software; the Free Software Foundation

 gives unlimited permission to copy, distribute and modify it.

 _ACEOF

@@ -1875,7 +1876,7 @@ ac_fn_c_check_header_compile ()

   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack

   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5

 $as_echo_n "checking for $2... " >&6; }

-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :

+if eval "test \"\${$3+set}\"" = set; then :

   $as_echo_n "(cached) " >&6

 else

   cat confdefs.h - <<_ACEOF >conftest.$ac_ext

@@ -1918,7 +1919,7 @@ $as_echo "$ac_try_echo"; } >&5

     mv -f conftest.er1 conftest.err

   fi

   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5

-  test $ac_status = 0; } >/dev/null && {

+  test $ac_status = 0; } > conftest.i && {

 	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

 	 test ! -s conftest.err

        }; then :

@@ -1984,7 +1985,7 @@ ac_fn_c_check_func ()

   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack

   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5

 $as_echo_n "checking for $2... " >&6; }

-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :

+if eval "test \"\${$3+set}\"" = set; then :

   $as_echo_n "(cached) " >&6

 else

   cat confdefs.h - <<_ACEOF >conftest.$ac_ext

@@ -2043,15 +2044,18 @@ $as_echo "$ac_res" >&6; }

 } # ac_fn_c_check_func

-# ac_fn_c_check_decl LINENO SYMBOL VAR

-# ------------------------------------

-# Tests whether SYMBOL is declared, setting cache variable VAR accordingly.

+# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES

+# ---------------------------------------------

+# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR

+# accordingly.

 ac_fn_c_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 "test \"\${$3+set}\"" = set; then :

   $as_echo_n "(cached) " >&6

 else

   cat confdefs.h - <<_ACEOF >conftest.$ac_ext

@@ -2060,8 +2064,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

   ;

@@ -2091,7 +2099,7 @@ ac_fn_c_check_type ()

   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack

   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5

 $as_echo_n "checking for $2... " >&6; }

-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :

+if eval "test \"\${$3+set}\"" = set; then :

   $as_echo_n "(cached) " >&6

 else

   eval "$3=no"

@@ -2144,10 +2152,10 @@ $as_echo "$ac_res" >&6; }

 ac_fn_c_check_header_mongrel ()

 {

   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack

-  if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :

+  if eval "test \"\${$3+set}\"" = set; then :

   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5

 $as_echo_n "checking for $2... " >&6; }

-if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then :

+if eval "test \"\${$3+set}\"" = set; then :

   $as_echo_n "(cached) " >&6

 fi

 eval ac_res=\$$3

@@ -2183,7 +2191,7 @@ if ac_fn_c_try_cpp "$LINENO"; then :

 else

   ac_header_preproc=no

 fi

-rm -f conftest.err conftest.$ac_ext

+rm -f conftest.err conftest.i conftest.$ac_ext

 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5

 $as_echo "$ac_header_preproc" >&6; }

@@ -2206,17 +2214,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://bugs.clamav.net/ ##

-## -------------------------------------- ##

-_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 "test \"\${$3+set}\"" = set; then :

   $as_echo_n "(cached) " >&6

 else

   eval "$3=\$ac_header_compiler"

@@ -2233,7 +2239,7 @@ This file contains any messages produced by compilers while

 running configure, to aid debugging if configure makes a mistake.

 It was created by ClamAV $as_me devel, which was

-generated by GNU Autoconf 2.65.  Invocation command line was

+generated by GNU Autoconf 2.67.  Invocation command line was

   $ $0 $@

@@ -2343,11 +2349,9 @@ trap 'exit_status=$?

   {

     echo

-    cat <<\_ASBOX

-## ---------------- ##

+    $as_echo "## ---------------- ##

 ## Cache variables. ##

-## ---------------- ##

-_ASBOX

+## ---------------- ##"

     echo

     # The following way of writing the cache mishandles newlines in values,

 (

@@ -2381,11 +2385,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

@@ -2398,11 +2400,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

@@ -2416,11 +2416,9 @@ _ASBOX

     fi

     if test -s confdefs.h; then

-      cat <<\_ASBOX

-## ----------- ##

+      $as_echo "## ----------- ##

 ## confdefs.h. ##

-## ----------- ##

-_ASBOX

+## ----------- ##"

       echo

       cat confdefs.h

       echo

@@ -2475,7 +2473,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

@@ -2490,7 +2493,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

@@ -2566,7 +2573,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. ##

@@ -2583,16 +2590,22 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu

 ac_aux_dir=

 for ac_dir in config "$srcdir"/config; 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 config \"$srcdir\"/config" "$LINENO" 5

+  as_fn_error $? "cannot find install-sh, install.sh, or shtool in config \"$srcdir\"/config" "$LINENO" 5

 fi

 # These three variables are undocumented and unsupported,

@@ -2611,7 +2624,7 @@ ac_config_headers="$ac_config_headers clamav-config.h"

 # Make sure we can run config.sub.

 $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||

-  as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5

+  as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5

 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5

 $as_echo_n "checking build system type... " >&6; }

@@ -2622,16 +2635,16 @@ else

 test "x$ac_build_alias" = x &&

   ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"`

 test "x$ac_build_alias" = x &&

-  as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5

+  as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5

 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` ||

-  as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5

+  as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5

 fi

 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5

 $as_echo "$ac_cv_build" >&6; }

 case $ac_cv_build in

 *-*-*) ;;

-*) as_fn_error "invalid value of canonical build" "$LINENO" 5;;

+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;

 esac

 build=$ac_cv_build

 ac_save_IFS=$IFS; IFS='-'

@@ -2656,7 +2669,7 @@ else

   ac_cv_host=$ac_cv_build

 else

   ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` ||

-    as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5

+    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5

 fi

 fi

@@ -2664,7 +2677,7 @@ fi

 $as_echo "$ac_cv_host" >&6; }

 case $ac_cv_host in

 *-*-*) ;;

-*) as_fn_error "invalid value of canonical host" "$LINENO" 5;;

+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;

 esac

 host=$ac_cv_host

 ac_save_IFS=$IFS; IFS='-'

@@ -2689,7 +2702,7 @@ else

   ac_cv_target=$ac_cv_host

 else

   ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` ||

-    as_fn_error "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5

+    as_fn_error $? "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5

 fi

 fi

@@ -2697,7 +2710,7 @@ fi

 $as_echo "$ac_cv_target" >&6; }

 case $ac_cv_target in

 *-*-*) ;;

-*) as_fn_error "invalid value of canonical target" "$LINENO" 5;;

+*) as_fn_error $? "invalid value of canonical target" "$LINENO" 5 ;;

 esac

 target=$ac_cv_target

 ac_save_IFS=$IFS; IFS='-'

@@ -3014,11 +3027,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

@@ -3040,7 +3053,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

@@ -3050,7 +3063,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

@@ -3288,7 +3301,7 @@ done

 $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }

 set x ${MAKE-make}

 ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`

-if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :

+if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :

   $as_echo_n "(cached) " >&6

 else

   cat >conftest.make <<\_ACEOF

@@ -3296,7 +3309,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;;

@@ -3330,7 +3343,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

@@ -3546,7 +3559,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 "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :

   $as_echo_n "(cached) " >&6

 else

   cat >conftest.make <<\_ACEOF

@@ -3554,7 +3567,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;;

@@ -3969,8 +3982,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

@@ -4084,9 +4097,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; }

@@ -4128,8 +4140,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

@@ -4186,9 +4198,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

@@ -4239,8 +4251,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

@@ -4644,7 +4656,7 @@ esac

   done

 IFS=$as_save_IFS

   if test -z "$ac_cv_path_SED"; then

-    as_fn_error "no acceptable sed could be found in \$PATH" "$LINENO" 5

+    as_fn_error $? "no acceptable sed could be found in \$PATH" "$LINENO" 5

   fi

 else

   ac_cv_path_SED=$SED

@@ -4720,7 +4732,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

@@ -4786,7 +4798,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

@@ -4853,7 +4865,7 @@ esac

   done

 IFS=$as_save_IFS

   if test -z "$ac_cv_path_FGREP"; then

-    as_fn_error "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5

+    as_fn_error $? "no acceptable fgrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5

   fi

 else

   ac_cv_path_FGREP=$FGREP

@@ -4969,7 +4981,7 @@ else

   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5

 $as_echo "no" >&6; }

 fi

-test -z "$LD" && as_fn_error "no acceptable ld found in \$PATH" "$LINENO" 5

+test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5

 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5

 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }

 if test "${lt_cv_prog_gnu_ld+set}" = set; then :

@@ -5171,13 +5183,13 @@ if test "${lt_cv_nm_interface+set}" = set; then :

 else

   lt_cv_nm_interface="BSD nm"

   echo "int some_variable = 0;" > conftest.$ac_ext

-  (eval echo "\"\$as_me:5174: $ac_compile\"" >&5)

+  (eval echo "\"\$as_me:5186: $ac_compile\"" >&5)

   (eval "$ac_compile" 2>conftest.err)

   cat conftest.err >&5

-  (eval echo "\"\$as_me:5177: $NM \\\"conftest.$ac_objext\\\"\"" >&5)

+  (eval echo "\"\$as_me:5189: $NM \\\"conftest.$ac_objext\\\"\"" >&5)

   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)

   cat conftest.err >&5

-  (eval echo "\"\$as_me:5180: output\"" >&5)

+  (eval echo "\"\$as_me:5192: output\"" >&5)

   cat conftest.out >&5

   if $GREP 'External.*some_variable' conftest.out > /dev/null; then

     lt_cv_nm_interface="MS dumpbin"

@@ -6372,7 +6384,7 @@ ia64-*-hpux*)

   ;;

 *-*-irix6*)

   # Find out which ABI we are using.

-  echo '#line 6375 "configure"' > conftest.$ac_ext

+  echo '#line 6387 "configure"' > conftest.$ac_ext

   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5

   (eval $ac_compile) 2>&5

   ac_status=$?

@@ -7161,7 +7173,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.

@@ -7177,11 +7189,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

@@ -7220,7 +7232,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.

@@ -7236,18 +7248,18 @@ else

 ac_preproc_ok=:

 break

 fi

-rm -f conftest.err conftest.$ac_ext

+rm -f conftest.err conftest.i conftest.$ac_ext

 done

 # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.

-rm -f conftest.err conftest.$ac_ext

+rm -f conftest.i conftest.err conftest.$ac_ext

 if $ac_preproc_ok; then :

 else

   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5

 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}

-as_fn_error "C preprocessor \"$CPP\" fails sanity check

-See \`config.log' for more details." "$LINENO" 5; }

+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check

+See \`config.log' for more details" "$LINENO" 5 ; }

 fi

 ac_ext=c

@@ -7376,8 +7388,7 @@ do :

   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`

 ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default

 "

-eval as_val=\$$as_ac_Header

-   if test "x$as_val" = x""yes; then :

+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :

   cat >>confdefs.h <<_ACEOF

 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1

 _ACEOF

@@ -7900,11 +7911,11 @@ else

    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

    -e 's:$: $lt_compiler_flag:'`

-   (eval echo "\"\$as_me:7903: $lt_compile\"" >&5)

+   (eval echo "\"\$as_me:7914: $lt_compile\"" >&5)

    (eval "$lt_compile" 2>conftest.err)

    ac_status=$?

    cat conftest.err >&5

-   echo "$as_me:7907: \$? = $ac_status" >&5

+   echo "$as_me:7918: \$? = $ac_status" >&5

    if (exit $ac_status) && test -s "$ac_outfile"; then

      # The compiler can only warn and ignore the option if not recognized

      # So say no if there are warnings other than the usual output.

@@ -8239,11 +8250,11 @@ else

    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

    -e 's:$: $lt_compiler_flag:'`

-   (eval echo "\"\$as_me:8242: $lt_compile\"" >&5)

+   (eval echo "\"\$as_me:8253: $lt_compile\"" >&5)

    (eval "$lt_compile" 2>conftest.err)

    ac_status=$?

    cat conftest.err >&5

-   echo "$as_me:8246: \$? = $ac_status" >&5

+   echo "$as_me:8257: \$? = $ac_status" >&5

    if (exit $ac_status) && test -s "$ac_outfile"; then

      # The compiler can only warn and ignore the option if not recognized

      # So say no if there are warnings other than the usual output.

@@ -8344,11 +8355,11 @@ else

    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

    -e 's:$: $lt_compiler_flag:'`

-   (eval echo "\"\$as_me:8347: $lt_compile\"" >&5)

+   (eval echo "\"\$as_me:8358: $lt_compile\"" >&5)

    (eval "$lt_compile" 2>out/conftest.err)

    ac_status=$?

    cat out/conftest.err >&5

-   echo "$as_me:8351: \$? = $ac_status" >&5

+   echo "$as_me:8362: \$? = $ac_status" >&5

    if (exit $ac_status) && test -s out/conftest2.$ac_objext

    then

      # The compiler can only warn and ignore the option if not recognized

@@ -8399,11 +8410,11 @@ else

    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

    -e 's:$: $lt_compiler_flag:'`

-   (eval echo "\"\$as_me:8402: $lt_compile\"" >&5)

+   (eval echo "\"\$as_me:8413: $lt_compile\"" >&5)

    (eval "$lt_compile" 2>out/conftest.err)

    ac_status=$?

    cat out/conftest.err >&5

-   echo "$as_me:8406: \$? = $ac_status" >&5

+   echo "$as_me:8417: \$? = $ac_status" >&5

    if (exit $ac_status) && test -s out/conftest2.$ac_objext

    then

      # The compiler can only warn and ignore the option if not recognized

@@ -10783,7 +10794,7 @@ else

   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

   lt_status=$lt_dlunknown

   cat > conftest.$ac_ext <<_LT_EOF

-#line 10786 "configure"

+#line 10797 "configure"

 #include "confdefs.h"

 #if HAVE_DLFCN_H

@@ -10879,7 +10890,7 @@ else

   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

   lt_status=$lt_dlunknown

   cat > conftest.$ac_ext <<_LT_EOF

-#line 10882 "configure"

+#line 10893 "configure"

 #include "confdefs.h"

 #if HAVE_DLFCN_H

@@ -11551,7 +11562,7 @@ else

   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

   lt_status=$lt_dlunknown

   cat > conftest.$ac_ext <<_LT_EOF

-#line 11554 "configure"

+#line 11565 "configure"

 #include "confdefs.h"

 #if HAVE_DLFCN_H

@@ -11788,8 +11799,7 @@ for ac_func in argz_add argz_append argz_count argz_create_sep argz_insert \

 do :

   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`

 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"

-eval as_val=\$$as_ac_var

-   if test "x$as_val" = x""yes; then :

+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :

   cat >>confdefs.h <<_ACEOF

 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1

 _ACEOF

@@ -11966,7 +11976,7 @@ fi

 if test -n "$with_ltdl_include"; then

   if test -f "$with_ltdl_include/ltdl.h"; then :

   else

-    as_fn_error "invalid ltdl include directory: \`$with_ltdl_include'" "$LINENO" 5

+    as_fn_error $? "invalid ltdl include directory: \`$with_ltdl_include'" "$LINENO" 5

   fi

 else

   with_ltdl_include=no

@@ -11982,7 +11992,7 @@ fi

 if test -n "$with_ltdl_lib"; then

   if test -f "$with_ltdl_lib/libltdl.la"; then :