From 517431892b292b039784c64decfb161f4a0664e9 Mon Sep 17 00:00:00 2001 From: Indrek Ardel Date: Sat, 9 May 2020 03:08:14 +0300 Subject: [PATCH] Fix default sendmail path when not found during build Closes GH-5548. --- acinclude.m4 | 2 +- main/main.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/acinclude.m4 b/acinclude.m4 index bf4c88d3a3f..a12fb862f76 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2084,7 +2084,7 @@ dnl Search for the sendmail binary dnl AC_DEFUN([PHP_PROG_SENDMAIL], [ PHP_ALT_PATH=/usr/bin:/usr/sbin:/usr/etc:/etc:/usr/ucblib:/usr/lib - AC_PATH_PROG(PROG_SENDMAIL, sendmail,[], $PATH:$PHP_ALT_PATH) + AC_PATH_PROG(PROG_SENDMAIL, sendmail, /usr/sbin/sendmail, $PATH:$PHP_ALT_PATH) PHP_SUBST(PROG_SENDMAIL) ]) diff --git a/main/main.c b/main/main.c index 30629117d91..f20a7867434 100644 --- a/main/main.c +++ b/main/main.c @@ -697,10 +697,8 @@ PHP_INI_MH(OnChangeBrowscap); /* Windows use the internal mail */ #if defined(PHP_WIN32) # define DEFAULT_SENDMAIL_PATH NULL -#elif defined(PHP_PROG_SENDMAIL) -# define DEFAULT_SENDMAIL_PATH PHP_PROG_SENDMAIL " -t -i " #else -# define DEFAULT_SENDMAIL_PATH "/usr/sbin/sendmail -t -i" +# define DEFAULT_SENDMAIL_PATH PHP_PROG_SENDMAIL " -t -i" #endif /* {{{ PHP_INI