Changeset 1447 for branches


Ignore:
Timestamp:
May 9, 2010 6:16:20 AM (9 years ago)
Author:
stefan
Message:

change dependency to CoinUtils?/trunk

Location:
branches/split/Cbc
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/split/Cbc/configure

    r1446 r1447  
    2077320773
    2077420774if test -n "$PKG_CONFIG" ; then
    20775   if $PKG_CONFIG --exists "coinutils = split osi cgl"; then
    20776     COINDEPEND_VERSIONS="`$PKG_CONFIG --modversion coinutils = split osi cgl 2>/dev/null`"
    20777      cflags=`$PKG_CONFIG --cflags "coinutils = split osi cgl" 2>/dev/null`
     20775  if $PKG_CONFIG --exists "coinutils = trunk osi cgl"; then
     20776    COINDEPEND_VERSIONS="`$PKG_CONFIG --modversion coinutils = trunk osi cgl 2>/dev/null`"
     20777     cflags=`$PKG_CONFIG --cflags "coinutils = trunk osi cgl" 2>/dev/null`
    2077820778    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
    2077920779        # thus, we modify the cflags extracted from pkg-config by putting CYGPATH_W behind -I's
     
    2078420784        fi
    2078520785    COINDEPEND_CFLAGS="$cflags"
    20786     COINDEPEND_LIBS=`$PKG_CONFIG --libs "coinutils = split osi cgl" 2>/dev/null`
    20787     COINDEPEND_DATA=`$PKG_CONFIG --variable=datadir "coinutils = split osi cgl" 2>/dev/null`
     20786    COINDEPEND_LIBS=`$PKG_CONFIG --libs "coinutils = trunk osi cgl" 2>/dev/null`
     20787    COINDEPEND_DATA=`$PKG_CONFIG --variable=datadir "coinutils = trunk osi cgl" 2>/dev/null`
    2078820788     coin_has_coindepend=yes
    2078920789        echo "$as_me:$LINENO: result: yes: $COINDEPEND_VERSIONS" >&5
    2079020790echo "${ECHO_T}yes: $COINDEPEND_VERSIONS" >&6
    20791         REQUIREDPACKAGES="$REQUIREDPACKAGES coinutils = split osi cgl"
     20791        REQUIREDPACKAGES="$REQUIREDPACKAGES coinutils = trunk osi cgl"
    2079220792
    2079320793
    2079420794  else
    20795     COINDEPEND_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors coinutils = split osi cgl`
     20795    COINDEPEND_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors coinutils = trunk osi cgl`
    2079620796      coin_has_coindepend=notGiven
    2079720797        echo "$as_me:$LINENO: result: not given: $COINDEPEND_PKG_ERRORS" >&5
     
    2081120811    PKG_CONFIG_PATH="$coin_save_PKG_CONFIG_PATH"
    2081220812  else
    20813     #if 4th argument is given, try fallback - whereby we take the first word from coinutils = split osi cgl as basename for the .pc file
     20813    #if 4th argument is given, try fallback - whereby we take the first word from coinutils = trunk osi cgl as basename for the .pc file
    2081420814    echo "$as_me:$LINENO: result: skipped check via pkg-config" >&5
    2081520815echo "${ECHO_T}skipped check via pkg-config" >&6
  • branches/split/Cbc/configure.ac

    r1446 r1447  
    5757#############################################################################
    5858
    59 AC_COIN_HAS_MODULE(CoinDepend, [coinutils = split osi cgl])
     59AC_COIN_HAS_MODULE(CoinDepend, [coinutils = trunk osi cgl])
    6060if test $coin_has_coindepend != yes ; then
    6161  #if we have to use the fallback routines, then obviously it will not find CoinUtils dependencies
Note: See TracChangeset for help on using the changeset viewer.