summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--configure.ac11
2 files changed, 14 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 8f57ef9b6..e438b495f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
120060706
2 - (dtucker) [configure.ac] Try AIX blibpath test in different order when
3 compiling with gcc. gcc 4.1.x will accept (but ignore) -b flags so
4 configure would not select the correct libpath linker flags.
5
120060705 620060705
2 - (dtucker) [ssh-rand-helper.c] Don't exit if mkdir fails because the 7 - (dtucker) [ssh-rand-helper.c] Don't exit if mkdir fails because the
3 target already exists. 8 target already exists.
@@ -4724,4 +4729,4 @@
4724 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 4729 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
4725 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 4730 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
4726 4731
4727$Id: ChangeLog,v 1.4356 2006/07/05 12:48:07 djm Exp $ 4732$Id: ChangeLog,v 1.4357 2006/07/06 01:56:25 dtucker Exp $
diff --git a/configure.ac b/configure.ac
index 3179ff3e7..252e7a993 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.343 2006/06/27 01:20:29 dtucker Exp $ 1# $Id: configure.ac,v 1.344 2006/07/06 01:56:25 dtucker Exp $
2# 2#
3# Copyright (c) 1999-2004 Damien Miller 3# Copyright (c) 1999-2004 Damien Miller
4# 4#
@@ -15,7 +15,7 @@
15# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 15# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
16 16
17AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org) 17AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org)
18AC_REVISION($Revision: 1.343 $) 18AC_REVISION($Revision: 1.344 $)
19AC_CONFIG_SRCDIR([ssh.c]) 19AC_CONFIG_SRCDIR([ssh.c])
20 20
21AC_CONFIG_HEADER(config.h) 21AC_CONFIG_HEADER(config.h)
@@ -135,7 +135,12 @@ case "$host" in
135 blibpath="/usr/lib:/lib" 135 blibpath="/usr/lib:/lib"
136 fi 136 fi
137 saved_LDFLAGS="$LDFLAGS" 137 saved_LDFLAGS="$LDFLAGS"
138 for tryflags in -blibpath: -Wl,-blibpath: -Wl,-rpath, ;do 138 if test "$GCC" = "yes"; then
139 flags="-Wl,-blibpath: -Wl,-rpath, -blibpath:"
140 else
141 flags="-blibpath: -Wl,-blibpath: -Wl,-rpath,"
142 fi
143 for tryflags in $flags ;do
139 if (test -z "$blibflags"); then 144 if (test -z "$blibflags"); then
140 LDFLAGS="$saved_LDFLAGS $tryflags$blibpath" 145 LDFLAGS="$saved_LDFLAGS $tryflags$blibpath"
141 AC_TRY_LINK([], [], [blibflags=$tryflags]) 146 AC_TRY_LINK([], [], [blibflags=$tryflags])