diff options
author | Darren Tucker <dtucker@zip.com.au> | 2006-07-06 03:56:25 +0200 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2006-07-06 03:56:25 +0200 |
commit | bdc121279f15b13b103c15555591f784886d0011 (patch) | |
tree | b4276ae6a25472daa1e8bce8a5585a9cb473eaa7 /configure.ac | |
parent | whitespace (diff) | |
download | openssh-bdc121279f15b13b103c15555591f784886d0011.tar.xz openssh-bdc121279f15b13b103c15555591f784886d0011.zip |
- (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.
Diffstat (limited to '')
-rw-r--r-- | configure.ac | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 3179ff3e7..252e7a993 100644 --- a/configure.ac +++ b/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]) |