* config/mailnotify (func_sendmail): Look for sendmail in a

couple of common non-PATH locations as well.

diff --git a/ChangeLog b/ChangeLog
index bc28ec4c7c243d17c59b2ed233f4363a2797405b..afaa9b2425bbbd5fe0618abe677edf427f2d43f0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-02-12  Scott James Remnant  <scott@netsplit.com>
+
+       * config/mailnotify (func_sendmail): Look for sendmail in a
+       couple of common non-PATH locations as well.
+
 2004-02-12  Scott James Remnant  <scott@netsplit.com>
 
        * ltmain.in: Fix typo: macro's -> macros.

diff --git a/config/mailnotify b/config/mailnotify
index d3221ebc6a8ccbc564ae6b8b4f7ce8468e7182f8..a9b07d90818dd3c3c21419459d1130a4cbb7a4f3 100755 (executable)
--- a/config/mailnotify
+++ b/config/mailnotify
@@ -370,13 +370,21 @@ func_sendmail ()
     from_name=`echo "$my_from" | sed 's, *<.*> *$,,;s,",,g'`
     from_addr=`echo "$my_from" | sed "$sed_mail_address"`
 
+    SENDMAIL=sendmail
+    for try_sendmail in sendmail /usr/lib/sendmail /usr/sbin/sendmail; do
+       if which $try_sendmail >/dev/null; then
+           SENDMAIL=$try_sendmail
+           break
+       fi
+    done
+
     func_verbose "Delivering mail, please wait..."
     if test -n "$from_name"; then
-        sendmail -F "$from_name" -f "$from_addr" $my_destination < "$my_infile"
+        $SENDMAIL -F "$from_name" -f "$from_addr" $my_destination < "$my_infile"
     elif test -n "$from_addr"; then
-        sendmail -f "$from_addr" $my_destination < "$my_infile"
+        $SENDMAIL -f "$from_addr" $my_destination < "$my_infile"
     else
-        sendmail $my_destination < "$my_infile"
+        $SENDMAIL $my_destination < "$my_infile"
     fi
     if test $? -eq 0; then
         func_verbose "...succeeded."