Allow make.conf to override ssh's xauth location.
authorPeter Avalos <pavalos@dragonflybsd.org>
Mon, 22 Aug 2016 22:09:18 +0000 (15:09 -0700)
committerPeter Avalos <pavalos@dragonflybsd.org>
Mon, 22 Aug 2016 22:09:18 +0000 (15:09 -0700)
This allows dports to install xauth based on the make.conf definition,
and was the original reason this functionality was added in eb12d1cc.
Note that this is a slightly different implementation than eb12d1cc.
This centralizes the definition instead of scattering it across multiple
Makefiles. Also, since we're doing this via a Makefile, revert the
change to vendor code in e00185f1.

Requested-by: swildner, marino
crypto/openssh/pathnames.h
secure/Makefile.ssh.common

index 78b0132..c3c13a4 100644 (file)
 
 /* xauth for X11 forwarding */
 #ifndef _PATH_XAUTH
-#define _PATH_XAUTH                    "/usr/local/bin/xauth"
+#define _PATH_XAUTH                    "/usr/X11R6/bin/xauth"
 #endif
 
 /* UNIX domain socket for X11 server; displaynum will replace %u */
index 440874f..a56da4c 100644 (file)
@@ -1,5 +1,7 @@
 SSHDIR=                ${.CURDIR}/../../../crypto/openssh
 
+XAUTH_PATH?=   /usr/local/bin/xauth
+CFLAGS+=       -DXAUTH_PATH=\"${XAUTH_PATH}\"
 CFLAGS+=       -I${.CURDIR}/../../lib/libssh -I${SSHDIR}
 
 .if ${.CURDIR:T} != "libssh"