- (dtucker) [configure.ac] Try AIX blibpath test in different order when
compiling with gcc. gcc 4.1.x will accept (but ignore) -b flags so configure would not select the correct libpath linker flags.
This commit is contained in:
parent
365e18db51
commit
bdc121279f
|
@ -1,3 +1,8 @@
|
|||
20060706
|
||||
- (dtucker) [configure.ac] Try AIX blibpath test in different order when
|
||||
compiling with gcc. gcc 4.1.x will accept (but ignore) -b flags so
|
||||
configure would not select the correct libpath linker flags.
|
||||
|
||||
20060705
|
||||
- (dtucker) [ssh-rand-helper.c] Don't exit if mkdir fails because the
|
||||
target already exists.
|
||||
|
@ -4724,4 +4729,4 @@
|
|||
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
|
||||
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
|
||||
|
||||
$Id: ChangeLog,v 1.4356 2006/07/05 12:48:07 djm Exp $
|
||||
$Id: ChangeLog,v 1.4357 2006/07/06 01:56:25 dtucker Exp $
|
||||
|
|
11
configure.ac
11
configure.ac
|
@ -1,4 +1,4 @@
|
|||
# $Id: configure.ac,v 1.343 2006/06/27 01:20:29 dtucker Exp $
|
||||
# $Id: configure.ac,v 1.344 2006/07/06 01:56:25 dtucker Exp $
|
||||
#
|
||||
# Copyright (c) 1999-2004 Damien Miller
|
||||
#
|
||||
|
@ -15,7 +15,7 @@
|
|||
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
|
||||
AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org)
|
||||
AC_REVISION($Revision: 1.343 $)
|
||||
AC_REVISION($Revision: 1.344 $)
|
||||
AC_CONFIG_SRCDIR([ssh.c])
|
||||
|
||||
AC_CONFIG_HEADER(config.h)
|
||||
|
@ -135,7 +135,12 @@ case "$host" in
|
|||
blibpath="/usr/lib:/lib"
|
||||
fi
|
||||
saved_LDFLAGS="$LDFLAGS"
|
||||
for tryflags in -blibpath: -Wl,-blibpath: -Wl,-rpath, ;do
|
||||
if test "$GCC" = "yes"; then
|
||||
flags="-Wl,-blibpath: -Wl,-rpath, -blibpath:"
|
||||
else
|
||||
flags="-blibpath: -Wl,-blibpath: -Wl,-rpath,"
|
||||
fi
|
||||
for tryflags in $flags ;do
|
||||
if (test -z "$blibflags"); then
|
||||
LDFLAGS="$saved_LDFLAGS $tryflags$blibpath"
|
||||
AC_TRY_LINK([], [], [blibflags=$tryflags])
|
||||
|
|
Loading…
Reference in New Issue