From 9f0d9b9890f5f29c474bc8eed3444ee04d1bb5f7 Mon Sep 17 00:00:00 2001
From: aCaB <acab@clamav.net>
Date: Sat, 29 Dec 2007 14:23:09 +0000
Subject: [PATCH] make gcc 3.4.6 build on solaris

git-svn: trunk@3466
---
 ChangeLog                  | 5 +++++
 Makefile.am                | 2 +-
 Makefile.in                | 2 +-
 libclamav/dconf.h          | 6 ++++++
 libclamav/lzma/Makefile.am | 1 -
 libclamav/lzma/Makefile.in | 6 +-----
 libclamav/lzma_iface.h     | 4 ++++
 libclamav/nsis/bzlib.c     | 2 +-
 libclamav/nsis/nulsft.c    | 2 +-
 9 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c51975a9e..30a7d11b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.
diff --git a/Makefile.am b/Makefile.am
index 28fa6320e..5f1365e8c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -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
 
diff --git a/Makefile.in b/Makefile.in
index 5ee269cdc..4065eb7e0 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -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
diff --git a/libclamav/dconf.h b/libclamav/dconf.h
index 662dc1ae1..120e2ba89 100644
--- a/libclamav/dconf.h
+++ b/libclamav/dconf.h
@@ -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>
 
diff --git a/libclamav/lzma/Makefile.am b/libclamav/lzma/Makefile.am
index a710577f0..7f44ce17c 100644
--- a/libclamav/lzma/Makefile.am
+++ b/libclamav/lzma/Makefile.am
@@ -23,5 +23,4 @@ noinst_LTLIBRARIES = liblzma.la
 liblzma_la_SOURCES = LzmaStateDecode.c \
 		     LzmaStateDecode.h \
 		     LzmaTypes.h
-liblzma_la_LDFLAGS = -static
 
diff --git a/libclamav/lzma/Makefile.in b/libclamav/lzma/Makefile.in
index 3dede31ee..cb423467e 100644
--- a/libclamav/lzma/Makefile.in
+++ b/libclamav/lzma/Makefile.in
@@ -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)
diff --git a/libclamav/lzma_iface.h b/libclamav/lzma_iface.h
index 84fa3e18f..ed5ea392a 100644
--- a/libclamav/lzma_iface.h
+++ b/libclamav/lzma_iface.h
@@ -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"
 
diff --git a/libclamav/nsis/bzlib.c b/libclamav/nsis/bzlib.c
index 104ed2952..0fc9dada2 100644
--- a/libclamav/nsis/bzlib.c
+++ b/libclamav/nsis/bzlib.c
@@ -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, 
diff --git a/libclamav/nsis/nulsft.c b/libclamav/nsis/nulsft.c
index f38f97dff..ff4bb1602 100644
--- a/libclamav/nsis/nulsft.c
+++ b/libclamav/nsis/nulsft.c
@@ -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 */