deleted file mode 100644

@@ -1,52 +0,0 @@

-The libclamunrar code is based on the work of Alexander L. Roshal (C)

-

-The UnRAR sources may be used in any software to handle RAR

-archives without limitations free of charge, but cannot be used

-to re-create the RAR compression algorithm, which is proprietary.

-Distribution of modified unRAR sources in separate form or as a

-part of other software is permitted, provided that it is clearly

-stated in the documentation and source comments that the code may

-not be used to develop a RAR (WinRAR) compatible archiver.

-

-Original UnRAR licence:

-

- ******    *****   ******   UnRAR - free utility for RAR archives

- **   **  **   **  **   **  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

- ******   *******  ******    License for use and distribution of

- **   **  **   **  **   **   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

- **   **  **   **  **   **         FREE portable version

-                                   ~~~~~~~~~~~~~~~~~~~~~

-

-      The source code of UnRAR utility is freeware. This means:

-

-   1. All copyrights to RAR and the utility UnRAR are exclusively

-      owned by the author - Alexander Roshal.

-

-   2. The UnRAR sources may be used in any software to handle RAR

-      archives without limitations free of charge, but cannot be used

-      to re-create the RAR compression algorithm, which is proprietary.

-      Distribution of modified UnRAR sources in separate form or as a

-      part of other software is permitted, provided that it is clearly

-      stated in the documentation and source comments that the code may

-      not be used to develop a RAR (WinRAR) compatible archiver.

-

-   3. The UnRAR utility may be freely distributed. It is allowed

-      to distribute UnRAR inside of other software packages.

-

-   4. THE RAR ARCHIVER AND THE UnRAR UTILITY ARE DISTRIBUTED "AS IS".

-      NO WARRANTY OF ANY KIND IS EXPRESSED OR IMPLIED.  YOU USE AT 

-      YOUR OWN RISK. THE AUTHOR WILL NOT BE LIABLE FOR DATA LOSS, 

-      DAMAGES, LOSS OF PROFITS OR ANY OTHER KIND OF LOSS WHILE USING

-      OR MISUSING THIS SOFTWARE.

-

-   5. Installing and using the UnRAR utility signifies acceptance of

-      these terms and conditions of the license.

-

-   6. If you don't agree with terms of the license you must remove

-      UnRAR files from your storage devices and cease to use the

-      utility.

-

-      Thank you for your interest in RAR and UnRAR.

-

-

-                                            Alexander L. Roshal

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

+Thu Dec  6 15:03:16 CET 2007 (tk)

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

+  * libclamunrar: temporarily remove the RAR code

+

 Mon Nov 12 17:47:21 GMT 2007 (njh)

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

   * libclamav/vba_extract.c:	Removed more unused code

@@ -16,7 +16,7 @@

 #  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,

 #  MA 02110-1301, USA.

-SUBDIRS = libclamunrar libclamav clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter

+SUBDIRS = libclamav clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter

 EXTRA_DIST = FAQ contrib test examples BUGS shared libclamav.pc.in UPGRADE COPYING.nsis

 bin_SCRIPTS=clamav-config

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

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

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

 # @configure_input@

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

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

+# 2003, 2004, 2005, 2006  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.

@@ -33,15 +33,11 @@

 #  MA 02110-1301, USA.

-srcdir = @srcdir@

-top_srcdir = @top_srcdir@

 VPATH = @srcdir@

 pkgdatadir = $(datadir)/@PACKAGE@

 pkglibdir = $(libdir)/@PACKAGE@

 pkgincludedir = $(includedir)/@PACKAGE@

-top_builddir = .

 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd

-INSTALL = @INSTALL@

 install_sh_DATA = $(install_sh) -c -m 644

 install_sh_PROGRAM = $(install_sh) -c

 install_sh_SCRIPT = $(install_sh) -c

