1. clamav-devel
  2. Commit 93c98bac22fea899e3bc40d99e38ebc10a612b30
Browse code

fix JPEG rule

git-svn-id: file:///var/lib/svn/clamav-devel/trunk/clamav-devel@912 77e5149b-7576-45b1-b177-96237e5ba77b

Tomasz Kojm authored on 2004/09/21 10:41:23
Showing 17 changed files
ChangeLog
History View file @ 93c98ba
... ... 
@@ -1,3 +1,7 @@
1 
+Tue Sep 21 03:25:59 CEST 2004 (tk)
2 
+----------------------------------
3 
+  * libclamav/filetypes.c: fix JPEG rule
4 
+
1 5 
 Mon Sep 20 18:08:53 BST 2004 (njh)
2 6 
 ----------------------------------
3 7 
   * libclamav/mbox.c:	Some performance enhancements
Makefile.in
History View file @ 93c98ba
... ... 
@@ -134,8 +134,8 @@ FRESHCLAM_LIBS = @FRESHCLAM_LIBS@
134 134 
 GETENT = @GETENT@
135 135 
 HAVE_MILTER_FALSE = @HAVE_MILTER_FALSE@
136 136 
 HAVE_MILTER_TRUE = @HAVE_MILTER_TRUE@
137 
-INSTALL_CLAMAV_CONF_FALSE = @INSTALL_CLAMAV_CONF_FALSE@
138 
-INSTALL_CLAMAV_CONF_TRUE = @INSTALL_CLAMAV_CONF_TRUE@
137 
+INSTALL_CLAMD_CONF_FALSE = @INSTALL_CLAMD_CONF_FALSE@
138 
+INSTALL_CLAMD_CONF_TRUE = @INSTALL_CLAMD_CONF_TRUE@
139 139 
 INSTALL_DATA = @INSTALL_DATA@
140 140 
 INSTALL_FRESHCLAM_CONF_FALSE = @INSTALL_FRESHCLAM_CONF_FALSE@
141 141 
 INSTALL_FRESHCLAM_CONF_TRUE = @INSTALL_FRESHCLAM_CONF_TRUE@
clamav-config
History View file @ 93c98ba
... ... 
@@ -46,7 +46,7 @@ while test $# -gt 0; do
46 46 
 	;;
47 47
48 48 
     --version)
49 
-	echo devel-20040830
49 
+	echo devel-20040921
50 50 
 	exit 0
51 51 
 	;;
52 52
clamav-milter/Makefile.in
History View file @ 93c98ba
... ... 
@@ -139,8 +139,8 @@ FRESHCLAM_LIBS = @FRESHCLAM_LIBS@
139 139 
 GETENT = @GETENT@
140 140 
 HAVE_MILTER_FALSE = @HAVE_MILTER_FALSE@
141 141 
 HAVE_MILTER_TRUE = @HAVE_MILTER_TRUE@
142 
-INSTALL_CLAMAV_CONF_FALSE = @INSTALL_CLAMAV_CONF_FALSE@
143 
-INSTALL_CLAMAV_CONF_TRUE = @INSTALL_CLAMAV_CONF_TRUE@
142 
+INSTALL_CLAMD_CONF_FALSE = @INSTALL_CLAMD_CONF_FALSE@
143 
+INSTALL_CLAMD_CONF_TRUE = @INSTALL_CLAMD_CONF_TRUE@
144 144 
 INSTALL_DATA = @INSTALL_DATA@
145 145 
 INSTALL_FRESHCLAM_CONF_FALSE = @INSTALL_FRESHCLAM_CONF_FALSE@
146 146 
 INSTALL_FRESHCLAM_CONF_TRUE = @INSTALL_FRESHCLAM_CONF_TRUE@
clamd/Makefile.in
History View file @ 93c98ba
... ... 
@@ -154,8 +154,8 @@ FRESHCLAM_LIBS = @FRESHCLAM_LIBS@
154 154 
 GETENT = @GETENT@
