@@ -1,3 +1,9 @@

+Sat Dec  2 01:02:45 CET 2006 (tk)

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

+  * libclamav: reorganize the NodalCore code and add support for runtime

+	       detection and loading of the acceleration library; based on

+	       patch from Peter Duthie <peter.duthie*sensorynetworks.com>

+

 Thu Nov 30 09:35:46 GMT 2006 (njh)

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

   * libclamav/mbox.c:	Fix compilation errors when SAVE_TO_DISC is not defined

@@ -168,7 +168,7 @@

 /* Define to 1 if you have a working `mmap' system call. */

 #undef HAVE_MMAP

-/* hardware acceleration */

+/* Support for NodalCore acceleration */

 #undef HAVE_NCORE

 /* Define to 1 if you have the <ndir.h> header file. */

@@ -1,6 +1,6 @@

 #! /bin/sh

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

-# Generated by GNU Autoconf 2.60a.

+# Generated by GNU Autoconf 2.61.

 #

 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,

 # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.

@@ -10,7 +10,8 @@

 ## M4sh Initialization.  ##

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

-# Be Bourne compatible

+# Be more Bourne compatible

+DUALCASE=1; export DUALCASE # for MKS sh

 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then

   emulate sh

   NULLCMD=:

@@ -19,10 +20,13 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then

   alias -g '${1+"$@"}'='"$@"'

   setopt NO_GLOB_SUBST

 else

-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac

+  case `(set -o) 2>/dev/null` in

+  *posix*) set -o posix ;;

+esac

+

 fi

-BIN_SH=xpg4; export BIN_SH # for Tru64

-DUALCASE=1; export DUALCASE # for MKS sh

+

+

 # PATH needs CR

@@ -215,7 +219,7 @@ test \$exitcode = 0) || { (exit 1); exit 1; }

 else

   as_candidate_shells=

     as_save_IFS=$IFS; IFS=$PATH_SEPARATOR

-for as_dir in /usr/bin/posix$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH

+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH

 do

   IFS=$as_save_IFS

   test -z "$as_dir" && as_dir=.

@@ -233,7 +237,6 @@ IFS=$as_save_IFS

 	 # Try only shells that exist, to save several forks.

 	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&

 		{ ("$as_shell") 2> /dev/null <<\_ASEOF

-# Be Bourne compatible

 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then

   emulate sh

   NULLCMD=:

@@ -242,10 +245,12 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then

   alias -g '${1+"$@"}'='"$@"'

   setopt NO_GLOB_SUBST

 else

-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac

+  case `(set -o) 2>/dev/null` in

+  *posix*) set -o posix ;;

+esac

+

 fi

-BIN_SH=xpg4; export BIN_SH # for Tru64

-DUALCASE=1; export DUALCASE # for MKS sh

+

 :

 _ASEOF

@@ -253,7 +258,6 @@ _ASEOF

   CONFIG_SHELL=$as_shell

 	       as_have_required=yes

 	       if { "$as_shell" 2> /dev/null <<\_ASEOF

-# Be Bourne compatible

 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then

   emulate sh

   NULLCMD=:

@@ -262,10 +266,12 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then

   alias -g '${1+"$@"}'='"$@"'

   setopt NO_GLOB_SUBST

 else

-  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac

+  case `(set -o) 2>/dev/null` in

+  *posix*) set -o posix ;;

+esac

+

 fi

-BIN_SH=xpg4; export BIN_SH # for Tru64

-DUALCASE=1; export DUALCASE # for MKS sh

