Changeset 10


Ignore:
Timestamp:
May 15, 2006 1:40:46 AM (14 years ago)
Author:
andreasw
Message:

Some corrections for MSys

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/coin.m4

    r9 r10  
    201201save_cxxflags="$CXXFLAGS"
    202202case $build in
    203   *-cygwin*) comps="g++ cl" ;;
    204   *-mingw*)  comps="g++ cl" ;;
     203  *-cygwin* | *-mingw*)
     204             comps="g++ cl" ;;
    205205  *-darwin*) comps="g++ c++ CC" ;;
    206206          *) comps="xlC aCC CC g++ c++ pgCC icpc" ;;
     
    242242  if test -z "$coin_opt_cxxflags"; then
    243243    case $build in
    244       *-cygwin*)
     244      *-cygwin* | *-mingw*)
    245245        case "$CXX" in
    246246          cl | */cl)
     
    439439save_cflags="$CFLAGS"
    440440case $build in
    441   *-cygwin*) comps="gcc cl" ;;
    442   *-mingw*)  comps="gcc cl" ;;
     441  *-cygwin* | *-mingw*)
     442             comps="gcc cl" ;;
    443443  *-linux-*) comps="xlc gcc cc pgcc icc" ;;
    444444  *)         comps="xlc cc gcc pgcc icc" ;;
     
    478478  if test -z "$coin_opt_cflags"; then
    479479    case $build in
    480       *-cygwin*)
     480      *-cygwin* | *-mingw*)
    481481        case "$CC" in
    482482          cl | */cl)
     
    578578save_fflags="$FFLAGS"
    579579case $build in
    580   *-cygwin*) comps="gfortran g77 ifort" ;;
    581   *-mingw*)  comps="gfortran g77 ifort" ;;
     580  *-cygwin* | *-mingw*)
     581             comps="gfortran g77 ifort" ;;
    582582  *)         comps="xlf fort77 gfortran f77 g77 pgf90 pgf77 ifort ifc" ;;
    583583esac
     
    607607  else
    608608    case $build in
    609       *-cygwin*)
     609      *-cygwin* | *-mingw*)
    610610        case $F77 in
    611611          ifort | */ifort)
     
    721721case $build in
    722722# The following is a fix to define FLIBS for ifort on Windows
    723    *-cygwin*)
     723   *-cygwin* | *-mingw*)
    724724     case $F77 in
    725725       ifort | */ifort)
     
    905905case $build in
    906906  *-cygwin*)
    907     if test x"$enable_shared" = xyes; then
    908       AC_MSG_WARN([On Cygwin, shared objects are not supported. I'm disabling your choice.])
    909     fi
    910     enable_shared=no
     907    coin_disable_shared=yes
     908  ;;
     909  *-mingw*)
     910    case $CXX in
     911      cl)
     912        coin_disable_shared=yes
     913    ;;
     914    esac
    911915  ;;
    912916esac
     917if test x"$coin_disable_shared" = xyes; then
     918  if test x"$enable_shared" = xyes; then
     919    AC_MSG_WARN([On Cygwin, shared objects are not supported. I'm disabling your choice.])
     920  fi
     921  enable_shared=no
     922fi
    913923# By default, we only want the shared objects to be compiled
    914924AC_DISABLE_STATIC
Note: See TracChangeset for help on using the changeset viewer.