@@ -1,10 +1,15 @@

-Mon Apr 18 11:55:48 BST 2005

+Tue Apr 19 01:26:56 CEST 2005 (tk)

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

+  * libclamav/unrarlib.[ch]: removed

+

+Mon Apr 18 11:55:48 BST 2005 (njh)

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

   * clamav-milter:	Fixed a multi-threading problem relating to updating

 				the database when in internal mode

 			Use HAVE_CTIME_R_[23]

 Thu Apr 14 19:39:49 BST 2005 (trog)

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

   * libclamav/scanners.c, libclamav/vba_extract.[ch]:

 	Decode and scan OLE objects embedded in MS Office documents.

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

-# Makefile.in generated by automake 1.8.5 from Makefile.am.

+# Makefile.in generated by automake 1.9.5 from Makefile.am.

 # @configure_input@

 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,

-# 2003, 2004  Free Software Foundation, Inc.

+# 2003, 2004, 2005  Free Software Foundation, Inc.

 # This Makefile.in is free software; the Free Software Foundation

 # gives unlimited permission to copy and/or distribute it,

 # with or without modifications, as long as this notice is preserved.

@@ -88,6 +88,12 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \

 	install-recursive installcheck-recursive installdirs-recursive \

 	pdf-recursive ps-recursive uninstall-info-recursive \

 	uninstall-recursive

+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;

+am__vpath_adj = case $$p in \

+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \

+    *) f=$$p;; \

+  esac;

+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;

 pkgconfigDATA_INSTALL = $(INSTALL_DATA)

 DATA = $(pkgconfig_DATA)

 ETAGS = etags

@@ -178,6 +184,8 @@ am__fastdepCC_TRUE = @am__fastdepCC_TRUE@

 am__include = @am__include@

 am__leading_dot = @am__leading_dot@

 am__quote = @am__quote@

+am__tar = @am__tar@

+am__untar = @am__untar@

 bindir = @bindir@

 build = @build@

 build_alias = @build_alias@

@@ -315,7 +323,7 @@ install-pkgconfigDATA: $(pkgconfig_DATA)

 	test -z "$(pkgconfigdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfigdir)"

 	@list='$(pkgconfig_DATA)'; for p in $$list; do \

 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \

-	  f="`echo $$p | sed -e 's|^.*/||'`"; \

+	  f=$(am__strip_dir) \

 	  echo " $(pkgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdir)/$$f'"; \

 	  $(pkgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdir)/$$f"; \

 	done

@@ -323,7 +331,7 @@ install-pkgconfigDATA: $(pkgconfig_DATA)

 uninstall-pkgconfigDATA:

 	@$(NORMAL_UNINSTALL)

 	@list='$(pkgconfig_DATA)'; for p in $$list; do \

-	  f="`echo $$p | sed -e 's|^.*/||'`"; \

+	  f=$(am__strip_dir) \

 	  echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \

 	  rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \

 	done

@@ -335,7 +343,13 @@ uninstall-pkgconfigDATA:

 #     (which will cause the Makefiles to be regenerated when you run `make');

 # (2) otherwise, pass the desired values on the `make' command line.

 $(RECURSIVE_TARGETS):

-	@set fnord $$MAKEFLAGS; amf=$$2; \

+	@failcom='exit 1'; \

+	for f in x $$MAKEFLAGS; do \

+	  case $$f in \

+	    *=* | --[!k]*);; \

+	    *k*) failcom='fail=yes';; \

+	  esac; \

+	done; \

 	dot_seen=no; \

 	target=`echo $@ | sed s/-recursive//`; \

 	list='$(SUBDIRS)'; for subdir in $$list; do \

@@ -347,7 +361,7 @@ $(RECURSIVE_TARGETS):

 	    local_target="$$target"; \

 	  fi; \

 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \

-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \

+	  || eval $$failcom; \

 	done; \

 	if test "$$dot_seen" = "no"; then \

 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \

@@ -355,7 +369,13 @@ $(RECURSIVE_TARGETS):

 mostlyclean-recursive clean-recursive distclean-recursive \

 maintainer-clean-recursive:

-	@set fnord $$MAKEFLAGS; amf=$$2; \

+	@failcom='exit 1'; \

