From 35f161c0db8583d980e370cb9c60ca456844e229 Mon Sep 17 00:00:00 2001 From: Albert Chin-A-Young Date: Thu, 24 Oct 2002 23:59:11 +0000 Subject: [PATCH] * libtool.m4: When LDFLAGS="-Wl,-brtl,[other options]", the -brtl special-case code for AIX never gets triggered because were are being too specific about how we search for -brtl. Use case statement to avoid this. Remove extraneous semicolon. * ltmain.in: Recognize the IBM xlc compiler. --- ChangeLog | 9 +++++++++ libtool.m4 | 8 +++++--- ltmain.in | 2 +- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index bea2cd34..48331087 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2002-10-25 Albert Chin-A-Young + + * libtool.m4: When LDFLAGS="-Wl,-brtl,[other options]", the + -brtl special-case code for AIX never gets triggered because + were are being too specific about how we search for -brtl. + Use case statement to avoid this. Remove extraneous + semicolon. + * ltmain.in: Recognize the IBM xlc compiler. + 2002-10-24 Andrew Suffield * libltdl/ltdl.c (lt_dlopenext): Corrected sense of "file not diff --git a/libtool.m4 b/libtool.m4 index 7090ada6..c9ce60f0 100644 --- a/libtool.m4 +++ b/libtool.m4 @@ -2535,10 +2535,12 @@ case $host_os in # need to do runtime linking. case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then + case $ld_flag in + *-brtl*) aix_use_runtimelinking=yes break - fi + ;; + esac done esac @@ -5515,7 +5517,7 @@ for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do # Check for GNU sed and select it if it is found. if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then lt_cv_path_SED=$lt_ac_sed - break; + break fi while true; do cat conftest.in conftest.in >conftest.tmp diff --git a/ltmain.in b/ltmain.in index e0f688a6..75ddc3c7 100644 --- a/ltmain.in +++ b/ltmain.in @@ -269,7 +269,7 @@ if test -z "$show_help"; then # Infer the operation mode. if test -z "$mode"; then case $nonopt in - *cc | *++ | gcc* | *-gcc* | g++*) + *cc | *++ | gcc* | *-gcc* | g++* | xlc) mode=link for arg do