Changeset 281 for trunk


Ignore:
Timestamp:
Mar 28, 2007 1:01:27 AM (13 years ago)
Author:
andreasw
Message:

fixing a few things for Cygwin compile with native MS/Intel compilers

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/coin.m4

    r280 r281  
    11251125          ifort* | */ifort* | IFORT* | */IFORT* )
    11261126            coin_opt_fflags='-O3'
    1127             coin_add_fflags='-nologo -MT'
     1127            coin_add_fflags='-fpp -nologo -MT'
    11281128            coin_dbg_fflags='-debug'
    11291129          ;;
     
    18001800            -e 's/$AR t/lib -nologo -list/' \
    18011801            -e 's%f_ex_an_ar_oldlib="\($?*1*\)"%f_ex_an_ar_oldlib='\`"$CYGPATH_W"' \1`%' \
    1802             -e  's%^archive_cmds=.*%archive_cmds="\\$CC -o \\$lib \\$libobjs \\$compiler_flags \\\\\\`echo \\\\\\"\\$deplibs\\\\\\" | \\$SED -e '"\'"'s/ -lc\\$//'"\'"'\\\\\\` -link -dll~linknames="%' \
     1802            -e 's%^archive_cmds=.*%archive_cmds="\\$CC -o \\$lib \\$libobjs \\$compiler_flags \\\\\\`echo \\\\\\"\\$deplibs\\\\\\" | \\$SED -e '"\'"'s/ -lc\\$//'"\'"'\\\\\\` -link -dll~linknames="%' \\
     1803            -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"%' \
    18031804        libtool > conftest.bla
    18041805
     
    23722373
    23732374# Determine the name of the ASL library
    2374 case "$CXX" in
     2375case "$CC" in
    23752376  cl* | */cl* | CL* | */CL*)
    23762377    ampllib=amplsolv.lib ;;
     
    28372838  coin_need_flibs=yes
    28382839
    2839   MUMPS_INCFLAGS="-I`$CYGPATH_W $coin_mumpssrcdir/MUMPS/libseq` -I`$CYGPATH_W $coin_mumpssrcdir/MUMPS/include`"
     2840  MUMPS_INCFLAGS="-I\`\$(CYGPATH_W) $coin_mumpssrcdir/MUMPS/libseq\` -I\`\$(CYGPATH_W) $coin_mumpssrcdir/MUMPS/include\`"
    28402841  AC_SUBST(MUMPS_INCFLAGS)
    28412842fi
     
    28432844AM_CONDITIONAL([COIN_HAS_MUMPS],[test x"$use_mumps" != x])
    28442845AM_CONDITIONAL([COIN_BUILD_MUMPS],[test "$use_mumps" = BUILD])
     2846
     2847AC_MSG_CHECKING([whether MUMPS is available])
    28452848
    28462849if test x"$use_mumps" = x || test "$use_mumps" = no; then
     
    28512854            [If defined, the MUMPS Library is available.])
    28522855fi
     2856AC_MSG_RESULT([$coin_has_mumps])
    28532857]) # AC_COIN_HAS_MUMPS
    28542858
Note: See TracChangeset for help on using the changeset viewer.