+	for f in x $$MAKEFLAGS; do \

+	  case $$f in \

+	    *=* | --[!k]*);; \

+	    *k*) failcom='fail=yes';; \

+	  esac; \

+	done; \

 	dot_seen=no; \

 	case "$@" in \

 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \

@@ -376,7 +396,7 @@ maintainer-clean-recursive:

 	    local_target="$$target"; \

 	  fi; \

 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \

-	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \

+	  || eval $$failcom; \

 	done && test -z "$$fail"

 tags-recursive:

 	list='$(SUBDIRS)'; for subdir in $$list; do \

@@ -478,15 +498,17 @@ distdir: $(DISTFILES)

 	    || exit 1; \

 	  fi; \

 	done

-	list='$(SUBDIRS)'; for subdir in $$list; do \

+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \

 	  if test "$$subdir" = .; then :; else \

 	    test -d "$(distdir)/$$subdir" \

-	    || mkdir "$(distdir)/$$subdir" \

+	    || $(mkdir_p) "$(distdir)/$$subdir" \

 	    || exit 1; \

+	    distdir=`$(am__cd) $(distdir) && pwd`; \

+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \

 	    (cd $$subdir && \

 	      $(MAKE) $(AM_MAKEFLAGS) \

-	        top_distdir="../$(top_distdir)" \

-	        distdir="../$(distdir)/$$subdir" \

+	        top_distdir="$$top_distdir" \

+	        distdir="$$distdir/$$subdir" \

 	        distdir) \

 	      || exit 1; \

 	  fi; \

@@ -497,15 +519,15 @@ distdir: $(DISTFILES)

 	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \

 	|| chmod -R a+r $(distdir)

 dist-gzip: distdir

-	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz

+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz

 	$(am__remove_distdir)

 dist-bzip2: distdir

-	$(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2

+	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2

 	$(am__remove_distdir)

 dist-tarZ: distdir

-	$(AMTAR) chof - $(distdir) | compress -c >$(distdir).tar.Z

+	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z

 	$(am__remove_distdir)

 dist-shar: distdir

@@ -518,7 +540,7 @@ dist-zip: distdir

 	$(am__remove_distdir)

 dist dist-all: distdir

-	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz

+	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz

 	$(am__remove_distdir)

 # This target untars the dist file and tries a VPATH configuration.  Then

@@ -527,11 +549,11 @@ dist dist-all: distdir

 distcheck: dist

 	case '$(DIST_ARCHIVES)' in \

 	*.tar.gz*) \

-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - ;;\

+	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\

 	*.tar.bz2*) \

-	  bunzip2 -c $(distdir).tar.bz2 | $(AMTAR) xf - ;;\

+	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\

 	*.tar.Z*) \

-	  uncompress -c $(distdir).tar.Z | $(AMTAR) xf - ;;\

+	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\

 	*.shar.gz*) \

 	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\

 	*.zip*) \

@@ -615,7 +637,7 @@ mostlyclean-generic:

 clean-generic:

 distclean-generic:

-	-rm -f $(CONFIG_CLEAN_FILES)

+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)

 maintainer-clean-generic:

 	@echo "This command is intended for maintainers to use"

@@ -1,7 +1,7 @@

-# generated automatically by aclocal 1.8.5 -*- Autoconf -*-

+# generated automatically by aclocal 1.9.5 -*- Autoconf -*-

-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004

-# Free Software Foundation, Inc.

+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,

+# 2005  Free Software Foundation, Inc.

 # This file is free software; the Free Software Foundation

 # gives unlimited permission to copy and/or distribute it,

 # with or without modifications, as long as this notice is preserved.

@@ -11,5971 +11,32 @@

 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A

 # PARTICULAR PURPOSE.

-# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-

-

-# serial 47 AC_PROG_LIBTOOL

-# Debian $Rev: 214 $

-

-

-# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)

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

-# If this macro is not defined by Autoconf, define it here.

-m4_ifdef([AC_PROVIDE_IFELSE],

-         [],

-         [m4_define([AC_PROVIDE_IFELSE],

-	         [m4_ifdef([AC_PROVIDE_$1],

-		           [$2], [$3])])])

-

-

-# AC_PROG_LIBTOOL

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