+

 :

 (as_func_return () {

@@ -512,19 +518,28 @@ else

   as_mkdir_p=false

 fi

-# Find out whether ``test -x'' works.  Don't use a zero-byte file, as

-# systems may use methods other than mode bits to determine executability.

-cat >conf$$.file <<_ASEOF

-#! /bin/sh

-exit 0

-_ASEOF

-chmod +x conf$$.file

-if test -x conf$$.file >/dev/null 2>&1; then

-  as_executable_p="test -x"

+if test -x / >/dev/null 2>&1; then

+  as_test_x='test -x'

 else

-  as_executable_p=:

+  if ls -dL / >/dev/null 2>&1; then

+    as_ls_L_option=L

+  else

+    as_ls_L_option=

+  fi

+  as_test_x='

+    eval sh -c '\''

+      if test -d "$1"; then

+        test -d "$1/.";

+      else

+	case $1 in

+        -*)set "./$1";;

+	esac;

+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in

+	???[sx]*):;;*)false;;esac;fi

+    '\'' sh

+  '

 fi

-rm -f conf$$.file

+as_executable_p=$as_test_x

 # Sed expression to map a string onto a valid CPP name.

 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"

@@ -879,6 +894,7 @@ target_alias

 CC

 CFLAGS

 LDFLAGS

+LIBS

 CPPFLAGS

 CPP'

@@ -986,10 +1002,10 @@ do

   -disable-* | --disable-*)

     ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`

     # Reject names that are not valid shell variable names.

-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&

+    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&

       { echo "$as_me: error: invalid feature name: $ac_feature" >&2

    { (exit 1); exit 1; }; }

-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`

+    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`

     eval enable_$ac_feature=no ;;

   -docdir | --docdir | --docdi | --doc | --do)

@@ -1005,10 +1021,10 @@ do

   -enable-* | --enable-*)

     ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`

     # Reject names that are not valid shell variable names.

-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&

+    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&

       { echo "$as_me: error: invalid feature name: $ac_feature" >&2

    { (exit 1); exit 1; }; }

-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`

+    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`

     eval enable_$ac_feature=\$ac_optarg ;;

   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \

@@ -1202,19 +1218,19 @@ do

   -with-* | --with-*)

     ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`

     # Reject names that are not valid shell variable names.

-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&

+    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&

       { echo "$as_me: error: invalid package name: $ac_package" >&2

    { (exit 1); exit 1; }; }

-    ac_package=`echo $ac_package| sed 's/-/_/g'`

+    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`

     eval with_$ac_package=\$ac_optarg ;;

   -without-* | --without-*)

     ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`

     # Reject names that are not valid shell variable names.

-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&

+    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&

       { echo "$as_me: error: invalid package name: $ac_package" >&2

    { (exit 1); exit 1; }; }

-    ac_package=`echo $ac_package | sed 's/-/_/g'`

+    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`

     eval with_$ac_package=no ;;

   --x)

@@ -1509,6 +1525,7 @@ Some influential environment variables:

   CFLAGS      C compiler flags

   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a

               nonstandard directory <lib dir>

+  LIBS        libraries to pass to the linker, e.g. -l<library>

   CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if

               you have headers in a nonstandard directory <include dir>

   CPP         C preprocessor

@@ -1577,7 +1594,7 @@ test -n "$ac_init_help" && exit $ac_status

 if $ac_init_version; then

   cat <<\_ACEOF

 configure

-generated by GNU Autoconf 2.60a

+generated by GNU Autoconf 2.61

 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,

 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.

@@ -1591,7 +1608,7 @@ This file contains any messages produced by compilers while

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

 It was created by $as_me, which was

-generated by GNU Autoconf 2.60a.  Invocation command line was

+generated by GNU Autoconf 2.61.  Invocation command line was

   $ $0 $@

@@ -2316,7 +2333,7 @@ case $as_dir/ in

     # by default.

     for ac_prog in ginstall scoinst install; do

       for ac_exec_ext in '' $ac_executable_extensions; do

-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then

+	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then

 	  if test $ac_prog = install &&

 	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then

 	    # AIX install.  It has an incompatible calling convention.

@@ -2482,7 +2499,7 @@ do

   IFS=$as_save_IFS

   test -z "$as_dir" && as_dir=.

   for ac_exec_ext in '' $ac_executable_extensions; do

-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then

