From cb52eb76b3ba0269742c5322e10a2b5151dafaf2 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Tue, 12 Jun 2018 16:11:19 +0200 Subject: Some preparations to eventuallt use gpgrt_argparse. * configure.ac (GNUPG_DEF_COPYRIGHT_LINE: New. * tools/watchgnupg.c (print_version): USe this macro. * common/init.c (_init_common_subsystems): Register argparse functions. Signed-off-by: Werner Koch --- tools/watchgnupg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/watchgnupg.c b/tools/watchgnupg.c index fc58d1428..1db1c7827 100644 --- a/tools/watchgnupg.c +++ b/tools/watchgnupg.c @@ -253,7 +253,7 @@ static void print_version (int with_help) { fputs (MYVERSION_LINE "\n" - "Copyright (C) 2017 Free Software Foundation, Inc.\n" + GNUPG_DEF_COPYRIGHT_LINE "\n" "License GPLv3+: " "GNU GPL version 3 or later \n" "This is free software: you are free to change and redistribute it.\n" -- cgit v1.2.3 From 08147f8bbdca40c98c2a094fa48fab15b8339c80 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Tue, 19 Jun 2018 08:06:50 +0200 Subject: wks: Take name of sendmail from configure. * configure.ac (NAME_OF_SENDMAIL): New ac_define. * tools/send-mail.c (run_sendmail): Use it. -- We used to ac_subst the SENDMAIL in the old keyserver via mail script. We cab reuse this to avoid a fixed name for sendmail in the send-mail.c helper. Signed-off-by: Werner Koch --- tools/send-mail.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/send-mail.c b/tools/send-mail.c index 9f07c7ac5..6492c43c1 100644 --- a/tools/send-mail.c +++ b/tools/send-mail.c @@ -33,7 +33,7 @@ static gpg_error_t run_sendmail (estream_t data) { gpg_error_t err; - const char pgmname[] = "/usr/lib/sendmail"; + const char pgmname[] = NAME_OF_SENDMAIL; const char *argv[3]; argv[0] = "-oi"; -- cgit v1.2.3