new file mode 100644

@@ -0,0 +1,45 @@

+Modified files from libbzip2 are present under libclamav/nsis.

+The original LICENSE file for bzip2 and libbzip2 is reproduced below.

+

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

+

+This program, "bzip2", the associated library "libbzip2", and all

+documentation, are copyright (C) 1996-2006 Julian R Seward.  All

+rights reserved.

+

+Redistribution and use in source and binary forms, with or without

+modification, are permitted provided that the following conditions

+are met:

+

+1. Redistributions of source code must retain the above copyright

+   notice, this list of conditions and the following disclaimer.

+

+2. The origin of this software must not be misrepresented; you must 

+   not claim that you wrote the original software.  If you use this 

+   software in a product, an acknowledgment in the product 

+   documentation would be appreciated but is not required.

+

+3. Altered source versions must be plainly marked as such, and must

+   not be misrepresented as being the original software.

+

+4. The name of the author may not be used to endorse or promote 

+   products derived from this software without specific prior written 

+   permission.

+

+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS

+OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

+ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY

+DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL

+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE

+GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS

+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,

+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING

+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

+

+Julian Seward, Cambridge, UK.

+jseward@bzip.org

+bzip2/libbzip2 version 1.0.4 of 20 December 2006

+

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

new file mode 100644

@@ -0,0 +1,72 @@

+Original unmodified files from the LZMA SDK are included under libclamav/lzma.

+The original lzma.txt license file, a small portion of which is reproduced below,

+is available under libclamav/lzma/lzma.txt. 

+

+LICENSE

+-------

+

+LZMA SDK is available under any of the following licenses:

+

+1) GNU Lesser General Public License (GNU LGPL)

+2) Common Public License (CPL)

+3) Simplified license for unmodified code (read SPECIAL EXCEPTION) 

+4) Proprietary license 

+

+It means that you can select one of these four options and follow rules of that license.

+

+

+1,2) GNU LGPL and CPL licenses are pretty similar and both these

+licenses are classified as 

+ - "Free software licenses" at http://www.gnu.org/ 

+ - "OSI-approved" at http://www.opensource.org/

+

+

+3) SPECIAL EXCEPTION

+

+Igor Pavlov, as the author of this code, expressly permits you 

+to statically or dynamically link your code (or bind by name) 

+to the files from LZMA SDK without subjecting your linked 

+code to the terms of the CPL or GNU LGPL. 

+Any modifications or additions to files from LZMA SDK, however, 

+are subject to the GNU LGPL or CPL terms.

+

+SPECIAL EXCEPTION allows you to use LZMA SDK in applications with closed code, 

+while you keep LZMA SDK code unmodified.

+

+

+SPECIAL EXCEPTION #2: Igor Pavlov, as the author of this code, expressly permits 

+you to use this code under the same terms and conditions contained in the License 

+Agreement you have for any previous version of LZMA SDK developed by Igor Pavlov.

+

+SPECIAL EXCEPTION #2 allows owners of proprietary licenses to use latest version 

+of LZMA SDK as update for previous versions.

+

+

+SPECIAL EXCEPTION #3: Igor Pavlov, as the author of this code, expressly permits 

+you to use code of the following files: 

+BranchTypes.h, LzmaTypes.h, LzmaTest.c, LzmaStateTest.c, LzmaAlone.cpp, 

+LzmaAlone.cs, LzmaAlone.java

+as public domain code. 

+

+

+4) Proprietary license

+

+LZMA SDK also can be available under a proprietary license which 

+can include:

+

+1) Right to modify code without subjecting modified code to the 

+terms of the CPL or GNU LGPL

+2) Technical support for code

+

+To request such proprietary license or any additional consultations,

+send email message from that page:

+http://www.7-zip.org/support.html

+

+

+You should have received a copy of the GNU Lesser General Public

+License along with this library; if not, write to the Free Software

+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+

+You should have received a copy of the Common Public License

+along with this library.

+

deleted file mode 100644

@@ -1,308 +0,0 @@

-********************************************************************************

-   This document contains licence details for files in libclamav/nsis. It can

-   be accessed on-line at http://nsis.sourceforge.net/License

-********************************************************************************

-