+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

     ac_cv_prog_AWK="$ac_prog"

     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

     break 2

@@ -2617,7 +2634,7 @@ do

   IFS=$as_save_IFS

   test -z "$as_dir" && as_dir=.

   for ac_exec_ext in '' $ac_executable_extensions; do

-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then

+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

     ac_cv_prog_STRIP="${ac_tool_prefix}strip"

     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

     break 2

@@ -2657,7 +2674,7 @@ do

   IFS=$as_save_IFS

   test -z "$as_dir" && as_dir=.

   for ac_exec_ext in '' $ac_executable_extensions; do

-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then

+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

     ac_cv_prog_ac_ct_STRIP="strip"

     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

     break 2

@@ -2738,7 +2755,7 @@ do

   IFS=$as_save_IFS

   test -z "$as_dir" && as_dir=.

   for ac_exec_ext in '' $ac_executable_extensions; do

-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then

+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

     ac_cv_prog_AWK="$ac_prog"

     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

     break 2

@@ -2784,7 +2801,7 @@ do

   IFS=$as_save_IFS

   test -z "$as_dir" && as_dir=.

   for ac_exec_ext in '' $ac_executable_extensions; do

-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then

+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

     ac_cv_prog_CC="${ac_tool_prefix}gcc"

     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

     break 2

@@ -2824,7 +2841,7 @@ do

   IFS=$as_save_IFS

   test -z "$as_dir" && as_dir=.

   for ac_exec_ext in '' $ac_executable_extensions; do

-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then

+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

     ac_cv_prog_ac_ct_CC="gcc"

     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

     break 2

@@ -2881,7 +2898,7 @@ do

   IFS=$as_save_IFS

   test -z "$as_dir" && as_dir=.

   for ac_exec_ext in '' $ac_executable_extensions; do

-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then

+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

     ac_cv_prog_CC="${ac_tool_prefix}cc"

     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

     break 2

@@ -2922,7 +2939,7 @@ do

   IFS=$as_save_IFS

   test -z "$as_dir" && as_dir=.

   for ac_exec_ext in '' $ac_executable_extensions; do

-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then

+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then

        ac_prog_rejected=yes

        continue

@@ -2980,7 +2997,7 @@ do

   IFS=$as_save_IFS

   test -z "$as_dir" && as_dir=.

   for ac_exec_ext in '' $ac_executable_extensions; do

-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then

+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"

     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

     break 2

@@ -3024,7 +3041,7 @@ do

   IFS=$as_save_IFS

   test -z "$as_dir" && as_dir=.

   for ac_exec_ext in '' $ac_executable_extensions; do

-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then

+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

     ac_cv_prog_ac_ct_CC="$ac_prog"

     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

     break 2

@@ -3387,27 +3404,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

   rm -f conftest.er1

   cat conftest.err >&5

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

-  (exit $ac_status); } &&

-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

-  { (case "(($ac_try" in

-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

-  *) ac_try_echo=$ac_try;;

-esac

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

-  (eval "$ac_try") 2>&5

-  ac_status=$?

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

-  (exit $ac_status); }; } &&

-	 { ac_try='test -s conftest.$ac_objext'

-  { (case "(($ac_try" in

-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

-  *) ac_try_echo=$ac_try;;

-esac

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

-  (eval "$ac_try") 2>&5

-  ac_status=$?

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

-  (exit $ac_status); }; }; then

+  (exit $ac_status); } && {

+	 test -z "$ac_c_werror_flag" ||

+	 test ! -s conftest.err

+       } && test -s conftest.$ac_objext; then

   ac_compiler_gnu=yes

 else

   echo "$as_me: failed program was:" >&5

@@ -3462,27 +3462,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

   rm -f conftest.er1

   cat conftest.err >&5

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

-  (exit $ac_status); } &&

-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

-  { (case "(($ac_try" in

-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

-  *) ac_try_echo=$ac_try;;

-esac

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

-  (eval "$ac_try") 2>&5

-  ac_status=$?

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

-  (exit $ac_status); }; } &&

