Changeset 2109 for trunk/Cbc/configure


Ignore:
Timestamp:
Jan 17, 2015 1:01:55 PM (5 years ago)
Author:
tkr
Message:

Updating externals and re-running autotools

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

    • Property svn:externals
      •  

        old new  
        1 BuildTools        https://projects.coin-or.org/svn/BuildTools/stable/0.7
        2 ThirdParty/ASL    https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/stable/1.2
        3 ThirdParty/Blas   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.3
        4 ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.4
        5 ThirdParty/Glpk   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/stable/1.9
        6 ThirdParty/Metis  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Metis/stable/1.2
        7 ThirdParty/Mumps  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Mumps/stable/1.4
         1BuildTools        https://projects.coin-or.org/svn/BuildTools/stable/0.8
         2ThirdParty/ASL    https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/stable/1.3
         3ThirdParty/Blas   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.4
         4ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.5
         5ThirdParty/Glpk   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/stable/1.10
         6ThirdParty/Metis  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Metis/stable/1.3
         7ThirdParty/Mumps  https://projects.coin-or.org/svn/BuildTools/ThirdParty/Mumps/stable/1.5
        88Data/Sample       https://projects.coin-or.org/svn/Data/Sample/stable/1.2
        99Data/miplib3      https://projects.coin-or.org/svn/Data/miplib3/stable/1.2
         
        1212Clp               https://projects.coin-or.org/svn/Clp/trunk/Clp
        1313Osi               https://projects.coin-or.org/svn/Osi/trunk/Osi
        14 
  • trunk/Cbc/configure

    r1988 r2109  
    19891989
    19901990
    1991  case $build in
    1992   *-mingw*)
    1993     if test "${LD+set}" = set; then :; else
    1994       LD=link
    1995     fi
    1996     ;;
    1997  esac
    1998  if test $enable_msvc = yes ; then
    1999    if test "x${LD+set}" = xset; then :; else
    2000      LD=link
    2001    fi
    2002  fi
    2003 
    2004 
    2005 
    20061991
    20071992ac_ext=c
     
    21072092             fi
    21082093             ;;
     2094  *-*-darwin*) comps="clang gcc cc" ;;
    21092095  *-linux-gnu*) comps="gcc cc pgcc icc xlc" ;;
    21102096  *-linux-*) comps="xlc gcc cc pgcc icc" ;;
     
    32243210  clang* ) ;;
    32253211  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    3226 
    3227  case $build in
    3228   *-mingw*)
    3229     if test "${LD+set}" = set; then :; else
    3230       LD=link
    3231     fi
    3232     ;;
    3233  esac
    3234  if test $enable_msvc = yes ; then
    3235    if test "x${LD+set}" = xset; then :; else
    3236      LD=link
    3237    fi
    3238  fi
    3239 
     3212    LD=link
    32403213    ;;
    32413214esac
     
    32763249  *-*-solaris*)
    32773250             comps="CC xlC_r aCC g++ c++ pgCC icpc gpp cxx cc++ cl FCC KCC RCC" ;;
    3278   *-darwin*) comps="g++ c++ CC" ;;
     3251  *-darwin*) comps="clang++ g++ c++ CC" ;;
    32793252  *-linux-gnu*)
    32803253             comps="g++ c++ pgCC icpc gpp cxx cc++ cl FCC KCC RCC xlC_r aCC CC" ;;
     
    37133686# It seems that we need to cleanup something here for the Windows
    37143687case "$CXX" in
    3715   clang* ) ;;
     3688  clang* | */clang*) ;;
    37163689  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    37173690    sed -e 's/^void exit (int);//' confdefs.h >> confdefs.hh
     
    41134086fi
    41144087
    4115 # correct the LD variable in a mingw build with MS or intel compiler
     4088# correct the LD variable in a build with MS or intel compiler
    41164089case "$CXX" in
    41174090  clang* ) ;;
    41184091  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    4119 
    4120  case $build in
    4121   *-mingw*)
    4122     if test "${LD+set}" = set; then :; else
    4123       LD=link
    4124     fi
    4125     ;;
    4126  esac
    4127  if test $enable_msvc = yes ; then
    4128    if test "x${LD+set}" = xset; then :; else
    4129      LD=link
    4130    fi
    4131  fi
    4132 
     4092    LD=link
    41334093    ;;
    41344094esac
     
    41594119  enable_shared=yes;
    41604120else
    4161   # On Cygwin and AIX, building DLLs doesn't work
    41624121  case $build in
    41634122    *-cygwin* | *-mingw*)
     
    41664125        case "$CC" in
    41674126          clang* )
    4168             { echo "$as_me:$LINENO: WARNING: DLL building not supported. I'm disabling your choice." >&5
    4169 echo "$as_me: WARNING: DLL building not supported. I'm disabling your choice." >&2;}
     4127            { echo "$as_me:$LINENO: WARNING: Building of DLLs not supported in this configuration." >&5
     4128echo "$as_me: WARNING: Building of DLLs not supported in this configuration." >&2;}
    41704129            ;;
    41714130          cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    4172             { echo "$as_me:$LINENO: DLL building not supported, but will build with -MD(d) instead of -MT(d)." >&5
    4173 echo "$as_me: DLL building not supported, but will build with -MD(d) instead of -MT(d)." >&6;}
     4131            { echo "$as_me:$LINENO: Building of DLLs not supported in this configuration." >&5
     4132echo "$as_me: Building of DLLs not supported in this configuration." >&6;}
    41744133            ;;
    41754134          *gcc*)
     
    41774136              coin_disable_shared=no
    41784137            else
    4179               { echo "$as_me:$LINENO: WARNING: To build shared libraries with gcc on CYGWIN or MSys, use --enable-dependency-linking" >&5
    4180 echo "$as_me: WARNING: To build shared libraries with gcc on CYGWIN or MSys, use --enable-dependency-linking" >&2;}
     4138              { echo "$as_me:$LINENO: WARNING: Dependency linking seems to be disabled, so shared libraries (DLLs) will not be built" >&5
     4139echo "$as_me: WARNING: Dependency linking seems to be disabled, so shared libraries (DLLs) will not be built" >&2;}
    41814140            fi
    41824141            ;;
    41834142          *)
    4184             { echo "$as_me:$LINENO: WARNING: DLL building not supported. I'm disabling your choice." >&5
    4185 echo "$as_me: WARNING: DLL building not supported. I'm disabling your choice." >&2;}
     4143            { echo "$as_me:$LINENO: WARNING: Building of DLLs not supported in this configuration." >&5
     4144echo "$as_me: WARNING: Building of DLLs not supported in this configuration." >&2;}
    41864145            ;;
    41874146        esac
     
    41924151      platform=AIX
    41934152      if test x"$enable_shared" = xyes; then
    4194         { echo "$as_me:$LINENO: WARNING: Shared objects are not supported. I'm disabling your choice." >&5
    4195 echo "$as_me: WARNING: Shared objects are not supported. I'm disabling your choice." >&2;}
     4153        { echo "$as_me:$LINENO: WARNING: Shared objects are not supported." >&5
     4154echo "$as_me: WARNING: Shared objects are not supported." >&2;}
    41964155      fi
    41974156    ;;
     
    59105869*-*-irix6*)
    59115870  # Find out which ABI we are using.
    5912   echo '#line 5912 "configure"' > conftest.$ac_ext
     5871  echo '#line 5871 "configure"' > conftest.$ac_ext
    59135872  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    59145873  (eval $ac_compile) 2>&5
     
    70447003
    70457004# Provide some information about the compiler.
    7046 echo "$as_me:7046:" \
     7005echo "$as_me:7005:" \
    70477006     "checking for Fortran 77 compiler version" >&5
    70487007ac_compiler=`set X $ac_compile; echo $2`
     
    81118070   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    81128071   -e 's:$: $lt_compiler_flag:'`
    8113    (eval echo "\"\$as_me:8113: $lt_compile\"" >&5)
     8072   (eval echo "\"\$as_me:8072: $lt_compile\"" >&5)
    81148073   (eval "$lt_compile" 2>conftest.err)
    81158074   ac_status=$?
    81168075   cat conftest.err >&5
    8117    echo "$as_me:8117: \$? = $ac_status" >&5
     8076   echo "$as_me:8076: \$? = $ac_status" >&5
    81188077   if (exit $ac_status) && test -s "$ac_outfile"; then
    81198078     # The compiler can only warn and ignore the option if not recognized
     
    83798338   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    83808339   -e 's:$: $lt_compiler_flag:'`
    8381    (eval echo "\"\$as_me:8381: $lt_compile\"" >&5)
     8340   (eval echo "\"\$as_me:8340: $lt_compile\"" >&5)
    83828341   (eval "$lt_compile" 2>conftest.err)
    83838342   ac_status=$?
    83848343   cat conftest.err >&5
    8385    echo "$as_me:8385: \$? = $ac_status" >&5
     8344   echo "$as_me:8344: \$? = $ac_status" >&5
    83868345   if (exit $ac_status) && test -s "$ac_outfile"; then
    83878346     # The compiler can only warn and ignore the option if not recognized
     
    84838442   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    84848443   -e 's:$: $lt_compiler_flag:'`
    8485    (eval echo "\"\$as_me:8485: $lt_compile\"" >&5)
     8444   (eval echo "\"\$as_me:8444: $lt_compile\"" >&5)
    84868445   (eval "$lt_compile" 2>out/conftest.err)
    84878446   ac_status=$?
    84888447   cat out/conftest.err >&5
    8489    echo "$as_me:8489: \$? = $ac_status" >&5
     8448   echo "$as_me:8448: \$? = $ac_status" >&5
    84908449   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    84918450   then
     
    1082810787  lt_status=$lt_dlunknown
    1082910788  cat > conftest.$ac_ext <<EOF
    10830 #line 10830 "configure"
     10789#line 10789 "configure"
    1083110790#include "confdefs.h"
    1083210791
     
    1092810887  lt_status=$lt_dlunknown
    1092910888  cat > conftest.$ac_ext <<EOF
    10930 #line 10930 "configure"
     10889#line 10889 "configure"
    1093110890#include "confdefs.h"
    1093210891
     
    1327213231   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1327313232   -e 's:$: $lt_compiler_flag:'`
    13274    (eval echo "\"\$as_me:13274: $lt_compile\"" >&5)
     13233   (eval echo "\"\$as_me:13233: $lt_compile\"" >&5)
    1327513234   (eval "$lt_compile" 2>conftest.err)
    1327613235   ac_status=$?
    1327713236   cat conftest.err >&5
    13278    echo "$as_me:13278: \$? = $ac_status" >&5
     13237   echo "$as_me:13237: \$? = $ac_status" >&5
    1327913238   if (exit $ac_status) && test -s "$ac_outfile"; then
    1328013239     # The compiler can only warn and ignore the option if not recognized
     
    1337613335   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1337713336   -e 's:$: $lt_compiler_flag:'`
    13378    (eval echo "\"\$as_me:13378: $lt_compile\"" >&5)
     13337   (eval echo "\"\$as_me:13337: $lt_compile\"" >&5)
    1337913338   (eval "$lt_compile" 2>out/conftest.err)
    1338013339   ac_status=$?
    1338113340   cat out/conftest.err >&5
    13382    echo "$as_me:13382: \$? = $ac_status" >&5
     13341   echo "$as_me:13341: \$? = $ac_status" >&5
    1338313342   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1338413343   then
     
    1494614905   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1494714906   -e 's:$: $lt_compiler_flag:'`
    14948    (eval echo "\"\$as_me:14948: $lt_compile\"" >&5)
     14907   (eval echo "\"\$as_me:14907: $lt_compile\"" >&5)
    1494914908   (eval "$lt_compile" 2>conftest.err)
    1495014909   ac_status=$?
    1495114910   cat conftest.err >&5
    14952    echo "$as_me:14952: \$? = $ac_status" >&5
     14911   echo "$as_me:14911: \$? = $ac_status" >&5
    1495314912   if (exit $ac_status) && test -s "$ac_outfile"; then
    1495414913     # The compiler can only warn and ignore the option if not recognized
     
    1505015009   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1505115010   -e 's:$: $lt_compiler_flag:'`
    15052    (eval echo "\"\$as_me:15052: $lt_compile\"" >&5)
     15011   (eval echo "\"\$as_me:15011: $lt_compile\"" >&5)
    1505315012   (eval "$lt_compile" 2>out/conftest.err)
    1505415013   ac_status=$?
    1505515014   cat out/conftest.err >&5
    15056    echo "$as_me:15056: \$? = $ac_status" >&5
     15015   echo "$as_me:15015: \$? = $ac_status" >&5
    1505715016   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1505815017   then
     
    1725717216   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1725817217   -e 's:$: $lt_compiler_flag:'`
    17259    (eval echo "\"\$as_me:17259: $lt_compile\"" >&5)
     17218   (eval echo "\"\$as_me:17218: $lt_compile\"" >&5)
    1726017219   (eval "$lt_compile" 2>conftest.err)
    1726117220   ac_status=$?
    1726217221   cat conftest.err >&5
    17263    echo "$as_me:17263: \$? = $ac_status" >&5
     17222   echo "$as_me:17222: \$? = $ac_status" >&5
    1726417223   if (exit $ac_status) && test -s "$ac_outfile"; then
    1726517224     # The compiler can only warn and ignore the option if not recognized
     
    1752517484   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1752617485   -e 's:$: $lt_compiler_flag:'`
    17527    (eval echo "\"\$as_me:17527: $lt_compile\"" >&5)
     17486   (eval echo "\"\$as_me:17486: $lt_compile\"" >&5)
    1752817487   (eval "$lt_compile" 2>conftest.err)
    1752917488   ac_status=$?
    1753017489   cat conftest.err >&5
    17531    echo "$as_me:17531: \$? = $ac_status" >&5
     17490   echo "$as_me:17490: \$? = $ac_status" >&5
    1753217491   if (exit $ac_status) && test -s "$ac_outfile"; then
    1753317492     # The compiler can only warn and ignore the option if not recognized
     
    1762917588   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1763017589   -e 's:$: $lt_compiler_flag:'`
    17631    (eval echo "\"\$as_me:17631: $lt_compile\"" >&5)
     17590   (eval echo "\"\$as_me:17590: $lt_compile\"" >&5)
    1763217591   (eval "$lt_compile" 2>out/conftest.err)
    1763317592   ac_status=$?
    1763417593   cat out/conftest.err >&5
    17635    echo "$as_me:17635: \$? = $ac_status" >&5
     17594   echo "$as_me:17594: \$? = $ac_status" >&5
    1763617595   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1763717596   then
     
    2051920478  dependency_linking="$enableval"
    2052020479else
     20480  dependency_linking=auto
     20481fi;
     20482
     20483if test "$dependency_linking" = auto; then
     20484  # On Cygwin and AIX, building DLLs doesn't work
    2052120485  dependency_linking=no
    20522 fi;
    20523 
    20524 # ToDo
    20525 # For now, don't use the -no-undefined flag, since the Makefiles are
    20526 # not yet set up that way.  But we need to fix this, when we want
    20527 # to comile DLLs under Windows.
     20486  if test x"$enable_shared" = xyes; then
     20487    case $build in
     20488      *-cygwin* | *-mingw*)
     20489        case "$CC" in
     20490          clang* )
     20491            dependency_linking=yes
     20492            ;;
     20493          cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
     20494            dependency_linking=no
     20495            ;;
     20496          *gcc*)
     20497            dependency_linking=yes
     20498            ;;
     20499          *)
     20500            dependency_linking=yes
     20501            ;;
     20502        esac
     20503        ;;
     20504      *)
     20505        dependency_linking=yes
     20506        ;;
     20507    esac
     20508  fi
     20509fi
     20510
    2052820511if test "$dependency_linking" = yes ;
    2052920512then
     
    2079420777COINDEPEND_PCLIBS=
    2079520778COINDEPEND_PCREQUIRES=
    20796 COINDEPEND_DATA=
    2079720779
    2079820780
     
    2134321325CLP_PCLIBS=
    2134421326CLP_PCREQUIRES=
    21345 CLP_DATA=
    2134621327
    2134721328
     
    2189221873OSITESTS_PCLIBS=
    2189321874OSITESTS_PCREQUIRES=
    21894 OSITESTS_DATA=
    2189521875
    2189621876
     
    2237322353SAMPLE_PCLIBS=
    2237422354SAMPLE_PCREQUIRES=
    22375 SAMPLE_DATA=
    2237622355
    2237722356
     
    2285422833NETLIB_PCLIBS=
    2285522834NETLIB_PCREQUIRES=
    22856 NETLIB_DATA=
    2285722835
    2285822836
     
    2333523313MIPLIB3_PCLIBS=
    2333623314MIPLIB3_PCREQUIRES=
    23337 MIPLIB3_DATA=
    2333823315
    2333923316
     
    2512825105DYLP_PCLIBS=
    2512925106DYLP_PCREQUIRES=
    25130 DYLP_DATA=
    2513125107
    2513225108
     
    2563925615VOL_PCLIBS=
    2564025616VOL_PCREQUIRES=
    25641 VOL_DATA=
    2564225617
    2564325618
     
    2612026095CPX_PCLIBS=
    2612126096CPX_PCREQUIRES=
    26122 CPX_DATA=
    2612326097
    2612426098
     
    2666126635GLPK_PCLIBS=
    2666226636GLPK_PCREQUIRES=
    26663 GLPK_DATA=
    2666426637
    2666526638
     
    2717227145GRB_PCLIBS=
    2717327146GRB_PCREQUIRES=
    27174 GRB_DATA=
    2717527147
    2717627148
     
    2765327625MSK_PCLIBS=
    2765427626MSK_PCREQUIRES=
    27655 MSK_DATA=
    2765627627
    2765727628
     
    2816428135SPX_PCLIBS=
    2816528136SPX_PCREQUIRES=
    28166 SPX_DATA=
    2816728137
    2816828138
     
    2867528645XPR_PCLIBS=
    2867628646XPR_PCREQUIRES=
    28677 XPR_DATA=
    2867828647
    2867928648
     
    2916229131ASL_PCLIBS=
    2916329132ASL_PCREQUIRES=
    29164 ASL_DATA=
    2916529133
    2916629134
Note: See TracChangeset for help on using the changeset viewer.