-Copyright (C) 1995-2007 Contributors 

-

-More detailed copyright information can be found in the individual source code 

-files. 

-

-Applicable licenses 

-

-* All NSIS source code, plug-ins, documentation, examples, header files and 

-  graphics, with the exception of the compression modules and where otherwise 

-  noted, are licensed under the zlib/libpng license. 

-

-* The zlib compression module for NSIS is licensed under the zlib/libpng

-  license. 

-

-* The bzip2 compression module for NSIS is licensed under the bzip2 license. 

-

-* The lzma compression module for NSIS is licensed under the Common Public

-  License version 1.0. 

-

-zlib/libpng license 

-

-This software is provided 'as-is', without any express or implied warranty. In 

-no event will the authors be held liable for any damages arising from the use

-of this software. 

-

-Permission is granted to anyone to use this software for any purpose, including 

-commercial applications, and to alter it and redistribute it freely, subject to 

-the following restrictions: 

-

-  1. The origin of this software must not be misrepresented; you must not

-     claim that you wrote the original software. If you use this software in

-     a product, an acknowledgment in the product documentation would be

-     appreciated but is not required. 

-

-  2. Altered source versions must be plainly marked as such, and must not be

-     misrepresented as being the original software. 

-

-  3. This notice may not be removed or altered from any source distribution. 

-

-bzip2 license 

-

-Redistribution and use in source and binary forms, with or without

-modification, are permitted provided that the following conditions are met: 

-

-  1. Redistributions of source code must retain the above copyright notice,

-     this list of conditions and the following disclaimer.

-

-  2. The origin of this software must not be misrepresented; you must not

-     claim that you wrote the original software. If you use this software in

-     a product, an acknowledgment in the product documentation would be

-     appreciated but is not required. 

-

-  3. Altered source versions must be plainly marked as such, and must not be

-     misrepresented as being the original software.

-

-  4. The name of the author may not be used to endorse or promote products

-     derived from this software without specific prior written permission. 

-

-THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS AND ANY EXPRESS OR IMPLIED 

-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 

-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO

-EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 

-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT 

-OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 

-INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN

-CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING

-IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY

-OF SUCH DAMAGE. 

-

-Julian Seward, Cambridge, UK. 

-

-jseward@acm.org 

-

-Common Public License version 1.0 

-

-THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON PUBLIC 

-LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM 

-CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT. 

-

-1. DEFINITIONS 

-

-"Contribution" means: 

-

-a) in the case of the initial Contributor, the initial code and documentation 

-   distributed under this Agreement, and b) in the case of each subsequent 

-   Contributor: 

-

-i) changes to the Program, and 

-

-ii) additions to the Program; 

-

-where such changes and/or additions to the Program originate from and are 

-distributed by that particular Contributor. A Contribution 'originates' from a 

-Contributor if it was added to the Program by such Contributor itself or anyone 

-acting on such Contributor's behalf. Contributions do not include additions to 

-the Program which: (i) are separate modules of software distributed in 

-conjunction with the Program under their own license agreement, and (ii) are

-not derivative works of the Program. 

-

-"Contributor" means any person or entity that distributes the Program. 

-

-"Licensed Patents " mean patent claims licensable by a Contributor which are 

-necessarily infringed by the use or sale of its Contribution alone or when 

-combined with the Program. 

-

-"Program" means the Contributions distributed in accordance with this Agreement.

-

-"Recipient" means anyone who receives the Program under this Agreement, 

-including all Contributors. 

-

-2. GRANT OF RIGHTS 

-

-a) Subject to the terms of this Agreement, each Contributor hereby grants 

-Recipient a non-exclusive, worldwide, royalty-free copyright license to 

-reproduce, prepare derivative works of, publicly display, publicly perform, 

-distribute and sublicense the Contribution of such Contributor, if any, and

-such derivative works, in source code and object code form. 

-

-b) Subject to the terms of this Agreement, each Contributor hereby grants 

-Recipient a non-exclusive, worldwide, royalty-free patent license under

-Licensed Patents to make, use, sell, offer to sell, import and otherwise

-transfer the Contribution of such Contributor, if any, in source code and

-object code form. This patent license shall apply to the combination of the