-	 { ac_try='test -s conftest.$ac_objext'

-  { (case "(($ac_try" in

-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

-  *) ac_try_echo=$ac_try;;

-esac

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

-  (eval "$ac_try") 2>&5

-  ac_status=$?

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

-  (exit $ac_status); }; }; then

+  (exit $ac_status); } && {

+	 test -z "$ac_c_werror_flag" ||

+	 test ! -s conftest.err

+       } && test -s conftest.$ac_objext; then

   ac_cv_prog_cc_g=yes

 else

   echo "$as_me: failed program was:" >&5

@@ -3517,27 +3500,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

   rm -f conftest.er1

   cat conftest.err >&5

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

-  (exit $ac_status); } &&

-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

-  { (case "(($ac_try" in

-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

-  *) ac_try_echo=$ac_try;;

-esac

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

-  (eval "$ac_try") 2>&5

-  ac_status=$?

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

-  (exit $ac_status); }; } &&

-	 { ac_try='test -s conftest.$ac_objext'

-  { (case "(($ac_try" in

-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

-  *) ac_try_echo=$ac_try;;

-esac

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

-  (eval "$ac_try") 2>&5

-  ac_status=$?

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

-  (exit $ac_status); }; }; then

+  (exit $ac_status); } && {

+	 test -z "$ac_c_werror_flag" ||

+	 test ! -s conftest.err

+       } && test -s conftest.$ac_objext; then

   :

 else

   echo "$as_me: failed program was:" >&5

@@ -3573,27 +3539,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

   rm -f conftest.er1

   cat conftest.err >&5

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

-  (exit $ac_status); } &&

-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

-  { (case "(($ac_try" in

-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

-  *) ac_try_echo=$ac_try;;

-esac

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

-  (eval "$ac_try") 2>&5

-  ac_status=$?

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

-  (exit $ac_status); }; } &&

-	 { ac_try='test -s conftest.$ac_objext'

-  { (case "(($ac_try" in

-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

-  *) ac_try_echo=$ac_try;;

-esac

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

-  (eval "$ac_try") 2>&5

-  ac_status=$?

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

-  (exit $ac_status); }; }; then

+  (exit $ac_status); } && {

+	 test -z "$ac_c_werror_flag" ||

+	 test ! -s conftest.err

+       } && test -s conftest.$ac_objext; then

   ac_cv_prog_cc_g=yes

 else

   echo "$as_me: failed program was:" >&5

@@ -3709,27 +3658,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

   rm -f conftest.er1

   cat conftest.err >&5

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

-  (exit $ac_status); } &&

-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

-  { (case "(($ac_try" in

-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

-  *) ac_try_echo=$ac_try;;

-esac

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

-  (eval "$ac_try") 2>&5

-  ac_status=$?

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

-  (exit $ac_status); }; } &&

-	 { ac_try='test -s conftest.$ac_objext'

-  { (case "(($ac_try" in

-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

-  *) ac_try_echo=$ac_try;;

-esac

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

-  (eval "$ac_try") 2>&5

-  ac_status=$?

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

-  (exit $ac_status); }; }; then

+  (exit $ac_status); } && {

+	 test -z "$ac_c_werror_flag" ||

+	 test ! -s conftest.err

+       } && test -s conftest.$ac_objext; then

   ac_cv_prog_cc_c89=$ac_arg

 else

   echo "$as_me: failed program was:" >&5

@@ -3976,7 +3908,7 @@ case $as_dir/ in

     # by default.

     for ac_prog in ginstall scoinst install; do

       for ac_exec_ext in '' $ac_executable_extensions; do

-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then

+	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then

 	  if test $ac_prog = install &&

 	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then

 	    # AIX install.  It has an incompatible calling convention.

@@ -4496,7 +4428,7 @@ do

   for ac_prog in grep ggrep; do

   for ac_exec_ext in '' $ac_executable_extensions; do

     ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"

