@@ -1,3 +1,9 @@

+Wed Nov 12 19:32:17 EET 2008 (edwin)

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

+ * libclamav/readdb.c, libltdl/Makefile.am, libltdl/Makefile.in: Fix

+ -Werror build: there is no libltdl directory when building with

+ VPATH,  $(srcdir)/libltdl is enough. Filter -Werror in libltdl.

+

 Wed Nov 12 19:03:36 EET 2008 (edwin)

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

  * clamd/thrmgr.c, unit_tests/check_clamav.c,

@@ -85,7 +85,7 @@ int (*cli_unrar_extract_next)(unrar_state_t *state, const char *dirname);

 void (*cli_unrar_close)(unrar_state_t *state);

 int have_rar = 0;

-void cli_rarload(void) {

+static void cli_rarload(void) {

     lt_dlhandle rhandle;

 #ifndef CL_THREAD_SAFE

@@ -28,6 +28,9 @@

 ## 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

 #####

+# ClamAV: filter -Werror here

+CFLAGS=`echo "@CFLAGS@" | sed -e 's/-Werror[^-]//'`

+

 ACLOCAL_AMFLAGS = -I m4

 AUTOMAKE_OPTIONS = foreign

 AM_CPPFLAGS =

@@ -44,7 +47,7 @@ MOSTLYCLEANFILES =

 # -I$(srcdir) is needed for user that built libltdl with a sub-Automake

 # (not as a sub-package!) using 'nostdinc':

 AM_CPPFLAGS	       += -DLT_CONFIG_H='<$(LT_CONFIG_H)>' \

-			  -DLTDL -I. -I$(srcdir) -Ilibltdl \

+			  -DLTDL -I. -I$(srcdir) \

 			  -I$(srcdir)/libltdl -I$(srcdir)/libltdl

 AM_LDFLAGS	       += -no-undefined

 LTDL_VERSION_INFO	= -version-info 9:0:2

@@ -162,7 +162,9 @@ AWK = @AWK@

 CC = @CC@

 CCDEPMODE = @CCDEPMODE@

 CFGDIR = @CFGDIR@

-CFLAGS = @CFLAGS@

+

+# ClamAV: filter -Werror here

+CFLAGS = `echo "@CFLAGS@" | sed -e 's/-Werror[^-]//'`

 CHECK_CPPFLAGS = @CHECK_CPPFLAGS@

 CHECK_LIBS = @CHECK_LIBS@

 CLAMAVGROUP = @CLAMAVGROUP@

@@ -314,7 +316,7 @@ AUTOMAKE_OPTIONS = foreign

 # -I$(srcdir) is needed for user that built libltdl with a sub-Automake

 # (not as a sub-package!) using 'nostdinc':

 AM_CPPFLAGS = -DLT_CONFIG_H='<$(LT_CONFIG_H)>' -DLTDL -I. -I$(srcdir) \

-	-Ilibltdl -I$(srcdir)/libltdl -I$(srcdir)/libltdl

+	-I$(srcdir)/libltdl -I$(srcdir)/libltdl

 AM_LDFLAGS = -no-undefined

 BUILT_SOURCES = $(ARGZ_H)

 include_HEADERS = $(am__append_1)