From 29ea30d95627517e45e886820e3ef32168bd8dd7 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Fri, 17 Mar 2000 10:54:15 +1100 Subject: [PATCH] - 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 --- ChangeLog | 6 ++++++ INSTALL | 2 +- UPGRADING | 6 +++++- configure.in | 17 +++++++++++++++++ 4 files changed, 29 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1c073da23..13dbdd01d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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 + + 20000316 - Fixed configure not passing LDFLAGS to Solaris. Report from David G. Hesprich diff --git a/INSTALL b/INSTALL index 5a7c41890..576fca085 100644 --- a/INSTALL +++ b/INSTALL @@ -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. diff --git a/UPGRADING b/UPGRADING index aacc9ab2b..df3a23e17 100644 --- a/UPGRADING +++ b/UPGRADING @@ -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)