Changeset 1549 for branches


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

change to CoinUtils?/trunk

Location:
branches/split/Clp
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/split/Clp/configure

    r1547 r1549  
    2073920739
    2074020740if test -n "$PKG_CONFIG" ; then
    20741   if $PKG_CONFIG --exists "coinutils = split"; then
    20742     COINUTILS_VERSIONS="`$PKG_CONFIG --modversion coinutils = split 2>/dev/null`"
    20743      cflags=`$PKG_CONFIG --cflags "coinutils = split" 2>/dev/null`
     20741  if $PKG_CONFIG --exists "coinutils = trunk"; then
     20742    COINUTILS_VERSIONS="`$PKG_CONFIG --modversion coinutils = trunk 2>/dev/null`"
     20743     cflags=`$PKG_CONFIG --cflags "coinutils = trunk" 2>/dev/null`
    2074420744    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
    2074520745        # thus, we modify the cflags extracted from pkg-config by putting CYGPATH_W behind -I's
     
    2075020750        fi
    2075120751    COINUTILS_CFLAGS="$cflags"
    20752     COINUTILS_LIBS=`$PKG_CONFIG --libs "coinutils = split" 2>/dev/null`
    20753     COINUTILS_DATA=`$PKG_CONFIG --variable=datadir "coinutils = split" 2>/dev/null`
     20752    COINUTILS_LIBS=`$PKG_CONFIG --libs "coinutils = trunk" 2>/dev/null`
     20753    COINUTILS_DATA=`$PKG_CONFIG --variable=datadir "coinutils = trunk" 2>/dev/null`
    2075420754     coin_has_coinutils=yes
    2075520755        echo "$as_me:$LINENO: result: yes: $COINUTILS_VERSIONS" >&5
    2075620756echo "${ECHO_T}yes: $COINUTILS_VERSIONS" >&6
    20757         REQUIREDPACKAGES="$REQUIREDPACKAGES coinutils = split"
     20757        REQUIREDPACKAGES="$REQUIREDPACKAGES coinutils = trunk"
    2075820758
    2075920759
    2076020760  else
    20761     COINUTILS_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors coinutils = split`
     20761    COINUTILS_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors coinutils = trunk`
    2076220762      coin_has_coinutils=notGiven
    2076320763        echo "$as_me:$LINENO: result: not given: $COINUTILS_PKG_ERRORS" >&5
     
    2077720777    PKG_CONFIG_PATH="$coin_save_PKG_CONFIG_PATH"
    2077820778  else
    20779     #if 4th argument is given, try fallback - whereby we take the first word from coinutils = split as basename for the .pc file
     20779    #if 4th argument is given, try fallback - whereby we take the first word from coinutils = trunk as basename for the .pc file
    2078020780    echo "$as_me:$LINENO: result: skipped check via pkg-config" >&5
    2078120781echo "${ECHO_T}skipped check via pkg-config" >&6
  • branches/split/Clp/configure.ac

    r1546 r1549  
    5757#############################################################################
    5858
    59 AC_COIN_HAS_MODULE(CoinUtils, [coinutils = split])
     59AC_COIN_HAS_MODULE(CoinUtils, [coinutils = trunk])
    6060if test $coin_has_coinutils != 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.