-AC_DEFUN([AC_PROG_LIBTOOL],

-[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl

-dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX

-dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.

-  AC_PROVIDE_IFELSE([AC_PROG_CXX],

-    [AC_LIBTOOL_CXX],

-    [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX

-  ])])

-dnl And a similar setup for Fortran 77 support

-  AC_PROVIDE_IFELSE([AC_PROG_F77],

-    [AC_LIBTOOL_F77],

-    [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77

-])])

-

-dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.

-dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run

-dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.

-  AC_PROVIDE_IFELSE([AC_PROG_GCJ],

-    [AC_LIBTOOL_GCJ],

-    [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],

-      [AC_LIBTOOL_GCJ],

-      [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],

-	[AC_LIBTOOL_GCJ],

-      [ifdef([AC_PROG_GCJ],

-	     [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])

-       ifdef([A][M_PROG_GCJ],

-	     [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])

-       ifdef([LT_AC_PROG_GCJ],

-	     [define([LT_AC_PROG_GCJ],

-		defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])

-])])# AC_PROG_LIBTOOL

-

-

-# _AC_PROG_LIBTOOL

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

-AC_DEFUN([_AC_PROG_LIBTOOL],

-[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl

-AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl

-AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl

-AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl

-

-# This can be used to rebuild libtool when needed

-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"

-

-# Always use our own libtool.

-LIBTOOL='$(SHELL) $(top_builddir)/libtool'

-AC_SUBST(LIBTOOL)dnl

-

-# Prevent multiple expansion

-define([AC_PROG_LIBTOOL], [])

-])# _AC_PROG_LIBTOOL

-

-

-# AC_LIBTOOL_SETUP

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

-AC_DEFUN([AC_LIBTOOL_SETUP],

-[AC_PREREQ(2.50)dnl

-AC_REQUIRE([AC_ENABLE_SHARED])dnl

-AC_REQUIRE([AC_ENABLE_STATIC])dnl

-AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl

-AC_REQUIRE([AC_CANONICAL_HOST])dnl

-AC_REQUIRE([AC_CANONICAL_BUILD])dnl

-AC_REQUIRE([AC_PROG_CC])dnl

-AC_REQUIRE([AC_PROG_LD])dnl

-AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl

-AC_REQUIRE([AC_PROG_NM])dnl

-

-AC_REQUIRE([AC_PROG_LN_S])dnl

-AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl

-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!

-AC_REQUIRE([AC_OBJEXT])dnl

-AC_REQUIRE([AC_EXEEXT])dnl

-dnl

-

-AC_LIBTOOL_SYS_MAX_CMD_LEN

-AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE

-AC_LIBTOOL_OBJDIR

-

-AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl

-_LT_AC_PROG_ECHO_BACKSLASH

-

-case $host_os in

-aix3*)

-  # AIX sometimes has problems with the GCC collect2 program.  For some

-  # reason, if we set the COLLECT_NAMES environment variable, the problems

-  # vanish in a puff of smoke.

-  if test "X${COLLECT_NAMES+set}" != Xset; then

-    COLLECT_NAMES=

-    export COLLECT_NAMES

-  fi

-  ;;

-esac

-

-# Sed substitution that helps us do robust quoting.  It backslashifies

-# metacharacters that are still active within double-quoted strings.

-Xsed='sed -e s/^X//'

-[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']

-

-# Same as above, but do not quote variable references.

-[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']

-

-# Sed substitution to delay expansion of an escaped shell variable in a

-# double_quote_subst'ed string.

-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'

-

-# Sed substitution to avoid accidental globbing in evaled expressions

-no_glob_subst='s/\*/\\\*/g'

-

-# Constants:

-rm="rm -f"

-

-# Global variables:

-default_ofile=libtool

-can_build_shared=yes

-

-# All known linkers require a `.a' archive for static linking (except M$VC,

-# which needs '.lib').

-libext=a

-ltmain="$ac_aux_dir/ltmain.sh"

-ofile="$default_ofile"

-with_gnu_ld="$lt_cv_prog_gnu_ld"

-

-AC_CHECK_TOOL(AR, ar, false)

-AC_CHECK_TOOL(RANLIB, ranlib, :)

-AC_CHECK_TOOL(STRIP, strip, :)

-

-old_CC="$CC"

-old_CFLAGS="$CFLAGS"

-

-# Set sane defaults for various variables

-test -z "$AR" && AR=ar

-test -z "$AR_FLAGS" && AR_FLAGS=cru

-test -z "$AS" && AS=as

-test -z "$CC" && CC=cc

-test -z "$LTCC" && LTCC=$CC

-test -z "$DLLTOOL" && DLLTOOL=dlltool

-test -z "$LD" && LD=ld

-test -z "$LN_S" && LN_S="ln -s"

-test -z "$MAGIC_CMD" && MAGIC_CMD=file

-test -z "$NM" && NM=nm

-test -z "$SED" && SED=sed

-test -z "$OBJDUMP" && OBJDUMP=objdump

-test -z "$RANLIB" && RANLIB=:

-test -z "$STRIP" && STRIP=:

-test -z "$ac_objext" && ac_objext=o

-

-# Determine commands to create old-style static archives.

-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'

-old_postinstall_cmds='chmod 644 $oldlib'

-old_postuninstall_cmds=

-

-if test -n "$RANLIB"; then

-  case $host_os in

-  openbsd*)

-    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"

-    ;;

-  *)

-    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"

-    ;;

-  esac

-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"

-fi

-

-# Only perform the check for file, if the check method requires it

-case $deplibs_check_method in

-file_magic*)

