- Renamed --with-xauth-path to --with-xauth
- Added --with-pid-dir option
- Released 1.2.1pre26
diff --git a/ChangeLog b/ChangeLog
index ec5ddac..6805ff2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+20000116
+ - Renamed --with-xauth-path to --with-xauth
+ - Added --with-pid-dir option
+ - Released 1.2.1pre26
+
20000115
- Add --with-xauth-path configure directive and explicit test for
/usr/openwin/bin/xauth for Solaris systems. Report from Anders
diff --git a/INSTALL b/INSTALL
index 0f86610..11ddf17 100644
--- a/INSTALL
+++ b/INSTALL
@@ -139,6 +139,11 @@
--with-default-path=PATH allows you to specify a default $PATH for sessions
started by sshd.
+--with-pid-dir=PATH specifies the directory in which the ssh.pid file is
+created.
+
+--with-xauth=PATH specifies the location of the xauth binary
+
--with-dante[=DIR] will enable Dante SOCKS library support. If the Dante
libsocks library isn't installed in a library searched by the compiler,
add the directory name as the option.
diff --git a/acconfig.h b/acconfig.h
index 52aef76..2e12bd4 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -132,6 +132,9 @@
/* Specify default $PATH */
#undef USER_PATH
+/* Specify location of ssh.pid */
+#undef PID_DIR
+
@BOTTOM@
/* ******************* Shouldn't need to edit below this line ************** */
diff --git a/configure.in b/configure.in
index 06a7707..816f56e 100644
--- a/configure.in
+++ b/configure.in
@@ -24,8 +24,8 @@
]
)
-AC_ARG_WITH(xauth-path,
- [ --with-xauth-path=PATH Specify path to xauth program ],
+AC_ARG_WITH(xauth,
+ [ --with-xauth=PATH Specify path to xauth program ],
[
if test "x$withval" != "$xno" ; then
AC_DEFINE_UNQUOTED(XAUTH_PATH, "$withval")
@@ -651,6 +651,15 @@
]
)
+AC_ARG_WITH(pid-dir,
+ [ --with-pid-dir=PATH Specify location of ssh.pid file],
+ [
+ if test "x$withval" != "xno" ; then
+ AC_DEFINE_UNQUOTED(PID_DIR, "$withval")
+ fi
+ ]
+)
+
dnl Check for mail directory (last resort if we cannot get it from headers)
if test ! -z "$MAIL" ; then
maildir=`dirname $MAIL`