diff options
| author | Damien Miller <djm@mindrot.org> | 2000-03-17 00:54:15 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2000-03-17 00:54:15 +0100 |
| commit | 29ea30d95627517e45e886820e3ef32168bd8dd7 (patch) | |
| tree | a18a0eb90f9b74dfb4e3b2eb9e54888893693f1b | |
| parent | Prepare for final test release (diff) | |
| download | openssh-29ea30d95627517e45e886820e3ef32168bd8dd7.tar.xz openssh-29ea30d95627517e45e886820e3ef32168bd8dd7.zip | |
- Clarified --with-default-path option.
- Added -blibpath handling for AIX to work around stupid runtime linking.
Problem elucidated by gshapiro@SENDMAIL.ORG by way of Jim Knoble
<jmknoble@pobox.com>
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | INSTALL | 2 | ||||
| -rw-r--r-- | UPGRADING | 6 | ||||
| -rw-r--r-- | configure.in | 17 |
4 files changed, 29 insertions, 2 deletions
@@ -1,3 +1,9 @@ +20000317 + - Clarified --with-default-path option. + - Added -blibpath handling for AIX to work around stupid runtime linking. + Problem elucidated by gshapiro@SENDMAIL.ORG by way of Jim Knoble + <jmknoble@pobox.com> + 20000316 - Fixed configure not passing LDFLAGS to Solaris. Report from David G. Hesprich <dghespri@sprintparanet.com> @@ -132,7 +132,7 @@ some platforms. $DISPLAY environment variable. Some broken systems need this. --with-default-path=PATH allows you to specify a default $PATH for sessions -started by sshd. +started by sshd. This replaces the standard path entirely. --with-pid-dir=PATH specifies the directory in which the ssh.pid file is created. @@ -124,5 +124,9 @@ either internally or through RSAref. scp must be in the default PATH on both the client and the server. You may need to use the --with-default-path option to specify a custom path to -search on the server. +search on the server. This option replaces the default path, so you need +to specify all the current directories on your path as well as where you +have installed scp. For example: + +./configure --with-default-path=/bin:/usr/bin:/usr/local/bin:/path/to/scp diff --git a/configure.in b/configure.in index 81265f1e8..0eeda65ef 100644 --- a/configure.in +++ b/configure.in @@ -29,6 +29,9 @@ case "$host" in AFS_LIBS="-lld" CFLAGS="$CFLAGS -I/usr/local/include" LDFLAGS="$LDFLAGS -L/usr/local/lib" + if test "$LD" != "gcc" -a -z "$blibpath"; then + blibpath="/usr/lib:/lib:/usr/local/lib" + fi AC_DEFINE(BROKEN_GETADDRINFO) ;; *-*-hpux10*) @@ -239,6 +242,9 @@ else if test ! -z "$need_dash_r" ; then LDFLAGS="$LDFLAGS -R$ssldir/lib -R$ssldir" fi + if test ! -z "$blibpath" ; then + blibpath="$blibpath:$ssldir:$ssldir/lib" + fi fi if test -z "$WANTS_RSAREF" ; then LIBS="$saved_LIBS -lcrypto" @@ -646,6 +652,12 @@ AC_ARG_WITH(kerberos4, if test "x$withval" != "$xyes" ; then CFLAGS="$CFLAGS -I${withval}/include" LDFLAGS="$LDFLAGS -L${withval}/lib" + if test ! -z "$need_dash_r" ; then + LDFLAGS="$LDFLAGS -R${withval}/lib" + fi + if test ! -z "$blibpath" ; then + blibpath="$blibpath:${withval}/lib" + fi else if test -d /usr/include/kerberosIV ; then CFLAGS="$CFLAGS -I/usr/include/kerberosIV" @@ -826,4 +838,9 @@ AC_ARG_WITH(pid-dir, AC_DEFINE_UNQUOTED(PIDDIR, "$piddir") AC_SUBST(piddir) +if test ! -z "$blibpath" ; then + LDFLAGS="$LDFLAGS -blibpath:$blibpath" + AC_MSG_WARN([Please check and edit -blibpath in LDFLAGS in Makefile]) +fi + AC_OUTPUT(Makefile) |