@@ -61,7 +61,7 @@ m4_include([m4/reorganization/compiler_checks.m4])

 m4_include([m4/reorganization/linker_checks.m4])

 AC_ARG_ENABLE([experimental],

-[  --enable-experimental	enable experimental code],

+[AS_HELP_STRING([--enable-experimental], [enable experimental code])],

 enable_experimental=$enableval, enable_experimental="no")

 if test "$enable_experimental" = "yes"; then

@@ -573,8 +573,8 @@ AC_DEFUN([AM_MAINTAINER_MODE],

 [AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])

   dnl maintainer-mode is disabled by default

   AC_ARG_ENABLE(maintainer-mode,

-[  --enable-maintainer-mode enable make rules and dependencies not useful

-                          (and sometimes confusing) to the casual installer],

+[AS_HELP_STRING([--enable-maintainer-mode], [make rules and dependencies not useful

+                                            (and sometimes confusing) to the casual installer])],

       USE_MAINTAINER_MODE=$enableval,

       USE_MAINTAINER_MODE=no)

   AC_MSG_RESULT($USE_MAINTAINER_MODE)

@@ -181,7 +181,7 @@ return 0;

 if test "x$ac_cv_have_control_in_msghdr" = "xyes" ; then

     dnl Check whether FD passing works <edwin@clamav.net>

     AC_MSG_CHECKING([BSD 4.4 / RFC2292 style fd passing])