@@ -56,6 +52,7 @@ POST_UNINSTALL = :

 build_triplet = @build@

 host_triplet = @host@

 target_triplet = @target@

+subdir = .

 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \

 	$(srcdir)/Makefile.in $(srcdir)/clamav-config.h.in \

 	$(srcdir)/clamav-config.in $(srcdir)/libclamav.pc.in \

@@ -71,14 +68,13 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \

 	$(top_srcdir)/docs/man/sigtool.1.in AUTHORS COPYING ChangeLog \

 	INSTALL NEWS config.guess config.sub depcomp install-sh \

 	ltmain.sh missing mkinstalldirs

-subdir = .

 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4

 am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \

 	$(top_srcdir)/configure.in

 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \

 	$(ACLOCAL_M4)

 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \

- configure.lineno configure.status.lineno

+ configure.lineno config.status.lineno

 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

 CONFIG_HEADER = clamav-config.h

 CONFIG_CLEAN_FILES = clamav-config libclamav.pc \

@@ -93,10 +89,11 @@ SOURCES =

 DIST_SOURCES =

 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \

 	html-recursive info-recursive install-data-recursive \

-	install-exec-recursive install-info-recursive \

-	install-recursive installcheck-recursive installdirs-recursive \

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

-	uninstall-recursive

+	install-dvi-recursive install-exec-recursive \

+	install-html-recursive install-info-recursive \

+	install-pdf-recursive install-ps-recursive install-recursive \

+	installcheck-recursive installdirs-recursive pdf-recursive \

+	ps-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/||"`;; \

@@ -105,6 +102,8 @@ am__vpath_adj = case $$p in \

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

 pkgconfigDATA_INSTALL = $(INSTALL_DATA)

 DATA = $(pkgconfig_DATA)

+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\

+  distclean-recursive maintainer-clean-recursive

 ETAGS = etags

 CTAGS = ctags

 DIST_SUBDIRS = $(SUBDIRS)

@@ -120,16 +119,12 @@ GZIP_ENV = --best

 distuninstallcheck_listfiles = find . -type f -print

 distcleancheck_listfiles = find . -type f -print

 ACLOCAL = @ACLOCAL@

-AMDEP_FALSE = @AMDEP_FALSE@

-AMDEP_TRUE = @AMDEP_TRUE@

 AMTAR = @AMTAR@

 AR = @AR@

 AUTOCONF = @AUTOCONF@

 AUTOHEADER = @AUTOHEADER@

 AUTOMAKE = @AUTOMAKE@

 AWK = @AWK@

-BUILD_CLAMD_FALSE = @BUILD_CLAMD_FALSE@

-BUILD_CLAMD_TRUE = @BUILD_CLAMD_TRUE@

 CC = @CC@

 CCDEPMODE = @CCDEPMODE@

 CFGDIR = @CFGDIR@

@@ -153,16 +148,13 @@ ECHO_C = @ECHO_C@

 ECHO_N = @ECHO_N@

 ECHO_T = @ECHO_T@

 EGREP = @EGREP@

-ENABLE_UNRAR_FALSE = @ENABLE_UNRAR_FALSE@

-ENABLE_UNRAR_TRUE = @ENABLE_UNRAR_TRUE@

 EXEEXT = @EXEEXT@

 F77 = @F77@

 FFLAGS = @FFLAGS@

 FRESHCLAM_LIBS = @FRESHCLAM_LIBS@

 GETENT = @GETENT@

 GREP = @GREP@

-HAVE_MILTER_FALSE = @HAVE_MILTER_FALSE@

-HAVE_MILTER_TRUE = @HAVE_MILTER_TRUE@

+INSTALL = @INSTALL@

 INSTALL_DATA = @INSTALL_DATA@

 INSTALL_PROGRAM = @INSTALL_PROGRAM@

 INSTALL_SCRIPT = @INSTALL_SCRIPT@

