Changeset 470 for trunk


Ignore:
Timestamp:
Nov 19, 2012 12:24:24 PM (5 years ago)
Author:
stefan
Message:

rerun autotools

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/CoinMP/configure

    r468 r470  
    17811781
    17821782    svn_rev_tmp=`LANG=en_EN svnversion $srcdir 2>/dev/null`
    1783     if test "x$svn_rev_tmp" != xexported -a "x$svn_rev_tmp" != x; then
     1783    if test "x$svn_rev_tmp" != xexported -a "x$svn_rev_tmp" != x -a "x$svn_rev_tmp" != "xUnversioned directory"; then
    17841784      COINMP_SVN_REV=`echo $svn_rev_tmp | sed -n -e 's/^[0-9]*://' -e 's/\([0-9]\)[^0-9]*$/\1/p'`
    17851785
     
    2071220712# unfortunately, ${libdir} expands to ${exec_prefix}/lib and ${exec_prefix} to ${prefix}...
    2071320713if test "x${prefix}" = xNONE ; then
    20714   COIN_PKG_CONFIG_PATH="${ac_default_prefix}/lib/pkgconfig:${ac_default_prefix}/share/pkgconfig:${COIN_PKG_CONFIG_PATH}"
    20715 else
    20716   COIN_PKG_CONFIG_PATH="${prefix}/lib/pkgconfig:${prefix}/share/pkgconfig:${COIN_PKG_CONFIG_PATH}"
     20714  COIN_PKG_CONFIG_PATH="${ac_default_prefix}/lib64/pkgconfig:${ac_default_prefix}/lib/pkgconfig:${ac_default_prefix}/share/pkgconfig:${COIN_PKG_CONFIG_PATH}"
     20715else
     20716  COIN_PKG_CONFIG_PATH="${prefix}/lib64/pkgconfig:${prefix}/lib/pkgconfig:${prefix}/share/pkgconfig:${COIN_PKG_CONFIG_PATH}"
    2071720717fi
    2071820718
     
    2122221222     # construct dependencies variables from LIBS variables
    2122321223     # we add an extra space in LIBS so we can substitute out everything starting with " -"
    21224      # remove everything of the form -framework xxx as used on Mac and mkl* and libiomp5* as used on Windows
     21224     # remove everything of the form -framework xxx as used on Mac and mkl* and libiomp5* and wsock32.lib as used on Windows
    2122521225     # then remove everything of the form -xxx
    2122621226     # also remove everything of the form `xxx`yyy (may have been added for cygwin/cl)
    21227      CBC_DEPENDENCIES=`echo " $CBC_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    21228 
    21229        COINMP_DEPENDENCIES=`echo " $COINMP_LIBS " | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     21227     CBC_DEPENDENCIES=`echo " $CBC_LIBS" | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ wsock32[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
     21228
     21229       COINMP_DEPENDENCIES=`echo " $COINMP_LIBS " | sed -e 's/ mkl[^ ]*//g' -e 's/ libiomp5[^ ]*//g' -e 's/ wsock32[^ ]*//g' -e 's/ -framework  *[^ ]*//g' -e 's/ -[^ ]*//g' -e 's/\`[^\`]*\`[^ ]* //g'`
    2123021230
    2123121231  fi
Note: See TracChangeset for help on using the changeset viewer.