@@ -974,6 +974,7 @@ with_user

 with_group

 enable_clamav

 enable_debug

+with_version

 enable_no_cache

 enable_dns_fix

 enable_bigstack

@@ -1683,6 +1684,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

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

 VERSION="0.97.2"

-cat >>confdefs.h <<_ACEOF

-#define VERSION "$VERSION"

-_ACEOF

-

-

 LC_CURRENT=7

 LC_REVISION=11

 LC_AGE=1

@@ -5180,13 +5177,13 @@ if test "${lt_cv_nm_interface+set}" = set; then :

 else

   lt_cv_nm_interface="BSD nm"

   echo "int some_variable = 0;" > conftest.$ac_ext

-  (eval echo "\"\$as_me:5183: $ac_compile\"" >&5)

+  (eval echo "\"\$as_me:5180: $ac_compile\"" >&5)

   (eval "$ac_compile" 2>conftest.err)

   cat conftest.err >&5

-  (eval echo "\"\$as_me:5186: $NM \\\"conftest.$ac_objext\\\"\"" >&5)

+  (eval echo "\"\$as_me:5183: $NM \\\"conftest.$ac_objext\\\"\"" >&5)

   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)

   cat conftest.err >&5

-  (eval echo "\"\$as_me:5189: output\"" >&5)

+  (eval echo "\"\$as_me:5186: output\"" >&5)

   cat conftest.out >&5

   if $GREP 'External.*some_variable' conftest.out > /dev/null; then

     lt_cv_nm_interface="MS dumpbin"

@@ -6381,7 +6378,7 @@ ia64-*-hpux*)

   ;;

 *-*-irix6*)

   # Find out which ABI we are using.

-  echo '#line 6384 "configure"' > conftest.$ac_ext

+  echo '#line 6381 "configure"' > conftest.$ac_ext

   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5

   (eval $ac_compile) 2>&5

   ac_status=$?

@@ -7908,11 +7905,11 @@ else

    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

    -e 's:$: $lt_compiler_flag:'`

-   (eval echo "\"\$as_me:7911: $lt_compile\"" >&5)

+   (eval echo "\"\$as_me:7908: $lt_compile\"" >&5)

    (eval "$lt_compile" 2>conftest.err)

    ac_status=$?

    cat conftest.err >&5

-   echo "$as_me:7915: \$? = $ac_status" >&5

+   echo "$as_me:7912: \$? = $ac_status" >&5

    if (exit $ac_status) && test -s "$ac_outfile"; then

      # The compiler can only warn and ignore the option if not recognized

      # So say no if there are warnings other than the usual output.

@@ -8247,11 +8244,11 @@ else

    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

    -e 's:$: $lt_compiler_flag:'`

-   (eval echo "\"\$as_me:8250: $lt_compile\"" >&5)

+   (eval echo "\"\$as_me:8247: $lt_compile\"" >&5)

    (eval "$lt_compile" 2>conftest.err)

    ac_status=$?

    cat conftest.err >&5

-   echo "$as_me:8254: \$? = $ac_status" >&5

+   echo "$as_me:8251: \$? = $ac_status" >&5

    if (exit $ac_status) && test -s "$ac_outfile"; then

      # The compiler can only warn and ignore the option if not recognized

      # So say no if there are warnings other than the usual output.

@@ -8352,11 +8349,11 @@ else

    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

    -e 's:$: $lt_compiler_flag:'`

-   (eval echo "\"\$as_me:8355: $lt_compile\"" >&5)

+   (eval echo "\"\$as_me:8352: $lt_compile\"" >&5)

    (eval "$lt_compile" 2>out/conftest.err)

    ac_status=$?

    cat out/conftest.err >&5

-   echo "$as_me:8359: \$? = $ac_status" >&5

+   echo "$as_me:8356: \$? = $ac_status" >&5

    if (exit $ac_status) && test -s out/conftest2.$ac_objext

    then

      # The compiler can only warn and ignore the option if not recognized

@@ -8407,11 +8404,11 @@ else

    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \

    -e 's:$: $lt_compiler_flag:'`

-   (eval echo "\"\$as_me:8410: $lt_compile\"" >&5)

+   (eval echo "\"\$as_me:8407: $lt_compile\"" >&5)

    (eval "$lt_compile" 2>out/conftest.err)

    ac_status=$?

    cat out/conftest.err >&5

-   echo "$as_me:8414: \$? = $ac_status" >&5

+   echo "$as_me:8411: \$? = $ac_status" >&5

    if (exit $ac_status) && test -s out/conftest2.$ac_objext

    then

      # The compiler can only warn and ignore the option if not recognized

@@ -10791,7 +10788,7 @@ else

   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

   lt_status=$lt_dlunknown

   cat > conftest.$ac_ext <<_LT_EOF

-#line 10794 "configure"

+#line 10791 "configure"

 #include "confdefs.h"

 #if HAVE_DLFCN_H

@@ -10887,7 +10884,7 @@ else

   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

   lt_status=$lt_dlunknown

   cat > conftest.$ac_ext <<_LT_EOF

-#line 10890 "configure"

+#line 10887 "configure"

 #include "confdefs.h"

 #if HAVE_DLFCN_H

@@ -11559,7 +11556,7 @@ else

   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2

   lt_status=$lt_dlunknown

   cat > conftest.$ac_ext <<_LT_EOF

-#line 11562 "configure"

+#line 11559 "configure"

 #include "confdefs.h"

 #if HAVE_DLFCN_H

@@ -16649,6 +16646,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

@@ -18369,6 +18373,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

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

 VERSION="0.97.2"

-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,