Changeset 1447 for branches/split/Cbc

Timestamp:

May 9, 2010 6:16:20 AM (11 years ago)

Author:

stefan

Message:

change dependency to CoinUtils?/trunk

Location:

branches/split/Cbc

Files:

• configure (modified) (3 diffs)
• configure.ac (modified) (1 diff)

branches/split/Cbc/configure

@@ -20773 +20773 @@
 
 if test -n "$PKG_CONFIG" ; then
-  if $PKG_CONFIG --exists "coinutils = split osi cgl"; then
-    COINDEPEND_VERSIONS="`$PKG_CONFIG --modversion coinutils = split osi cgl 2>/dev/null`"
-     cflags=`$PKG_CONFIG --cflags "coinutils = split osi cgl" 2>/dev/null`
+  if $PKG_CONFIG --exists "coinutils = trunk osi cgl"; then
+    COINDEPEND_VERSIONS="`$PKG_CONFIG --modversion coinutils = trunk osi cgl 2>/dev/null`"
+     cflags=`$PKG_CONFIG --cflags "coinutils = trunk osi cgl" 2>/dev/null`
     # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
         # thus, we modify the cflags extracted from pkg-config by putting CYGPATH_W behind -I's
@@ -20784 +20784 @@
         fi
     COINDEPEND_CFLAGS="$cflags"
-    COINDEPEND_LIBS=`$PKG_CONFIG --libs "coinutils = split osi cgl" 2>/dev/null`
-    COINDEPEND_DATA=`$PKG_CONFIG --variable=datadir "coinutils = split osi cgl" 2>/dev/null`
+    COINDEPEND_LIBS=`$PKG_CONFIG --libs "coinutils = trunk osi cgl" 2>/dev/null`
+    COINDEPEND_DATA=`$PKG_CONFIG --variable=datadir "coinutils = trunk osi cgl" 2>/dev/null`
      coin_has_coindepend=yes
         echo "$as_me:$LINENO: result: yes: $COINDEPEND_VERSIONS" >&5
 echo "${ECHO_T}yes: $COINDEPEND_VERSIONS" >&6
-        REQUIREDPACKAGES="$REQUIREDPACKAGES coinutils = split osi cgl"
+        REQUIREDPACKAGES="$REQUIREDPACKAGES coinutils = trunk osi cgl"
 
 
   else
-    COINDEPEND_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors coinutils = split osi cgl`
+    COINDEPEND_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors coinutils = trunk osi cgl`
       coin_has_coindepend=notGiven
         echo "$as_me:$LINENO: result: not given: $COINDEPEND_PKG_ERRORS" >&5
@@ -20811 +20811 @@
     PKG_CONFIG_PATH="$coin_save_PKG_CONFIG_PATH"
   else
-    #if 4th argument is given, try fallback - whereby we take the first word from coinutils = split osi cgl as basename for the .pc file
+    #if 4th argument is given, try fallback - whereby we take the first word from coinutils = trunk osi cgl as basename for the .pc file
     echo "$as_me:$LINENO: result: skipped check via pkg-config" >&5
 echo "${ECHO_T}skipped check via pkg-config" >&6

branches/split/Cbc/configure.ac

@@ -57 +57 @@
 #############################################################################
 
-AC_COIN_HAS_MODULE(CoinDepend, [coinutils = split osi cgl])
+AC_COIN_HAS_MODULE(CoinDepend, [coinutils = trunk osi cgl])
 if test $coin_has_coindepend != yes ; then
   #if we have to use the fallback routines, then obviously it will not find CoinUtils dependencies