155 155 
 HAVE_MILTER_FALSE = @HAVE_MILTER_FALSE@
156 156 
 HAVE_MILTER_TRUE = @HAVE_MILTER_TRUE@
157 
-INSTALL_CLAMAV_CONF_FALSE = @INSTALL_CLAMAV_CONF_FALSE@
158 
-INSTALL_CLAMAV_CONF_TRUE = @INSTALL_CLAMAV_CONF_TRUE@
157 
+INSTALL_CLAMD_CONF_FALSE = @INSTALL_CLAMD_CONF_FALSE@
158 
+INSTALL_CLAMD_CONF_TRUE = @INSTALL_CLAMD_CONF_TRUE@
159 159 
 INSTALL_DATA = @INSTALL_DATA@
160 160 
 INSTALL_FRESHCLAM_CONF_FALSE = @INSTALL_FRESHCLAM_CONF_FALSE@
161 161 
 INSTALL_FRESHCLAM_CONF_TRUE = @INSTALL_FRESHCLAM_CONF_TRUE@
clamdscan/Makefile.in
History View file @ 93c98ba
... ... 
@@ -139,8 +139,8 @@ FRESHCLAM_LIBS = @FRESHCLAM_LIBS@
139 139 
 GETENT = @GETENT@
140 140 
 HAVE_MILTER_FALSE = @HAVE_MILTER_FALSE@
141 141 
 HAVE_MILTER_TRUE = @HAVE_MILTER_TRUE@
142 
-INSTALL_CLAMAV_CONF_FALSE = @INSTALL_CLAMAV_CONF_FALSE@
143 
-INSTALL_CLAMAV_CONF_TRUE = @INSTALL_CLAMAV_CONF_TRUE@
142 
+INSTALL_CLAMD_CONF_FALSE = @INSTALL_CLAMD_CONF_FALSE@
143 
+INSTALL_CLAMD_CONF_TRUE = @INSTALL_CLAMD_CONF_TRUE@
144 144 
 INSTALL_DATA = @INSTALL_DATA@
145 145 
 INSTALL_FRESHCLAM_CONF_FALSE = @INSTALL_FRESHCLAM_CONF_FALSE@
146 146 
 INSTALL_FRESHCLAM_CONF_TRUE = @INSTALL_FRESHCLAM_CONF_TRUE@
clamscan/Makefile.in
History View file @ 93c98ba
... ... 
@@ -134,8 +134,8 @@ FRESHCLAM_LIBS = @FRESHCLAM_LIBS@
134 134 
 GETENT = @GETENT@
135 135 
 HAVE_MILTER_FALSE = @HAVE_MILTER_FALSE@
136 136 
 HAVE_MILTER_TRUE = @HAVE_MILTER_TRUE@
137 
-INSTALL_CLAMAV_CONF_FALSE = @INSTALL_CLAMAV_CONF_FALSE@
138 
-INSTALL_CLAMAV_CONF_TRUE = @INSTALL_CLAMAV_CONF_TRUE@
137 
+INSTALL_CLAMD_CONF_FALSE = @INSTALL_CLAMD_CONF_FALSE@
138 
+INSTALL_CLAMD_CONF_TRUE = @INSTALL_CLAMD_CONF_TRUE@
139 139 
 INSTALL_DATA = @INSTALL_DATA@
140 140 
 INSTALL_FRESHCLAM_CONF_FALSE = @INSTALL_FRESHCLAM_CONF_FALSE@
141 141 
 INSTALL_FRESHCLAM_CONF_TRUE = @INSTALL_FRESHCLAM_CONF_TRUE@
configure
History View file @ 93c98ba
... ... 
@@ -468,7 +468,7 @@ ac_includes_default="\
468 468 
 # include <unistd.h>
469 469 
 #endif"
