From e22be3b11ea1e5cb349665a3cbc57bc564f39ad7 Mon Sep 17 00:00:00 2001 From: Tim Rice Date: Wed, 17 Jul 2002 19:20:07 -0700 Subject: [configure.ac] change how we do paths in AC_PATH_PROGS tests for autoconf 2.53. Based on a patch by jrj@purdue.edu --- ChangeLog | 4 +++- configure.ac | 12 +++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7984d15b0..6aeb6f18f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 20020717 - (bal) aixbff package updated by dtucker@zip.com.au + - (tim) [configure.ac] change how we do paths in AC_PATH_PROGS tests + for autoconf 2.53. Based on a patch by jrj@purdue.edu 20020716 - (tim) [contrib/solaris/opensshd.in] Only kill sshd if .pid file found @@ -1380,4 +1382,4 @@ - (stevesk) entropy.c: typo in debug message - (djm) ssh-keygen -i needs seeded RNG; report from markus@ -$Id: ChangeLog,v 1.2372 2002/07/18 01:04:50 mouring Exp $ +$Id: ChangeLog,v 1.2373 2002/07/18 02:20:07 tim Exp $ diff --git a/configure.ac b/configure.ac index 1fb3056e6..f94f6c848 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -# $Id: configure.ac,v 1.79 2002/07/14 20:36:50 tim Exp $ +# $Id: configure.ac,v 1.80 2002/07/18 02:20:08 tim Exp $ AC_INIT AC_CONFIG_SRCDIR([ssh.c]) @@ -1818,7 +1818,12 @@ AC_ARG_WITH(xauth, fi ], [ - AC_PATH_PROG(xauth_path, xauth,,$PATH:/usr/X/bin:/usr/bin/X11:/usr/X11R6/bin:/usr/openwin/bin) + TestPath="$PATH" + TestPath="${TestPath}${PATH_SEPARATOR}/usr/X/bin" + TestPath="${TestPath}${PATH_SEPARATOR}/usr/bin/X11" + TestPath="${TestPath}${PATH_SEPARATOR}/usr/X11R6/bin" + TestPath="${TestPath}${PATH_SEPARATOR}/usr/openwin/bin" + AC_PATH_PROG(xauth_path, xauth, , $TestPath) if (test ! -z "$xauth_path" && test -x "/usr/openwin/bin/xauth") ; then xauth_path="/usr/openwin/bin/xauth" fi @@ -1872,7 +1877,8 @@ AC_ARG_WITH(mantype, ] ) if test -z "$MANTYPE"; then - AC_PATH_PROGS(NROFF, nroff awf, /bin/false, /usr/bin:/usr/ucb) + TestPath="/usr/bin${PATH_SEPARATOR}/usr/ucb" + AC_PATH_PROGS(NROFF, nroff awf, /bin/false, $TestPath) if ${NROFF} -mdoc ${srcdir}/ssh.1 >/dev/null 2>&1; then MANTYPE=doc elif ${NROFF} -man ${srcdir}/ssh.1 >/dev/null 2>&1; then -- cgit v1.2.3