summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Rice <tim@multitalents.net>2002-11-22 13:29:01 -0800
committerTim Rice <tim@multitalents.net>2002-11-22 13:29:01 -0800
commit1c9e688548a0f47fcfe41de43625f5b8a7d500dd (patch)
treed7726661187fd59e483c810112873d7bdfff7c0d
parentbe2396458eb442f095402019609d425fd54cacc1 (diff)
[configure.ac] fix STDPATH test for IRIX. First reported by advax@triumf.ca.
This type of solution tested by <herb@sgi.com>
-rw-r--r--ChangeLog6
-rw-r--r--configure.ac8
2 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 57c6d6d62..f8fdc9bab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
120021122
2 - (tim) [configure.ac] fix STDPATH test for IRIX. First reported by
3 advax@triumf.ca. This type of solution tested by <herb@sgi.com>
4
120021113 520021113
2 - (tim) [configure.ac] remove unused variables no_libsocket and no_libnsl 6 - (tim) [configure.ac] remove unused variables no_libsocket and no_libnsl
3 7
@@ -825,4 +829,4 @@
825 save auth method before monitor_reset_key_state(); bugzilla bug #284; 829 save auth method before monitor_reset_key_state(); bugzilla bug #284;
826 ok provos@ 830 ok provos@
827 831
828$Id: ChangeLog,v 1.2513 2002/11/13 23:55:55 tim Exp $ 832$Id: ChangeLog,v 1.2514 2002/11/22 21:29:01 tim Exp $
diff --git a/configure.ac b/configure.ac
index 0736e41ab..e96a0721d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.92 2002/11/13 23:55:57 tim Exp $ 1# $Id: configure.ac,v 1.93 2002/11/22 21:29:03 tim Exp $
2 2
3AC_INIT 3AC_INIT
4AC_CONFIG_SRCDIR([ssh.c]) 4AC_CONFIG_SRCDIR([ssh.c])
@@ -2060,7 +2060,11 @@ Edit /etc/login.conf instead.])
2060# include <paths.h> 2060# include <paths.h>
2061#endif 2061#endif
2062#ifndef _PATH_STDPATH 2062#ifndef _PATH_STDPATH
2063# define _PATH_STDPATH "/usr/bin:/bin:/usr/sbin:/sbin" 2063# ifdef _PATH_USERPATH /* Irix */
2064# define _PATH_STDPATH _PATH_USERPATH
2065# else
2066# define _PATH_STDPATH "/usr/bin:/bin:/usr/sbin:/sbin"
2067# endif
2064#endif 2068#endif
2065#include <sys/types.h> 2069#include <sys/types.h>
2066#include <sys/stat.h> 2070#include <sys/stat.h>