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

+Wed Apr 19 12:31:44 BST 2006 (njh)

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

+  * libclamav/mbox.c:	Mark the use of --mail-follow-urls without CURL as

+			deprecated - it will be completely removed in a future

+			release

+

 Sat Apr 15 19:55:35 CEST 2006 (tk)

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

   * clamconf: initial version of configuration tool

@@ -41,7 +47,7 @@ Fri Apr  7 21:09:25 CEST 2006 (tk)

 Fri Apr  7 12:25:20 BST 2006 (njh)

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

   * libclamav/mbox.c:		Better handling of messages with lots of

-  					consecutive blank lines

+					consecutive blank lines

 Fri Apr  7 11:13:29 BST 2006 (trog)

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

@@ -16,7 +16,7 @@

  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,

  *  MA 02110-1301, USA.

  */

-static	char	const	rcsid[] = "$Id: mbox.c,v 1.288 2006/04/15 10:51:11 nigelhorne Exp $";

+static	char	const	rcsid[] = "$Id: mbox.c,v 1.289 2006/04/19 11:33:49 nigelhorne Exp $";

 #if HAVE_CONFIG_H

 #include "clamav-config.h"

@@ -149,6 +149,9 @@ typedef enum	{ FALSE = 0, TRUE = 1 } bool;

 #undef	WITH_CURL	/* also undef FOLLOWURLS? */

 #endif

+#else

+#error	"FOLLOWURLS without CURL is no longer supported"

+

 #endif	/*WITH_CURL*/

 #else	/*!FOLLOWURLS*/

@@ -3904,7 +3907,8 @@ checkURLs(message *m, const char *dir)

 			getURL(&arg);

 #endif

-#else

+#else	/*!WITH_CURL*/

+			cli_warnmsg("The use of mail-follow-urls without CURL being installed is deprecated\n");

 			/*

 			 * TODO: maximum size and timeouts

 			 */