-    { test -f "$ac_path_GREP" && $as_executable_p "$ac_path_GREP"; } || continue

+    { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue

     # Check for GNU ac_path_GREP and select it if it is found.

   # Check for GNU $ac_path_GREP

 case `"$ac_path_GREP" --version 2>&1` in

@@ -4578,7 +4510,7 @@ do

   for ac_prog in egrep; do

   for ac_exec_ext in '' $ac_executable_extensions; do

     ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"

-    { test -f "$ac_path_EGREP" && $as_executable_p "$ac_path_EGREP"; } || continue

+    { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue

     # Check for GNU ac_path_EGREP and select it if it is found.

   # Check for GNU $ac_path_EGREP

 case `"$ac_path_EGREP" --version 2>&1` in

@@ -4888,17 +4820,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

   rm -f conftest.er1

   cat conftest.err >&5

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

-  (exit $ac_status); } >/dev/null; then

-  if test -s conftest.err; then

-    ac_cpp_err=$ac_c_preproc_warn_flag

-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag

-  else

-    ac_cpp_err=

-  fi

-else

-  ac_cpp_err=yes

-fi

-if test -z "$ac_cpp_err"; then

+  (exit $ac_status); } >/dev/null && {

+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

+	 test ! -s conftest.err

+       }; then

   :

 else

   echo "$as_me: failed program was:" >&5

@@ -4932,17 +4857,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

   rm -f conftest.er1

   cat conftest.err >&5

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

-  (exit $ac_status); } >/dev/null; then

-  if test -s conftest.err; then

-    ac_cpp_err=$ac_c_preproc_warn_flag

-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag

-  else

-    ac_cpp_err=

-  fi

-else

-  ac_cpp_err=yes

-fi

-if test -z "$ac_cpp_err"; then

+  (exit $ac_status); } >/dev/null && {

+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

+	 test ! -s conftest.err

+       }; then

   # Broken: success on invalid input.

 continue

 else

@@ -5007,17 +4925,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

   rm -f conftest.er1

   cat conftest.err >&5

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

-  (exit $ac_status); } >/dev/null; then

-  if test -s conftest.err; then

-    ac_cpp_err=$ac_c_preproc_warn_flag

-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag

-  else

-    ac_cpp_err=

-  fi

-else

-  ac_cpp_err=yes

-fi

-if test -z "$ac_cpp_err"; then

+  (exit $ac_status); } >/dev/null && {

+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

+	 test ! -s conftest.err

+       }; then

   :

 else

   echo "$as_me: failed program was:" >&5

@@ -5051,17 +4962,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

   rm -f conftest.er1

   cat conftest.err >&5

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

-  (exit $ac_status); } >/dev/null; then

-  if test -s conftest.err; then

-    ac_cpp_err=$ac_c_preproc_warn_flag

-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag

-  else

-    ac_cpp_err=

-  fi

-else

-  ac_cpp_err=yes

-fi

-if test -z "$ac_cpp_err"; then

+  (exit $ac_status); } >/dev/null && {

+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

+	 test ! -s conftest.err

+       }; then

   # Broken: success on invalid input.

 continue

 else

@@ -5132,27 +5036,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

   rm -f conftest.er1

   cat conftest.err >&5

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

-  (exit $ac_status); } &&

-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

-  { (case "(($ac_try" in

-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

-  *) ac_try_echo=$ac_try;;

-esac

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

-  (eval "$ac_try") 2>&5

-  ac_status=$?

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

-  (exit $ac_status); }; } &&

-	 { ac_try='test -s conftest.$ac_objext'

-  { (case "(($ac_try" in

-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

-  *) ac_try_echo=$ac_try;;

-esac

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

-  (eval "$ac_try") 2>&5

-  ac_status=$?

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

-  (exit $ac_status); }; }; then