-Contribution and the Program if, at the time the Contribution is added by the

-Contributor, such addition of the Contribution causes such combination to be

-covered by the Licensed Patents. The patent license shall not apply to any

-other combinations which include the Contribution. No hardware per se is

-licensed hereunder.

-

-c) Recipient understands that although each Contributor grants the licenses to 

-its Contributions set forth herein, no assurances are provided by any 

-Contributor that the Program does not infringe the patent or other intellectual 

-property rights of any other entity. Each Contributor disclaims any liability

-to Recipient for claims brought by any other entity based on infringement of 

-intellectual property rights or otherwise. As a condition to exercising the 

-rights and licenses granted hereunder, each Recipient hereby assumes sole 

-responsibility to secure any other intellectual property rights needed, if any. 

-For example, if a third party patent license is required to allow Recipient to 

-distribute the Program, it is Recipient's responsibility to acquire that

-license before distributing the Program. 

-

-d) Each Contributor represents that to its knowledge it has sufficient

-copyright rights in its Contribution, if any, to grant the copyright license

-set forth in this Agreement. 

-

-3. REQUIREMENTS 

-

-A Contributor may choose to distribute the Program in object code form under

-its own license agreement, provided that: 

-

-a) it complies with the terms and conditions of this Agreement; and 

-

-b) its license agreement: 

-

-i) effectively disclaims on behalf of all Contributors all warranties and 

-conditions, express and implied, including warranties or conditions of title

-and non-infringement, and implied warranties or conditions of merchantability

-and fitness for a particular purpose; 

-

-ii) effectively excludes on behalf of all Contributors all liability for

-damages, including direct, indirect, special, incidental and consequential

-damages, such as lost profits; 

-

-iii) states that any provisions which differ from this Agreement are offered by 

-that Contributor alone and not by any other party; and 

-

-iv) states that source code for the Program is available from such Contributor, 

-and informs licensees how to obtain it in a reasonable manner on or through a 

-medium customarily used for software exchange. 

-

-When the Program is made available in source code form: 

-

-a) it must be made available under this Agreement; and 

-

-b) a copy of this Agreement must be included with each copy of the Program. 

-

-Contributors may not remove or alter any copyright notices contained within the 

-Program. 

-

-Each Contributor must identify itself as the originator of its Contribution, if 

-any, in a manner that reasonably allows subsequent Recipients to identify the 

-originator of the Contribution. 

-

-4. COMMERCIAL DISTRIBUTION 

-

-Commercial distributors of software may accept certain responsibilities with 

-respect to end users, business partners and the like. While this license is 

-intended to facilitate the commercial use of the Program, the Contributor who 

-includes the Program in a commercial product offering should do so in a manner 

-which does not create potential liability for other Contributors. Therefore, if 

-a Contributor includes the Program in a commercial product offering, such 

-Contributor ("Commercial Contributor") hereby agrees to defend and indemnify 

-every other Contributor ("Indemnified Contributor") against any losses, damages 

-and costs (collectively "Losses") arising from claims, lawsuits and other legal 

-actions brought by a third party against the Indemnified Contributor to the 

-extent caused by the acts or omissions of such Commercial Contributor in 

-connection with its distribution of the Program in a commercial product

-offering. The obligations in this section do not apply to any claims or Losses

-relating to any actual or alleged intellectual property infringement. In order

-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial

-Contributor in writing of such claim, and b) allow the Commercial Contributor

-to control, and cooperate with the Commercial Contributor in, the defense and

-any related settlement negotiations. The Indemnified Contributor may

-participate in any such claim at its own expense. 

-

-For example, a Contributor might include the Program in a commercial product 

-offering, Product X. That Contributor is then a Commercial Contributor. If that 

-Commercial Contributor then makes performance claims, or offers warranties 

-related to Product X, those performance claims and warranties are such 

-Commercial Contributor's responsibility alone. Under this section, the 

-Commercial Contributor would have to defend claims against the other 

-Contributors related to those performance claims and warranties, and if a court 

-requires any other Contributor to pay any damages as a result, the Commercial 

-Contributor must pay those damages. 

-

-5. NO WARRANTY 

-

-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON

-AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS

-OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF

-TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.

