Changeset 2092 for stable


Ignore:
Timestamp:
Jan 16, 2011 7:24:37 AM (9 years ago)
Author:
stefan
Message:

merge chgset 2075 and fix from 2076 from trunk

Location:
stable/0.6
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • stable/0.6

    • Property svn:mergeinfo changed
      /trunkmerged: 2075
  • stable/0.6/coin.m4

    r2039 r2092  
    40804080  AC_DEFINE(m4_toupper(COIN_HAS_$1),[1],[Define to 1 if the $1 package is available])
    40814081
    4082   # construct dependencies variables from LIBS variables
    4083   # we add an extra space in LIBS so we can substitute out everything starting with " -"
    4084   # before, substitute out everything of the form -framework xxx as used on Mac
    4085   # also substitute out everything of the form `xxx`yyy (may have been added for cygwin/cl)
    4086   m4_toupper($1)_DEPENDENCIES=`echo " $m4_toupper($1)_LIBS" | [sed -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g']`
    4087   coin_foreach_w([myvar], [$3], [
    4088     m4_toupper(myvar)_DEPENDENCIES=`echo " $m4_toupper(myvar)_LIBS " | [sed -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g']`
    4089   ])
     4082  AC_ARG_ENABLE([interpackage-dependencies],
     4083    AC_HELP_STRING([--enable-interpackage-dependencies], [whether to deduce Makefile dependencies from package linker flags (default: yes)]),
     4084    [], [enable_interpackage_dependencies=yes])
     4085   
     4086  if test $enable_interpackage_dependencies = yes ; then
     4087     # construct dependencies variables from LIBS variables
     4088     # we add an extra space in LIBS so we can substitute out everything starting with " -"
     4089     # remove everything of the form -framework xxx as used on Mac and mklxxx as used on Windows
     4090     # then remove everything of the form -xxx
     4091     # also remove everything of the form `xxx`yyy (may have been added for cygwin/cl)
     4092     m4_toupper($1)_DEPENDENCIES=`echo " $m4_toupper($1)_LIBS" | [sed -e 's/ mkl[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g']`
     4093     coin_foreach_w([myvar], [$3], [
     4094       m4_toupper(myvar)_DEPENDENCIES=`echo " $m4_toupper(myvar)_LIBS " | [sed -e 's/ mkl[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g']`
     4095     ])
     4096  fi
    40904097
    40914098  if test 1 = 0 ; then  #change this test to enable a bit of debugging output
  • stable/0.6/compile_f2c

    • Property svn:mergeinfo changed (with no actual effect on merging)
Note: See TracChangeset for help on using the changeset viewer.