Changeset 1565 for stable


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

Set CLP_VERSION properly from PROJECTDIR_INIT.

Location:
stable/1.12/Clp
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • stable/1.12/Clp/configure

    r1555 r1565  
    16981698coin_projectdir=yes
    16991699
    1700 # Check if a library version is set for libtool
     1700#Set the project's version number.
     1701if test "xClp" != x; then
     1702  # temporary hack to avoid breaking lapack 1.0.20;
     1703  # do not propagate to BuildTools trunk!  --lh, 100615--
     1704  if expr "Clp" : '.*:.*' >/dev/null 2>&1 ; then
     1705    coin_libversion="Clp"
     1706  else
     1707
     1708cat >>confdefs.h <<_ACEOF
     1709#define CLP_VERSION "$PACKAGE_VERSION"
     1710_ACEOF
     1711
     1712  fi
     1713fi
     1714
     1715# Capture libtool library version, if given.
    17011716
    17021717
     
    57865801*-*-irix6*)
    57875802  # Find out which ABI we are using.
    5788   echo '#line 5788 "configure"' > conftest.$ac_ext
     5803  echo '#line 5803 "configure"' > conftest.$ac_ext
    57895804  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    57905805  (eval $ac_compile) 2>&5
     
    69206935
    69216936# Provide some information about the compiler.
    6922 echo "$as_me:6922:" \
     6937echo "$as_me:6937:" \
    69236938     "checking for Fortran 77 compiler version" >&5
    69246939ac_compiler=`set X $ac_compile; echo $2`
     
    79878002   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    79888003   -e 's:$: $lt_compiler_flag:'`
    7989    (eval echo "\"\$as_me:7989: $lt_compile\"" >&5)
     8004   (eval echo "\"\$as_me:8004: $lt_compile\"" >&5)
    79908005   (eval "$lt_compile" 2>conftest.err)
    79918006   ac_status=$?
    79928007   cat conftest.err >&5
    7993    echo "$as_me:7993: \$? = $ac_status" >&5
     8008   echo "$as_me:8008: \$? = $ac_status" >&5
    79948009   if (exit $ac_status) && test -s "$ac_outfile"; then
    79958010     # The compiler can only warn and ignore the option if not recognized
     
    82558270   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    82568271   -e 's:$: $lt_compiler_flag:'`
    8257    (eval echo "\"\$as_me:8257: $lt_compile\"" >&5)
     8272   (eval echo "\"\$as_me:8272: $lt_compile\"" >&5)
    82588273   (eval "$lt_compile" 2>conftest.err)
    82598274   ac_status=$?
    82608275   cat conftest.err >&5
    8261    echo "$as_me:8261: \$? = $ac_status" >&5
     8276   echo "$as_me:8276: \$? = $ac_status" >&5
    82628277   if (exit $ac_status) && test -s "$ac_outfile"; then
    82638278     # The compiler can only warn and ignore the option if not recognized
     
    83598374   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    83608375   -e 's:$: $lt_compiler_flag:'`
    8361    (eval echo "\"\$as_me:8361: $lt_compile\"" >&5)
     8376   (eval echo "\"\$as_me:8376: $lt_compile\"" >&5)
    83628377   (eval "$lt_compile" 2>out/conftest.err)
    83638378   ac_status=$?
    83648379   cat out/conftest.err >&5
    8365    echo "$as_me:8365: \$? = $ac_status" >&5
     8380   echo "$as_me:8380: \$? = $ac_status" >&5
    83668381   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    83678382   then
     
    1070410719  lt_status=$lt_dlunknown
    1070510720  cat > conftest.$ac_ext <<EOF
    10706 #line 10706 "configure"
     10721#line 10721 "configure"
    1070710722#include "confdefs.h"
    1070810723
     
    1080410819  lt_status=$lt_dlunknown
    1080510820  cat > conftest.$ac_ext <<EOF
    10806 #line 10806 "configure"
     10821#line 10821 "configure"
    1080710822#include "confdefs.h"
    1080810823
     
    1314813163   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1314913164   -e 's:$: $lt_compiler_flag:'`
    13150    (eval echo "\"\$as_me:13150: $lt_compile\"" >&5)
     13165   (eval echo "\"\$as_me:13165: $lt_compile\"" >&5)
    1315113166   (eval "$lt_compile" 2>conftest.err)
    1315213167   ac_status=$?
    1315313168   cat conftest.err >&5
    13154    echo "$as_me:13154: \$? = $ac_status" >&5
     13169   echo "$as_me:13169: \$? = $ac_status" >&5
    1315513170   if (exit $ac_status) && test -s "$ac_outfile"; then
    1315613171     # The compiler can only warn and ignore the option if not recognized
     
    1325213267   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1325313268   -e 's:$: $lt_compiler_flag:'`
    13254    (eval echo "\"\$as_me:13254: $lt_compile\"" >&5)
     13269   (eval echo "\"\$as_me:13269: $lt_compile\"" >&5)
    1325513270   (eval "$lt_compile" 2>out/conftest.err)
    1325613271   ac_status=$?
    1325713272   cat out/conftest.err >&5
    13258    echo "$as_me:13258: \$? = $ac_status" >&5
     13273   echo "$as_me:13273: \$? = $ac_status" >&5
    1325913274   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1326013275   then
     
    1482214837   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1482314838   -e 's:$: $lt_compiler_flag:'`
    14824    (eval echo "\"\$as_me:14824: $lt_compile\"" >&5)
     14839   (eval echo "\"\$as_me:14839: $lt_compile\"" >&5)
    1482514840   (eval "$lt_compile" 2>conftest.err)
    1482614841   ac_status=$?
    1482714842   cat conftest.err >&5
    14828    echo "$as_me:14828: \$? = $ac_status" >&5
     14843   echo "$as_me:14843: \$? = $ac_status" >&5
    1482914844   if (exit $ac_status) && test -s "$ac_outfile"; then
    1483014845     # The compiler can only warn and ignore the option if not recognized
     
    1492614941   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1492714942   -e 's:$: $lt_compiler_flag:'`
    14928    (eval echo "\"\$as_me:14928: $lt_compile\"" >&5)
     14943   (eval echo "\"\$as_me:14943: $lt_compile\"" >&5)
    1492914944   (eval "$lt_compile" 2>out/conftest.err)
    1493014945   ac_status=$?
    1493114946   cat out/conftest.err >&5
    14932    echo "$as_me:14932: \$? = $ac_status" >&5
     14947   echo "$as_me:14947: \$? = $ac_status" >&5
    1493314948   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1493414949   then
     
    1713317148   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1713417149   -e 's:$: $lt_compiler_flag:'`
    17135    (eval echo "\"\$as_me:17135: $lt_compile\"" >&5)
     17150   (eval echo "\"\$as_me:17150: $lt_compile\"" >&5)
    1713617151   (eval "$lt_compile" 2>conftest.err)
    1713717152   ac_status=$?
    1713817153   cat conftest.err >&5
    17139    echo "$as_me:17139: \$? = $ac_status" >&5
     17154   echo "$as_me:17154: \$? = $ac_status" >&5
    1714017155   if (exit $ac_status) && test -s "$ac_outfile"; then
    1714117156     # The compiler can only warn and ignore the option if not recognized
     
    1740117416   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1740217417   -e 's:$: $lt_compiler_flag:'`
    17403    (eval echo "\"\$as_me:17403: $lt_compile\"" >&5)
     17418   (eval echo "\"\$as_me:17418: $lt_compile\"" >&5)
    1740417419   (eval "$lt_compile" 2>conftest.err)
    1740517420   ac_status=$?
    1740617421   cat conftest.err >&5
    17407    echo "$as_me:17407: \$? = $ac_status" >&5
     17422   echo "$as_me:17422: \$? = $ac_status" >&5
    1740817423   if (exit $ac_status) && test -s "$ac_outfile"; then
    1740917424     # The compiler can only warn and ignore the option if not recognized
     
    1750517520   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1750617521   -e 's:$: $lt_compiler_flag:'`
    17507    (eval echo "\"\$as_me:17507: $lt_compile\"" >&5)
     17522   (eval echo "\"\$as_me:17522: $lt_compile\"" >&5)
    1750817523   (eval "$lt_compile" 2>out/conftest.err)
    1750917524   ac_status=$?
    1751017525   cat out/conftest.err >&5
    17511    echo "$as_me:17511: \$? = $ac_status" >&5
     17526   echo "$as_me:17526: \$? = $ac_status" >&5
    1751217527   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1751317528   then
     
    2066320678
    2066420679fi
    20665 
    20666 #############################################################################
    20667 #                           CLP version number                              #
    20668 #############################################################################
    20669 
    20670 
    20671 cat >>confdefs.h <<_ACEOF
    20672 #define CLP_VERSION "$PACKAGE_VERSION"
    20673 _ACEOF
    20674 
    2067520680
    2067620681#############################################################################
  • stable/1.12/Clp/configure.ac

    r1555 r1565  
    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(Clp)
    4545
    4646# Check if user wants to produce debugging code
     
    9696
    9797#############################################################################
    98 #                           CLP version number                              #
    99 #############################################################################
    100 
    101 AC_DEFINE_UNQUOTED(CLP_VERSION, "$PACKAGE_VERSION", "Version of Clp")
    102 
    103 #############################################################################
    10498#                             Other dependencies                            #
    10599#############################################################################
  • stable/1.12/Clp/inc/config_clp.h.in

    r1554 r1565  
    11/* inc/config_clp.h.in.  Generated from configure.ac by autoheader.  */
    22
    3 /* "Version of Clp" */
     3/* Version number of project */
    44#undef CLP_VERSION
    55
  • stable/1.12/Clp/src/ClpConfig.h

    r1555 r1565  
    5959/* #undef COIN_HAS_READLINE */
    6060
     61/* Clp version */
    6162#define CLP_VERSION "1.12"
    6263
Note: See TracChangeset for help on using the changeset viewer.