+  (exit $ac_status); } && {

+	 test -z "$ac_c_werror_flag" ||

+	 test ! -s conftest.err

+       } && test -s conftest.$ac_objext; then

   ac_cv_header_stdc=yes

 else

   echo "$as_me: failed program was:" >&5

@@ -5328,27 +5215,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

   rm -f conftest.er1

   cat conftest.err >&5

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

-  (exit $ac_status); } &&

-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

-  { (case "(($ac_try" in

-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

-  *) ac_try_echo=$ac_try;;

-esac

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

-  (eval "$ac_try") 2>&5

-  ac_status=$?

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

-  (exit $ac_status); }; } &&

-	 { ac_try='test -s conftest.$ac_objext'

-  { (case "(($ac_try" in

-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

-  *) ac_try_echo=$ac_try;;

-esac

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

-  (eval "$ac_try") 2>&5

-  ac_status=$?

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

-  (exit $ac_status); }; }; then

+  (exit $ac_status); } && {

+	 test -z "$ac_c_werror_flag" ||

+	 test ! -s conftest.err

+       } && test -s conftest.$ac_objext; then

   eval "$as_ac_Header=yes"

 else

   echo "$as_me: failed program was:" >&5

@@ -5411,27 +5281,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

   rm -f conftest.er1

   cat conftest.err >&5

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

-  (exit $ac_status); } &&

-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

-  { (case "(($ac_try" in

-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

-  *) ac_try_echo=$ac_try;;

-esac

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

-  (eval "$ac_try") 2>&5

-  ac_status=$?

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

-  (exit $ac_status); }; } &&

-	 { ac_try='test -s conftest.$ac_objext'

-  { (case "(($ac_try" in

-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

-  *) ac_try_echo=$ac_try;;

-esac

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

-  (eval "$ac_try") 2>&5

-  ac_status=$?

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

-  (exit $ac_status); }; }; then

+  (exit $ac_status); } && {

+	 test -z "$ac_c_werror_flag" ||

+	 test ! -s conftest.err

+       } && test -s conftest.$ac_objext; then

   ac_header_compiler=yes

 else

   echo "$as_me: failed program was:" >&5

@@ -5467,17 +5320,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

   rm -f conftest.er1

   cat conftest.err >&5

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

-  (exit $ac_status); } >/dev/null; then

-  if test -s conftest.err; then

-    ac_cpp_err=$ac_c_preproc_warn_flag

-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag

-  else

-    ac_cpp_err=

-  fi

-else

-  ac_cpp_err=yes

-fi

-if test -z "$ac_cpp_err"; then

+  (exit $ac_status); } >/dev/null && {

+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||

+	 test ! -s conftest.err

+       }; then

   ac_header_preproc=yes

 else

   echo "$as_me: failed program was:" >&5

@@ -5696,7 +5542,7 @@ do

   IFS=$as_save_IFS

   test -z "$as_dir" && as_dir=.

   for ac_exec_ext in '' $ac_executable_extensions; do

-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then

+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"

     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

     break 2

@@ -5736,7 +5582,7 @@ do

   IFS=$as_save_IFS

   test -z "$as_dir" && as_dir=.

   for ac_exec_ext in '' $ac_executable_extensions; do

-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then

+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

     ac_cv_prog_ac_ct_RANLIB="ranlib"

     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

     break 2

@@ -5792,7 +5638,7 @@ do

   IFS=$as_save_IFS

   test -z "$as_dir" && as_dir=.

   for ac_exec_ext in '' $ac_executable_extensions; do

-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then

+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

     ac_cv_prog_STRIP="${ac_tool_prefix}strip"

     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

     break 2

@@ -5832,7 +5678,7 @@ do

   IFS=$as_save_IFS

   test -z "$as_dir" && as_dir=.

   for ac_exec_ext in '' $ac_executable_extensions; do

-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then

+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then

     ac_cv_prog_ac_ct_STRIP="strip"

     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5

     break 2

@@ -5887,7 +5733,7 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes

 case $host in

 *-*-irix6*)

   # Find out which ABI we are using.

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

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

   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5

   (eval $ac_compile) 2>&5

   ac_status=$?

