1.1 --- a/configure	Thu Jul 15 14:24:40 2010 +0200
     1.2 +++ b/configure	Thu Jul 15 14:37:49 2010 +0200
     1.3 @@ -1346,24 +1346,24 @@
     1.4    --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
     1.5    --disable-dependency-tracking  speeds up one-time build
     1.6    --enable-dependency-tracking   do not reject slow dependency extractors
     1.7 -  --disable-resolver       disable resolver support
     1.8 -  --disable-debug          disable debugging
     1.9 -  --disable-smtp-server    disable smtp server support
    1.10 -  --enable-auth            enable AUTH (RFC 2554) client support
    1.11 -  --enable-maildir            enable qmail style maildir support
    1.12 -  --enable-ident           enable ident (RFC 1413) support
    1.13 +  --disable-resolver      disable resolver support
    1.14 +  --disable-debug         disable debugging
    1.15 +  --disable-smtp-server   disable smtp server support
    1.16 +  --enable-auth           enable AUTH (RFC 2554) client support
    1.17 +  --enable-maildir        enable qmail style maildir support
    1.18 +  --enable-ident          enable ident (RFC 1413) support
    1.19  
    1.20  Optional Packages:
    1.21    --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
    1.22    --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
    1.23 -  --with-user=USER         set user mail
    1.24 -  --with-group=GROUP       set group trusted
    1.25 -  --with-glib-static=path  link glib statically (path mandatory!)
    1.26 -  --with-libcrypto         use libcrypto
    1.27 -  --with-liblockfile       use liblock (for Debian)
    1.28 -  --with-logdir=DIR        set log directory /var/log/masqmail
    1.29 -  --with-spooldir=DIR      set spool directory /var/spool/masqmail
    1.30 -  --with-confdir           directory for configuration /etc/masqmail
    1.31 +  --with-user=USER        set user mail
    1.32 +  --with-group=GROUP      set group trusted
    1.33 +  --with-glib-static=path            link glib statically (path mandatory!)
    1.34 +  --with-libcrypto        use libcrypto
    1.35 +  --with-liblockfile      use liblock (for Debian)
    1.36 +  --with-logdir=DIR       set log directory /var/log/masqmail
    1.37 +  --with-spooldir=DIR     set spool directory /var/spool/masqmail
    1.38 +  --with-confdir          directory for configuration /etc/masqmail
    1.39  
    1.40  Some influential environment variables:
    1.41    CC          C compiler command

     2.1 --- a/configure.ac	Thu Jul 15 14:24:40 2010 +0200
     2.2 +++ b/configure.ac	Thu Jul 15 14:37:49 2010 +0200
     2.3 @@ -25,7 +25,7 @@
     2.4  
     2.5  dnl resolver support (default is use it)
     2.6  AC_ARG_ENABLE(resolver,
     2.7 -	[  --disable-resolver       disable resolver support],
     2.8 +	[  --disable-resolver      disable resolver support],
     2.9  	if test "$enable_resolver" != 'no'; then
    2.10  		resolver_enabled='yes'
    2.11  	fi,
    2.12 @@ -88,14 +88,14 @@
    2.13  
    2.14  dnl user and group configuration
    2.15  AC_ARG_WITH(user,
    2.16 -	[  --with-user=USER         set user [mail]],
    2.17 +	[  --with-user=USER        set user [mail]],
    2.18  	)
    2.19  if test "x$with_user" = 'x'; then
    2.20  	with_user='mail'
    2.21  fi
    2.22  
    2.23  AC_ARG_WITH(group,
    2.24 -	[  --with-group=GROUP       set group [trusted]],
    2.25 +	[  --with-group=GROUP      set group [trusted]],
    2.26  	)
    2.27  if test "x$with_group" = 'x'; then
    2.28  	with_group='trusted'
    2.29 @@ -103,7 +103,7 @@
    2.30  
    2.31  dnl debugging support (default is use it)
    2.32  AC_ARG_ENABLE(debug,
    2.33 -	[  --disable-debug          disable debugging],
    2.34 +	[  --disable-debug         disable debugging],
    2.35  	if test "x$enable_debug" != 'xno'; then
    2.36  		debug_enabled='yes'
    2.37  	fi,
    2.38 @@ -120,7 +120,7 @@
    2.39  
    2.40  dnl link glib statically?
    2.41  AC_ARG_WITH(glib_static,
    2.42 -	[  --with-glib-static=path  link glib statically (path mandatory!)],
    2.43 +	[  --with-glib-static=path            link glib statically (path mandatory!)],
    2.44  	)
    2.45  if test "x$with_glib_static" != 'x'; then
    2.46  	GLIB_LIBS=$with_glib_static
    2.47 @@ -133,7 +133,7 @@
    2.48  
    2.49  dnl smtp server support (default is use it)
    2.50  AC_ARG_ENABLE(smtp_server,
    2.51 -	[  --disable-smtp-server    disable smtp server support],
    2.52 +	[  --disable-smtp-server   disable smtp server support],
    2.53  	if test "x$enable_smtp_server" != 'xno'; then
    2.54  		smtp_server_enabled='yes'
    2.55  	fi,
    2.56 @@ -145,7 +145,7 @@
    2.57  
    2.58  dnl auth support (default is to not use it)
    2.59  AC_ARG_ENABLE(auth,
    2.60 -	[  --enable-auth            enable AUTH (RFC 2554) client support],
    2.61 +	[  --enable-auth           enable AUTH (RFC 2554) client support],
    2.62  	if test "x$enable_auth" != 'xno'; then
    2.63  		auth_enabled='yes'
    2.64  	fi,
    2.65 @@ -160,7 +160,7 @@
    2.66  
    2.67  dnl maildir support (default is to not use it)
    2.68  AC_ARG_ENABLE(maildir,
    2.69 -	[  --enable-maildir            enable qmail style maildir support],
    2.70 +	[  --enable-maildir        enable qmail style maildir support],
    2.71  	if test "x$enable_maildir" != 'xno'; then
    2.72  		maildir_enabled='yes'
    2.73  	fi,
    2.74 @@ -171,7 +171,7 @@
    2.75  
    2.76  dnl libcrypto
    2.77  AC_ARG_WITH(libcrypto,
    2.78 -	[  --with-libcrypto         use libcrypto],
    2.79 +	[  --with-libcrypto        use libcrypto],
    2.80  	)
    2.81  if test "x$with_libcrypto" != 'xyes'; then
    2.82  	with_libcrypto='no'
    2.83 @@ -194,7 +194,7 @@
    2.84  dnl ident support (default is to not use it)
    2.85  IDENT_LIBS=''
    2.86  AC_ARG_ENABLE(ident,
    2.87 -	[  --enable-ident           enable ident (RFC 1413) support],
    2.88 +	[  --enable-ident          enable ident (RFC 1413) support],
    2.89  	if test "x$enable_ident" != 'xno'; then
    2.90  		ident_enabled='yes'
    2.91  	fi,
    2.92 @@ -208,7 +208,7 @@
    2.93  
    2.94  dnl liblockfile
    2.95  AC_ARG_WITH(liblockfile,
    2.96 -	[  --with-liblockfile       use liblock (for Debian)],
    2.97 +	[  --with-liblockfile      use liblock (for Debian)],
    2.98  	)
    2.99  if test "x$with_liblockfile" = 'xno'; then
   2.100  	with_liblockfile=''
   2.101 @@ -228,7 +228,7 @@
   2.102  
   2.103  dnl log and spool directories
   2.104  AC_ARG_WITH(logdir,
   2.105 -	[  --with-logdir=DIR        set log directory [/var/log/masqmail]],
   2.106 +	[  --with-logdir=DIR       set log directory [/var/log/masqmail]],
   2.107  	,
   2.108          with_logdir='/var/log/masqmail/'
   2.109  	)
   2.110 @@ -236,7 +236,7 @@
   2.111  AC_SUBST(with_logdir)
   2.112  
   2.113  AC_ARG_WITH(spooldir,
   2.114 -	[  --with-spooldir=DIR      set spool directory [/var/spool/masqmail]],
   2.115 +	[  --with-spooldir=DIR     set spool directory [/var/spool/masqmail]],
   2.116  	,
   2.117  	with_spooldir='/var/spool/masqmail/'
   2.118  	)
   2.119 @@ -245,7 +245,7 @@
   2.120  
   2.121  dnl configuration file
   2.122  AC_ARG_WITH(confdir,
   2.123 -	[  --with-confdir           directory for configuration [/etc/masqmail]],
   2.124 +	[  --with-confdir          directory for configuration [/etc/masqmail]],
   2.125  	,
   2.126  	with_confdir='/etc/masqmail'
   2.127  	)