Changeset 2866 for stable/0.7/coin.m4


Ignore:
Timestamp:
Sep 8, 2013 12:27:09 PM (7 years ago)
Author:
stefan
Message:

merge r2839-2856,2858-2865 from trunk

Location:
stable/0.7
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • stable/0.7

  • stable/0.7/coin.m4

    r2802 r2866  
    380380      AC_MSG_NOTICE([Overruling autoconf; cl does not recognise -g.])
    381381    fi ;;
     382  * )
     383    CYGPATH_W=echo
     384    ;;
    382385esac
    383386CXXFLAGS="$save_cxxflags"
     
    789792      AC_MSG_NOTICE([Overruling autoconf; cl does not recognise -g.])
    790793    fi ;;
     794  * )
     795    CYGPATH_W=echo
     796    ;;
    791797esac
    792798CFLAGS="$save_cflags"
     
    16301636  # On Cygwin and AIX, building DLLs doesn't work
    16311637  case $build in
    1632     *-cygwin*)
     1638    *-cygwin* | *-mingw*)
    16331639      coin_disable_shared=yes
    1634       platform=Cygwin
     1640      if test x"$enable_shared" = xyes; then
     1641        case "$CXX" in
     1642          clang* )
     1643            AC_MSG_WARN([DLL building not supported. I'm disabling your choice.])
     1644            ;;
     1645          cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
     1646            AC_MSG_WARN([DLL building not supported. I'm disabling your choice, but will build with -MD(d) instead of -MT(d).])
     1647            ;;
     1648          *)
     1649            AC_MSG_WARN([DLL building not supported. I'm disabling your choice.])
     1650            ;;
     1651        esac
     1652      fi
    16351653    ;;
    16361654    *-aix*)
    16371655      coin_disable_shared=yes
    16381656      platform=AIX
    1639     ;;
    1640     *-mingw*)
    1641       coin_disable_shared=yes
    1642       platform="Msys"
    1643 #      case "$CXX" in
    1644 #        cl*)
    1645 #          coin_disable_shared=yes
    1646 #          platform="Msys with cl"
    1647 #      ;;
    1648 #      esac
     1657      if test x"$enable_shared" = xyes; then
     1658        AC_MSG_WARN([Shared objects are not supported. I'm disabling your choice.])
     1659      fi
    16491660    ;;
    16501661  esac
     
    16521663if test x"$coin_disable_shared" = xyes; then
    16531664  if test x"$enable_shared" = xyes; then
    1654     AC_MSG_WARN([On $platform, shared objects are not supported. I'm disabling your choice.])
     1665    :
    16551666  else
    16561667    # we don't disable shared, because it was not selected anyway
Note: See TracChangeset for help on using the changeset viewer.