aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2018-06-19 06:06:50 +0000
committerWerner Koch <[email protected]>2018-06-19 06:07:59 +0000
commit08147f8bbdca40c98c2a094fa48fab15b8339c80 (patch)
treecfd0c6795e6691d61d46aa6ee2b4cc35b67f22f1
parentlibdns: Fix for non-FQDN hostname. (diff)
downloadgnupg-08147f8bbdca40c98c2a094fa48fab15b8339c80.tar.gz
gnupg-08147f8bbdca40c98c2a094fa48fab15b8339c80.zip
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 <[email protected]>
-rw-r--r--configure.ac2
-rw-r--r--tools/send-mail.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 0d270a4bf..60ec94104 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1219,6 +1219,8 @@ elif test x"$with_mailprog" != xno ; then
AC_SUBST(SENDMAIL,$with_mailprog)
AC_MSG_RESULT($with_mailprog)
fi
+AC_DEFINE_UNQUOTED(NAME_OF_SENDMAIL,"$SENDMAIL",
+ [Tool with sendmail -t interface])
#
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";