470 470
471 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot LIBCLAMAV_VERSION CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE LN_S ECHO RANLIB ac_ct_RANLIB CPP EGREP LIBTOOL DBDIR CFGDIR INSTALL_CLAMAV_CONF_TRUE INSTALL_CLAMAV_CONF_FALSE INSTALL_FRESHCLAM_CONF_TRUE INSTALL_FRESHCLAM_CONF_FALSE LIBCLAMAV_LIBS CLAMD_LIBS CLAMAV_MILTER_LIBS FRESHCLAM_LIBS TH_SAFE ADDITIONAL_LIBS BUILD_CLAMD_TRUE BUILD_CLAMD_FALSE HAVE_MILTER_TRUE HAVE_MILTER_FALSE SENDMAIL GETENT CLAMAVUSER CLAMAVGROUP LIBOBJS LTLIBOBJS'
471 
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot LIBCLAMAV_VERSION CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE LN_S ECHO RANLIB ac_ct_RANLIB CPP EGREP LIBTOOL DBDIR CFGDIR INSTALL_CLAMD_CONF_TRUE INSTALL_CLAMD_CONF_FALSE INSTALL_FRESHCLAM_CONF_TRUE INSTALL_FRESHCLAM_CONF_FALSE LIBCLAMAV_LIBS CLAMD_LIBS CLAMAV_MILTER_LIBS FRESHCLAM_LIBS TH_SAFE ADDITIONAL_LIBS BUILD_CLAMD_TRUE BUILD_CLAMD_FALSE HAVE_MILTER_TRUE HAVE_MILTER_FALSE SENDMAIL GETENT CLAMAVUSER CLAMAVGROUP LIBOBJS LTLIBOBJS'
472 472 
 ac_subst_files=''
473 473
474 474 
 # Initialize some variables set by options.
... ... 
@@ -11203,12 +11203,12 @@ _ACEOF
11203 11203
11204 11204
11205 11205
11206 
-if test ! -r "$cfg_dir/clamav.conf"; then
11207 
-  INSTALL_CLAMAV_CONF_TRUE=
11208 
-  INSTALL_CLAMAV_CONF_FALSE='#'
11206 
+if test ! -r "$cfg_dir/clamd.conf"; then
11207 
+  INSTALL_CLAMD_CONF_TRUE=
11208 
+  INSTALL_CLAMD_CONF_FALSE='#'
11209 11209 
 else
11210 
-  INSTALL_CLAMAV_CONF_TRUE='#'
11211 
-  INSTALL_CLAMAV_CONF_FALSE=
11210 
+  INSTALL_CLAMD_CONF_TRUE='#'
11211 
+  INSTALL_CLAMD_CONF_FALSE=
11212 11212 
 fi
11213 11213
11214 11214
... ... 
@@ -13499,10 +13499,10 @@ echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
13499 13499 
 Usually this means the macro was only invoked conditionally." >&2;}
13500 13500 
    { (exit 1); exit 1; }; }
13501 13501 
 fi