-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then

-    AC_PATH_MAGIC

-  fi

-  ;;

-esac

-

-AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)

-AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],

-enable_win32_dll=yes, enable_win32_dll=no)

-

-AC_ARG_ENABLE([libtool-lock],

-    [AC_HELP_STRING([--disable-libtool-lock],

-	[avoid locking (might break parallel builds)])])

-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes

-

-AC_ARG_WITH([pic],

-    [AC_HELP_STRING([--with-pic],

-	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],

-    [pic_mode="$withval"],

-    [pic_mode=default])

-test -z "$pic_mode" && pic_mode=default

-

-# Use C for the default configuration in the libtool script

-tagname=

-AC_LIBTOOL_LANG_C_CONFIG

-_LT_AC_TAGCONFIG

-])# AC_LIBTOOL_SETUP

-

-

-# _LT_AC_SYS_COMPILER

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

-AC_DEFUN([_LT_AC_SYS_COMPILER],

-[AC_REQUIRE([AC_PROG_CC])dnl

-

-# If no C compiler was specified, use CC.

-LTCC=${LTCC-"$CC"}

-

-# Allow CC to be a program name with arguments.

-compiler=$CC

-])# _LT_AC_SYS_COMPILER

-

-

-# _LT_AC_SYS_LIBPATH_AIX

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

-# Links a minimal program and checks the executable

-# for the system default hardcoded library path. In most cases,

-# this is /usr/lib:/lib, but when the MPI compilers are used

-# the location of the communication and MPI libs are included too.

-# If we don't find anything, use the default library path according

-# to the aix ld manual.

-AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],

-[AC_LINK_IFELSE(AC_LANG_PROGRAM,[

-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }

-}'`

-# Check for a 64-bit object if we didn't find anything.

-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }

-}'`; fi],[])

-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

-])# _LT_AC_SYS_LIBPATH_AIX

-

-

-# _LT_AC_SHELL_INIT(ARG)

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

-AC_DEFUN([_LT_AC_SHELL_INIT],

-[ifdef([AC_DIVERSION_NOTICE],

-	     [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],

-	 [AC_DIVERT_PUSH(NOTICE)])

-$1

-AC_DIVERT_POP

-])# _LT_AC_SHELL_INIT

-

-

-# _LT_AC_PROG_ECHO_BACKSLASH

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

-# Add some code to the start of the generated configure script which

-# will find an echo command which doesn't interpret backslashes.

-AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH],

