Extra information in mutt version string, redux.

Restores [f1b4d1d17200] functionality with a slight change to keep
'make dist' working (see backout in [6b38124a5b81]).

Automake is too much voodoo for me at this time, so I let it keep
VERSION. mutt.h defined MUTT_VERSION as VERSION and the code used that,
so I removed MUTT_VERSION from mutt.h and put it into config.h via
configure.ac.  A couple of tweaks were needed elsewhere.  This restores
the fancy-versioning feature within mutt and keeps 'make dist' happy.

1 files changed, 1 insertions, 1 deletions

diff --git a/dotlock.c b/dotlock.c
index d9a05aaf..5bf03480 100644
--- a/dotlock.c
+++ b/dotlock.c
@@ -339,7 +339,7 @@ END_PRIVILEGED (void)
 static void 
 usage (const char *av0)
 {
-  fprintf (stderr, "dotlock [Mutt %s (%s)]\n", VERSION, ReleaseDate);
+  fprintf (stderr, "dotlock [Mutt %s (%s)]\n", MUTT_VERSION, ReleaseDate);
   fprintf (stderr, "usage: %s [-t|-f|-u|-d] [-p] [-r <retries>] file\n",
 	  av0);