@@ -848,6 +848,7 @@ with_user

 with_group

 enable_clamav

 enable_debug

+with_version

 enable_no_cache

 enable_dns_fix

 enable_bigstack

@@ -1559,6 +1560,7 @@ Optional Packages:

   --with-iconv supports iconv() (default=auto)

   --with-user=uid	  name of the clamav user (default=clamav)

   --with-group=gid	  name of the clamav group (default=clamav)

+  --with-version=STR    use custom version string (dev only)

   --with-dbdir=path	  path to virus database directory

   --with-libncurses-prefix[=DIR]  search for libncurses in DIR/include and DIR/lib

   --without-libncurses-prefix     don't search for libncurses in includedir and libdir

@@ -3363,11 +3365,6 @@ $as_echo "#define PACKAGE PACKAGE_NAME" >>confdefs.h

 VERSION="devel-`date +%Y%m%d`"

-cat >>confdefs.h <<_ACEOF

-#define VERSION "$VERSION"

-_ACEOF

-

-

 LC_CURRENT=7

 LC_REVISION=11

 LC_AGE=1

@@ -17460,6 +17457,13 @@ $as_echo "#define NDEBUG 1" >>confdefs.h

 fi

+

+# Check whether --with-version was given.

+if test "${with_version+set}" = set; then :

+  withval=$with_version; VERSION="$withval"

+fi

+

+

 # Check whether --enable-no-cache was given.

 if test "${enable_no_cache+set}" = set; then :

   enableval=$enable_no_cache; enable_nocache=$enableval

@@ -19180,6 +19184,11 @@ fi

 cat >>confdefs.h <<_ACEOF

+#define VERSION "$VERSION"

+_ACEOF

+

+

+cat >>confdefs.h <<_ACEOF

 #define VERSION_SUFFIX "$VERSION_SUFFIX"

 _ACEOF

@@ -44,7 +44,6 @@ AC_DEFINE([PACKAGE], PACKAGE_NAME, [Name of package])

 dnl change this on a release

 VERSION="devel-`date +%Y%m%d`"

 dnl VERSION="0.94rc1"

-AC_DEFINE_UNQUOTED([VERSION],"$VERSION",[Version number of package])

 LC_CURRENT=7

 LC_REVISION=11

@@ -856,6 +855,10 @@ else

   AC_DEFINE([NDEBUG],1,[disable assertions])

 fi

+AC_ARG_WITH([version], 

+[  --with-version=STR    use custom version string (dev only)],

+VERSION="$withval", )

+

 AC_ARG_ENABLE([no-cache],

 [  --enable-no-cache	  use "Cache-Control: no-cache" in freshclam],

 enable_nocache=$enableval, enable_nocache="no")

@@ -1528,6 +1531,7 @@ AC_MSG_RESULT([$have_signed_rightshift_extended]);

 AC_C_FDPASSING

+AC_DEFINE_UNQUOTED([VERSION],"$VERSION",[Version number of package])

 AC_DEFINE_UNQUOTED([VERSION_SUFFIX],"$VERSION_SUFFIX",[Version suffix for package])

 AC_ARG_ENABLE(clamdtop,