Changeset 1476 for stable


Ignore:
Timestamp:
Jul 4, 2010 9:10:29 PM (9 years ago)
Author:
lou
Message:

Revert to BuildTools?/stable/0.5 for compatibility. Requires 0.5.30 or greater
to correctly define CBC_VERSION.

Location:
stable/2.5
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • stable/2.5

    • Property svn:externals
      •  

        old new  
        1 BuildTools  https://projects.coin-or.org/svn/BuildTools/stable/0.6
        2 ThirdParty/ASL  https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/releases/1.0.17/
        3 ThirdParty/Blas  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/releases/1.0.14/
        4 ThirdParty/Lapack  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/releases/1.1.0/
        5 ThirdParty/Glpk  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/releases/1.5.1/
        6 Data/Sample  https://projects.coin-or.org/svn/Data/releases/1.0.7/Sample
        7 CoinUtils  https://projects.coin-or.org/svn/CoinUtils/releases/2.6.4/CoinUtils
        8 Cgl  https://projects.coin-or.org/svn/Cgl/releases/0.55.0/Cgl
         1BuildTools  https://projects.coin-or.org/svn/BuildTools/stable/0.5
         2ThirdParty/ASL  https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/stable/1.0
         3ThirdParty/Blas  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.0
         4ThirdParty/Lapack  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.1
         5ThirdParty/Glpk  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/stable/1.5
         6Data/Sample  https://projects.coin-or.org/svn/Data/stable/1.0/Sample
         7CoinUtils  https://projects.coin-or.org/svn/CoinUtils/stable/2.6/CoinUtils
         8Cgl  https://projects.coin-or.org/svn/Cgl/stable/0.55/Cgl
        99Clp  https://projects.coin-or.org/svn/Clp/stable/1.12/Clp
        1010Osi  https://projects.coin-or.org/svn/Osi/stable/0.103/Osi
        11 Vol  https://projects.coin-or.org/svn/Vol/releases/1.1.7/Vol
         11Vol  https://projects.coin-or.org/svn/Vol/stable/1.1/Vol
  • stable/2.5/Cbc/configure

    r1474 r1476  
    17341734coin_projectdir=yes
    17351735
    1736 # Set the project's version number.
    1737 if test "xCbc" != x; then
    1738   # temporary hack to avoid breaking lapack 1.0.20;
    1739   # do not propagate to BuildTools trunk!  --lh, 100615--
    1740   if expr "Cbc" : '.*:.*' >/dev/null 2>&1 ; then
    1741     coin_libversion="Cbc"
    1742   else
     1736# Set the project's version number. Use m4_ifval here to avoid defining
     1737# _VERSION when the user has not supplied a parameter.
     1738 # temporary hack to avoid breaking lapack 1.0.20;
     1739    # do not propagate to BuildTools trunk!  --lh, 100615--
     1740    if expr "Cbc" : '.*:.*' >/dev/null 2>&1 ; then
     1741      coin_libversion="Cbc"
     1742    else
    17431743
    17441744cat >>confdefs.h <<_ACEOF
     
    17461746_ACEOF
    17471747
    1748   fi
    1749 fi
    1750 
    1751 # Capture libtool library version, if given.
     1748    fi
    17521749
    17531750
     
    58375834*-*-irix6*)
    58385835  # Find out which ABI we are using.
    5839   echo '#line 5839 "configure"' > conftest.$ac_ext
     5836  echo '#line 5836 "configure"' > conftest.$ac_ext
    58405837  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    58415838  (eval $ac_compile) 2>&5
     
    69716968
    69726969# Provide some information about the compiler.
    6973 echo "$as_me:6973:" \
     6970echo "$as_me:6970:" \
    69746971     "checking for Fortran 77 compiler version" >&5
    69756972ac_compiler=`set X $ac_compile; echo $2`
     
    80388035   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    80398036   -e 's:$: $lt_compiler_flag:'`
    8040    (eval echo "\"\$as_me:8040: $lt_compile\"" >&5)
     8037   (eval echo "\"\$as_me:8037: $lt_compile\"" >&5)
    80418038   (eval "$lt_compile" 2>conftest.err)
    80428039   ac_status=$?
    80438040   cat conftest.err >&5
    8044    echo "$as_me:8044: \$? = $ac_status" >&5
     8041   echo "$as_me:8041: \$? = $ac_status" >&5
    80458042   if (exit $ac_status) && test -s "$ac_outfile"; then
    80468043     # The compiler can only warn and ignore the option if not recognized
     
    83068303   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    83078304   -e 's:$: $lt_compiler_flag:'`
    8308    (eval echo "\"\$as_me:8308: $lt_compile\"" >&5)
     8305   (eval echo "\"\$as_me:8305: $lt_compile\"" >&5)
    83098306   (eval "$lt_compile" 2>conftest.err)
    83108307   ac_status=$?
    83118308   cat conftest.err >&5
    8312    echo "$as_me:8312: \$? = $ac_status" >&5
     8309   echo "$as_me:8309: \$? = $ac_status" >&5
    83138310   if (exit $ac_status) && test -s "$ac_outfile"; then
    83148311     # The compiler can only warn and ignore the option if not recognized
     
    84108407   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    84118408   -e 's:$: $lt_compiler_flag:'`
    8412    (eval echo "\"\$as_me:8412: $lt_compile\"" >&5)
     8409   (eval echo "\"\$as_me:8409: $lt_compile\"" >&5)
    84138410   (eval "$lt_compile" 2>out/conftest.err)
    84148411   ac_status=$?
    84158412   cat out/conftest.err >&5
    8416    echo "$as_me:8416: \$? = $ac_status" >&5
     8413   echo "$as_me:8413: \$? = $ac_status" >&5
    84178414   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    84188415   then
     
    1075510752  lt_status=$lt_dlunknown
    1075610753  cat > conftest.$ac_ext <<EOF
    10757 #line 10757 "configure"
     10754#line 10754 "configure"
    1075810755#include "confdefs.h"
    1075910756
     
    1085510852  lt_status=$lt_dlunknown
    1085610853  cat > conftest.$ac_ext <<EOF
    10857 #line 10857 "configure"
     10854#line 10854 "configure"
    1085810855#include "confdefs.h"
    1085910856
     
    1319913196   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1320013197   -e 's:$: $lt_compiler_flag:'`
    13201    (eval echo "\"\$as_me:13201: $lt_compile\"" >&5)
     13198   (eval echo "\"\$as_me:13198: $lt_compile\"" >&5)
    1320213199   (eval "$lt_compile" 2>conftest.err)
    1320313200   ac_status=$?
    1320413201   cat conftest.err >&5
    13205    echo "$as_me:13205: \$? = $ac_status" >&5
     13202   echo "$as_me:13202: \$? = $ac_status" >&5
    1320613203   if (exit $ac_status) && test -s "$ac_outfile"; then
    1320713204     # The compiler can only warn and ignore the option if not recognized
     
    1330313300   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1330413301   -e 's:$: $lt_compiler_flag:'`
    13305    (eval echo "\"\$as_me:13305: $lt_compile\"" >&5)
     13302   (eval echo "\"\$as_me:13302: $lt_compile\"" >&5)
    1330613303   (eval "$lt_compile" 2>out/conftest.err)
    1330713304   ac_status=$?
    1330813305   cat out/conftest.err >&5
    13309    echo "$as_me:13309: \$? = $ac_status" >&5
     13306   echo "$as_me:13306: \$? = $ac_status" >&5
    1331013307   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1331113308   then
     
    1487314870   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1487414871   -e 's:$: $lt_compiler_flag:'`
    14875    (eval echo "\"\$as_me:14875: $lt_compile\"" >&5)
     14872   (eval echo "\"\$as_me:14872: $lt_compile\"" >&5)
    1487614873   (eval "$lt_compile" 2>conftest.err)
    1487714874   ac_status=$?
    1487814875   cat conftest.err >&5
    14879    echo "$as_me:14879: \$? = $ac_status" >&5
     14876   echo "$as_me:14876: \$? = $ac_status" >&5
    1488014877   if (exit $ac_status) && test -s "$ac_outfile"; then
    1488114878     # The compiler can only warn and ignore the option if not recognized
     
    1497714974   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1497814975   -e 's:$: $lt_compiler_flag:'`
    14979    (eval echo "\"\$as_me:14979: $lt_compile\"" >&5)
     14976   (eval echo "\"\$as_me:14976: $lt_compile\"" >&5)
    1498014977   (eval "$lt_compile" 2>out/conftest.err)
    1498114978   ac_status=$?
    1498214979   cat out/conftest.err >&5
    14983    echo "$as_me:14983: \$? = $ac_status" >&5
     14980   echo "$as_me:14980: \$? = $ac_status" >&5
    1498414981   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1498514982   then
     
    1718417181   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1718517182   -e 's:$: $lt_compiler_flag:'`
    17186    (eval echo "\"\$as_me:17186: $lt_compile\"" >&5)
     17183   (eval echo "\"\$as_me:17183: $lt_compile\"" >&5)
    1718717184   (eval "$lt_compile" 2>conftest.err)
    1718817185   ac_status=$?
    1718917186   cat conftest.err >&5
    17190    echo "$as_me:17190: \$? = $ac_status" >&5
     17187   echo "$as_me:17187: \$? = $ac_status" >&5
    1719117188   if (exit $ac_status) && test -s "$ac_outfile"; then
    1719217189     # The compiler can only warn and ignore the option if not recognized
     
    1745217449   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1745317450   -e 's:$: $lt_compiler_flag:'`
    17454    (eval echo "\"\$as_me:17454: $lt_compile\"" >&5)
     17451   (eval echo "\"\$as_me:17451: $lt_compile\"" >&5)
    1745517452   (eval "$lt_compile" 2>conftest.err)
    1745617453   ac_status=$?
    1745717454   cat conftest.err >&5
    17458    echo "$as_me:17458: \$? = $ac_status" >&5
     17455   echo "$as_me:17455: \$? = $ac_status" >&5
    1745917456   if (exit $ac_status) && test -s "$ac_outfile"; then
    1746017457     # The compiler can only warn and ignore the option if not recognized
     
    1755617553   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1755717554   -e 's:$: $lt_compiler_flag:'`
    17558    (eval echo "\"\$as_me:17558: $lt_compile\"" >&5)
     17555   (eval echo "\"\$as_me:17555: $lt_compile\"" >&5)
    1755917556   (eval "$lt_compile" 2>out/conftest.err)
    1756017557   ac_status=$?
    1756117558   cat out/conftest.err >&5
    17562    echo "$as_me:17562: \$? = $ac_status" >&5
     17559   echo "$as_me:17559: \$? = $ac_status" >&5
    1756317560   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1756417561   then
     
    2044020437# to comile DLLs under Windows.
    2044120438LT_LDFLAGS=
    20442 
    20443 # Check if we want to set the library version
    20444 echo "$as_me:$LINENO: checking if library version is set" >&5
    20445 echo $ECHO_N "checking if library version is set... $ECHO_C" >&6
    20446 if test x"$coin_libversion" != x; then
    20447   LT_LDFLAGS="$LT_LDFLAGS -version-info $coin_libversion"
    20448   echo "$as_me:$LINENO: result: $coin_libversion" >&5
    20449 echo "${ECHO_T}$coin_libversion" >&6
    20450 else
    20451   echo "$as_me:$LINENO: result: no" >&5
    20452 echo "${ECHO_T}no" >&6
    20453 fi
    20454 
    2045520439
    2045620440
  • stable/2.5/Dependencies

    r1459 r1476  
    1 BuildTools  https://projects.coin-or.org/svn/BuildTools/stable/0.6
     1BuildTools  https://projects.coin-or.org/svn/BuildTools/stable/0.5
    22ThirdParty/ASL  https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/stable/1.0
    33ThirdParty/Blas  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.0
  • stable/2.5/Externals

    r1456 r1476  
    1 BuildTools        https://projects.coin-or.org/svn/BuildTools/stable/0.6
     1BuildTools        https://projects.coin-or.org/svn/BuildTools/stable/0.5
    22ThirdParty/ASL    https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/stable/1.0
    33ThirdParty/Blas   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.0
  • stable/2.5/configure

    r1459 r1476  
    2079820798LT_LDFLAGS=
    2079920799
    20800 # Check if we want to set the library version
    20801 echo "$as_me:$LINENO: checking if library version is set" >&5
    20802 echo $ECHO_N "checking if library version is set... $ECHO_C" >&6
    20803 if test x"$coin_libversion" != x; then
    20804   LT_LDFLAGS="$LT_LDFLAGS -version-info $coin_libversion"
    20805   echo "$as_me:$LINENO: result: $coin_libversion" >&5
    20806 echo "${ECHO_T}$coin_libversion" >&6
    20807 else
    20808   echo "$as_me:$LINENO: result: no" >&5
    20809 echo "${ECHO_T}no" >&6
    20810 fi
    20811 
    20812 
    2081320800
    2081420801#END
Note: See TracChangeset for help on using the changeset viewer.