Search for xauth.

Rev: ChangeLog:1.544 Rev: configure.ac:1.15

Search for xauth.
Rev: ChangeLog:1.544 Rev: configure.ac:1.15
14c5a4ea · Pontus Freyhult · d574744b · 14c5a4ea · 14c5a4ea
Commit 14c5a4ea authored Sep 03, 2002 by Pontus Freyhult
Hide whitespace changes
Inline Side-by-side

Showing with 16 additions and 0 deletions

ChangeLog ChangeLog +4 -0

configure.ac configure.ac +12 -0

No files found.
--- a/ChangeLog
+++ b/ChangeLog
+2002-09-03  Pontus Skld  <pont@soua.net>
+
+	* configure.ac: Search for xauth.
+
 2002-09-02  Pontus Skld  <pont@soua.net>

 	* src/testsuite/lsh-8-test: New test. Check whatever unencrypted

--- a/configure.ac
+++ b/configure.ac
@@ -415,6 +415,18 @@ AC_CHECK_HEADERS(X11/Xauth.h)
 AC_CHECK_LIB(Xau, XauGetAuthByAddr)
 LSH_RPATH_FIX

+AC_ARG_VAR(XAUTH_PROGRAM, Program used to handle .Xauthority-files by lshd)
+
+if test -z "$XAUTH_PROGRAM"; then
+  AC_PATH_PROG(XAUTH_PROGRAM, xauth,, /usr/X11R6/bin:/usr/openwin/bin:/usr/X/bin:/usr/X11/bin:/usr/bin:/usr/bin/X:/usr/bin/X11)
+fi
+
+if test -z "$XAUTH_PROGRAM"; then
+  AC_MSG_WARN(Couldn't find xauth, try passing XAUTH_PROGRAM=/path/to/xauth to configure)
+else
+  AC_DEFINE_UNQUOTED(XAUTH_PROGRAM, "$XAUTH_PROGRAM", Program used by lshd to handle .Xauthority-files)
+fi
+
 AC_CHECK_LIB(crypt, crypt)
 AC_CHECK_LIB(xnet, inet_addr)
 AC_CHECK_LIB(nsl, gethostbyname)