diff options
| author | Tim Rice <tim@multitalents.net> | 2002-07-17 19:20:07 -0700 |
|---|---|---|
| committer | Tim Rice <tim@multitalents.net> | 2002-07-17 19:20:07 -0700 |
| commit | e22be3b11ea1e5cb349665a3cbc57bc564f39ad7 (patch) | |
| tree | 2b5ea95e4f1f1cabc9c6d7bde47c75d5af641dd7 /configure.ac | |
| parent | 2faabf3d798a8bab6d6b6a13c40e4c0d51bbf826 (diff) | |
[configure.ac] change how we do paths in AC_PATH_PROGS tests
for autoconf 2.53. Based on a patch by jrj@purdue.edu
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 1fb3056e..f94f6c84 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 |