-[_LT_AC_SHELL_INIT([

-# Check that we are running under the correct shell.

-SHELL=${CONFIG_SHELL-/bin/sh}

-

-case X$ECHO in

-X*--fallback-echo)

-  # Remove one level of quotation (which was required for Make).

-  ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`

-  ;;

-esac

-

-echo=${ECHO-echo}

-if test "X[$]1" = X--no-reexec; then

-  # Discard the --no-reexec flag, and continue.

-  shift

-elif test "X[$]1" = X--fallback-echo; then

-  # Avoid inline document here, it may be left over

-  :

-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then

-  # Yippee, $echo works!

-  :

-else

-  # Restart under the correct shell.

-  exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}

-fi

-

-if test "X[$]1" = X--fallback-echo; then

-  # used as fallback echo

-  shift

-  cat <<EOF

-[$]*

-EOF

-  exit 0

-fi

-

-# The HP-UX ksh and POSIX shell print the target directory to stdout

-# if CDPATH is set.

-if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi

-

-if test -z "$ECHO"; then

-if test "X${echo_test_string+set}" != Xset; then

-# find a string as large as possible, as long as the shell can cope with it

-  for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do

-    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...

-    if (echo_test_string="`eval $cmd`") 2>/dev/null &&

-       echo_test_string="`eval $cmd`" &&

-       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null

-    then

-      break

-    fi

-  done

-fi

-

-if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&

-   echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&

-   test "X$echo_testing_string" = "X$echo_test_string"; then

-  :

-else

-  # The Solaris, AIX, and Digital Unix default echo programs unquote

-  # backslashes.  This makes it impossible to quote backslashes using

-  #   echo "$something" | sed 's/\\/\\\\/g'

-  #

-  # So, first we look for a working echo in the user's PATH.

-

-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR

-  for dir in $PATH /usr/ucb; do

-    IFS="$lt_save_ifs"

-    if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&

-       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&

-       echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&

-       test "X$echo_testing_string" = "X$echo_test_string"; then

-      echo="$dir/echo"

-      break

-    fi

-  done

-  IFS="$lt_save_ifs"

-

-  if test "X$echo" = Xecho; then

-    # We didn't find a better echo, so look for alternatives.

-    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&

-       echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&

-       test "X$echo_testing_string" = "X$echo_test_string"; then

-      # This shell has a builtin print -r that does the trick.

-      echo='print -r'

-    elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&

-	 test "X$CONFIG_SHELL" != X/bin/ksh; then

-      # If we have ksh, try running configure again with it.

-      ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}

-      export ORIGINAL_CONFIG_SHELL

-      CONFIG_SHELL=/bin/ksh

-      export CONFIG_SHELL

-      exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}

-    else

-      # Try using printf.

-      echo='printf %s\n'

-      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&

-	 echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&

-	 test "X$echo_testing_string" = "X$echo_test_string"; then

-	# Cool, printf works

-	:

-      elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&

-	   test "X$echo_testing_string" = 'X\t' &&

-	   echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&

-	   test "X$echo_testing_string" = "X$echo_test_string"; then

-	CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL

-	export CONFIG_SHELL

-	SHELL="$CONFIG_SHELL"

-	export SHELL

-	echo="$CONFIG_SHELL [$]0 --fallback-echo"

-      elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&

-	   test "X$echo_testing_string" = 'X\t' &&

-	   echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&

-	   test "X$echo_testing_string" = "X$echo_test_string"; then

-	echo="$CONFIG_SHELL [$]0 --fallback-echo"

-      else

-	# maybe with a smaller string...

-	prev=:

-

-	for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do

-	  if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null

-	  then

-	    break

-	  fi

-	  prev="$cmd"

-	done

-

-	if test "$prev" != 'sed 50q "[$]0"'; then

-	  echo_test_string=`eval $prev`

-	  export echo_test_string

-	  exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}

-	else

-	  # Oops.  We lost completely, so just stick with echo.

-	  echo=echo

-	fi

-      fi

-    fi

-  fi

-fi

-fi

-

-# Copy echo and quote the copy suitably for passing to libtool from

-# the Makefile, instead of quoting the original, which is used later.

-ECHO=$echo

-if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then

-   ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"

-fi

-

-AC_SUBST(ECHO)

-])])# _LT_AC_PROG_ECHO_BACKSLASH

-

-

-# _LT_AC_LOCK

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

-AC_DEFUN([_LT_AC_LOCK],

-[AC_ARG_ENABLE([libtool-lock],

-    [AC_HELP_STRING([--disable-libtool-lock],

-	[avoid locking (might break parallel builds)])])

-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes

-

-# Some flags need to be propagated to the compiler or linker for good

-# libtool support.

-case $host in

-ia64-*-hpux*)

-  # Find out which ABI we are using.

-  echo 'int i;' > conftest.$ac_ext

-  if AC_TRY_EVAL(ac_compile); then

-    case `/usr/bin/file conftest.$ac_objext` in

-    *ELF-32*)

-      HPUX_IA64_MODE="32"

-      ;;

-    *ELF-64*)

-      HPUX_IA64_MODE="64"

-      ;;

-    esac

-  fi

-  rm -rf conftest*

-  ;;

-*-*-irix6*)

-  # Find out which ABI we are using.

-  echo '[#]line __oline__ "configure"' > conftest.$ac_ext

-  if AC_TRY_EVAL(ac_compile); then

-   if test "$lt_cv_prog_gnu_ld" = yes; then

-    case `/usr/bin/file conftest.$ac_objext` in

-    *32-bit*)

-      LD="${LD-ld} -melf32bsmip"

-      ;;

-    *N32*)

-      LD="${LD-ld} -melf32bmipn32"

-      ;;

-    *64-bit*)

-      LD="${LD-ld} -melf64bmip"

-      ;;

-    esac

-   else

-    case `/usr/bin/file conftest.$ac_objext` in

-    *32-bit*)

-      LD="${LD-ld} -32"

-      ;;

-    *N32*)

-      LD="${LD-ld} -n32"

-      ;;

-    *64-bit*)

-      LD="${LD-ld} -64"

-      ;;

-    esac

-   fi

-  fi

-  rm -rf conftest*

-  ;;

-

-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)

-  # Find out which ABI we are using.

-  echo 'int i;' > conftest.$ac_ext

-  if AC_TRY_EVAL(ac_compile); then

-    case "`/usr/bin/file conftest.o`" in

-    *32-bit*)

-      case $host in

-        x86_64-*linux*)

-          LD="${LD-ld} -m elf_i386"

-          ;;

-        ppc64-*linux*|powerpc64-*linux*)

-          LD="${LD-ld} -m elf32ppclinux"

-          ;;

-        s390x-*linux*)

-          LD="${LD-ld} -m elf_s390"

-          ;;

-        sparc64-*linux*)

-          LD="${LD-ld} -m elf32_sparc"

-          ;;

-      esac

-      ;;

-    *64-bit*)

-      case $host in

-        x86_64-*linux*)

-          LD="${LD-ld} -m elf_x86_64"

-          ;;

-        ppc*-*linux*|powerpc*-*linux*)

-          LD="${LD-ld} -m elf64ppc"

-          ;;

-        s390*-*linux*)

-          LD="${LD-ld} -m elf64_s390"

-          ;;

-        sparc*-*linux*)

-          LD="${LD-ld} -m elf64_sparc"

-          ;;

-      esac

-      ;;

-    esac

-  fi

-  rm -rf conftest*

-  ;;

-

-*-*-sco3.2v5*)

-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.

-  SAVE_CFLAGS="$CFLAGS"

-  CFLAGS="$CFLAGS -belf"

-  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,

-    [AC_LANG_PUSH(C)

-     AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])

-     AC_LANG_POP])

-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then

-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf

-    CFLAGS="$SAVE_CFLAGS"

-  fi

-  ;;

-AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],

-[*-*-cygwin* | *-*-mingw* | *-*-pw32*)

-  AC_CHECK_TOOL(DLLTOOL, dlltool, false)

-  AC_CHECK_TOOL(AS, as, false)

-  AC_CHECK_TOOL(OBJDUMP, objdump, false)

-  ;;

-  ])

-esac

-

-need_locks="$enable_libtool_lock"

-

-])# _LT_AC_LOCK

-

-

-# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,

-#		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])

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

-# Check whether the given compiler option works

-AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION],

-[AC_REQUIRE([LT_AC_PROG_SED])

-AC_CACHE_CHECK([$1], [$2],

-  [$2=no

-  ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])

-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext

-   lt_compiler_flag="$3"

-   # Insert the option either (1) after the last *FLAGS variable, or

-   # (2) before a word containing "conftest.", or (3) at the end.

-   # Note that $ac_compile itself does not contain backslashes and begins

-   # with a dollar sign (not a hyphen), so the echo should work correctly.

-   # The option is referenced via a variable to avoid confusing sed.

-   lt_compile=`echo "$ac_compile" | $SED \

-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \

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

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

-   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)

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

-   ac_status=$?

-   cat conftest.err >&AS_MESSAGE_LOG_FD

-   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD

-   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

-     if test ! -s conftest.err; then

-       $2=yes

-     fi

-   fi

-   $rm conftest*

-])