-Each Recipient is solely responsible for determining the appropriateness of

-using and distributing the Program and assumes all risks associated with its

-exercise of rights under this Agreement, including but not limited to the risks

-and costs of program errors, compliance with applicable laws, damage to or loss

-of data, programs or equipment, and unavailability or interruption of

-operations. 

-

-6. DISCLAIMER OF LIABILITY 

-

-EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY 

-CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, 

-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST 

-PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, 

-STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY

-WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS

-GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. 

-

-7. GENERAL 

-

-If any provision of this Agreement is invalid or unenforceable under applicable 

-law, it shall not affect the validity or enforceability of the remainder of the 

-terms of this Agreement, and without further action by the parties hereto, such 

-provision shall be reformed to the minimum extent necessary to make such 

-provision valid and enforceable. 

-

-If Recipient institutes patent litigation against a Contributor with respect to 

-a patent applicable to software (including a cross-claim or counterclaim in a 

-lawsuit), then any patent licenses granted by that Contributor to such

-Recipient under this Agreement shall terminate as of the date such litigation

-is filed. In addition, if Recipient institutes patent litigation against any

-entity (including a cross-claim or counterclaim in a lawsuit) alleging that the

-Program itself (excluding combinations of the Program with other software or

-hardware) infringes such Recipient's patent(s), then such Recipient's rights

-granted under Section 2(b) shall terminate as of the date such litigation is

-filed. 

-

-All Recipient's rights under this Agreement shall terminate if it fails to 

-comply with any of the material terms or conditions of this Agreement and does 

-not cure such failure in a reasonable period of time after becoming aware of 

-such noncompliance. If all Recipient's rights under this Agreement terminate, 

-Recipient agrees to cease use and distribution of the Program as soon as 

-reasonably practicable. However, Recipient's obligations under this Agreement 

-and any licenses granted by Recipient relating to the Program shall continue

-and survive. 

-

-Everyone is permitted to copy and distribute copies of this Agreement, but in 

-order to avoid inconsistency the Agreement is copyrighted and may only be 

-modified in the following manner. The Agreement Steward reserves the right to 

-publish new versions (including revisions) of this Agreement from time to time. 

-No one other than the Agreement Steward has the right to modify this Agreement. 

-IBM is the initial Agreement Steward. IBM may assign the responsibility to

-serve as the Agreement Steward to a suitable separate entity. Each new version

-of the Agreement will be given a distinguishing version number. The Program

-(including Contributions) may always be distributed subject to the version of

-the Agreement under which it was received. In addition, after a new version of

-the Agreement is published, Contributor may elect to distribute the Program

-(including its Contributions) under the new version. Except as expressly

-stated in Sections 2(a) and 2(b) above, Recipient receives no rights or

-licenses to the intellectual property of any Contributor under this Agreement,

-whether expressly, by implication, estoppel or otherwise. All rights in the

-Program not expressly granted under this Agreement are reserved. 

-

-This Agreement is governed by the laws of the State of New York and the 

-intellectual property laws of the United States of America. No party to this 

-Agreement will bring a legal action under this Agreement more than one year 

-after the cause of action arose. Each party waives its rights to a jury trial

-in any resulting litigation. 

-

-Special exception for LZMA compression module 

-

-Igor Pavlov and Amir Szekely, the authors of the LZMA compression module for 

-NSIS, expressly permit you to statically or dynamically link your code (or bind 

-by name) to the files from the LZMA compression module for NSIS without 

-subjecting your linked code to the terms of the Common Public license version

-1.0.  Any modifications or additions to files from the LZMA compression module

-for NSIS, however, are subject to the terms of the Common Public License

-version 1.0. 

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

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

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

 # @configure_input@

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

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

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

 #  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

@@ -52,7 +56,6 @@ 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 \

@@ -68,13 +71,14 @@ 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 config.status.lineno

+ configure.lineno configure.status.lineno

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

 CONFIG_HEADER = clamav-config.h

 CONFIG_CLEAN_FILES = clamav-config libclamav.pc \

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

 DIST_SOURCES =

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

 	html-recursive info-recursive install-data-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

+	install-exec-recursive install-info-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/||"`;; \

