Changeset 1762 for trunk


Ignore:
Timestamp:
Jan 28, 2012 11:16:23 AM (7 years ago)
Author:
tkr
Message:

Updating configure file for tweak in build tools

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cbc/configure

    r1751 r1762  
    20092009if test x"$CXX" != x; then
    20102010  case "$CXX" in
     2011    clang* ) ;;
    20112012    cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    20122013      if test x"$CC" = x; then
     
    28282829# Autoconf incorrectly concludes that cl recognises -g. It doesn't.
    28292830case "$CC" in
     2831  clang* ) ;;
    28302832  cl* | */cl* | CL* | */CL* )
    28312833    if test "$ac_cv_prog_cc_g" = yes ; then
     
    28402842coin_cc_is_cl=false
    28412843case "$CC" in
     2844  clang* ) ;;
    28422845  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    28432846    coin_cc_is_cl=true
     
    29432946      *-cygwin* | *-mingw*)
    29442947        case "$CC" in
     2948          clang* ) ;;
    29452949          cl* | */cl* | CL* | */CL*)
    29462950            coin_opt_cflags='-MT -O2'
     
    32643268# Correct the LD variable if we are using the MS or Intel-windows compiler
    32653269case "$CC" in
     3270  clang* ) ;;
    32663271  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    32673272    case $build in
     
    37553760# It seems that we need to cleanup something here for the Windows
    37563761case "$CXX" in
     3762  clang* ) ;;
    37573763  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    37583764    sed -e 's/^void exit (int);//' confdefs.h >> confdefs.hh
     
    37763782# Autoconf incorrectly concludes that cl recognises -g. It doesn't.
    37773783case "$CXX" in
     3784  clang* ) ;;
    37783785  cl* | */cl* | CL* | */CL* )
    37793786    if test "$ac_cv_prog_cxx_g" = yes ; then
     
    38793886      *-cygwin* | *-mingw*)
    38803887        case "$CXX" in
     3888          clang* ) ;;
    38813889          cl* | */cl* | CL* | */CL*)
    38823890            # The MT and MTd options are mutually exclusive
     
    42084216# correct the LD variable in a mingw build with MS or intel compiler
    42094217case "$CXX" in
     4218  clang* ) ;;
    42104219  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    42114220    case $build in
     
    59835992*-*-irix6*)
    59845993  # Find out which ABI we are using.
    5985   echo '#line 5985 "configure"' > conftest.$ac_ext
     5994  echo '#line 5994 "configure"' > conftest.$ac_ext
    59865995  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    59875996  (eval $ac_compile) 2>&5
     
    71177126
    71187127# Provide some information about the compiler.
    7119 echo "$as_me:7119:" \
     7128echo "$as_me:7128:" \
    71207129     "checking for Fortran 77 compiler version" >&5
    71217130ac_compiler=`set X $ac_compile; echo $2`
     
    81848193   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    81858194   -e 's:$: $lt_compiler_flag:'`
    8186    (eval echo "\"\$as_me:8186: $lt_compile\"" >&5)
     8195   (eval echo "\"\$as_me:8195: $lt_compile\"" >&5)
    81878196   (eval "$lt_compile" 2>conftest.err)
    81888197   ac_status=$?
    81898198   cat conftest.err >&5
    8190    echo "$as_me:8190: \$? = $ac_status" >&5
     8199   echo "$as_me:8199: \$? = $ac_status" >&5
    81918200   if (exit $ac_status) && test -s "$ac_outfile"; then
    81928201     # The compiler can only warn and ignore the option if not recognized
     
    84528461   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    84538462   -e 's:$: $lt_compiler_flag:'`
    8454    (eval echo "\"\$as_me:8454: $lt_compile\"" >&5)
     8463   (eval echo "\"\$as_me:8463: $lt_compile\"" >&5)
    84558464   (eval "$lt_compile" 2>conftest.err)
    84568465   ac_status=$?
    84578466   cat conftest.err >&5
    8458    echo "$as_me:8458: \$? = $ac_status" >&5
     8467   echo "$as_me:8467: \$? = $ac_status" >&5
    84598468   if (exit $ac_status) && test -s "$ac_outfile"; then
    84608469     # The compiler can only warn and ignore the option if not recognized
     
    85568565   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    85578566   -e 's:$: $lt_compiler_flag:'`
    8558    (eval echo "\"\$as_me:8558: $lt_compile\"" >&5)
     8567   (eval echo "\"\$as_me:8567: $lt_compile\"" >&5)
    85598568   (eval "$lt_compile" 2>out/conftest.err)
    85608569   ac_status=$?
    85618570   cat out/conftest.err >&5
    8562    echo "$as_me:8562: \$? = $ac_status" >&5
     8571   echo "$as_me:8571: \$? = $ac_status" >&5
    85638572   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    85648573   then
     
    1090110910  lt_status=$lt_dlunknown
    1090210911  cat > conftest.$ac_ext <<EOF
    10903 #line 10903 "configure"
     10912#line 10912 "configure"
    1090410913#include "confdefs.h"
    1090510914
     
    1100111010  lt_status=$lt_dlunknown
    1100211011  cat > conftest.$ac_ext <<EOF
    11003 #line 11003 "configure"
     11012#line 11012 "configure"
    1100411013#include "confdefs.h"
    1100511014
     
    1334513354   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1334613355   -e 's:$: $lt_compiler_flag:'`
    13347    (eval echo "\"\$as_me:13347: $lt_compile\"" >&5)
     13356   (eval echo "\"\$as_me:13356: $lt_compile\"" >&5)
    1334813357   (eval "$lt_compile" 2>conftest.err)
    1334913358   ac_status=$?
    1335013359   cat conftest.err >&5
    13351    echo "$as_me:13351: \$? = $ac_status" >&5
     13360   echo "$as_me:13360: \$? = $ac_status" >&5
    1335213361   if (exit $ac_status) && test -s "$ac_outfile"; then
    1335313362     # The compiler can only warn and ignore the option if not recognized
     
    1344913458   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1345013459   -e 's:$: $lt_compiler_flag:'`
    13451    (eval echo "\"\$as_me:13451: $lt_compile\"" >&5)
     13460   (eval echo "\"\$as_me:13460: $lt_compile\"" >&5)
    1345213461   (eval "$lt_compile" 2>out/conftest.err)
    1345313462   ac_status=$?
    1345413463   cat out/conftest.err >&5
    13455    echo "$as_me:13455: \$? = $ac_status" >&5
     13464   echo "$as_me:13464: \$? = $ac_status" >&5
    1345613465   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1345713466   then
     
    1501915028   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1502015029   -e 's:$: $lt_compiler_flag:'`
    15021    (eval echo "\"\$as_me:15021: $lt_compile\"" >&5)
     15030   (eval echo "\"\$as_me:15030: $lt_compile\"" >&5)
    1502215031   (eval "$lt_compile" 2>conftest.err)
    1502315032   ac_status=$?
    1502415033   cat conftest.err >&5
    15025    echo "$as_me:15025: \$? = $ac_status" >&5
     15034   echo "$as_me:15034: \$? = $ac_status" >&5
    1502615035   if (exit $ac_status) && test -s "$ac_outfile"; then
    1502715036     # The compiler can only warn and ignore the option if not recognized
     
    1512315132   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1512415133   -e 's:$: $lt_compiler_flag:'`
    15125    (eval echo "\"\$as_me:15125: $lt_compile\"" >&5)
     15134   (eval echo "\"\$as_me:15134: $lt_compile\"" >&5)
    1512615135   (eval "$lt_compile" 2>out/conftest.err)
    1512715136   ac_status=$?
    1512815137   cat out/conftest.err >&5
    15129    echo "$as_me:15129: \$? = $ac_status" >&5
     15138   echo "$as_me:15138: \$? = $ac_status" >&5
    1513015139   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1513115140   then
     
    1733017339   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1733117340   -e 's:$: $lt_compiler_flag:'`
    17332    (eval echo "\"\$as_me:17332: $lt_compile\"" >&5)
     17341   (eval echo "\"\$as_me:17341: $lt_compile\"" >&5)
    1733317342   (eval "$lt_compile" 2>conftest.err)
    1733417343   ac_status=$?
    1733517344   cat conftest.err >&5
    17336    echo "$as_me:17336: \$? = $ac_status" >&5
     17345   echo "$as_me:17345: \$? = $ac_status" >&5
    1733717346   if (exit $ac_status) && test -s "$ac_outfile"; then
    1733817347     # The compiler can only warn and ignore the option if not recognized
     
    1759817607   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1759917608   -e 's:$: $lt_compiler_flag:'`
    17600    (eval echo "\"\$as_me:17600: $lt_compile\"" >&5)
     17609   (eval echo "\"\$as_me:17609: $lt_compile\"" >&5)
    1760117610   (eval "$lt_compile" 2>conftest.err)
    1760217611   ac_status=$?
    1760317612   cat conftest.err >&5
    17604    echo "$as_me:17604: \$? = $ac_status" >&5
     17613   echo "$as_me:17613: \$? = $ac_status" >&5
    1760517614   if (exit $ac_status) && test -s "$ac_outfile"; then
    1760617615     # The compiler can only warn and ignore the option if not recognized
     
    1770217711   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1770317712   -e 's:$: $lt_compiler_flag:'`
    17704    (eval echo "\"\$as_me:17704: $lt_compile\"" >&5)
     17713   (eval echo "\"\$as_me:17713: $lt_compile\"" >&5)
    1770517714   (eval "$lt_compile" 2>out/conftest.err)
    1770617715   ac_status=$?
    1770717716   cat out/conftest.err >&5
    17708    echo "$as_me:17708: \$? = $ac_status" >&5
     17717   echo "$as_me:17717: \$? = $ac_status" >&5
    1770917718   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1771017719   then
     
    2044220451    *-cygwin* | *-mingw*)
    2044320452       case "$CXX" in
     20453    clang* )
     20454      # we assume that libtool patches for CLANG are the same as for GNU compiler - correct???
     20455      { echo "$as_me:$LINENO: Applying patches to libtool for CLANG compiler" >&5
     20456echo "$as_me: Applying patches to libtool for CLANG compiler" >&6;}
     20457      sed -e 's|fix_srcfile_path=\"`cygpath -w \"\$srcfile\"`\"|fix_srcfile_path=\"\\\`'"$CYGPATH_W"' \\\"\\$srcfile\\\"\\\`\"|' \
     20458          -e 's|"lib /OUT:\\$oldlib\\$oldobjs\\$old_deplibs"|"\\$AR \\$AR_FLAGS \\$oldlib\\$oldobjs\\$old_deplibs~\\$RANLIB \\$oldlib"|' \
     20459          -e 's|libext="lib"|libext="a"|' \
     20460      libtool > conftest.bla
     20461      ;;
    2044420462    cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    2044520463      { echo "$as_me:$LINENO: Applying patches to libtool for cl compiler" >&5
     
    2045720475          -e 's%old_archive_cmds="lib -OUT:\\$oldlib\\$oldobjs\\$old_deplibs"%old_archive_cmds="if test -r \\$oldlib; then bla=\\"\\$oldlib\\"; else bla=; fi; lib -OUT:\\$oldlib \\\\\\$bla\\$oldobjs\\$old_deplibs"%' \
    2045820476      libtool > conftest.bla
    20459 
    20460       mv conftest.bla libtool
    20461       chmod 755 libtool
    2046220477      ;;
    2046320478    *)
     
    2046820483          -e 's|libext="lib"|libext="a"|' \
    2046920484      libtool > conftest.bla
    20470 
    20471       mv conftest.bla libtool
    20472       chmod 755 libtool
    2047320485      ;;
    2047420486  esac
     20487  mv conftest.bla libtool
     20488  chmod 755 libtool
     20489
    2047520490      ;;
    2047620491    *-darwin*)
     
    3044830463fi
    3044930464case "$CC" in
     30465  clang* ) ;;
    3045030466  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    3045130467    coin_link_input_cmd=cp ;;
     
    3046130477
    3046230478  case "$CC" in
     30479    clang* )
     30480         LIBEXT=a ;;
    3046330481    cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    3046430482         LIBEXT=lib ;;
Note: See TracChangeset for help on using the changeset viewer.