summaryrefslogtreecommitdiff
path: root/frm
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org.ua>2010-05-02 16:16:44 +0300
committerSergey Poznyakoff <gray@gnu.org.ua>2010-09-08 16:06:59 +0300
commitc8abc2b1adfcddccf0e85caf44f3376aad11552c (patch)
treec712b0cc89c717c9a3c078de81d5c7d39e03509b /frm
parentfa54cb19078773382fb1db24bbf450a9962e186d (diff)
downloadmailutils-c8abc2b1adfcddccf0e85caf44f3376aad11552c.tar.gz
mailutils-c8abc2b1adfcddccf0e85caf44f3376aad11552c.tar.bz2
For alpha version, include git tag info in the version output.
* include/mailutils/libargp.h (mu_program_version_hook): New proto. * libmu_argp/Makefile.am (libmu_argp_a_SOURCES): Remove mu_argp.h. * libmu_argp/mu_argp.h: Remove. * libmu_argp/muinit.c [MU_ALPHA_RELEASE]: Include git-describe.h (mu_program_version_hook): New function. (mu_argp_init): Set mu_program_version_hook, unless vers is given. * comsat/comsat.c (main): Call mu_argp_init with NULL arguments. * config/mailutils-config.c: Likewise. * dotlock/dotlock.c: Likewise. * examples/muauth.c: Likewise. * frm/frm.c: Likewise. * frm/from.c: Likewise. * guimb/main.c: Likewise. * imap4d/imap4d.c: Likewise. * maidag/maidag.c: Likewise. * mail/mail.c: Likewise. * messages/messages.c: Likewise. * mimeview/mimeview.c: Likewise. * movemail/movemail.c: Likewise. * pop3d/pop3d.c: Likewise. * pop3d/popauth.c: Likewise. * readmsg/readmsg.c: Likewise. * sieve/sieve.c: Likewise.
Diffstat (limited to 'frm')
-rw-r--r--frm/frm.c3
-rw-r--r--frm/from.c3
2 files changed, 2 insertions, 4 deletions
diff --git a/frm/frm.c b/frm/frm.c
index b56bff2c7..f97856020 100644
--- a/frm/frm.c
+++ b/frm/frm.c
@@ -31,7 +31,6 @@ static int align = 0; /* Tidy mode. -t option. */
#define IS_NEW 0x100
static int select_attribute;
-const char *program_version = "frm (" PACKAGE_STRING ")";
static char doc[] = N_("GNU frm -- display From: lines.");
static struct attr_tab {
@@ -358,7 +357,7 @@ main (int argc, char **argv)
mu_gocs_register ("tls", mu_tls_module_init);
#endif
- mu_argp_init (program_version, NULL);
+ mu_argp_init (NULL, NULL);
if (mu_app_init (&argp, frm_argp_capa, NULL, argc, argv, 0, &c, NULL))
exit (1);
diff --git a/frm/from.c b/frm/from.c
index 080b548f7..6b9fdf84b 100644
--- a/frm/from.c
+++ b/frm/from.c
@@ -23,7 +23,6 @@ int count_only;
char *sender_option;
char *mailbox_name;
-const char *program_version = "from (" PACKAGE_STRING ")";
static char doc[] = N_("GNU from -- display from and subject.");
static struct argp_option options[] = {
@@ -120,7 +119,7 @@ main (int argc, char **argv)
mu_gocs_register ("tls", mu_tls_module_init);
#endif
- mu_argp_init (program_version, NULL);
+ mu_argp_init (NULL, NULL);
if (mu_app_init (&argp, capa, NULL, argc, argv, 0, &c, NULL))
exit (1);

Return to:

Send suggestions and report system problems to the System administrator.