@@ -5970,27 +5816,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

   rm -f conftest.er1

   cat conftest.err >&5

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

-  (exit $ac_status); } &&

-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

-  { (case "(($ac_try" in

-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

-  *) ac_try_echo=$ac_try;;

-esac

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

-  (eval "$ac_try") 2>&5

-  ac_status=$?

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

-  (exit $ac_status); }; } &&

-	 { ac_try='test -s conftest$ac_exeext'

-  { (case "(($ac_try" in

-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

-  *) ac_try_echo=$ac_try;;

-esac

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

-  (eval "$ac_try") 2>&5

-  ac_status=$?

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

-  (exit $ac_status); }; }; then

+  (exit $ac_status); } && {

+	 test -z "$ac_c_werror_flag" ||

+	 test ! -s conftest.err

+       } && test -s conftest$ac_exeext &&

+       $as_test_x conftest$ac_exeext; then

   lt_cv_cc_needs_belf=yes

 else

   echo "$as_me: failed program was:" >&5

@@ -6332,27 +6162,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

   rm -f conftest.er1

   cat conftest.err >&5

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

-  (exit $ac_status); } &&

-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

-  { (case "(($ac_try" in

-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

-  *) ac_try_echo=$ac_try;;

-esac

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

-  (eval "$ac_try") 2>&5

-  ac_status=$?

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

-  (exit $ac_status); }; } &&

-	 { ac_try='test -s conftest.$ac_objext'

-  { (case "(($ac_try" in

-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

-  *) ac_try_echo=$ac_try;;

-esac

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

-  (eval "$ac_try") 2>&5

-  ac_status=$?

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

-  (exit $ac_status); }; }; then

+  (exit $ac_status); } && {

+	 test -z "$ac_c_werror_flag" ||

+	 test ! -s conftest.err

+       } && test -s conftest.$ac_objext; then

         case $host_os in

       hpux9* | hpux10* | hpux11*)

 	# On HP-UX, both CC and GCC only warn that PIC is supported... then

@@ -6446,27 +6259,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

   rm -f conftest.er1

   cat conftest.err >&5

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

-  (exit $ac_status); } &&

-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

-  { (case "(($ac_try" in

-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

-  *) ac_try_echo=$ac_try;;

-esac

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

-  (eval "$ac_try") 2>&5

-  ac_status=$?

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

-  (exit $ac_status); }; } &&

-	 { ac_try='test -s conftest$ac_exeext'

-  { (case "(($ac_try" in

-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

-  *) ac_try_echo=$ac_try;;

-esac

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

-  (eval "$ac_try") 2>&5

-  ac_status=$?

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

-  (exit $ac_status); }; }; then

+  (exit $ac_status); } && {

+	 test -z "$ac_c_werror_flag" ||

+	 test ! -s conftest.err

+       } && test -s conftest$ac_exeext &&

+       $as_test_x conftest$ac_exeext; then

   lt_cv_prog_cc_static_works=yes

 else

   echo "$as_me: failed program was:" >&5

@@ -6520,7 +6317,7 @@ chmod -w .

 save_CFLAGS="$CFLAGS"

 CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"

 compiler_c_o=no

-if { (eval echo configure:6523: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then

+if { (eval echo configure:6320: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then

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

   # So say no if there are warnings

   if test -s out/conftest.err; then

@@ -6588,27 +6385,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

   rm -f conftest.er1

   cat conftest.err >&5

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

-  (exit $ac_status); } &&

-	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'

-  { (case "(($ac_try" in

-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

-  *) ac_try_echo=$ac_try;;

-esac

-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5

-  (eval "$ac_try") 2>&5

-  ac_status=$?

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

-  (exit $ac_status); }; } &&

-	 { ac_try='test -s conftest.$ac_objext'

-  { (case "(($ac_try" in

-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;

-  *) ac_try_echo=$ac_try;;

-esac