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

+Sat Dec 29 14:41:29 CET 2007 (acab)

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

+  * libclamav:	Misc fixes to make gcc 3.4.6 work on solaris

+  		(requested by Edwin)

+

 Sat Dec 29 12:36:36 EET 2007 (edwin)

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

   * libclamav/others.h: fix typo causing build failure on ppc.

@@ -17,7 +17,7 @@

 #  MA 02110-1301, USA.

 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

+EXTRA_DIST = FAQ contrib test examples BUGS shared libclamav.pc.in UPGRADE COPYING.bzip2 COPYING.lzma COPYING.unrar COPYING.LGPL

 bin_SCRIPTS=clamav-config

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

+EXTRA_DIST = FAQ contrib test examples BUGS shared libclamav.pc.in UPGRADE COPYING.bzip2 COPYING.lzma COPYING.unrar COPYING.LGPL

 bin_SCRIPTS = clamav-config

 pkgconfigdir = $(libdir)/pkgconfig

 pkgconfig_DATA = libclamav.pc

@@ -19,6 +19,12 @@

 #ifndef __DCONF_H

 #define __DCONF_H

+/* DIRTY HACK TO COMPILE ON SOLARIS GCC 3.4.6 */

+#ifdef Byte

+#undef Byte

+#endif

+/* DIRTY HACK TO COMPILE ON SOLARIS GCC 3.4.6 */

+

 #include <stdio.h>

 #include <zlib.h>

@@ -23,5 +23,4 @@ noinst_LTLIBRARIES = liblzma.la

 liblzma_la_SOURCES = LzmaStateDecode.c \

 		     LzmaStateDecode.h \

 		     LzmaTypes.h

-liblzma_la_LDFLAGS = -static

@@ -66,9 +66,6 @@ LTLIBRARIES = $(noinst_LTLIBRARIES)

 liblzma_la_LIBADD =

 am_liblzma_la_OBJECTS = LzmaStateDecode.lo

 liblzma_la_OBJECTS = $(am_liblzma_la_OBJECTS)

-liblzma_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \

-	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \

-	$(liblzma_la_LDFLAGS) $(LDFLAGS) -o $@

 DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@

 depcomp = $(SHELL) $(top_srcdir)/depcomp

 am__depfiles_maybe = depfiles

@@ -216,7 +213,6 @@ liblzma_la_SOURCES = LzmaStateDecode.c \

 		     LzmaStateDecode.h \

 		     LzmaTypes.h

-liblzma_la_LDFLAGS = -static

 all: all-am

 .SUFFIXES:

@@ -260,7 +256,7 @@ clean-noinstLTLIBRARIES:

 	  rm -f "$${dir}/so_locations"; \

 	done

 liblzma.la: $(liblzma_la_OBJECTS) $(liblzma_la_DEPENDENCIES) 

-	$(liblzma_la_LINK)  $(liblzma_la_OBJECTS) $(liblzma_la_LIBADD) $(LIBS)

+	$(LINK)  $(liblzma_la_OBJECTS) $(liblzma_la_LIBADD) $(LIBS)

 mostlyclean-compile:

 	-rm -f *.$(OBJEXT)

@@ -22,6 +22,10 @@

 #ifndef __LZMA_IFACE_H

 #define __LZMA_IFACE_H

+/* DIRTY HACK TO COMPILE ON SOLARIS GCC 3.4.6 */

+#define Byte BByte

+/* DIRTY HACK TO COMPILE ON SOLARIS GCC 3.4.6 */

+

 #include "LzmaStateDecode.h"

 #include "cltypes.h"

@@ -33,7 +33,7 @@

 #include "bzlib_private.h"

 #include "others.h"

-const Int32 BZ2_rNums[512] = { 

+static const Int32 BZ2_rNums[512] = { 

    619, 720, 127, 481, 931, 816, 813, 233, 566, 247, 

    985, 724, 205, 454, 863, 491, 741, 242, 949, 214, 

    733, 859, 335, 708, 621, 574, 73, 654, 730, 472, 

@@ -32,8 +32,8 @@

 #include "others.h"

 #include "cltypes.h"

 #include "nsis_bzlib.h"

-#include "lzma_iface.h"

 #include "zlib.h"

+#include "lzma_iface.h"

 #include "matcher.h"

 #include "scanners.h"

 #include "nulsft.h" /* SHUT UP GCC -Wextra */