@@ -102,8 +105,6 @@ 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)

@@ -119,12 +120,16 @@ 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@

@@ -148,13 +153,16 @@ 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@

-INSTALL = @INSTALL@

+HAVE_MILTER_FALSE = @HAVE_MILTER_FALSE@

+HAVE_MILTER_TRUE = @HAVE_MILTER_TRUE@

 INSTALL_DATA = @INSTALL_DATA@

 INSTALL_PROGRAM = @INSTALL_PROGRAM@

 INSTALL_SCRIPT = @INSTALL_SCRIPT@

@@ -168,8 +176,9 @@ 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@

@@ -186,13 +195,13 @@ 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@

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

 build_cpu = @build_cpu@

 build_os = @build_os@

 build_vendor = @build_vendor@

-builddir = @builddir@

 datadir = @datadir@

 datarootdir = @datarootdir@

 docdir = @docdir@

@@ -233,15 +241,12 @@ 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@

-top_builddir = @top_builddir@

-top_srcdir = @top_srcdir@

 SUBDIRS = libclamunrar libclamunrar_iface 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 COPYING.unrar COPYING.LGPL

 bin_SCRIPTS = clamav-config

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

 clamav-config.h: stamp-h1

 	@if test ! -f $@; then \

 	  rm -f stamp-h1; \

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

+	  $(MAKE) stamp-h1; \

 	else :; fi

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

@@ -325,7 +330,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 \

@@ -351,9 +356,10 @@ 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) \

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

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

 	fi; test -z "$$fail"

-$(RECURSIVE_CLEAN_TARGETS):

+mostlyclean-recursive clean-recursive distclean-recursive \

+maintainer-clean-recursive:

 	@failcom='exit 1'; \

 	for f in x $$MAKEFLAGS; do \

 	  case $$f in \

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

 distdir: $(DISTFILES)

 	$(am__remove_distdir)

-	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 \

+	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; \

 	  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; \

@@ -531,7 +540,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`; \

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

 	      $(MAKE) $(AM_MAKEFLAGS) \

 	        top_distdir="$$top_distdir" \

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

-		am__remove_distdir=: \

-		am__skip_length_check=: \

 	        distdir) \

 	      || exit 1; \

 	  fi; \

@@ -548,7 +555,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 $(install_sh) -c -m a+r {} {} \; \

+	  ! -type d ! -perm -444 -exec $(SHELL) $(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

@@ -623,7 +630,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 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'

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

 distuninstallcheck:

 	@cd $(distuninstallcheck_dir) \

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

@@ -648,7 +655,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

@@ -696,20 +703,12 @@ 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

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

 ps-am:

-uninstall-am: uninstall-binSCRIPTS uninstall-pkgconfigDATA

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

+	uninstall-pkgconfigDATA

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

-	install-strip

+uninstall-info: uninstall-info-recursive

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

+.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 \

 	distclean-generic distclean-hdr distclean-libtool \

-	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

+	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

 # 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.10 -*- Autoconf -*-

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

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

-# 2005, 2006  Free Software Foundation, Inc.

+# 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,11 +11,6 @@

 # 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 51 Debian 1.5.24-2 AC_PROG_LIBTOOL

@@ -6597,7 +6592,7 @@ AC_SUBST([SED])

 AC_MSG_RESULT([$SED])

 ])

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

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

 #

 # This file is free software; the Free Software Foundation

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

@@ -6607,29 +6602,14 @@ 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.

-# (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], [])

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

 # AM_SET_CURRENT_AUTOMAKE_VERSION

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

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

+# Call AM_AUTOMAKE_VERSION so it can be traced.

 # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.

 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],

-[AM_AUTOMAKE_VERSION([1.10])dnl

-_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])

+	 [AM_AUTOMAKE_VERSION([1.9.6])])

 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-

@@ -6686,14 +6666,14 @@ am_aux_dir=`cd $ac_aux_dir && pwd`

 # AM_CONDITIONAL                                            -*- Autoconf -*-

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

+# Copyright (C) 1997, 2000, 2001, 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.

-# serial 8

+# serial 7

 # AM_CONDITIONAL(NAME, SHELL-CONDITION)

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

@@ -6702,10 +6682,8 @@ 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