Sophie

Sophie

distrib > Mandriva > 2009.1 > x86_64 > by-pkgid > c7c86d531e3b9469eafd4bf0c1a54c5b > files > 3

clamav-0.96-0.1mdv2009.1.src.rpm

diff -Naur clamav-0.95.1/clamav-milter/Makefile.am clamav-0.95.1.oden/clamav-milter/Makefile.am
--- clamav-0.95.1/clamav-milter/Makefile.am	2009-04-09 15:24:56.000000000 +0200
+++ clamav-0.95.1.oden/clamav-milter/Makefile.am	2009-04-09 15:25:25.000000000 +0200
@@ -45,7 +45,7 @@
 endif
 
 DEFS = @DEFS@ -DCL_NOLIBCLAMAV
-CFLAGS=`echo "@CFLAGS@" | sed -e 's/-Wwrite-strings//' -e 's/-Werror /-Werror -Wno-error=format-nonliteral /'`
+CFLAGS=@CFLAGS@
 LIBS = @CLAMAV_MILTER_LIBS@ $(top_builddir)/libclamav/libclamav_internal_utils.la @THREAD_LIBS@
 AM_CPPFLAGS = -I$(top_srcdir)/clamd -I$(top_srcdir)/libclamav -I$(top_srcdir)/shared -I$(top_srcdir)
 CLEANFILES=*.gcda *.gcno
diff -Naur clamav-0.95.1/clamav-milter/Makefile.in clamav-0.95.1.oden/clamav-milter/Makefile.in
--- clamav-0.95.1/clamav-milter/Makefile.in	2009-04-09 15:24:56.000000000 +0200
+++ clamav-0.95.1.oden/clamav-milter/Makefile.in	2009-04-09 15:25:25.000000000 +0200
@@ -123,7 +123,7 @@
 CC = @CC@
 CCDEPMODE = @CCDEPMODE@
 CFGDIR = @CFGDIR@
-CFLAGS = `echo "@CFLAGS@" | sed -e 's/-Wwrite-strings//' -e 's/-Werror /-Werror -Wno-error=format-nonliteral /'`
+CFLAGS = @CFLAGS@
 CHECK_CPPFLAGS = @CHECK_CPPFLAGS@
 CHECK_LIBS = @CHECK_LIBS@
 CLAMAVGROUP = @CLAMAVGROUP@
diff -Naur clamav-0.95.1/libltdl/Makefile.am clamav-0.95.1.oden/libltdl/Makefile.am
--- clamav-0.95.1/libltdl/Makefile.am	2009-04-01 13:48:54.000000000 +0200
+++ clamav-0.95.1.oden/libltdl/Makefile.am	2009-04-09 15:26:12.000000000 +0200
@@ -29,7 +29,7 @@
 #####
 
 # ClamAV: filter -Werror here
-CFLAGS=`echo "@CFLAGS@" | sed -e 's/-Werror[^=-]//'`
+CFLAGS=@CFLAGS@
 
 ACLOCAL_AMFLAGS = -I m4
 AUTOMAKE_OPTIONS = foreign
diff -Naur clamav-0.95.1/libltdl/Makefile.in clamav-0.95.1.oden/libltdl/Makefile.in
--- clamav-0.95.1/libltdl/Makefile.in	2009-04-07 19:56:26.000000000 +0200
+++ clamav-0.95.1.oden/libltdl/Makefile.in	2009-04-09 15:26:59.000000000 +0200
@@ -165,7 +165,7 @@
 CFGDIR = @CFGDIR@
 
 # ClamAV: filter -Werror here
-CFLAGS = `echo "@CFLAGS@" | sed -e 's/-Werror[^=-]//'`
+CFLAGS = @CFLAGS@
 CHECK_CPPFLAGS = @CHECK_CPPFLAGS@
 CHECK_LIBS = @CHECK_LIBS@
 CLAMAVGROUP = @CLAMAVGROUP@