Changeset 1621


Ignore:
Timestamp:
Nov 3, 2010 1:23:01 PM (9 years ago)
Author:
lou
Message:

Remove explicit trunk requirement on CoinUtils? from Clp/configure.ac.

Location:
trunk/Clp
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Clp/configure

    r1619 r1621  
    2077320773
    2077420774if test -n "$PKG_CONFIG" ; then
    20775   if $PKG_CONFIG --exists "coinutils = trunk"; then
    20776     COINUTILS_VERSIONS="`$PKG_CONFIG --modversion "coinutils = trunk" 2>/dev/null`"
    20777      cflags=`$PKG_CONFIG --cflags "coinutils = trunk" 2>/dev/null`
     20775  if $PKG_CONFIG --exists "coinutils"; then
     20776    COINUTILS_VERSIONS="`$PKG_CONFIG --modversion "coinutils" 2>/dev/null`"
     20777     cflags=`$PKG_CONFIG --cflags "coinutils" 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    COINUTILS_CFLAGS="$cflags"
    20786     COINUTILS_LIBS=`$PKG_CONFIG --libs "coinutils = trunk" 2>/dev/null`
    20787     COINUTILS_DATA=`$PKG_CONFIG --variable=datadir "coinutils = trunk" 2>/dev/null`
     20786    COINUTILS_LIBS=`$PKG_CONFIG --libs "coinutils" 2>/dev/null`
     20787    COINUTILS_DATA=`$PKG_CONFIG --variable=datadir "coinutils" 2>/dev/null`
    2078820788     coin_has_coinutils=yes
    2078920789        echo "$as_me:$LINENO: result: yes: $COINUTILS_VERSIONS" >&5
    2079020790echo "${ECHO_T}yes: $COINUTILS_VERSIONS" >&6
    20791         CLPLIB_PCREQUIRES="coinutils = trunk $CLPLIB_PCREQUIRES"
     20791        CLPLIB_PCREQUIRES="coinutils $CLPLIB_PCREQUIRES"
    2079220792
    2079320793
    2079420794
    2079520795  else
    20796     COINUTILS_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors coinutils = trunk`
     20796    COINUTILS_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors coinutils`
    2079720797      coin_has_coinutils=notGiven
    2079820798        echo "$as_me:$LINENO: result: not given: $COINUTILS_PKG_ERRORS" >&5
     
    2083020830COINUTILS_DATA=
    2083120831
    20832 # initial list of dependencies is "coinutils = trunk", but we need to filter out version number specifications (= x, <= x, >= x)
    20833 projtoprocess="coinutils "
     20832# initial list of dependencies is "coinutils", but we need to filter out version number specifications (= x, <= x, >= x)
     20833projtoprocess="coinutils"
    2083420834projprocessed=""
    2083520835
     
    2091620916
    2091720917
    20918       CLPLIB_PCREQUIRES="coinutils = trunk $CLPLIB_PCREQUIRES"
     20918      CLPLIB_PCREQUIRES="coinutils $CLPLIB_PCREQUIRES"
    2091920919      CLPLIB_CFLAGS="$COINUTILS_CFLAGS $CLPLIB_CFLAGS"
    2092020920      CLPLIB_LIBS="$COINUTILS_LIBS $CLPLIB_LIBS"
  • trunk/Clp/configure.ac

    r1618 r1621  
    5757#############################################################################
    5858
    59 AC_COIN_CHECK_PACKAGE(CoinUtils, [coinutils = trunk], [ClpLib])
     59AC_COIN_CHECK_PACKAGE(CoinUtils, [coinutils], [ClpLib])
    6060AC_COIN_CHECK_PACKAGE(Osi,       [osi],               [OsiClpLib])
    6161AC_COIN_CHECK_PACKAGE(OsiTests,  [osi-unittests])
Note: See TracChangeset for help on using the changeset viewer.