@@ -176,9 +168,8 @@ LIBTOOL = @LIBTOOL@

 LN_S = @LN_S@

 LTLIBOBJS = @LTLIBOBJS@

 MAINT = @MAINT@

-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@

-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@

 MAKEINFO = @MAKEINFO@

+MKDIR_P = @MKDIR_P@

 OBJEXT = @OBJEXT@

 PACKAGE = @PACKAGE@

 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@

@@ -188,20 +179,19 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@

 PACKAGE_VERSION = @PACKAGE_VERSION@

 PATH_SEPARATOR = @PATH_SEPARATOR@

 RANLIB = @RANLIB@

-SED = @SED@

 SET_MAKE = @SET_MAKE@

 SHELL = @SHELL@

 STRIP = @STRIP@

 THREAD_LIBS = @THREAD_LIBS@

 TH_SAFE = @TH_SAFE@

 VERSION = @VERSION@

+abs_builddir = @abs_builddir@

+abs_srcdir = @abs_srcdir@

+abs_top_builddir = @abs_top_builddir@

+abs_top_srcdir = @abs_top_srcdir@

 ac_ct_CC = @ac_ct_CC@

 ac_ct_CXX = @ac_ct_CXX@

 ac_ct_F77 = @ac_ct_F77@

-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@

-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@

-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@

-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@

 am__include = @am__include@

 am__leading_dot = @am__leading_dot@

 am__quote = @am__quote@

@@ -213,6 +203,7 @@ build_alias = @build_alias@

 build_cpu = @build_cpu@

 build_os = @build_os@

 build_vendor = @build_vendor@

+builddir = @builddir@

 datadir = @datadir@

 datarootdir = @datarootdir@

 docdir = @docdir@

@@ -241,13 +232,16 @@ psdir = @psdir@

 sbindir = @sbindir@

 sendmailprog = @sendmailprog@

 sharedstatedir = @sharedstatedir@

+srcdir = @srcdir@

 sysconfdir = @sysconfdir@

 target = @target@

 target_alias = @target_alias@

 target_cpu = @target_cpu@

 target_os = @target_os@

 target_vendor = @target_vendor@

-SUBDIRS = libclamunrar libclamav clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter

+top_builddir = @top_builddir@

+top_srcdir = @top_srcdir@

+SUBDIRS = libclamav clamscan clamd clamdscan freshclam sigtool clamconf database docs etc clamav-milter

 EXTRA_DIST = FAQ contrib test examples BUGS shared libclamav.pc.in UPGRADE COPYING.nsis

 bin_SCRIPTS = clamav-config

 pkgconfigdir = $(libdir)/pkgconfig

@@ -293,7 +287,7 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)

 clamav-config.h: stamp-h1

 	@if test ! -f $@; then \

 	  rm -f stamp-h1; \

-	  $(MAKE) stamp-h1; \

+	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \

 	else :; fi

 stamp-h1: $(srcdir)/clamav-config.h.in $(top_builddir)/config.status

@@ -330,7 +324,7 @@ docs/man/sigtool.1: $(top_builddir)/config.status $(top_srcdir)/docs/man/sigtool

 	cd $(top_builddir) && $(SHELL) ./config.status $@

 install-binSCRIPTS: $(bin_SCRIPTS)

 	@$(NORMAL_INSTALL)

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

+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"

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

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

 	  if test -f $$d$$p; then \

@@ -356,10 +350,9 @@ clean-libtool:

 distclean-libtool:

 	-rm -f libtool

-uninstall-info-am:

 install-pkgconfigDATA: $(pkgconfig_DATA)

 	@$(NORMAL_INSTALL)

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

+	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=$(am__strip_dir) \

@@ -406,8 +399,7 @@ $(RECURSIVE_TARGETS):

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

 	fi; test -z "$$fail"

-mostlyclean-recursive clean-recursive distclean-recursive \

-maintainer-clean-recursive:

