summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2000-01-16 12:05:18 +1100
committerDamien Miller <djm@mindrot.org>2000-01-16 12:05:18 +1100
commit5eed6a2d71a62ab575f0557d09ba5404f2ffe055 (patch)
treefe713fff26c8a27b0a4e01180d7ef189e9bc6073
parent229779984d6531ddb2c28838c312d413307a705d (diff)
- Renamed --with-xauth-path to --with-xauth
- Added --with-pid-dir option - Released 1.2.1pre26
-rw-r--r--ChangeLog5
-rw-r--r--INSTALL5
-rw-r--r--acconfig.h3
-rw-r--r--configure.in13
4 files changed, 24 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index ec5ddac55..6805ff2e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
120000116
2 - Renamed --with-xauth-path to --with-xauth
3 - Added --with-pid-dir option
4 - Released 1.2.1pre26
5
120000115 620000115
2 - Add --with-xauth-path configure directive and explicit test for 7 - Add --with-xauth-path configure directive and explicit test for
3 /usr/openwin/bin/xauth for Solaris systems. Report from Anders 8 /usr/openwin/bin/xauth for Solaris systems. Report from Anders
diff --git a/INSTALL b/INSTALL
index 0f86610c5..11ddf1786 100644
--- a/INSTALL
+++ b/INSTALL
@@ -139,6 +139,11 @@ $DISPLAY environment variable. Some broken systems need this.
139--with-default-path=PATH allows you to specify a default $PATH for sessions 139--with-default-path=PATH allows you to specify a default $PATH for sessions
140started by sshd. 140started by sshd.
141 141
142--with-pid-dir=PATH specifies the directory in which the ssh.pid file is
143created.
144
145--with-xauth=PATH specifies the location of the xauth binary
146
142--with-dante[=DIR] will enable Dante SOCKS library support. If the Dante 147--with-dante[=DIR] will enable Dante SOCKS library support. If the Dante
143libsocks library isn't installed in a library searched by the compiler, 148libsocks library isn't installed in a library searched by the compiler,
144add the directory name as the option. 149add the directory name as the option.
diff --git a/acconfig.h b/acconfig.h
index 52aef76a6..2e12bd47f 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -132,6 +132,9 @@
132/* Specify default $PATH */ 132/* Specify default $PATH */
133#undef USER_PATH 133#undef USER_PATH
134 134
135/* Specify location of ssh.pid */
136#undef PID_DIR
137
135@BOTTOM@ 138@BOTTOM@
136 139
137/* ******************* Shouldn't need to edit below this line ************** */ 140/* ******************* Shouldn't need to edit below this line ************** */
diff --git a/configure.in b/configure.in
index 06a770764..816f56eb0 100644
--- a/configure.in
+++ b/configure.in
@@ -24,8 +24,8 @@ AC_ARG_WITH(rsh,
24 ] 24 ]
25) 25)
26 26
27AC_ARG_WITH(xauth-path, 27AC_ARG_WITH(xauth,
28 [ --with-xauth-path=PATH Specify path to xauth program ], 28 [ --with-xauth=PATH Specify path to xauth program ],
29 [ 29 [
30 if test "x$withval" != "$xno" ; then 30 if test "x$withval" != "$xno" ; then
31 AC_DEFINE_UNQUOTED(XAUTH_PATH, "$withval") 31 AC_DEFINE_UNQUOTED(XAUTH_PATH, "$withval")
@@ -651,6 +651,15 @@ AC_ARG_WITH(default-path,
651 ] 651 ]
652) 652)
653 653
654AC_ARG_WITH(pid-dir,
655 [ --with-pid-dir=PATH Specify location of ssh.pid file],
656 [
657 if test "x$withval" != "xno" ; then
658 AC_DEFINE_UNQUOTED(PID_DIR, "$withval")
659 fi
660 ]
661)
662
654dnl Check for mail directory (last resort if we cannot get it from headers) 663dnl Check for mail directory (last resort if we cannot get it from headers)
655if test ! -z "$MAIL" ; then 664if test ! -z "$MAIL" ; then
656 maildir=`dirname $MAIL` 665 maildir=`dirname $MAIL`