13502 
-if test -z "${INSTALL_CLAMAV_CONF_TRUE}" && test -z "${INSTALL_CLAMAV_CONF_FALSE}"; then
13503 
-  { { echo "$as_me:$LINENO: error: conditional \"INSTALL_CLAMAV_CONF\" was never defined.
13502 
+if test -z "${INSTALL_CLAMD_CONF_TRUE}" && test -z "${INSTALL_CLAMD_CONF_FALSE}"; then
13503 
+  { { echo "$as_me:$LINENO: error: conditional \"INSTALL_CLAMD_CONF\" was never defined.
13504 13504 
 Usually this means the macro was only invoked conditionally." >&5
13505 
-echo "$as_me: error: conditional \"INSTALL_CLAMAV_CONF\" was never defined.
13505 
+echo "$as_me: error: conditional \"INSTALL_CLAMD_CONF\" was never defined.
13506 13506 
 Usually this means the macro was only invoked conditionally." >&2;}
13507 13507 
    { (exit 1); exit 1; }; }
13508 13508 
 fi
... ... 
@@ -14129,8 +14129,8 @@ s,@EGREP@,$EGREP,;t t
14129 14129 
 s,@LIBTOOL@,$LIBTOOL,;t t
14130 14130 
 s,@DBDIR@,$DBDIR,;t t
14131 14131 
 s,@CFGDIR@,$CFGDIR,;t t
14132 
-s,@INSTALL_CLAMAV_CONF_TRUE@,$INSTALL_CLAMAV_CONF_TRUE,;t t
14133 
-s,@INSTALL_CLAMAV_CONF_FALSE@,$INSTALL_CLAMAV_CONF_FALSE,;t t
14132 
+s,@INSTALL_CLAMD_CONF_TRUE@,$INSTALL_CLAMD_CONF_TRUE,;t t
14133 
+s,@INSTALL_CLAMD_CONF_FALSE@,$INSTALL_CLAMD_CONF_FALSE,;t t
14134 14134 
 s,@INSTALL_FRESHCLAM_CONF_TRUE@,$INSTALL_FRESHCLAM_CONF_TRUE,;t t
14135 14135 
 s,@INSTALL_FRESHCLAM_CONF_FALSE@,$INSTALL_FRESHCLAM_CONF_FALSE,;t t
14136 14136 
 s,@LIBCLAMAV_LIBS@,$LIBCLAMAV_LIBS,;t t
configure.in
History View file @ 93c98ba
... ... 
@@ -225,7 +225,7 @@ AC_SUBST(CFGDIR)
225 225 
 AC_DEFINE_UNQUOTED(CONFDIR,"$cfg_dir",[where to look for the config file])
226 226
227 227 
 dnl Do not overwrite current config files
228 
-AM_CONDITIONAL(INSTALL_CLAMAV_CONF, test ! -r "$cfg_dir/clamav.conf")
228 
+AM_CONDITIONAL(INSTALL_CLAMD_CONF, test ! -r "$cfg_dir/clamd.conf")
229 229 
 AM_CONDITIONAL(INSTALL_FRESHCLAM_CONF, test ! -r "$cfg_dir/freshclam.conf")
230 230
231 231 
 dnl check for in_port_t definition
database/Makefile.in
History View file @ 93c98ba
... ... 
@@ -103,8 +103,8 @@ FRESHCLAM_LIBS = @FRESHCLAM_LIBS@
103 103 
 GETENT = @GETENT@
104 104 
 HAVE_MILTER_FALSE = @HAVE_MILTER_FALSE@
105 105 
 HAVE_MILTER_TRUE = @HAVE_MILTER_TRUE@
106 
-INSTALL_CLAMAV_CONF_FALSE = @INSTALL_CLAMAV_CONF_FALSE@
107 
-INSTALL_CLAMAV_CONF_TRUE = @INSTALL_CLAMAV_CONF_TRUE@
106 
+INSTALL_CLAMD_CONF_FALSE = @INSTALL_CLAMD_CONF_FALSE@
107 
+INSTALL_CLAMD_CONF_TRUE = @INSTALL_CLAMD_CONF_TRUE@
108 108 
 INSTALL_DATA = @INSTALL_DATA@
109 109 
 INSTALL_FRESHCLAM_CONF_FALSE = @INSTALL_FRESHCLAM_CONF_FALSE@
110 110 
 INSTALL_FRESHCLAM_CONF_TRUE = @INSTALL_FRESHCLAM_CONF_TRUE@
docs/Makefile.in
History View file @ 93c98ba
... ... 
@@ -107,8 +107,8 @@ FRESHCLAM_LIBS = @FRESHCLAM_LIBS@
107 107 
 GETENT = @GETENT@
108 108 
 HAVE_MILTER_FALSE = @HAVE_MILTER_FALSE@
109 109 
 HAVE_MILTER_TRUE = @HAVE_MILTER_TRUE@
110 
-INSTALL_CLAMAV_CONF_FALSE = @INSTALL_CLAMAV_CONF_FALSE@
111 
-INSTALL_CLAMAV_CONF_TRUE = @INSTALL_CLAMAV_CONF_TRUE@
110 
+INSTALL_CLAMD_CONF_FALSE = @INSTALL_CLAMD_CONF_FALSE@
111 
+INSTALL_CLAMD_CONF_TRUE = @INSTALL_CLAMD_CONF_TRUE@
112 112 
 INSTALL_DATA = @INSTALL_DATA@
113 113 
 INSTALL_FRESHCLAM_CONF_FALSE = @INSTALL_FRESHCLAM_CONF_FALSE@
114 114 
 INSTALL_FRESHCLAM_CONF_TRUE = @INSTALL_FRESHCLAM_CONF_TRUE@
etc/Makefile.am
History View file @ 93c98ba
... ... 
@@ -22,7 +22,7 @@ CFGINST = @CFGDIR@
22 22
23 23 
 install:
24 24 
 	$(mkinstalldirs) $(DESTDIR)$(CFGINST)
25 
-if INSTALL_CLAMAV_CONF
25 
+if INSTALL_CLAMD_CONF
26 26 
 	@$(INSTALL_DATA) $(srcdir)/clamd.conf $(DESTDIR)$(CFGINST)
27 27 
 endif
28 28 
 if INSTALL_FRESHCLAM_CONF
etc/Makefile.in
History View file @ 93c98ba
... ... 
@@ -103,8 +103,8 @@ FRESHCLAM_LIBS = @FRESHCLAM_LIBS@
103 103 
 GETENT = @GETENT@
104 104 
 HAVE_MILTER_FALSE = @HAVE_MILTER_FALSE@
105 105 
 HAVE_MILTER_TRUE = @HAVE_MILTER_TRUE@
106 
-INSTALL_CLAMAV_CONF_FALSE = @INSTALL_CLAMAV_CONF_FALSE@
107 
-INSTALL_CLAMAV_CONF_TRUE = @INSTALL_CLAMAV_CONF_TRUE@
106 
+INSTALL_CLAMD_CONF_FALSE = @INSTALL_CLAMD_CONF_FALSE@
107 
+INSTALL_CLAMD_CONF_TRUE = @INSTALL_CLAMD_CONF_TRUE@
108 108 
 INSTALL_DATA = @INSTALL_DATA@
109 109 
 INSTALL_FRESHCLAM_CONF_FALSE = @INSTALL_FRESHCLAM_CONF_FALSE@
110 110 
 INSTALL_FRESHCLAM_CONF_TRUE = @INSTALL_FRESHCLAM_CONF_TRUE@
... ... 
@@ -339,7 +339,7 @@ uninstall-am: uninstall-info-am
339 339
340 340 
 install:
341 341 
 	$(mkinstalldirs) $(DESTDIR)$(CFGINST)
342 
-@INSTALL_CLAMAV_CONF_TRUE@	@$(INSTALL_DATA) $(srcdir)/clamd.conf $(DESTDIR)$(CFGINST)
342 
+@INSTALL_CLAMD_CONF_TRUE@	@$(INSTALL_DATA) $(srcdir)/clamd.conf $(DESTDIR)$(CFGINST)
343 343 
 @INSTALL_FRESHCLAM_CONF_TRUE@	@$(INSTALL_DATA) $(srcdir)/freshclam.conf $(DESTDIR)$(CFGINST)
344 344 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
345 345 
 # Otherwise a system limit (for SysV at least) may be exceeded.
freshclam/Makefile.in
History View file @ 93c98ba
... ... 
@@ -133,8 +133,8 @@ FRESHCLAM_LIBS = @FRESHCLAM_LIBS@
133 133 
 GETENT = @GETENT@
134 134 
 HAVE_MILTER_FALSE = @HAVE_MILTER_FALSE@
135 135 
 HAVE_MILTER_TRUE = @HAVE_MILTER_TRUE@
136 
-INSTALL_CLAMAV_CONF_FALSE = @INSTALL_CLAMAV_CONF_FALSE@
137 
-INSTALL_CLAMAV_CONF_TRUE = @INSTALL_CLAMAV_CONF_TRUE@
136 
+INSTALL_CLAMD_CONF_FALSE = @INSTALL_CLAMD_CONF_FALSE@
137 
+INSTALL_CLAMD_CONF_TRUE = @INSTALL_CLAMD_CONF_TRUE@
138 138 
 INSTALL_DATA = @INSTALL_DATA@
139 139 
 INSTALL_FRESHCLAM_CONF_FALSE = @INSTALL_FRESHCLAM_CONF_FALSE@
140 140 
 INSTALL_FRESHCLAM_CONF_TRUE = @INSTALL_FRESHCLAM_CONF_TRUE@
libclamav/Makefile.in
History View file @ 93c98ba
... ... 
@@ -158,8 +158,8 @@ FRESHCLAM_LIBS = @FRESHCLAM_LIBS@
158 158 
 GETENT = @GETENT@
159 159 
 HAVE_MILTER_FALSE = @HAVE_MILTER_FALSE@
160 160 
 HAVE_MILTER_TRUE = @HAVE_MILTER_TRUE@
161 
-INSTALL_CLAMAV_CONF_FALSE = @INSTALL_CLAMAV_CONF_FALSE@
162 
-INSTALL_CLAMAV_CONF_TRUE = @INSTALL_CLAMAV_CONF_TRUE@
161 
+INSTALL_CLAMD_CONF_FALSE = @INSTALL_CLAMD_CONF_FALSE@
162 
+INSTALL_CLAMD_CONF_TRUE = @INSTALL_CLAMD_CONF_TRUE@
163 163 
 INSTALL_DATA = @INSTALL_DATA@
164 164 
 INSTALL_FRESHCLAM_CONF_FALSE = @INSTALL_FRESHCLAM_CONF_FALSE@
165 165 
 INSTALL_FRESHCLAM_CONF_TRUE = @INSTALL_FRESHCLAM_CONF_TRUE@
libclamav/filetypes.c
History View file @ 93c98ba
... ... 
@@ -101,7 +101,7 @@ static const struct cli_magic_s cli_magic[] = {
101 101
102 102 
     {0,  "GIF",				 3, "GIF",	    CL_TYPE_GRAPHICS},
103 103 
     {0,  "BM",				 2, "BMP",          CL_TYPE_GRAPHICS},
104 
-    {0,  "\377\330\377",		 4, "JPEG",         CL_TYPE_GRAPHICS},
104 
+    {0,  "\377\330\377",		 3, "JPEG",         CL_TYPE_GRAPHICS},
105 105 
     {6,  "JFIF",			 4, "JPEG",         CL_TYPE_GRAPHICS},
106 106 
     {6,  "Exif",			 4, "JPEG",         CL_TYPE_GRAPHICS},
107 107 
     {0,  "\x89PNG",			 4, "PNG",          CL_TYPE_GRAPHICS},
sigtool/Makefile.in
History View file @ 93c98ba
... ... 
@@ -130,8 +130,8 @@ FRESHCLAM_LIBS = @FRESHCLAM_LIBS@
130 130 
 GETENT = @GETENT@
131 131 
 HAVE_MILTER_FALSE = @HAVE_MILTER_FALSE@
132 132 
 HAVE_MILTER_TRUE = @HAVE_MILTER_TRUE@
133 
-INSTALL_CLAMAV_CONF_FALSE = @INSTALL_CLAMAV_CONF_FALSE@
134 
-INSTALL_CLAMAV_CONF_TRUE = @INSTALL_CLAMAV_CONF_TRUE@
133 
+INSTALL_CLAMD_CONF_FALSE = @INSTALL_CLAMD_CONF_FALSE@
134 
+INSTALL_CLAMD_CONF_TRUE = @INSTALL_CLAMD_CONF_TRUE@
135 135 
 INSTALL_DATA = @INSTALL_DATA@
136 136 
 INSTALL_FRESHCLAM_CONF_FALSE = @INSTALL_FRESHCLAM_CONF_FALSE@
137 137 
 INSTALL_FRESHCLAM_CONF_TRUE = @INSTALL_FRESHCLAM_CONF_TRUE@