-

-if test x"[$]$2" = xyes; then

-    ifelse([$5], , :, [$5])

-else

-    ifelse([$6], , :, [$6])

-fi

-])# AC_LIBTOOL_COMPILER_OPTION

-

-

-# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,

-#                          [ACTION-SUCCESS], [ACTION-FAILURE])

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

-# Check whether the given compiler option works

-AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],

-[AC_CACHE_CHECK([$1], [$2],

-  [$2=no

-   save_LDFLAGS="$LDFLAGS"

-   LDFLAGS="$LDFLAGS $3"

-   printf "$lt_simple_link_test_code" > conftest.$ac_ext

-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then

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

-     # So say no if there are warnings

-     if test -s conftest.err; then

-       # Append any errors to the config.log.

-       cat conftest.err 1>&AS_MESSAGE_LOG_FD

-     else

-       $2=yes

-     fi

-   fi

-   $rm conftest*

-   LDFLAGS="$save_LDFLAGS"

-])

-

-if test x"[$]$2" = xyes; then

-    ifelse([$4], , :, [$4])

-else

-    ifelse([$5], , :, [$5])

-fi

-])# AC_LIBTOOL_LINKER_OPTION

-

-

-# AC_LIBTOOL_SYS_MAX_CMD_LEN

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

-AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN],

