From: Chong Yidong <cyd@stupidchicken.com>
Date: Mon, 4 Sep 2006 14:18:10 +0000 (+0000)
Subject: * message.el (message-send-mail-with-sendmail): Look for sendmail in
X-Git-Tag: emacs-pretest-22.0.90~772
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=de4fbbe4ff7be8911738ba397086ff64487713e4;p=emacs.git

* message.el (message-send-mail-with-sendmail): Look for sendmail in
	several common directories.
---

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index c46cc3d87f9..81d566fc856 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2006-09-04  Chong Yidong  <cyd@stupidchicken.com>
+
+	* message.el (message-send-mail-with-sendmail): Look for sendmail in
+	several common directories.
+
 2006-09-04  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* rfc2047.el (rfc2047-strip-backslashes-in-quoted-strings): Decode `\\'
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 4ee87933967..f8d3a32a515 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -3897,9 +3897,15 @@ If you always want Gnus to send messages in one piece, set
 		       'call-process-region
 		       (append
 			(list (point-min) (point-max)
-			      (if (boundp 'sendmail-program)
-				  sendmail-program
-				"/usr/lib/sendmail")
+			      (cond ((boundp 'sendmail-program)
+				     sendmail-program)
+				    ((file-exists-p "/usr/sbin/sendmail")
+				     "/usr/sbin/sendmail")
+				    ((file-exists-p "/usr/lib/sendmail")
+				     "/usr/lib/sendmail")
+				    ((file-exists-p "/usr/ucblib/sendmail")
+				     "/usr/ucblib/sendmail")
+				    (t "fakemail"))
 			      nil errbuf nil "-oi")
 			;; Always specify who from,
 			;; since some systems have broken sendmails.