- 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>
diff --git a/ChangeLog b/ChangeLog
index 1c073da..13dbdd0 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
+ <jmknoble@pobox.com>
+
20000316
- Fixed configure not passing LDFLAGS to Solaris. Report from David G.
Hesprich <dghespri@sprintparanet.com>
diff --git a/INSTALL b/INSTALL
index 5a7c418..576fca0 100644
--- a/INSTALL
+++ b/INSTALL
@@ -132,7 +132,7 @@
$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 aacc9ab..df3a23e 100644
--- a/UPGRADING
+++ b/UPGRADING
@@ -124,5 +124,9 @@
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 81265f1..0eeda65 100644
--- a/configure.in
+++ b/configure.in
@@ -29,6 +29,9 @@
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 @@
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 @@
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_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)