Removed argp_program_bug_address. Use PACKAGE_STRING, provided by the new autoconf.

@@ -17,8 +17,6 @@
 
 #include "comsat.h"
 
-#define	IMPL		"GNU Comsat Daemon"
-
 #ifndef PATH_DEV
 # define PATH_DEV "/dev"
 #endif
@@ -53,8 +51,7 @@ typedef struct utmp UTMP;
 
 #define MAX_TTY_SIZE (sizeof (PATH_TTY_PFX) + sizeof (((UTMP*)0)->ut_line))
 
-const char *argp_program_version = "comsatd (" PACKAGE ") " VERSION;
-const char *argp_program_bug_address = "<bug-mailutils@gnu.org>";
+const char *argp_program_version = "comsatd (" PACKAGE_STRING ")";
 static char doc[] = "GNU comsatd";
 
 static struct argp_option options[] = 

@@ -30,8 +30,7 @@
 #include <mailutils/errno.h>
 #include <mailutils/locker.h>
 
-const char *argp_program_version = "GNU dotlock (" PACKAGE ") " VERSION;
-const char *argp_program_bug_address = "<bug-mailutils@gnu.org>";
+const char *argp_program_version = "GNU dotlock (" PACKAGE_STRING ")";
 static char doc[] =
   "GNU dotlock -- lock mail spool files"
   "\v"

@@ -59,8 +59,7 @@ static int selected;
 
 static int action (observer_t, size_t);
 
-const char *argp_program_version = "frm (" PACKAGE ") " VERSION;
-const char *argp_program_bug_address = "<bug-mailutils@gnu.org>";
+const char *argp_program_version = "frm (" PACKAGE_STRING ")";
 static char doc[] = "GNU frm -- display From: lines";
 
 static struct argp_option options[] = {

@@ -44,8 +44,7 @@
 #include <mailutils/registrar.h>
 #include <mailutils/stream.h>
 
-const char *argp_program_version = "from (" PACKAGE ") " VERSION;
-const char *argp_program_bug_address = "<bug-mailutils@gnu.org>";
+const char *argp_program_version = "from (" PACKAGE_STRING ")";
 static char doc[] = "GNU from -- display from and subject";
 
 static struct argp_option options[] = {

@@ -118,10 +118,9 @@ parse_opt (int key, char *arg, struct argp_state *state)
   return 0;
 }
 
-const char *argp_program_version = "guimb (" PACKAGE ") " VERSION;
-const char *argp_program_bug_address = "<bug-mailutils@gnu.org>";
+const char *argp_program_version = "guimb (" PACKAGE_STRING ")";
 static char doc[] =
-"GNU messages -- Process the contents of the specified mailboxes\n"
+"GNU guimb -- Process the contents of the specified mailboxes\n"
 "using a Scheme program or expression.";
 static char args_doc[] = "[mailbox...]";
 

@@ -38,8 +38,7 @@ struct daemon_param daemon_param = {
 /* Number of child processes.  */
 volatile size_t children;
 
-const char *argp_program_version = "imap4d (" PACKAGE ") " VERSION;
-const char *argp_program_bug_address = "<bug-mailutils@gnu.org>";
+const char *argp_program_version = "imap4d (" PACKAGE_STRING ")";
 static char doc[] = "GNU imap4d -- the IMAP4D daemon";
 
 static struct argp_option options[] = 

@@ -36,8 +36,7 @@ void guess_retval (int ec);
 void mailer_err (char *fmt, ...);
 void notify_biff (mailbox_t mbox, char *name, size_t size);
 
-const char *argp_program_version = "mail.local (" PACKAGE ") " VERSION;
-const char *argp_program_bug_address = "<bug-mailutils@gnu.org>";
+const char *argp_program_version = "mail.local (" PACKAGE_STRING ")";
 static char doc[] = "GNU mail.local -- the local MDA";
 static char args_doc[] = "recipient [recipient ...]";
 

@@ -39,8 +39,7 @@
 #include <mailutils/registrar.h>
 #include <mailutils/stream.h>
 
-const char *argp_program_version = "mail.remote (" PACKAGE ") " VERSION;
-const char *argp_program_bug_address = "<bug-mailutils@gnu.org>";
+const char *argp_program_version = "mail.remote (" PACKAGE_STRING ")";
 static char doc[] =
   "GNU mail.remote -- pseudo-sendmail interface for mail delivery\n"
   "\v"

@@ -25,8 +25,7 @@ size_t total;
 FILE *ofile;
 int interactive;
 
-const char *argp_program_version = "mail (" PACKAGE ") " VERSION;
-const char *argp_program_bug_address = "<bug-mailutils@gnu.org>";
+const char *argp_program_version = "mail (" PACKAGE_STRING ")";
 static char doc[] = "GNU mail -- the standard /bin/mail interface";
 static char args_doc[] = "[address...]";
 
@@ -354,8 +353,9 @@ main (int argc, char **argv)
 	       "%s, Copyright (C) 2001 Free Software Foundation, Inc.\n"
 	       "mail is free software with ABSOLUTELY NO WARRANTY.\n"
 	       "For details type `warranty'.\n"
-	       "Send bug reports to <bug-mailutils@gnu.org>.\n",
-	       argp_program_version);
+	       "Send bug reports to %s.\n",
+	       argp_program_version,
+	       argp_program_bug_address);
     }
 
   ml_readline_init ();

@@ -30,8 +30,7 @@
 
 static int messages_count (const char *);
 
-const char *argp_program_version = "messages (" PACKAGE ") " VERSION;
-const char *argp_program_bug_address = "<bug-mailutils@gnu.org>";
+const char *argp_program_version = "messages (" PACKAGE_STRING ")";
 static char doc[] = "GNU messages -- count the number of messages in a mailbox";
 static char args_doc[] = "[mailbox...]";
 

@@ -19,8 +19,7 @@
 
 #include <mh.h>
 
-const char *argp_program_version = "inc (" PACKAGE ") " VERSION;
-const char *argp_program_bug_address = "<bug-mailutils@gnu.org>";
+const char *argp_program_version = "inc (" PACKAGE_STRING ")";
 static char doc[] = "GNU MH inc";
 static char args_doc[] = "";
 

@@ -25,8 +25,7 @@
 #include <sys/stat.h>
 #include <time.h>
 
-const char *argp_program_version = "scan (" PACKAGE ") " VERSION;
-const char *argp_program_bug_address = "<bug-mailutils@gnu.org>";
+const char *argp_program_version = "scan (" PACKAGE_STRING ")";
 static char doc[] = "GNU MH scan";
 static char args_doc[] = "";
 

@@ -45,7 +45,7 @@ pop3d_capa (const char *arg)
      message.  */
   /*pop3d_outf ("EXPIRE NEVER\r\n"); */
   if (state == TRANSACTION)	/* let's not advertise to just anyone */
-    pop3d_outf ("IMPLEMENTATION %s %s\r\n", IMPL, VERSION);
+    pop3d_outf ("IMPLEMENTATION %s\r\n", PACKAGE_STRING);
   pop3d_outf (".\r\n");
   return OK;
 }

@@ -51,8 +51,7 @@ sieve script interpreter.
 
 void mutil_register_all_mbox_formats(void);
 
-const char *argp_program_version = "sieve (" PACKAGE ") " VERSION;
-const char *argp_program_bug_address = "<bug-mailutils@gnu.org>";
+const char *argp_program_version = "sieve (" PACKAGE_STRING ")";
 
 static char doc[] =
   "GNU sieve -- a mail filtering tool\n"