diff options
-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 @@ | |||
1 | 20000317 | ||
2 | - Clarified --with-default-path option. | ||
3 | - Added -blibpath handling for AIX to work around stupid runtime linking. | ||
4 | Problem elucidated by gshapiro@SENDMAIL.ORG by way of Jim Knoble | ||
5 | <jmknoble@pobox.com> | ||
6 | |||
1 | 20000316 | 7 | 20000316 |
2 | - Fixed configure not passing LDFLAGS to Solaris. Report from David G. | 8 | - Fixed configure not passing LDFLAGS to Solaris. Report from David G. |
3 | Hesprich <dghespri@sprintparanet.com> | 9 | Hesprich <dghespri@sprintparanet.com> |
@@ -132,7 +132,7 @@ some platforms. | |||
132 | $DISPLAY environment variable. Some broken systems need this. | 132 | $DISPLAY environment variable. Some broken systems need this. |
133 | 133 | ||
134 | --with-default-path=PATH allows you to specify a default $PATH for sessions | 134 | --with-default-path=PATH allows you to specify a default $PATH for sessions |
135 | started by sshd. | 135 | started by sshd. This replaces the standard path entirely. |
136 | 136 | ||
137 | --with-pid-dir=PATH specifies the directory in which the ssh.pid file is | 137 | --with-pid-dir=PATH specifies the directory in which the ssh.pid file is |
138 | created. | 138 | created. |
@@ -124,5 +124,9 @@ either internally or through RSAref. | |||
124 | 124 | ||
125 | scp must be in the default PATH on both the client and the server. You may | 125 | scp must be in the default PATH on both the client and the server. You may |
126 | need to use the --with-default-path option to specify a custom path to | 126 | need to use the --with-default-path option to specify a custom path to |
127 | search on the server. | 127 | search on the server. This option replaces the default path, so you need |
128 | to specify all the current directories on your path as well as where you | ||
129 | have installed scp. For example: | ||
130 | |||
131 | ./configure --with-default-path=/bin:/usr/bin:/usr/local/bin:/path/to/scp | ||
128 | 132 | ||
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 | |||
29 | AFS_LIBS="-lld" | 29 | AFS_LIBS="-lld" |
30 | CFLAGS="$CFLAGS -I/usr/local/include" | 30 | CFLAGS="$CFLAGS -I/usr/local/include" |
31 | LDFLAGS="$LDFLAGS -L/usr/local/lib" | 31 | LDFLAGS="$LDFLAGS -L/usr/local/lib" |
32 | if test "$LD" != "gcc" -a -z "$blibpath"; then | ||
33 | blibpath="/usr/lib:/lib:/usr/local/lib" | ||
34 | fi | ||
32 | AC_DEFINE(BROKEN_GETADDRINFO) | 35 | AC_DEFINE(BROKEN_GETADDRINFO) |
33 | ;; | 36 | ;; |
34 | *-*-hpux10*) | 37 | *-*-hpux10*) |
@@ -239,6 +242,9 @@ else | |||
239 | if test ! -z "$need_dash_r" ; then | 242 | if test ! -z "$need_dash_r" ; then |
240 | LDFLAGS="$LDFLAGS -R$ssldir/lib -R$ssldir" | 243 | LDFLAGS="$LDFLAGS -R$ssldir/lib -R$ssldir" |
241 | fi | 244 | fi |
245 | if test ! -z "$blibpath" ; then | ||
246 | blibpath="$blibpath:$ssldir:$ssldir/lib" | ||
247 | fi | ||
242 | fi | 248 | fi |
243 | if test -z "$WANTS_RSAREF" ; then | 249 | if test -z "$WANTS_RSAREF" ; then |
244 | LIBS="$saved_LIBS -lcrypto" | 250 | LIBS="$saved_LIBS -lcrypto" |
@@ -646,6 +652,12 @@ AC_ARG_WITH(kerberos4, | |||
646 | if test "x$withval" != "$xyes" ; then | 652 | if test "x$withval" != "$xyes" ; then |
647 | CFLAGS="$CFLAGS -I${withval}/include" | 653 | CFLAGS="$CFLAGS -I${withval}/include" |
648 | LDFLAGS="$LDFLAGS -L${withval}/lib" | 654 | LDFLAGS="$LDFLAGS -L${withval}/lib" |
655 | if test ! -z "$need_dash_r" ; then | ||
656 | LDFLAGS="$LDFLAGS -R${withval}/lib" | ||
657 | fi | ||
658 | if test ! -z "$blibpath" ; then | ||
659 | blibpath="$blibpath:${withval}/lib" | ||
660 | fi | ||
649 | else | 661 | else |
650 | if test -d /usr/include/kerberosIV ; then | 662 | if test -d /usr/include/kerberosIV ; then |
651 | CFLAGS="$CFLAGS -I/usr/include/kerberosIV" | 663 | CFLAGS="$CFLAGS -I/usr/include/kerberosIV" |
@@ -826,4 +838,9 @@ AC_ARG_WITH(pid-dir, | |||
826 | AC_DEFINE_UNQUOTED(PIDDIR, "$piddir") | 838 | AC_DEFINE_UNQUOTED(PIDDIR, "$piddir") |
827 | AC_SUBST(piddir) | 839 | AC_SUBST(piddir) |
828 | 840 | ||
841 | if test ! -z "$blibpath" ; then | ||
842 | LDFLAGS="$LDFLAGS -blibpath:$blibpath" | ||
843 | AC_MSG_WARN([Please check and edit -blibpath in LDFLAGS in Makefile]) | ||
844 | fi | ||
845 | |||
829 | AC_OUTPUT(Makefile) | 846 | AC_OUTPUT(Makefile) |