Changeset 71


Ignore:
Timestamp:
Jun 23, 2006 4:23:10 PM (15 years ago)
Author:
andreasw
Message:

several improvements for MSys

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/coin.m4

    r68 r71  
    270270AC_SUBST(ADDLIBS)
    271271
     272# Initialize the FADDLIBS variable (which is to be used with a fortran
     273# compiler and will not include FLIBS)
     274FADDLIBS=
     275AC_SUBST(FADDLIBS)
     276
    272277# A useful makefile conditional that is always false
    273278AM_CONDITIONAL(ALWAYS_FALSE, false)
     
    362367          *) comps="xlC aCC CC g++ c++ pgCC icpc" ;;
    363368esac
     369
     370# We delete the cached value, since the test might not have been
     371# performed with out choise of compilers earlier
     372ac_cv_prog_CXX=
    364373AC_PROG_CXX([$comps])
    365374CXXFLAGS="$save_cxxflags"
     
    632641  *)         comps="xlc cc gcc pgcc icc" ;;
    633642esac
     643
     644# We delete the cached value, since the test might not have been
     645# performed with out choise of compilers earlier
     646ac_cv_prog_CC=
    634647AC_PROG_CC([$comps])
    635648CFLAGS="$save_cflags"
     
    791804  *)         comps="xlf fort77 gfortran f77 g77 pgf90 pgf77 ifort ifc" ;;
    792805esac
     806
     807# We delete the cached value, since the test might not have been
     808# performed with out choise of compilers earlier
     809ac_cv_prog_F77=
    793810AC_PROG_F77($comps)
    794811FFLAGS="$save_fflags"
     
    951968     case $F77 in
    952969       ifort* | */ifort*)
    953            FLIBS="/link libifcorert.lib $LIBS /NODEFAULTLIB:libc.lib";;
     970           FLIBS="-link libifcorert.lib $LIBS /NODEFAULTLIB:libc.lib";;
    954971     esac;;
    955972   *-hp-*)
     
    11881205  ;;
    11891206  *-mingw*)
    1190     case "$CXX" in
    1191       cl*)
    1192         coin_disable_shared=yes
    1193         platform="Msys with cl"
    1194     ;;
    1195     esac
     1207    coin_disable_shared=yes
     1208    platform="Msys"
     1209#    case "$CXX" in
     1210#      cl*)
     1211#        coin_disable_shared=yes
     1212#        platform="Msys with cl"
     1213#    ;;
     1214#    esac
    11961215  ;;
    11971216esac
     
    12861305      sed -e 's|fix_srcfile_path=\"`cygpath -w \"\$srcfile\"`\"|fix_srcfile_path=\"\\\`'"$CYGPATH_W"' \\\"\\$srcfile\\\"\\\`\"|' \
    12871306          -e 's|"lib /OUT:\\$oldlib\\$oldobjs\\$old_deplibs"|"\\$AR \\$AR_FLAGS \\$oldlib\\$oldobjs\\$old_deplibs~\\$RANLIB \\$oldlib"|' \
     1307          -e 's|libext="lib"|libext="a"|' \
    12881308      libtool > conftest.bla
    12891309
     
    13321352        done
    13331353      esac ;;
     1354    *-darwin*)
     1355        RPATH_FLAGS=nothing ;;
    13341356    *-ibm-*)
    13351357      case "$CXX" in
     
    13701392AC_DEFUN([AC_COIN_FINALIZE],
    13711393[
     1394FADDLIBS="$ADDLIBS"
    13721395if test x"$coin_need_flibs" = xyes; then
    13731396  ADDLIBS="$ADDLIBS $FLIBS"
Note: See TracChangeset for help on using the changeset viewer.