Changeset 1567 for stable


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

Revert to BuildTools?/stable/0.5 for compatibility. Requires 0.5.30 or better
so that CLP_VERSION is properly defined.

Location:
stable/1.12
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • stable/1.12

    • Property svn:externals
      •  

        old new  
        1 BuildTools  https://projects.coin-or.org/svn/BuildTools/stable/0.6
        2 ThirdParty/Blas  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/releases/1.0.14/
        3 ThirdParty/Lapack  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/releases/1.0.20/
        4 Data/Netlib  https://projects.coin-or.org/svn/Data/releases/1.0.7/Netlib
        5 Data/Sample  https://projects.coin-or.org/svn/Data/releases/1.0.7/Sample
        6 CoinUtils  https://projects.coin-or.org/svn/CoinUtils/releases/2.6.4/CoinUtils
         1BuildTools    https://projects.coin-or.org/svn/BuildTools/stable/0.5
         2ThirdParty/Blas https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.0
         3ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.0
         4Data/Netlib   https://projects.coin-or.org/svn/Data/stable/1.0/Netlib
         5Data/Sample   https://projects.coin-or.org/svn/Data/stable/1.0/Sample
         6CoinUtils     https://projects.coin-or.org/svn/CoinUtils/stable/2.6/CoinUtils
  • stable/1.12/Clp/configure

    r1565 r1567  
    16981698coin_projectdir=yes
    16991699
    1700 #Set the project's version number.
    1701 if 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
     1700# Set the project's version number. Use m4_ifval here to avoid defining
     1701# _VERSION when the user has not supplied a parameter.
     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
    17071707
    17081708cat >>confdefs.h <<_ACEOF
     
    17101710_ACEOF
    17111711
    1712   fi
    1713 fi
    1714 
    1715 # Capture libtool library version, if given.
     1712    fi
    17161713
    17171714
     
    58015798*-*-irix6*)
    58025799  # Find out which ABI we are using.
    5803   echo '#line 5803 "configure"' > conftest.$ac_ext
     5800  echo '#line 5800 "configure"' > conftest.$ac_ext
    58045801  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    58055802  (eval $ac_compile) 2>&5
     
    69356932
    69366933# Provide some information about the compiler.
    6937 echo "$as_me:6937:" \
     6934echo "$as_me:6934:" \
    69386935     "checking for Fortran 77 compiler version" >&5
    69396936ac_compiler=`set X $ac_compile; echo $2`
     
    80027999   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    80038000   -e 's:$: $lt_compiler_flag:'`
    8004    (eval echo "\"\$as_me:8004: $lt_compile\"" >&5)
     8001   (eval echo "\"\$as_me:8001: $lt_compile\"" >&5)
    80058002   (eval "$lt_compile" 2>conftest.err)
    80068003   ac_status=$?
    80078004   cat conftest.err >&5
    8008    echo "$as_me:8008: \$? = $ac_status" >&5
     8005   echo "$as_me:8005: \$? = $ac_status" >&5
    80098006   if (exit $ac_status) && test -s "$ac_outfile"; then
    80108007     # The compiler can only warn and ignore the option if not recognized
     
    82708267   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    82718268   -e 's:$: $lt_compiler_flag:'`
    8272    (eval echo "\"\$as_me:8272: $lt_compile\"" >&5)
     8269   (eval echo "\"\$as_me:8269: $lt_compile\"" >&5)
    82738270   (eval "$lt_compile" 2>conftest.err)
    82748271   ac_status=$?
    82758272   cat conftest.err >&5
    8276    echo "$as_me:8276: \$? = $ac_status" >&5
     8273   echo "$as_me:8273: \$? = $ac_status" >&5
    82778274   if (exit $ac_status) && test -s "$ac_outfile"; then
    82788275     # The compiler can only warn and ignore the option if not recognized
     
    83748371   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    83758372   -e 's:$: $lt_compiler_flag:'`
    8376    (eval echo "\"\$as_me:8376: $lt_compile\"" >&5)
     8373   (eval echo "\"\$as_me:8373: $lt_compile\"" >&5)
    83778374   (eval "$lt_compile" 2>out/conftest.err)
    83788375   ac_status=$?
    83798376   cat out/conftest.err >&5
    8380    echo "$as_me:8380: \$? = $ac_status" >&5
     8377   echo "$as_me:8377: \$? = $ac_status" >&5
    83818378   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    83828379   then
     
    1071910716  lt_status=$lt_dlunknown
    1072010717  cat > conftest.$ac_ext <<EOF
    10721 #line 10721 "configure"
     10718#line 10718 "configure"
    1072210719#include "confdefs.h"
    1072310720
     
    1081910816  lt_status=$lt_dlunknown
    1082010817  cat > conftest.$ac_ext <<EOF
    10821 #line 10821 "configure"
     10818#line 10818 "configure"
    1082210819#include "confdefs.h"
    1082310820
     
    1316313160   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1316413161   -e 's:$: $lt_compiler_flag:'`
    13165    (eval echo "\"\$as_me:13165: $lt_compile\"" >&5)
     13162   (eval echo "\"\$as_me:13162: $lt_compile\"" >&5)
    1316613163   (eval "$lt_compile" 2>conftest.err)
    1316713164   ac_status=$?
    1316813165   cat conftest.err >&5
    13169    echo "$as_me:13169: \$? = $ac_status" >&5
     13166   echo "$as_me:13166: \$? = $ac_status" >&5
    1317013167   if (exit $ac_status) && test -s "$ac_outfile"; then
    1317113168     # The compiler can only warn and ignore the option if not recognized
     
    1326713264   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1326813265   -e 's:$: $lt_compiler_flag:'`
    13269    (eval echo "\"\$as_me:13269: $lt_compile\"" >&5)
     13266   (eval echo "\"\$as_me:13266: $lt_compile\"" >&5)
    1327013267   (eval "$lt_compile" 2>out/conftest.err)
    1327113268   ac_status=$?
    1327213269   cat out/conftest.err >&5
    13273    echo "$as_me:13273: \$? = $ac_status" >&5
     13270   echo "$as_me:13270: \$? = $ac_status" >&5
    1327413271   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1327513272   then
     
    1483714834   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1483814835   -e 's:$: $lt_compiler_flag:'`
    14839    (eval echo "\"\$as_me:14839: $lt_compile\"" >&5)
     14836   (eval echo "\"\$as_me:14836: $lt_compile\"" >&5)
    1484014837   (eval "$lt_compile" 2>conftest.err)
    1484114838   ac_status=$?
    1484214839   cat conftest.err >&5
    14843    echo "$as_me:14843: \$? = $ac_status" >&5
     14840   echo "$as_me:14840: \$? = $ac_status" >&5
    1484414841   if (exit $ac_status) && test -s "$ac_outfile"; then
    1484514842     # The compiler can only warn and ignore the option if not recognized
     
    1494114938   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1494214939   -e 's:$: $lt_compiler_flag:'`
    14943    (eval echo "\"\$as_me:14943: $lt_compile\"" >&5)
     14940   (eval echo "\"\$as_me:14940: $lt_compile\"" >&5)
    1494414941   (eval "$lt_compile" 2>out/conftest.err)
    1494514942   ac_status=$?
    1494614943   cat out/conftest.err >&5
    14947    echo "$as_me:14947: \$? = $ac_status" >&5
     14944   echo "$as_me:14944: \$? = $ac_status" >&5
    1494814945   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1494914946   then
     
    1714817145   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1714917146   -e 's:$: $lt_compiler_flag:'`
    17150    (eval echo "\"\$as_me:17150: $lt_compile\"" >&5)
     17147   (eval echo "\"\$as_me:17147: $lt_compile\"" >&5)
    1715117148   (eval "$lt_compile" 2>conftest.err)
    1715217149   ac_status=$?
    1715317150   cat conftest.err >&5
    17154    echo "$as_me:17154: \$? = $ac_status" >&5
     17151   echo "$as_me:17151: \$? = $ac_status" >&5
    1715517152   if (exit $ac_status) && test -s "$ac_outfile"; then
    1715617153     # The compiler can only warn and ignore the option if not recognized
     
    1741617413   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1741717414   -e 's:$: $lt_compiler_flag:'`
    17418    (eval echo "\"\$as_me:17418: $lt_compile\"" >&5)
     17415   (eval echo "\"\$as_me:17415: $lt_compile\"" >&5)
    1741917416   (eval "$lt_compile" 2>conftest.err)
    1742017417   ac_status=$?
    1742117418   cat conftest.err >&5
    17422    echo "$as_me:17422: \$? = $ac_status" >&5
     17419   echo "$as_me:17419: \$? = $ac_status" >&5
    1742317420   if (exit $ac_status) && test -s "$ac_outfile"; then
    1742417421     # The compiler can only warn and ignore the option if not recognized
     
    1752017517   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1752117518   -e 's:$: $lt_compiler_flag:'`
    17522    (eval echo "\"\$as_me:17522: $lt_compile\"" >&5)
     17519   (eval echo "\"\$as_me:17519: $lt_compile\"" >&5)
    1752317520   (eval "$lt_compile" 2>out/conftest.err)
    1752417521   ac_status=$?
    1752517522   cat out/conftest.err >&5
    17526    echo "$as_me:17526: \$? = $ac_status" >&5
     17523   echo "$as_me:17523: \$? = $ac_status" >&5
    1752717524   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1752817525   then
     
    2040420401# to comile DLLs under Windows.
    2040520402LT_LDFLAGS=
    20406 
    20407 # Check if we want to set the library version
    20408 echo "$as_me:$LINENO: checking if library version is set" >&5
    20409 echo $ECHO_N "checking if library version is set... $ECHO_C" >&6
    20410 if test x"$coin_libversion" != x; then
    20411   LT_LDFLAGS="$LT_LDFLAGS -version-info $coin_libversion"
    20412   echo "$as_me:$LINENO: result: $coin_libversion" >&5
    20413 echo "${ECHO_T}$coin_libversion" >&6
    20414 else
    20415   echo "$as_me:$LINENO: result: no" >&5
    20416 echo "${ECHO_T}no" >&6
    20417 fi
    20418 
    2041920403
    2042020404
  • stable/1.12/Dependencies

    r1553 r1567  
    1 BuildTools    https://projects.coin-or.org/svn/BuildTools/stable/0.6
     1BuildTools    https://projects.coin-or.org/svn/BuildTools/stable/0.5
    22ThirdParty/Blas https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.0
    33ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.0
  • stable/1.12/Externals

    r1553 r1567  
    1 BuildTools    https://projects.coin-or.org/svn/BuildTools/stable/0.6
     1BuildTools    https://projects.coin-or.org/svn/BuildTools/stable/0.5
    22ThirdParty/Blas https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.0
    33ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.0
  • stable/1.12/configure

    r1555 r1567  
    2078920789LT_LDFLAGS=
    2079020790
    20791 # Check if we want to set the library version
    20792 echo "$as_me:$LINENO: checking if library version is set" >&5
    20793 echo $ECHO_N "checking if library version is set... $ECHO_C" >&6
    20794 if test x"$coin_libversion" != x; then
    20795   LT_LDFLAGS="$LT_LDFLAGS -version-info $coin_libversion"
    20796   echo "$as_me:$LINENO: result: $coin_libversion" >&5
    20797 echo "${ECHO_T}$coin_libversion" >&6
    20798 else
    20799   echo "$as_me:$LINENO: result: no" >&5
    20800 echo "${ECHO_T}no" >&6
    20801 fi
    20802 
    20803 
    2080420791
    2080520792#END
Note: See TracChangeset for help on using the changeset viewer.