+$(RECURSIVE_CLEAN_TARGETS):

 	@failcom='exit 1'; \

 	for f in x $$MAKEFLAGS; do \

 	  case $$f in \

@@ -509,24 +501,22 @@ distclean-tags:

 distdir: $(DISTFILES)

 	$(am__remove_distdir)

-	mkdir $(distdir)

-	$(mkdir_p) $(distdir)/. $(distdir)/docs/man

-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \

-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \

-	list='$(DISTFILES)'; for file in $$list; do \

-	  case $$file in \

-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \

-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \

-	  esac; \

+	test -d $(distdir) || mkdir $(distdir)

+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \

+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \

+	list='$(DISTFILES)'; \

+	  dist_files=`for file in $$list; do echo $$file; done | \

+	  sed -e "s|^$$srcdirstrip/||;t" \

+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \

+	case $$dist_files in \

+	  */*) $(MKDIR_P) `echo "$$dist_files" | \

+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \

+			   sort -u` ;; \

+	esac; \

+	for file in $$dist_files; do \

 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \

-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \

-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \

-	    dir="/$$dir"; \

-	    $(mkdir_p) "$(distdir)$$dir"; \

-	  else \

-	    dir=''; \

-	  fi; \

 	  if test -d $$d/$$file; then \

+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \

 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \

 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \

 	    fi; \

@@ -540,7 +530,7 @@ distdir: $(DISTFILES)

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

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

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

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

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

 	    || exit 1; \

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

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

@@ -548,6 +538,8 @@ distdir: $(DISTFILES)

 	      $(MAKE) $(AM_MAKEFLAGS) \

 	        top_distdir="$$top_distdir" \

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

+		am__remove_distdir=: \

+		am__skip_length_check=: \

 	        distdir) \

 	      || exit 1; \

 	  fi; \

@@ -555,7 +547,7 @@ distdir: $(DISTFILES)

 	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \

 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \

 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \

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

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

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

 dist-gzip: distdir

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

@@ -630,7 +622,7 @@ distcheck: dist

 	$(am__remove_distdir)

 	@(echo "$(distdir) archives ready for distribution: "; \

 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \

-	  sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'

+	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'

 distuninstallcheck:

 	@cd $(distuninstallcheck_dir) \

 	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \

@@ -655,7 +647,7 @@ all-am: Makefile $(SCRIPTS) $(DATA) clamav-config.h

 installdirs: installdirs-recursive

 installdirs-am:

 	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkgconfigdir)"; do \

-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \

+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \

 	done

 install: install-recursive

 install-exec: install-exec-recursive

@@ -703,12 +695,20 @@ info-am:

 install-data-am: install-pkgconfigDATA

+install-dvi: install-dvi-recursive

+

 install-exec-am: install-binSCRIPTS

+install-html: install-html-recursive

+

 install-info: install-info-recursive

 install-man:

+install-pdf: install-pdf-recursive

+

+install-ps: install-ps-recursive

+

 installcheck-am:

 maintainer-clean: maintainer-clean-recursive

@@ -729,27 +729,28 @@ ps: ps-recursive

 ps-am:

-uninstall-am: uninstall-binSCRIPTS uninstall-info-am \

-	uninstall-pkgconfigDATA

+uninstall-am: uninstall-binSCRIPTS uninstall-pkgconfigDATA

-uninstall-info: uninstall-info-recursive

+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \

+	install-strip

-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \

-	check-am clean clean-generic clean-libtool clean-recursive \

-	ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \

-	dist-shar dist-tarZ dist-zip distcheck distclean \

+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \

+	all all-am am--refresh check check-am clean clean-generic \

+	clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \

+	dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \

 	distclean-generic distclean-hdr distclean-libtool \

-	distclean-recursive distclean-tags distcleancheck distdir \

-	distuninstallcheck dvi dvi-am html html-am info info-am \

-	install install-am install-binSCRIPTS install-data \

-	install-data-am install-exec install-exec-am install-info \

-	install-info-am install-man install-pkgconfigDATA \

-	install-strip installcheck installcheck-am installdirs \

-	installdirs-am maintainer-clean maintainer-clean-generic \

-	maintainer-clean-recursive mostlyclean mostlyclean-generic \

-	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \

-	tags tags-recursive uninstall uninstall-am \

-	uninstall-binSCRIPTS uninstall-info-am uninstall-pkgconfigDATA

+	distclean-tags distcleancheck distdir distuninstallcheck dvi \

+	dvi-am html html-am info info-am install install-am \

+	install-binSCRIPTS install-data install-data-am install-dvi \

+	install-dvi-am install-exec install-exec-am install-html \

+	install-html-am install-info install-info-am install-man \

+	install-pdf install-pdf-am install-pkgconfigDATA install-ps \

+	install-ps-am install-strip installcheck installcheck-am \

+	installdirs installdirs-am maintainer-clean \

+	maintainer-clean-generic mostlyclean mostlyclean-generic \

+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \

+	uninstall uninstall-am uninstall-binSCRIPTS \

+	uninstall-pkgconfigDATA

 # Tell versions [3.59,3.63) of GNU make to not export all variables.

 # Otherwise a system limit (for SysV at least) may be exceeded.

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

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

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

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

-# 2005  Free Software Foundation, Inc.

+# 2005, 2006  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,9 +11,14 @@

 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A

 # PARTICULAR PURPOSE.

+m4_if(m4_PACKAGE_VERSION, [2.61],,

+[m4_fatal([this file was generated for autoconf 2.61.

+You have another version of autoconf.  If you want to use that,

+you should regenerate the build system entirely.], [63])])

+

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

-# serial 48 AC_PROG_LIBTOOL

+# serial 48 Debian 1.5.22-4 AC_PROG_LIBTOOL

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

@@ -1397,18 +1402,6 @@ freebsd1*)

   dynamic_linker=no

   ;;

-kfreebsd*-gnu)

-  version_type=linux

-  need_lib_prefix=no

-  need_version=no

-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'

-  soname_spec='${libname}${release}${shared_ext}$major'

-  shlibpath_var=LD_LIBRARY_PATH

-  shlibpath_overrides_runpath=no

-  hardcode_into_libs=yes

-  dynamic_linker='GNU ld.so'

-  ;;

-

 freebsd* | dragonfly*)

   # DragonFly does not have aout.  When/if they implement a new

   # versioning mechanism, adjust this.

@@ -1564,7 +1557,7 @@ linux*oldld* | linux*aout* | linux*coff*)

   ;;

 # This must be Linux ELF.

-linux*)

+linux* | k*bsd*-gnu)

   version_type=linux

   need_lib_prefix=no

   need_version=no

@@ -1578,27 +1571,10 @@ linux*)

   # before this can be enabled.

   hardcode_into_libs=yes

-  # find out which ABI we are using

-  libsuff=

-  case "$host_cpu" in

-  x86_64*|s390x*|powerpc64*)

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

-    if AC_TRY_EVAL(ac_compile); then

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

-      *64-bit*)

-        libsuff=64

-        sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"

-        ;;

-      esac

-    fi

-    rm -rf conftest*

-    ;;

-  esac

-

   # Append ld.so.conf contents to the search path

   if test -f /etc/ld.so.conf; then

-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/^[	 ]*//;s/#.*//;/^[^\/]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`

