--- configure.in.old	2008-01-26 15:07:28.000000000 +0100
+++ configure.in	2008-01-26 15:14:05.000000000 +0100
@@ -160,7 +160,9 @@
 fi
 
 # Check whether static linking has explicitly been disabled
-AC_ARG_ENABLE(static,[  --disable-static        Disable static linking (lowers the security of aide)], [aide_static_choice=$enableval], [aide_static_choice=yes])
+AC_ARG_ENABLE(static,
+	      AC_HELP_STRING([--disable-static],[Disable static linking (lowers the security of aide)]),
+	      [aide_static_choice=$enableval], [aide_static_choice=yes])
 
 if test "$aide_static_choice" != "yes"; then
 	LD_STATIC_FLAG=""
@@ -190,8 +192,8 @@
 AC_CHECK_FUNCS(stricmp strnstr strnlen)
 
 AC_ARG_WITH([mmap],
-	[AC_HELP_STRING([--with-mmap],
-		[use mmap @<:@default=check@:>@])],
+	AC_HELP_STRING([--with-mmap],
+		[use mmap @<:@default=check@:>@]),
 	[],
 	[with_mmap=check]
 )
@@ -283,8 +285,8 @@
 AC_CHECK_HEADERS(syslog.h inttypes.h fcntl.h)
 
 AC_ARG_WITH([locale],
-	[AC_HELP_STRING([--with-locale],
-		[use locale stuff])],
+	AC_HELP_STRING([--with-locale],
+		[use locale stuff]),
 	[],
 	[with_locale=no]
 )
@@ -369,10 +371,10 @@
 	[AC_HELP_STRING([--with-posix-acl],
 		[use POSIX ACLs (no checking)])],
 	[],
-	[with_posix_acl_support=no]
+	[with_posix_acl=no]
 )
 
-AS_IF([test "x$with_posix_acl_support" != xno],
+AS_IF([test "x$with_posix_acl" != xno],
 	[AC_DEFINE(WITH_POSIX_ACL,1,[use POSIX ACLs])
 	AC_DEFINE(WITH_ACL,1,[use ACL])
 	ACLLIB="-lacl"
@@ -388,10 +390,10 @@
 	[AC_HELP_STRING([--with-selinux],
 		[use SELinux (no checking)])],
 	[],
-	[with_selinux_support=no]
+	[with_selinux=no]
 )
 
-AS_IF([test "x$with_selinux_support" != xno],
+AS_IF([test "x$with_selinux" != xno],
 	[AC_DEFINE(WITH_SELINUX,1,[use SELinux])
 	if test -n "$PKG_CONFIG" && $PKG_CONFIG --exists libselinux; then
 		SELINUXLIB=$(${PKG_CONFIG} --libs libselinux --static)
@@ -410,10 +412,10 @@
 	[AC_HELP_STRING([--with-xattr],
 		[use xattr (no checking)])],
 	[],
-	[with_xattr_support=no]
+	[with_xattr=no]
 )
 	
-AS_IF([test "x$with_xattr_support" != xno],
+AS_IF([test "x$with_xattr" != xno],
 	[AC_DEFINE(WITH_XATTR,1,[use xattr])
 	ATTRLIB=-lattr
 	compoptionstring="${compoptionstring}WITH_XATTR\\n"