From f49a37942435d43b1fa96dfba1b7ca2c5cd2d8dd Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Sat, 11 Jun 2005 11:02:52 +0000 Subject: [PATCH] * m4/libtool.m4 (_LT_COMPILER_OPTION, _LT_LINKER_OPTION): No need for $ECHO here. Fix sed script syntax to be portable. This should now put the pic-flag right after the last $*FLAGS variable again, if any. Necessary for Fortran AC_FC_SRCEXT. --- ChangeLog | 7 +++++++ m4/libtool.m4 | 8 ++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 95726c5d2..63cb0f7c3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2005-06-11 Ralf Wildenhues + + * m4/libtool.m4 (_LT_COMPILER_OPTION, _LT_LINKER_OPTION): No + need for $ECHO here. Fix sed script syntax to be portable. + This should now put the pic-flag right after the last $*FLAGS + variable again, if any. Necessary for Fortran AC_FC_SRCEXT. + 2005-06-09 Ralf Wildenhues * m4/libtool.m4 (_LT_CONFIG_COMMANDS): Remove long lines. diff --git a/m4/libtool.m4 b/m4/libtool.m4 index 56fc4f935..a14aefdbc 100644 --- a/m4/libtool.m4 +++ b/m4/libtool.m4 @@ -1055,8 +1055,8 @@ AC_CACHE_CHECK([$1], [$2], # Note that $ac_compile itself does not contain backslashes and begins # with a dollar sign (not a hyphen), so the echo should work correctly. # The option is referenced via a variable to avoid confusing sed. - lt_compile=`$ECHO "$ac_compile" | $SED \ - -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) @@ -1477,8 +1477,8 @@ AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], # (2) before a word containing "conftest.", or (3) at the end. # Note that $ac_compile itself does not contain backslashes and begins # with a dollar sign (not a hyphen), so the echo should work correctly. - lt_compile=`$ECHO "$ac_compile" | $SED \ - -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ + lt_compile=`echo "$ac_compile" | $SED \ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) -- 2.47.2