-    sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra"

+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`

+    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"

   fi

   # We used to test for /lib/ld.so.1 and disable shared libraries on

@@ -1610,7 +1586,7 @@ linux*)

   dynamic_linker='GNU/Linux ld.so'

   ;;

-knetbsd*-gnu)

+netbsdelf*-gnu)

   version_type=linux

   need_lib_prefix=no

   need_version=no

@@ -1619,7 +1595,7 @@ knetbsd*-gnu)

   shlibpath_var=LD_LIBRARY_PATH

   shlibpath_overrides_runpath=no

   hardcode_into_libs=yes

-  dynamic_linker='GNU ld.so'

+  dynamic_linker='NetBSD ld.elf_so'

   ;;

 netbsd*)

@@ -2327,7 +2303,7 @@ darwin* | rhapsody*)

   lt_cv_deplibs_check_method=pass_all

   ;;

-freebsd* | kfreebsd*-gnu | dragonfly*)

+freebsd* | dragonfly*)

   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then

     case $host_cpu in

     i*86 )

@@ -2381,11 +2357,11 @@ irix5* | irix6* | nonstopux*)

   ;;

 # This must be Linux ELF.

-linux*)

+linux* | k*bsd*-gnu)

   lt_cv_deplibs_check_method=pass_all

   ;;

-netbsd*)

+netbsd* | netbsdelf*-gnu)

   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then

     lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'

   else

@@ -3133,7 +3109,7 @@ case $host_os in

   freebsd-elf*)

     _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no

     ;;

-  freebsd* | kfreebsd*-gnu | dragonfly*)

+  freebsd* | dragonfly*)

     # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF

     # conventions

     _LT_AC_TAGVAR(ld_shlibs, $1)=yes

@@ -3292,7 +3268,7 @@ case $host_os in

     _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'

     _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:

     ;;

-  linux*)

+  linux* | k*bsd*-gnu)

     case $cc_basename in

       KCC*)

 	# Kuck and Associates, Inc. (KAI) C++ Compiler

@@ -3394,7 +3370,7 @@ case $host_os in

 	;;

     esac

     ;;

-  netbsd*)

+  netbsd* | netbsdelf*-gnu)

     if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then

       _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'

       wlarc=

@@ -4659,7 +4635,7 @@ hpux*) # Its linker distinguishes data from code symbols

   lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"

   lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"

   ;;

-linux*)

+linux* | k*bsd*-gnu)

   if test "$host_cpu" = ia64; then

     symcode='[[ABCDGIRSTW]]'

     lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"

@@ -4932,7 +4908,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])

 	    ;;

 	esac

 	;;

-      freebsd* | kfreebsd*-gnu | dragonfly*)

+      freebsd* | dragonfly*)

 	# FreeBSD uses GNU C++

 	;;

       hpux9* | hpux10* | hpux11*)

@@ -4975,7 +4951,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])

 	    ;;

 	esac

 	;;

-      linux*)

+      linux* | k*bsd*-gnu)

 	case $cc_basename in

 	  KCC*)

 	    # KAI C++ Compiler

@@ -5018,7 +4994,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])

 	    ;;

 	esac

 	;;

-      netbsd*)

+      netbsd* | netbsdelf*-gnu)

 	;;

       osf3* | osf4* | osf5*)

 	case $cc_basename in

@@ -5229,7 +5205,7 @@ AC_MSG_CHECKING([for $compiler option to produce PIC])

       _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'

       ;;

-    linux*)

+    linux* | k*bsd*-gnu)

       case $cc_basename in

       icc* | ecc*)

 	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'

@@ -5370,6 +5346,9 @@ ifelse([$1],[CXX],[

   cygwin* | mingw*)

     _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]] /s/.* \([[^ ]]*\)/\1 DATA/;/^.* __nm__/s/^.* __nm__\([[^ ]]*\) [[^ ]]*/\1 DATA/;/^I /d;/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'

   ;;

+  linux* | k*bsd*-gnu)

+    _LT_AC_TAGVAR(link_all_deplibs, $1)=no

+  ;;

   *)

     _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'

   ;;

@@ -5540,7 +5519,7 @@ EOF

       _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'

       ;;

-    linux*)

+    linux* | k*bsd*-gnu)

       if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then

 	tmp_addflag=

 	case $cc_basename,$host_cpu in

@@ -5566,12 +5545,13 @@ EOF

   $echo "local: *; };" >> $output_objdir/$libname.ver~

 	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'

 	fi

+	_LT_AC_TAGVAR(link_all_deplibs, $1)=no

       else

 	_LT_AC_TAGVAR(ld_shlibs, $1)=no

       fi

       ;;

-    netbsd*)

+    netbsd* | netbsdelf*-gnu)

       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then

 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'

 	wlarc=

@@ -5901,7 +5881,7 @@ _LT_EOF

       ;;

     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.

-    freebsd* | kfreebsd*-gnu | dragonfly*)

+    freebsd* | dragonfly*)

       _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'

       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'

       _LT_AC_TAGVAR(hardcode_direct, $1)=yes

@@ -6003,7 +5983,7 @@ _LT_EOF

       _LT_AC_TAGVAR(link_all_deplibs, $1)=yes

       ;;

-    netbsd*)

+    netbsd* | netbsdelf*-gnu)

       if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then

 	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out

       else

@@ -6370,7 +6350,6 @@ do

     done

   done

 done

-IFS=$as_save_IFS

 lt_ac_max=0

 lt_ac_count=0

 # Add /usr/xpg4/bin/sed as it is typically found on Solaris

@@ -6403,11 +6382,10 @@ for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do

 done

 ])

 SED=$lt_cv_path_SED

-AC_SUBST([SED])

 AC_MSG_RESULT([$SED])

 ])

-# Copyright (C) 2002, 2003, 2005  Free Software Foundation, Inc.

+# Copyright (C) 2002, 2003, 2005, 2006  Free Software Foundation, Inc.

 #

 # This file is free software; the Free Software Foundation

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

@@ -6417,14 +6395,29 @@ AC_MSG_RESULT([$SED])

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

 # Automake X.Y traces this macro to ensure aclocal.m4 has been

 # generated from the m4 files accompanying Automake X.Y.

-AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])

+# (This private macro should not be called outside this file.)

+AC_DEFUN([AM_AUTOMAKE_VERSION],

+[am__api_version='1.10'

+dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to

+dnl require some minimum version.  Point them to the right macro.

+m4_if([$1], [1.10], [],

+      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl

+])

+

+# _AM_AUTOCONF_VERSION(VERSION)

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

+# aclocal traces this macro to find the Autoconf version.

+# This is a private macro too.  Using m4_define simplifies

+# the logic in aclocal, which can simply ignore this definition.

+m4_define([_AM_AUTOCONF_VERSION], [])

 # AM_SET_CURRENT_AUTOMAKE_VERSION

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

-# Call AM_AUTOMAKE_VERSION so it can be traced.

+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.

 # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.

 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],

-	 [AM_AUTOMAKE_VERSION([1.9.6])])

+[AM_AUTOMAKE_VERSION([1.10])dnl

+_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])

 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-

@@ -6481,14 +6474,14 @@ am_aux_dir=`cd $ac_aux_dir && pwd`

 # AM_CONDITIONAL                                            -*- Autoconf -*-

-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005

+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006

 # 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.

-# serial 7

+# serial 8

 # AM_CONDITIONAL(NAME, SHELL-CONDITION)

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

@@ -6497,8 +6490,10 @@ AC_DEFUN([AM_CONDITIONAL],

 [AC_PREREQ(2.52)dnl

  ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],

 	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl

-AC_SUBST([$1_TRUE])

-AC_SUBST([$1_FALSE])

+AC_SUBST([$1_TRUE])dnl

+AC_SUBST([$1_FALSE])dnl

+_AM_SUBST_NOTMAKE([$1_TRUE])dnl

+_AM_SUBST_NOTMAKE([$1_FALSE])dnl

 if $2; then

   $1_TRUE=

   $1_FALSE='#'

@@ -6512,15 +6507,14 @@ AC_CONFIG_COMMANDS_PRE(

 Usually this means the macro was only invoked conditionally.]])

 fi])])

-

-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005

+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006

 # 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.

-# serial 8

+# serial 9

 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be

 # written in clear, in which case automake, when reading aclocal.m4,

@@ -6548,6 +6542,7 @@ AC_REQUIRE([AM_DEP_TRACK])dnl

 ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],

        [$1], CXX,  [depcc="$CXX"  am_compiler_list=],

        [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],

+       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],

        [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],

                    [depcc="$$1"   am_compiler_list=])

@@ -6613,6 +6608,7 @@ AC_CACHE_CHECK([dependency style of $depcc],

        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \

        $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \

          >/dev/null 2>conftest.err &&

+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&

        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&

        grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&

        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then

@@ -6665,7 +6661,8 @@ if test "x$enable_dependency_tracking" != xno; then

   AMDEPBACKSLASH='\'

 fi

 AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])

-AC_SUBST([AMDEPBACKSLASH])

+AC_SUBST([AMDEPBACKSLASH])dnl

+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl

 ])

 # Generate code to set up dependency tracking.              -*- Autoconf -*-

@@ -6690,8 +6687,9 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],

   # some people rename them; so instead we look at the file content.

   # Grep'ing the first line is not enough: some people post-process

   # each Makefile.in and add a new line on top of each file to say so.

-  # So let's grep whole file.

-  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then

+  # Grep'ing the whole file is not good either: AIX grep has a line

+  # limit of 2048, but all sed's we know have understand at least 4000.

+  if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then

     dirpart=`AS_DIRNAME("$mf")`

   else

     continue

@@ -6750,8 +6748,8 @@ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])

 # Do all the work for Automake.                             -*- Autoconf -*-

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

-# Free Software Foundation, Inc.

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

+# 2005, 2006 Free Software Foundation, Inc.

 #

 # This file is free software; the Free Software Foundation

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

@@ -6774,16 +6772,20 @@ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])

 # arguments mandatory, and then we can depend on a new Autoconf

 # release and drop the old call support.

 AC_DEFUN([AM_INIT_AUTOMAKE],

-[AC_PREREQ([2.58])dnl

+[AC_PREREQ([2.60])dnl

 dnl Autoconf wants to disallow AM_ names.  We explicitly allow

 dnl the ones we care about.

 m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl

 AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl

 AC_REQUIRE([AC_PROG_INSTALL])dnl

-# test to see if srcdir already configured

-if test "`cd $srcdir && pwd`" != "`pwd`" &&

-   test -f $srcdir/config.status; then

-  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])

+if test "`cd $srcdir && pwd`" != "`pwd`"; then

+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output

+  # is not polluted with repeated "-I."

+  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl

+  # test to see if srcdir already configured

+  if test -f $srcdir/config.status; then

+    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])

+  fi

 fi

 # test whether we have cygpath

@@ -6803,6 +6805,9 @@ m4_ifval([$2],

  AC_SUBST([PACKAGE], [$1])dnl

  AC_SUBST([VERSION], [$2])],

 [_AM_SET_OPTIONS([$1])dnl

+dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.

+m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,

+  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl

  AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl

  AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl

@@ -6838,6 +6843,10 @@ AC_PROVIDE_IFELSE([AC_PROG_CXX],

                   [_AM_DEPENDENCIES(CXX)],

                   [define([AC_PROG_CXX],

                           defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl

+AC_PROVIDE_IFELSE([AC_PROG_OBJC],

+                  [_AM_DEPENDENCIES(OBJC)],

+                  [define([AC_PROG_OBJC],

+                          defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl

 ])

 ])

@@ -6873,7 +6882,7 @@ echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])

 # Define $install_sh.

 AC_DEFUN([AM_PROG_INSTALL_SH],

 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl

-install_sh=${install_sh-"$am_aux_dir/install-sh"}

+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}