-    AC_ARG_ENABLE([fdpassing],[  --disable-fdpassing        don't build file descriptor passing support],

+    AC_ARG_ENABLE([fdpassing],[AS_HELP_STRING([--disable-fdpassing], [do not build file descriptor passing support])],

         want_fdpassing=$enableval, want_fdpassing="yes")

     if test "x$want_fdpassing" = "xyes"; then

@@ -24,7 +24,7 @@ with_gnu_ld=$acl_cv_prog_gnu_ld

 dnl From libtool-1.4. Sets the variable LD.

 AC_DEFUN([AC_LIB_PROG_LD],

 [AC_ARG_WITH(gnu-ld,

-[  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]],

+[AS_HELP_STRING([--with-gnu-ld], [assume the C compiler uses GNU ld @<:@default=no@:>@])],

 test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no)

 AC_REQUIRE([AC_PROG_CC])dnl

 AC_REQUIRE([AC_CANONICAL_HOST])dnl

@@ -132,7 +132,7 @@ AC_DEFUN([AC_LIB_RPATH],

   acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"

   dnl Determine whether the user wants rpath handling at all.

   AC_ARG_ENABLE(rpath,

-    [  --disable-rpath         do not hardcode runtime library paths],

+    [AS_HELP_STRING([--disable-rpath], [do not hardcode runtime library paths])],

     :, enable_rpath=yes)

 ])

@@ -1225,8 +1225,8 @@ _LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])

 AC_DEFUN([_LT_WITH_SYSROOT],

 [AC_MSG_CHECKING([for sysroot])

 AC_ARG_WITH([sysroot],

-[  --with-sysroot[=DIR] Search for dependent libraries within DIR

-                        (or the compiler's sysroot if not specified).],

+[AS_HELP_STRING([--with-sysroot@<:@=DIR@:>@], [search for dependent libraries within DIR

+                                              (or the compiler's sysroot if not specified).])],

 [], [with_sysroot=no])

 dnl lt_sysroot will always be passed unquoted.  We quote it here

@@ -265,7 +265,7 @@ dnl eponymous directory:

 AC_PROVIDE_IFELSE([LT_CONFIG_LTDL_DIR], [], [_LT_CONFIG_LTDL_DIR([libltdl])])

 AC_ARG_WITH([ltdl_include],

-    [AS_HELP_STRING([--with-ltdl-include=DIR],

+    [AS_HELP_STRING([--with-ltdl-include@<:@=DIR@:>@],

                     [use the ltdl headers installed in DIR])])

 if test -n "$with_ltdl_include"; then

@@ -278,7 +278,7 @@ else

 fi

 AC_ARG_WITH([ltdl_lib],

-    [AS_HELP_STRING([--with-ltdl-lib=DIR],

+    [AS_HELP_STRING([--with-ltdl-lib@<:@=DIR@:>@],

                     [use the libltdl.la installed in DIR])])

 if test -n "$with_ltdl_lib"; then

@@ -1,5 +1,5 @@

 AC_ARG_ENABLE([bigstack],

-[  --enable-bigstack	  increase thread stack size],

+[AS_HELP_STRING([--enable-bigstack], [increase thread stack size])],

 enable_bigstack=$enableval, enable_bigstack="no")

 if test "$enable_bigstack" = "yes"; then

@@ -1,6 +1,5 @@

 AC_ARG_ENABLE(clamdtop,

-	      AC_HELP_STRING([--enable-clamdtop],

-			     [Enable 'clamdtop' tool @<:@default=auto@:>@]),

+	     [AC_HELP_STRING([--enable-clamdtop], [build clamdtop tool @<:@default=auto@:>@])],

 [enable_clamdtop=$enableval], [enable_clamdtop="auto"])

 if test "$enable_clamdtop" != "no"; then

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

 AC_ARG_ENABLE([fanotify],

-[  --disable-fanotify	  disable fanotify support (Linux only)],

+[AS_HELP_STRING([--disable-fanotify], [do not add fanotify support (Linux only)])],

 want_fanotify=$enableval, want_fanotify="yes")

@@ -1,7 +1,7 @@

 dnl we need to try to link with iconv, otherwise there could be a 

 dnl mismatch between a 32-bit and 64-bit lib. Detect this at configure time.

 dnl we need to check after zlib/bzip2, because they can change the include path

-AC_ARG_WITH([iconv], [  --with-iconv supports iconv() (default=auto)],

+AC_ARG_WITH([iconv], [AS_HELP_STRING([--with-iconv], [supports iconv() @<:@default=auto@:>@])],

 [

  case "$withval" in

 	 yes|no) wiconv="$withval";;

@@ -1,5 +1,5 @@

 AC_ARG_ENABLE([ipv6],

-[  --disable-ipv6          disable IPv6 support],

+[AS_HELP_STRING([--disable-ipv6], [do not include IPv6 support])],

 want_ipv6=$enableval, want_ipv6="yes")

 if test "$want_ipv6" = "yes"

@@ -1,4 +1,4 @@

-AC_ARG_ENABLE([mempool],[  --disable-mempool       disable memory pools], enable_mempool=$enableval, enable_mempool="yes")

+AC_ARG_ENABLE([mempool],[AS_HELP_STRING([--disable-mempool], [do not use memory pools])], enable_mempool=$enableval, enable_mempool="yes")

 have_mempool="no"

 if test "$enable_mempool" = "yes"; then

 	if test "$ac_cv_c_mmap_private" != "yes"; then

@@ -2,5 +2,5 @@ have_pthreads=no

 AC_CHECK_HEADER([pthread.h],[have_pthreads=yes])

 AC_ARG_ENABLE([pthreads],

-[  --disable-pthreads      disable POSIX threads support],

+[AS_HELP_STRING([--disable-pthreads], [do not include POSIX threads support])],

 have_pthreads=$enableval,)

@@ -29,7 +29,7 @@ if test -z "$ac_cv_readdir_args"; then

 fi

 AC_ARG_ENABLE([readdir_r],

-[  --enable-readdir_r		    enable support for readdir_r],

+[AS_HELP_STRING([--enable-readdir_r], [enable support for readdir_r])],

 enable_readdir_r=$enableval, enable_readdir_r="no")

 if test "$enable_readdir_r" = "no"; then

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

 AC_ARG_ENABLE([cr],

-[  --disable-cr		  don't link with C reentrant library (BSD) ],

+[AS_HELP_STRING([--disable-cr], [do not link with C reentrant library (BSD)])],

 use_cr=$enableval,)

@@ -1,7 +1,7 @@

 enable_check_ut=auto

 enable_ut_install=no

 AC_ARG_ENABLE(check,

-[  --enable-check           Enable 'check' unit tests (default=auto)], enable_check_ut=$enableval, enable_check_ut="auto" )

+[AS_HELP_STRING([--enable-check], [enable check unit tests @<:@default=auto@:>@])], enable_check_ut=$enableval, enable_check_ut="auto" )

 if test "$enable_check_ut" != "no" ; then

 case "$host_os" in

@@ -1,5 +1,5 @@

 AC_ARG_ENABLE([gcc-vcheck],

-[  --disable-gcc-vcheck	  do not check for buggy gcc version ],

+[AS_HELP_STRING([--disable-gcc-vcheck], [do not check for buggy gcc version])],

 gcc_check=$enableval, gcc_check="yes")

 msg_gcc_check="use --disable-gcc-vcheck to disable this check. Before reporting any bugs check with a supported version of gcc"

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

 AC_ARG_WITH([version], 

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

+[AS_HELP_STRING([--with-version@<:@=STR@:>@], [use custom version string (dev only)])],

 VERSION="$withval", )

@@ -1,5 +1,5 @@

 AC_ARG_WITH([dbdir], 

-[  --with-dbdir=path	  path to virus database directory],

+[AS_HELP_STRING([--with-dbdir@<:@=path@:>@], [path to virus database directory])],

 db_dir="$withval", db_dir="_default_")

 dnl I had problems with $pkgdatadir thus these funny checks

@@ -1,5 +1,5 @@

 AC_ARG_ENABLE([dns-fix],

-[  --enable-dns-fix	  enable workaround for broken DNS servers (as in SpeedTouch 510)],

+[AS_HELP_STRING([--enable-dns-fix], [enable workaround for broken DNS servers (as in SpeedTouch 510)])],

 enable_dnsfix=$enableval, enable_dnsfix="no")

 if test "$enable_dnsfix" = "yes"; then

@@ -1,6 +1,6 @@

 AC_ARG_ENABLE([bzip2],

-[  --disable-bzip2	  disable bzip2 support],

+[AS_HELP_STRING([--disable-bzip2], [do not include bzip2 support])],

 want_bzip2=$enableval, want_bzip2="yes")

 bzip_check="ok"

@@ -3,8 +3,8 @@ curl_msg="Please use the web interface for submitting FPs/FNs."

 AC_MSG_CHECKING([for libcurl installation])

 AC_ARG_WITH([libcurl],

-[  --with-libcurl=DIR   path to directory containing libcurl (default=

-    /usr/local or /usr if not found in /usr/local)],

+[AS_HELP_STRING([--with-libcurl@<:@=DIR@:>@], [path to directory containing libcurl

+                @<:@default=/usr/local or /usr if not found in /usr/local@:>@])],

 [

 if test "$withval"; then

     LIBCURL_HOME="$withval"

@@ -1,8 +1,8 @@

 dnl Check for libjson

 AC_ARG_WITH([libjson],

-[  --with-libjson=DIR   path to directory containing libjson (default=

-    /usr/local or /usr if not found in /usr/local)],

+[AS_HELP_STRING([--with-libjson@<:@=DIR@:>@], [path to directory containing libjson

+                @<:@default=/usr/local or /usr if not found in /usr/local@:>@])],

 [

 AC_MSG_CHECKING([for libjson installation])

 if test "X$withval" != "Xyes"

@@ -2,8 +2,8 @@

 dnl Check for zlib

 AC_MSG_CHECKING([for zlib installation])

 AC_ARG_WITH([zlib],

-[  --with-zlib=DIR	  path to directory containing zlib library (default=

-			  /usr/local or /usr if not found in /usr/local)],

+[AS_HELP_STRING([--with-zlib@<:@=DIR@:>@], [path to directory containing zlib library

+                @<:@default=/usr/local or /usr if not found in /usr/local@:>@])],

 [

 if test "$withval"; then

   ZLIB_HOME="$withval"

@@ -21,7 +21,7 @@ AC_MSG_RESULT([$ZLIB_HOME])

 CLAMDSCAN_LIBS="$FRESHCLAM_LIBS"

 AC_ARG_ENABLE([zlib-vcheck],

-[  --disable-zlib-vcheck	  do not check for buggy zlib version ],

+[AS_HELP_STRING([--disable-zlib-vcheck], [do not check for buggy zlib version])],

 zlib_check=$enableval, zlib_check="yes")

 if test ! -f "$ZLIB_HOME/include/zlib.h"

@@ -2,8 +2,8 @@ dnl Check for OpenSSL

 AC_MSG_CHECKING([for OpenSSL installation])

 AC_ARG_WITH([openssl],

-[  --with-openssl=DIR   path to directory containing openssl (default=

-    /usr/local or /usr if not found in /usr/local)],

+[AS_HELP_STRING([--with-openssl@<:@=DIR@:>@], [path to directory containing openssl

+                @<:@default=/usr/local or /usr if not found in /usr/local@:>@])],

 [

 if test "$withval"; then

     LIBSSL_HOME="$withval"

@@ -3,8 +3,8 @@ dnl Check for PCRE

 dnl determine the home of pcre

 PCRE_HOME=""

 AC_ARG_WITH([pcre],

-[  --with-pcre=DIR        path to directory containing libpcre library (default=

-                          /usr/local or /usr if not found in /usr/local)],

+[AS_HELP_STRING([--with-pcre@<:@=DIR@:>@], [path to directory containing libpcre library

+                @<:@default=/usr/local or /usr if not found in /usr/local@:>@])],

 [

   AC_MSG_CHECKING([for libpcre installation])

 dnl --with-pcre=no

@@ -1,10 +1,10 @@

 AC_ARG_ENABLE([unrar],

-[  --disable-unrar	  don't build libclamunrar and libclamunrar_iface ],

+[AS_HELP_STRING([--disable-unrar], [do not build libclamunrar and libclamunrar_iface])],

 want_unrar=$enableval, want_unrar="yes")

 AM_CONDITIONAL([ENABLE_UNRAR],[test "$want_unrar" = "yes"])

 AC_ARG_ENABLE([getaddrinfo],

-[  --disable-getaddrinfo          disable support for getaddrinfo],

+[AS_HELP_STRING([--disable-getaddrinfo], [do not include support for getaddrinfo])],

 want_getaddrinfo=$enableval, want_getaddrinfo="yes")

 if test "$want_getaddrinfo" = "yes"

@@ -1,15 +1,15 @@

 want_xml="auto"

 AC_ARG_ENABLE([xml],

-[  --disable-xml	  disable DMG and XAR support],

+[AS_HELP_STRING([--disable-xml], [do not include DMG and XAR support])],

 want_xml=$enableval, want_xml="auto")

 XML_HOME=""

 if test "X$want_xml" != "Xno"; then

   AC_MSG_CHECKING([for libxml2 installation])

   AC_ARG_WITH([xml],

-  [  --with-xml=DIR	  path to directory containing libxml2 library (default=

-			  /usr/local or /usr if not found in /usr/local)],

+  [AS_HELP_STRING([--with-xml@<:@=DIR@:>@], [path to directory containing libxml2 library

+                  @<:@default=/usr/local or /usr if not found in /usr/local@:>@])],

   [

   if test "$withval"

   then

@@ -1,6 +1,6 @@

-AC_ARG_WITH([system-llvm], AC_HELP_STRING([--with-system-llvm],

-[Use system llvm instead of built-in, uses full path to llvm-config (default=

-/usr/local or /usr if not found in /usr/local)]),

+AC_ARG_WITH([system-llvm], [AC_HELP_STRING([--with-system-llvm],

+[use system llvm instead of built-in, uses full path to llvm-config

+@<:@default=/usr/local or /usr if not found in /usr/local@:>@])],

 [case "$withval" in

   yes)

     system_llvm="default"

@@ -14,7 +14,7 @@ AC_ARG_WITH([system-llvm], AC_HELP_STRING([--with-system-llvm],

 ], [system_llvm="built-in"])

 AC_ARG_ENABLE([llvm],AC_HELP_STRING([--enable-llvm],

-[Enable 'llvm' JIT/verifier support @<:@default=auto@:>@]),

+[enable 'llvm' JIT/verifier support @<:@default=auto@:>@]),

 [enable_llvm=$enableval],

 [

 if test "x$system_llvm" != "xbuilt-in"; then

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

 AC_ARG_ENABLE([milter],

-[  --enable-milter	  build clamav-milter],

+[AS_HELP_STRING([--enable-milter], [build clamav-milter])],

 have_milter=$enableval, have_milter="no")

@@ -1,5 +1,5 @@

 AC_ARG_ENABLE([no-cache],

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

+[AS_HELP_STRING([--enable-no-cache], [use "Cache-Control: no-cache" in freshclam])],

 enable_nocache=$enableval, enable_nocache="no")

 if test "$enable_nocache" = "yes"; then

@@ -1,13 +1,13 @@

 AC_ARG_ENABLE([yp-check],

-[  --enable-yp-check	  use ypmatch utility instead of /etc/passwd parsing],

+[AS_HELP_STRING([--enable-yp-check], [use ypmatch utility instead of /etc/passwd parsing])],

 use_yp=$enableval, use_yp="no")

 AC_ARG_WITH([user], 

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

+[AS_HELP_STRING([--with-user@<:@=uid@:>@], [name of the clamav user @<:@default=clamav@:>@])],

 clamav_user="$withval", clamav_user="clamav")

 AC_ARG_WITH([group], 

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

+[AS_HELP_STRING([--with-group@<:@=gid@:>@], [name of the clamav group @<:@default=clamav@:>@])],

 clamav_group="$withval", clamav_group="clamav")

 AC_DEFINE_UNQUOTED([CLAMAVUSER],"$clamav_user",[name of the clamav user])

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

 AC_ARG_ENABLE([id-check],

-[  --enable-id-check	  use id utility instead of /etc/passwd parsing],

+[AS_HELP_STRING([--enable-id-check], [use id utility instead of /etc/passwd parsing])],

 use_id=$enableval, use_id="no")

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

 AC_ARG_ENABLE([yp-check],

-[  --enable-yp-check	  use ypmatch utility instead of /etc/passwd parsing],

+[AS_HELP_STRING([--enable-yp-check], [use ypmatch utility instead of /etc/passwd parsing])],

 use_yp=$enableval, use_yp="no")

@@ -9,7 +9,7 @@ dnl as symbols are often redefined in resolv.h

 AC_DEFUN([AC_C_DNS], [

 AC_ARG_ENABLE([dns],

-    AC_HELP_STRING([--disable-dns], [disable support for database verification through DNS]),

+    [AC_HELP_STRING([--disable-dns], [do not include support for database verification through DNS])],

     [want_dns=$enableval], [want_dns=yes]

 )

 if test $want_dns = yes; then