Changeset 1473


Ignore:
Timestamp:
Jun 16, 2010 10:48:47 AM (9 years ago)
Author:
lou
Message:

Set CBC_VERSION properly from PROJECTDIR_INIT.

Location:
stable/2.5/Cbc
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • stable/2.5/Cbc/configure

    r1459 r1473  
    17341734coin_projectdir=yes
    17351735
    1736 # Check if a library version is set for libtool
     1736# Set the project's version number.
     1737if 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
     1743
     1744cat >>confdefs.h <<_ACEOF
     1745#define CBC_VERSION "$PACKAGE_VERSION"
     1746_ACEOF
     1747
     1748  fi
     1749fi
     1750
     1751# Capture libtool library version, if given.
    17371752
    17381753
     
    58225837*-*-irix6*)
    58235838  # Find out which ABI we are using.
    5824   echo '#line 5824 "configure"' > conftest.$ac_ext
     5839  echo '#line 5839 "configure"' > conftest.$ac_ext
    58255840  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    58265841  (eval $ac_compile) 2>&5
     
    69566971
    69576972# Provide some information about the compiler.
    6958 echo "$as_me:6958:" \
     6973echo "$as_me:6973:" \
    69596974     "checking for Fortran 77 compiler version" >&5
    69606975ac_compiler=`set X $ac_compile; echo $2`
     
    80238038   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    80248039   -e 's:$: $lt_compiler_flag:'`
    8025    (eval echo "\"\$as_me:8025: $lt_compile\"" >&5)
     8040   (eval echo "\"\$as_me:8040: $lt_compile\"" >&5)
    80268041   (eval "$lt_compile" 2>conftest.err)
    80278042   ac_status=$?
    80288043   cat conftest.err >&5
    8029    echo "$as_me:8029: \$? = $ac_status" >&5
     8044   echo "$as_me:8044: \$? = $ac_status" >&5
    80308045   if (exit $ac_status) && test -s "$ac_outfile"; then
    80318046     # The compiler can only warn and ignore the option if not recognized
     
    82918306   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    82928307   -e 's:$: $lt_compiler_flag:'`
    8293    (eval echo "\"\$as_me:8293: $lt_compile\"" >&5)
     8308   (eval echo "\"\$as_me:8308: $lt_compile\"" >&5)
    82948309   (eval "$lt_compile" 2>conftest.err)
    82958310   ac_status=$?
    82968311   cat conftest.err >&5
    8297    echo "$as_me:8297: \$? = $ac_status" >&5
     8312   echo "$as_me:8312: \$? = $ac_status" >&5
    82988313   if (exit $ac_status) && test -s "$ac_outfile"; then
    82998314     # The compiler can only warn and ignore the option if not recognized
     
    83958410   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    83968411   -e 's:$: $lt_compiler_flag:'`
    8397    (eval echo "\"\$as_me:8397: $lt_compile\"" >&5)
     8412   (eval echo "\"\$as_me:8412: $lt_compile\"" >&5)
    83988413   (eval "$lt_compile" 2>out/conftest.err)
    83998414   ac_status=$?
    84008415   cat out/conftest.err >&5
    8401    echo "$as_me:8401: \$? = $ac_status" >&5
     8416   echo "$as_me:8416: \$? = $ac_status" >&5
    84028417   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    84038418   then
     
    1074010755  lt_status=$lt_dlunknown
    1074110756  cat > conftest.$ac_ext <<EOF
    10742 #line 10742 "configure"
     10757#line 10757 "configure"
    1074310758#include "confdefs.h"
    1074410759
     
    1084010855  lt_status=$lt_dlunknown
    1084110856  cat > conftest.$ac_ext <<EOF
    10842 #line 10842 "configure"
     10857#line 10857 "configure"
    1084310858#include "confdefs.h"
    1084410859
     
    1318413199   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1318513200   -e 's:$: $lt_compiler_flag:'`
    13186    (eval echo "\"\$as_me:13186: $lt_compile\"" >&5)
     13201   (eval echo "\"\$as_me:13201: $lt_compile\"" >&5)
    1318713202   (eval "$lt_compile" 2>conftest.err)
    1318813203   ac_status=$?
    1318913204   cat conftest.err >&5
    13190    echo "$as_me:13190: \$? = $ac_status" >&5
     13205   echo "$as_me:13205: \$? = $ac_status" >&5
    1319113206   if (exit $ac_status) && test -s "$ac_outfile"; then
    1319213207     # The compiler can only warn and ignore the option if not recognized
     
    1328813303   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1328913304   -e 's:$: $lt_compiler_flag:'`
    13290    (eval echo "\"\$as_me:13290: $lt_compile\"" >&5)
     13305   (eval echo "\"\$as_me:13305: $lt_compile\"" >&5)
    1329113306   (eval "$lt_compile" 2>out/conftest.err)
    1329213307   ac_status=$?
    1329313308   cat out/conftest.err >&5
    13294    echo "$as_me:13294: \$? = $ac_status" >&5
     13309   echo "$as_me:13309: \$? = $ac_status" >&5
    1329513310   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1329613311   then
     
    1485814873   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1485914874   -e 's:$: $lt_compiler_flag:'`
    14860    (eval echo "\"\$as_me:14860: $lt_compile\"" >&5)
     14875   (eval echo "\"\$as_me:14875: $lt_compile\"" >&5)
    1486114876   (eval "$lt_compile" 2>conftest.err)
    1486214877   ac_status=$?
    1486314878   cat conftest.err >&5
    14864    echo "$as_me:14864: \$? = $ac_status" >&5
     14879   echo "$as_me:14879: \$? = $ac_status" >&5
    1486514880   if (exit $ac_status) && test -s "$ac_outfile"; then
    1486614881     # The compiler can only warn and ignore the option if not recognized
     
    1496214977   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1496314978   -e 's:$: $lt_compiler_flag:'`
    14964    (eval echo "\"\$as_me:14964: $lt_compile\"" >&5)
     14979   (eval echo "\"\$as_me:14979: $lt_compile\"" >&5)
    1496514980   (eval "$lt_compile" 2>out/conftest.err)
    1496614981   ac_status=$?
    1496714982   cat out/conftest.err >&5
    14968    echo "$as_me:14968: \$? = $ac_status" >&5
     14983   echo "$as_me:14983: \$? = $ac_status" >&5
    1496914984   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1497014985   then
     
    1716917184   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1717017185   -e 's:$: $lt_compiler_flag:'`
    17171    (eval echo "\"\$as_me:17171: $lt_compile\"" >&5)
     17186   (eval echo "\"\$as_me:17186: $lt_compile\"" >&5)
    1717217187   (eval "$lt_compile" 2>conftest.err)
    1717317188   ac_status=$?
    1717417189   cat conftest.err >&5
    17175    echo "$as_me:17175: \$? = $ac_status" >&5
     17190   echo "$as_me:17190: \$? = $ac_status" >&5
    1717617191   if (exit $ac_status) && test -s "$ac_outfile"; then
    1717717192     # The compiler can only warn and ignore the option if not recognized
     
    1743717452   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1743817453   -e 's:$: $lt_compiler_flag:'`
    17439    (eval echo "\"\$as_me:17439: $lt_compile\"" >&5)
     17454   (eval echo "\"\$as_me:17454: $lt_compile\"" >&5)
    1744017455   (eval "$lt_compile" 2>conftest.err)
    1744117456   ac_status=$?
    1744217457   cat conftest.err >&5
    17443    echo "$as_me:17443: \$? = $ac_status" >&5
     17458   echo "$as_me:17458: \$? = $ac_status" >&5
    1744417459   if (exit $ac_status) && test -s "$ac_outfile"; then
    1744517460     # The compiler can only warn and ignore the option if not recognized
     
    1754117556   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1754217557   -e 's:$: $lt_compiler_flag:'`
    17543    (eval echo "\"\$as_me:17543: $lt_compile\"" >&5)
     17558   (eval echo "\"\$as_me:17558: $lt_compile\"" >&5)
    1754417559   (eval "$lt_compile" 2>out/conftest.err)
    1754517560   ac_status=$?
    1754617561   cat out/conftest.err >&5
    17547    echo "$as_me:17547: \$? = $ac_status" >&5
     17562   echo "$as_me:17562: \$? = $ac_status" >&5
    1754817563   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1754917564   then
  • stable/2.5/Cbc/configure.ac

    r1459 r1473  
    4242# externals.  The following macro ensures that those externals are
    4343# retrieved by svn if they are not there yet.
    44 AC_COIN_PROJECTDIR_INIT
     44AC_COIN_PROJECTDIR_INIT(Cbc)
    4545
    4646# Check if user wants to produce debugging code
  • stable/2.5/Cbc/src/CbcConfig.h

    r1459 r1473  
    9595/* #undef COIN_HAS_XPR */
    9696
     97/* Cbc version */
    9798#define CBC_VERSION "2.5"
    9899
Note: See TracChangeset for help on using the changeset viewer.