-[# find the maximum length of command line arguments

-AC_MSG_CHECKING([the maximum length of command line arguments])

-AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl

-  i=0

-  teststring="ABCD"

-

-  case $build_os in

-  msdosdjgpp*)

-    # On DJGPP, this test can blow up pretty badly due to problems in libc

-    # (any single argument exceeding 2000 bytes causes a buffer overrun

-    # during glob expansion).  Even if it were fixed, the result of this

-    # check would be larger than it should be.

-    lt_cv_sys_max_cmd_len=12288;    # 12K is about right

-    ;;

-

-  gnu*)

-    # Under GNU Hurd, this test is not required because there is

-    # no limit to the length of command line arguments.

-    # Libtool will interpret -1 as no limit whatsoever

-    lt_cv_sys_max_cmd_len=-1;

-    ;;

-

-  cygwin* | mingw*)

-    # On Win9x/ME, this test blows up -- it succeeds, but takes

-    # about 5 minutes as the teststring grows exponentially.

-    # Worse, since 9x/ME are not pre-emptively multitasking,

-    # you end up with a "frozen" computer, even though with patience

-    # the test eventually succeeds (with a max line length of 256k).

-    # Instead, let's just punt: use the minimum linelength reported by

-    # all of the supported platforms: 8192 (on NT/2K/XP).

-    lt_cv_sys_max_cmd_len=8192;

-    ;;

-

-  amigaos*)

-    # On AmigaOS with pdksh, this test takes hours, literally.

-    # So we just punt and use a minimum line length of 8192.

-    lt_cv_sys_max_cmd_len=8192;

-    ;;

-

- *)

-    # If test is not a shell built-in, we'll probably end up computing a

-    # maximum length that is only half of the actual maximum length, but

-    # we can't tell.

-    while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \

-	       = "XX$teststring") >/dev/null 2>&1 &&

-	    new_result=`expr "X$teststring" : ".*" 2>&1` &&

-	    lt_cv_sys_max_cmd_len=$new_result &&

-	    test $i != 17 # 1/2 MB should be enough

-    do

-      i=`expr $i + 1`

-      teststring=$teststring$teststring

-    done

-    teststring=

-    # Add a significant safety factor because C++ compilers can tack on massive

-    # amounts of additional arguments before passing them to the linker.

-    # It appears as though 1/2 is a usable value.

-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`