- Timestamp:
- Nov 3, 2010 3:28:51 PM (10 years ago)
- Location:
- trunk/Cbc
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Cbc/configure
r1517 r1518 20818 20818 20819 20819 if test -n "$PKG_CONFIG" ; then 20820 if $PKG_CONFIG --exists "cgl osi coinutils = trunk"; then20821 COINDEPEND_VERSIONS="`$PKG_CONFIG --modversion "cgl osi coinutils = trunk" 2>/dev/null`"20822 cflags=`$PKG_CONFIG --cflags "cgl osi coinutils = trunk" 2>/dev/null`20820 if $PKG_CONFIG --exists "cgl osi coinutils"; then 20821 COINDEPEND_VERSIONS="`$PKG_CONFIG --modversion "cgl osi coinutils" 2>/dev/null`" 20822 cflags=`$PKG_CONFIG --cflags "cgl osi coinutils" 2>/dev/null` 20823 20823 # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files 20824 20824 # thus, we modify the cflags extracted from pkg-config by putting CYGPATH_W behind -I's … … 20829 20829 fi 20830 20830 COINDEPEND_CFLAGS="$cflags" 20831 COINDEPEND_LIBS=`$PKG_CONFIG --libs "cgl osi coinutils = trunk" 2>/dev/null`20832 COINDEPEND_DATA=`$PKG_CONFIG --variable=datadir "cgl osi coinutils = trunk" 2>/dev/null`20831 COINDEPEND_LIBS=`$PKG_CONFIG --libs "cgl osi coinutils" 2>/dev/null` 20832 COINDEPEND_DATA=`$PKG_CONFIG --variable=datadir "cgl osi coinutils" 2>/dev/null` 20833 20833 coin_has_coindepend=yes 20834 20834 echo "$as_me:$LINENO: result: yes: $COINDEPEND_VERSIONS" >&5 20835 20835 echo "${ECHO_T}yes: $COINDEPEND_VERSIONS" >&6 20836 CBCLIB_PCREQUIRES="cgl osi coinutils = trunk$CBCLIB_PCREQUIRES"20837 CBCGENERIC_PCREQUIRES="cgl osi coinutils = trunk$CBCGENERIC_PCREQUIRES"20836 CBCLIB_PCREQUIRES="cgl osi coinutils $CBCLIB_PCREQUIRES" 20837 CBCGENERIC_PCREQUIRES="cgl osi coinutils $CBCGENERIC_PCREQUIRES" 20838 20838 20839 20839 20840 20840 20841 20841 else 20842 COINDEPEND_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors cgl osi coinutils = trunk`20842 COINDEPEND_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors cgl osi coinutils` 20843 20843 coin_has_coindepend=notGiven 20844 20844 echo "$as_me:$LINENO: result: not given: $COINDEPEND_PKG_ERRORS" >&5 … … 20879 20879 COINDEPEND_DATA= 20880 20880 20881 # initial list of dependencies is "cgl osi coinutils = trunk", but we need to filter out version number specifications (= x, <= x, >= x)20882 projtoprocess="cgl osi coinutils 20881 # initial list of dependencies is "cgl osi coinutils", but we need to filter out version number specifications (= x, <= x, >= x) 20882 projtoprocess="cgl osi coinutils" 20883 20883 projprocessed="" 20884 20884 … … 20965 20965 20966 20966 20967 CBCLIB_PCREQUIRES="cgl osi coinutils = trunk$CBCLIB_PCREQUIRES"20967 CBCLIB_PCREQUIRES="cgl osi coinutils $CBCLIB_PCREQUIRES" 20968 20968 CBCLIB_CFLAGS="$COINDEPEND_CFLAGS $CBCLIB_CFLAGS" 20969 20969 CBCLIB_LIBS="$COINDEPEND_LIBS $CBCLIB_LIBS" 20970 20970 20971 CBCGENERIC_PCREQUIRES="cgl osi coinutils = trunk$CBCGENERIC_PCREQUIRES"20971 CBCGENERIC_PCREQUIRES="cgl osi coinutils $CBCGENERIC_PCREQUIRES" 20972 20972 CBCGENERIC_CFLAGS="$COINDEPEND_CFLAGS $CBCGENERIC_CFLAGS" 20973 20973 CBCGENERIC_LIBS="$COINDEPEND_LIBS $CBCGENERIC_LIBS" … … 21076 21076 21077 21077 if test $coin_has_coindepend != yes ; then 21078 { { echo "$as_me:$LINENO: error: Required package CoinUtils, Osi, or Cglnot available." >&521079 echo "$as_me: error: Required package CoinUtils, Osi, or Cglnot available." >&2;}21078 { { echo "$as_me:$LINENO: error: One or more required packages CoinUtils, Osi, and Cgl are not available." >&5 21079 echo "$as_me: error: One or more required packages CoinUtils, Osi, and Cgl are not available." >&2;} 21080 21080 { (exit 1); exit 1; }; } 21081 21081 fi -
trunk/Cbc/configure.ac
r1516 r1518 57 57 ############################################################################# 58 58 59 AC_COIN_CHECK_PACKAGE(CoinDepend, [cgl osi coinutils = trunk], [CbcLib CbcGeneric])59 AC_COIN_CHECK_PACKAGE(CoinDepend, [cgl osi coinutils], [CbcLib CbcGeneric]) 60 60 if test $coin_has_coindepend != yes ; then 61 AC_MSG_ERROR([ Required package CoinUtils, Osi, or Cglnot available.])61 AC_MSG_ERROR([One or more required packages CoinUtils, Osi, and Cgl are not available.]) 62 62 fi 63 63
Note: See TracChangeset
for help on using the changeset viewer.