Changeset 2483 for stable


Ignore:
Timestamp:
Nov 13, 2011 1:19:10 PM (9 years ago)
Author:
stefan
Message:

sync with trunk rev2482

Location:
stable/0.7
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • stable/0.7

    • Property svn:mergeinfo changed
      /trunkmerged: 2482
  • stable/0.7/coin.m4

    r2432 r2483  
    350350# It seems that we need to cleanup something here for the Windows
    351351case "$CXX" in
     352  clang* ) ;;
    352353  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    353354    sed -e 's/^void exit (int);//' confdefs.h >> confdefs.hh
     
    362363# Autoconf incorrectly concludes that cl recognises -g. It doesn't.
    363364case "$CXX" in
     365  clang* ) ;;
    364366  cl* | */cl* | CL* | */CL* )
    365367    if test "$ac_cv_prog_cxx_g" = yes ; then
     
    420422      *-cygwin* | *-mingw*)
    421423        case "$CXX" in
     424          clang* ) ;;
    422425          cl* | */cl* | CL* | */CL*)
    423426            # The MT and MTd options are mutually exclusive
     
    567570# correct the LD variable in a mingw build with MS or intel compiler
    568571case "$CXX" in
     572  clang* ) ;;
    569573  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    570574    AC_COIN_MINGW_LD_FIX
     
    601605     *-mingw32 | *-cygwin* )
    602606      case "$CXX" in
     607      clang* ) ;;
    603608      cl* | */cl* | CL* | */CL*)
    604609        CXXLIBS=nothing;;
     
    703708if test x"$CXX" != x; then
    704709  case "$CXX" in
     710    clang* ) ;;
    705711    cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    706712      if test x"$CC" = x; then
     
    756762# Autoconf incorrectly concludes that cl recognises -g. It doesn't.
    757763case "$CC" in
     764  clang* ) ;;
    758765  cl* | */cl* | CL* | */CL* )
    759766    if test "$ac_cv_prog_cc_g" = yes ; then
     
    767774coin_cc_is_cl=false
    768775case "$CC" in
     776  clang* ) ;;
    769777  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    770778    coin_cc_is_cl=true
     
    818826      *-cygwin* | *-mingw*)
    819827        case "$CC" in
     828          clang* ) ;;
    820829          cl* | */cl* | CL* | */CL*)
    821830            coin_opt_cflags='-MT -O2'
     
    957966# Correct the LD variable if we are using the MS or Intel-windows compiler
    958967case "$CC" in
     968  clang* ) ;;
    959969  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    960970    AC_COIN_MINGW_LD_FIX
     
    17171727AC_DEFUN([AC_COIN_PATCH_LIBTOOL_CYGWIN],
    17181728[ case "$CXX" in
     1729    clang* )
     1730      # we assume that libtool patches for CLANG are the same as for GNU compiler - correct???
     1731      AC_MSG_NOTICE(Applying patches to libtool for CLANG compiler)
     1732      sed -e 's|fix_srcfile_path=\"`cygpath -w \"\$srcfile\"`\"|fix_srcfile_path=\"\\\`'"$CYGPATH_W"' \\\"\\$srcfile\\\"\\\`\"|' \
     1733          -e 's|"lib /OUT:\\$oldlib\\$oldobjs\\$old_deplibs"|"\\$AR \\$AR_FLAGS \\$oldlib\\$oldobjs\\$old_deplibs~\\$RANLIB \\$oldlib"|' \
     1734          -e 's|libext="lib"|libext="a"|' \
     1735      libtool > conftest.bla
     1736      ;;
    17191737    cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    17201738      AC_MSG_NOTICE(Applying patches to libtool for cl compiler)
     
    17311749          -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"%' \
    17321750      libtool > conftest.bla
    1733 
    1734       mv conftest.bla libtool
    1735       chmod 755 libtool
    17361751      ;;
    17371752    *)
     
    17411756          -e 's|libext="lib"|libext="a"|' \
    17421757      libtool > conftest.bla
    1743 
    1744       mv conftest.bla libtool
    1745       chmod 755 libtool
    17461758      ;;
    1747   esac ]) # COIN_PATCH_LIBTOOL_CYGWIN
     1759  esac
     1760  mv conftest.bla libtool
     1761  chmod 755 libtool
     1762]) # COIN_PATCH_LIBTOOL_CYGWIN
    17481763
    17491764###########################################################################
     
    19461961fi
    19471962case "$CC" in
     1963  clang* ) ;;
    19481964  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    19491965    coin_link_input_cmd=cp ;;
     
    19711987  AC_SUBST(LIBEXT)
    19721988  case "$CC" in
     1989    clang* )
     1990         LIBEXT=a ;;
    19731991    cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    19741992         LIBEXT=lib ;;
     
    20892107[AC_BEFORE([AC_COIN_PROG_CC],[$0])
    20902108
    2091 case "$CC" in
    2092   cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    2093     ;;
    2094   *)
    2095     coin_foreach_w([myvar], [$1], [
    2096       m4_toupper(myvar)_LIBS="-lm $m4_toupper(myvar)_LIBS"
    2097       m4_toupper(myvar)_PCLIBS="-lm $m4_toupper(myvar)_PCLIBS"
    2098       m4_toupper(myvar)_LIBS_INSTALLED="-lm $m4_toupper(myvar)_LIBS_INSTALLED"
    2099     ])
    2100   ;;
    2101 esac
     2109if test $coin_cc_is_cl != true ; then
     2110  coin_foreach_w([myvar], [$1], [
     2111    m4_toupper(myvar)_LIBS="-lm $m4_toupper(myvar)_LIBS"
     2112    m4_toupper(myvar)_PCLIBS="-lm $m4_toupper(myvar)_PCLIBS"
     2113    m4_toupper(myvar)_LIBS_INSTALLED="-lm $m4_toupper(myvar)_LIBS_INSTALLED"
     2114  ])
     2115fi
    21022116
    21032117]) # AC_COIN_CHECK_LIBM
     
    26232637  fi
    26242638  case "$CC" in
     2639    clang* ) ;;
    26252640    cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    26262641      lnkcmd=cp ;;
     
    39403955      fi
    39413956      case "$CC" in
     3957        clang* ) ;;
    39423958        cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    39433959          coin_save_LIBS="$LIBS"
  • stable/0.7/compile_f2c

    • Property svn:mergeinfo changed (with no actual effect on merging)
Note: See TracChangeset for help on using the changeset viewer.