tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-26 07:15:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

[configure.ac] change how we do paths in AC_PATH_PROGS tests

Browse Source 
for autoconf 2.53. Based on a patch by jrj@purdue.edu
This commit is contained in:
Tim Rice 2002-07-17 19:20:07 -07:00
parent 2faabf3d79
commit e22be3b11e
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,5 +1,7 @@
20020717 20020717
- (bal) aixbff package updated by dtucker@zip.com.au - (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 20020716
- (tim) [contrib/solaris/opensshd.in] Only kill sshd if .pid file found - (tim) [contrib/solaris/opensshd.in] Only kill sshd if .pid file found
@ -1380,4 +1382,4 @@
- (stevesk) entropy.c: typo in debug message - (stevesk) entropy.c: typo in debug message
- (djm) ssh-keygen -i needs seeded RNG; report from markus@ - (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 $

12
configure.ac
View File

@ -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_INIT
AC_CONFIG_SRCDIR([ssh.c]) AC_CONFIG_SRCDIR([ssh.c])
@ -1818,7 +1818,12 @@ AC_ARG_WITH(xauth,
fi 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 if (test ! -z "$xauth_path" && test -x "/usr/openwin/bin/xauth") ; then
xauth_path="/usr/openwin/bin/xauth" xauth_path="/usr/openwin/bin/xauth"
fi fi
@ -1872,7 +1877,8 @@ AC_ARG_WITH(mantype,
] ]
) )
if test -z "$MANTYPE"; then 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 if ${NROFF} -mdoc ${srcdir}/ssh.1 >/dev/null 2>&1; then
MANTYPE=doc MANTYPE=doc
elif ${NROFF} -man ${srcdir}/ssh.1 >/dev/null 2>&1; then elif ${NROFF} -man ${srcdir}/ssh.1 >/dev/null 2>&1; then