From: Todd C. Miller <Todd.Miller@courtesan.com>
Date: Sat, 12 Mar 1994 18:39:00 +0000 (+0000)
Subject: updated
X-Git-Tag: SUDO_1_3_1~297
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f2660677a7c112bccc3fea897f3492fcbbff91e8;p=sudo

updated
---

diff --git a/aclocal.m4 b/aclocal.m4
index a0b527738..5b8b8c21f 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -57,17 +57,27 @@ dnl check for sendmail
 dnl
 define(SUDO_PROG_SENDMAIL,
 [if test -f "/usr/sbin/sendmail"; then
-    SENDMAIL="/usr/sbin/sendmail"
+    AC_DEFINE(_PATH_SENDMAIL, "/usr/sbin/sendmail")
 elif test -f "/usr/lib/sendmail"; then
-    SENDMAIL="/usr/lib/sendmail"
+    AC_DEFINE(_PATH_SENDMAIL, "/usr/lib/sendmail")
 elif test -f "/usr/etc/sendmail"; then
-    SENDMAIL="/usr/etc/sendmail"
+    AC_DEFINE(_PATH_SENDMAIL, "/usr/etc/sendmail")
 elif test -f "/usr/local/lib/sendmail"; then
-    SENDMAIL="/usr/local/lib/sendmail"
+    AC_DEFINE(_PATH_SENDMAIL, "/usr/local/lib/sendmail")
 elif test -f "/usr/local/bin/sendmail"; then
-    SENDMAIL="/usr/local/bin/sendmail"
-else
-    SENDMAIL=""
+    AC_DEFINE(_PATH_SENDMAIL, "/usr/local/bin/sendmail")
+fi
+])dnl
+dnl
+dnl check for vi
+dnl
+define(SUDO_PROG_VI,
+[if test -f "/usr/bin/vi"; then
+    AC_DEFINE(_PATH_VI, "/usr/bin/vi")
+elif test -f "/usr/ucb/vi"; then
+    AC_DEFINE(_PATH_VI, "/usr/ucb/vi")
+elif test -f "/usr/local/bin/vi"; then
+    AC_DEFINE(_PATH_VI, "/usr/local/bin/vi")
 fi
 ])dnl
 dnl
@@ -145,3 +155,14 @@ $0], [AC_HEADER_EGREP])AC_BEFORE([$0], [AC_TEST_CPP])AC_PROGRAM_EGREP(yes,
 ], [$1], [$2])
 ])dnl
 dnl
+define(SUDO_IRIX,
+[echo checking for Irix
+AC_BEFORE([$0], [AC_COMPILE_CHECK])AC_BEFORE([$0], [AC_TEST_PROGRAM])AC_BEFORE([
+$0], [AC_HEADER_EGREP])AC_BEFORE([$0], [AC_TEST_CPP])AC_PROGRAM_EGREP(yes,
+[
+#ifdef sgi
+  yes
+#endif
+], [$1], [$2])
+])dnl
+dnl