Changeset 2037 for stable/0.6/coin.m4


Ignore:
Timestamp:
Dec 31, 2010 7:52:45 AM (9 years ago)
Author:
stefan
Message:

merge fix for X_DEPENDENCIES setup from trunk chgset 2036

File:
1 edited

Legend:

Unmodified
Added
Removed
  • stable/0.6/coin.m4

    r2034 r2037  
    40724072  # construct dependencies variables from LIBS variables
    40734073  # we add an extra space in LIBS so we can substitute out everything starting with " -"
     4074  # before, substitute out everything of the form -framework xxx as used on Mac
    40744075  # also substitute out everything of the form `xxx`yyy (may have been added for cygwin/cl)
    4075   m4_toupper($1)_DEPENDENCIES=`echo " $m4_toupper($1)_LIBS" | [sed -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g']`
     4076  m4_toupper($1)_DEPENDENCIES=`echo " $m4_toupper($1)_LIBS" | [sed -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g']`
    40764077  coin_foreach_w([myvar], [$3], [
    4077     m4_toupper(myvar)_DEPENDENCIES=`echo " $m4_toupper(myvar)_LIBS " | [sed -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g']`
     4078    m4_toupper(myvar)_DEPENDENCIES=`echo " $m4_toupper(myvar)_LIBS " | [sed -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g']`
    40784079  ])
    40794080
Note: See TracChangeset for help on using the changeset viewer.