Demime: cleanup after WITH_OLD_DEMIME removal

diff --git a/src/src/EDITME b/src/src/EDITME
index d852103c4b1edf260198ee3ac1db86d5dfea4827..5745bb391b7f15124c0c24c3f3ba01007f759a1e 100644 (file)
--- a/src/src/EDITME
+++ b/src/src/EDITME
@@ -392,13 +392,6 @@ EXIM_MONITOR=eximon.bin
 
 # WITH_CONTENT_SCAN=yes
 
 
 # WITH_CONTENT_SCAN=yes
 

-# If you want to use the deprecated "demime" condition in the DATA ACL,
-# uncomment the line below. Doing so will also explicitly turn on the
-# WITH_CONTENT_SCAN option. If possible, use the MIME ACL instead of
-# the "demime" condition.
-
-# WITH_OLD_DEMIME=yes
-

 #------------------------------------------------------------------------------
 # If you're using ClamAV and are backporting fixes to an old version, instead
 # of staying current (which is the more usual approach) then you may need to
 #------------------------------------------------------------------------------
 # If you're using ClamAV and are backporting fixes to an old version, instead
 # of staying current (which is the more usual approach) then you may need to

diff --git a/src/src/buildconfig.c b/src/src/buildconfig.c
index 2f1114dcdb33266867ac6116423e807b6c53bb55..3a45cac18dcee1a1b346ab6362c18172c0ad0346 100644 (file)
--- a/src/src/buildconfig.c
+++ b/src/src/buildconfig.c
@@ -727,8 +727,8 @@ else if (isgroup)
     continue;
     }
 
     continue;
     }
 

-  /* WITH_CONTENT_SCAN is another special case: it must be set if either it or
-  WITH_OLD_DEMIME is set. */
+  /* WITH_CONTENT_SCAN is another special case: it must be set if it or
+  EXPERIMENTAL_DCC is set. */

 
   if (strcmp(name, "WITH_CONTENT_SCAN") == 0)
     {
 
   if (strcmp(name, "WITH_CONTENT_SCAN") == 0)
     {