./configure --help in 2.2.0 CVS wrong

[samba-technical at thewrittenword.com]

On Fri, Apr 13, 2001 at 09:29:59AM -0500, Gerald Carter wrote:
> On Thu, 12 Apr 2001 samba-technical at thewrittenword.com wrote:
> 
> > Looking at configure.in, I see things like:
> > 
> > AC_ARG_WITH(privatedir,
> > [  --with-privatedir=DIR     Where to put smbpasswd ($privatedir)],
> > [ case "$withval" in
> > 
> > AC_ARG_WITH(lockdir,
> > [  --with-lockdir=DIR     Where to put lock files ($lockdir)],
> > [ case "$withval" in
> > 
> > Obviously $privatedir, $lockdir, etc. are not being expanded. And, by
> > looking at configure and how it handles --help, it's impossible for
> > the variables to be expanded. So, we need *hard-coded* defaults for
> > the values in parentheses for --help to generate something more useful
> > than the above.
> 
> How about something like 
> 
> 	 Where to put smbpasswd ($prefix/private) 
> 
> Would that make more sense?  Or do you think the
> default of /usr/local/samba/private should be hard coded?

The first option seems good to me. How about this patch.

-- 
albert chin (china at thewrittenword.com)

-- snip snip
--- source/configure.in.orig	Thu Apr 19 14:46:16 2001
+++ source/configure.in	Thu Apr 19 14:49:42 2001
@@ -25,7 +25,7 @@
 #################################################
 # set private directory location
 AC_ARG_WITH(privatedir,
-[  --with-privatedir=DIR     Where to put smbpasswd ($privatedir)],
+[  --with-privatedir=DIR     Where to put smbpasswd (\$prefix/private)],
 [ case "$withval" in
   yes|no)
   #
@@ -41,7 +41,7 @@
 #################################################
 # set lock directory location
 AC_ARG_WITH(lockdir,
-[  --with-lockdir=DIR     Where to put lock files ($lockdir)],
+[  --with-lockdir=DIR     Where to put lock files (\$localstatedir/locks)],
 [ case "$withval" in
   yes|no)
   #
@@ -57,7 +57,7 @@
 #################################################
 # set SWAT directory location
 AC_ARG_WITH(swatdir,
-[  --with-swatdir=DIR     Where to put SWAT files ($swatdir)],
+[  --with-swatdir=DIR     Where to put SWAT files (\$prefix/swat)],
 [ case "$withval" in
   yes|no)
   #
@@ -73,7 +73,7 @@
 #################################################
 # set configuration directory location
 AC_ARG_WITH(configdir,
-[  --with-configdir=DIR     Where to put configuration files ($configdir)],
+[  --with-configdir=DIR     Where to put configuration files (\$libdir)],
 [ case "$withval" in
   yes|no)
   #
@@ -89,7 +89,7 @@
 #################################################
 # set codepage directory location
 AC_ARG_WITH(codepagedir,
-[  --with-codepagedir=DIR     Where to put codepage files ($codepagedir)],
+[  --with-codepagedir=DIR     Where to put codepage files (\$libdir/codepages)],
 [ case "$withval" in
   yes|no)
   #