Changeset 281 for trunk/coin.m4

Timestamp:

Mar 28, 2007 1:01:27 AM (14 years ago)

Author:

andreasw

Message:

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

File:

• trunk/coin.m4 (modified) (6 diffs)

trunk/coin.m4

@@ -1125 +1125 @@
           ifort* | */ifort* | IFORT* | */IFORT* )
             coin_opt_fflags='-O3'
-            coin_add_fflags='-nologo -MT'
+            coin_add_fflags='-fpp -nologo -MT'
             coin_dbg_fflags='-debug'
           ;;
@@ -1800 +1800 @@
             -e 's/$AR t/lib -nologo -list/' \
             -e 's%f_ex_an_ar_oldlib="\($?*1*\)"%f_ex_an_ar_oldlib='\`"$CYGPATH_W"' \1`%' \ 
-            -e  's%^archive_cmds=.*%archive_cmds="\\$CC -o \\$lib \\$libobjs \\$compiler_flags \\\\\\`echo \\\\\\"\\$deplibs\\\\\\" | \\$SED -e '"\'"'s/ -lc\\$//'"\'"'\\\\\\` -link -dll~linknames="%' \
+            -e 's%^archive_cmds=.*%archive_cmds="\\$CC -o \\$lib \\$libobjs \\$compiler_flags \\\\\\`echo \\\\\\"\\$deplibs\\\\\\" | \\$SED -e '"\'"'s/ -lc\\$//'"\'"'\\\\\\` -link -dll~linknames="%' \\
+            -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"%' \
         libtool > conftest.bla
 
@@ -2372 +2373 @@
 
 # Determine the name of the ASL library
-case "$CXX" in
+case "$CC" in
   cl* | */cl* | CL* | */CL*)
     ampllib=amplsolv.lib ;;
@@ -2837 +2838 @@
   coin_need_flibs=yes
 
-  MUMPS_INCFLAGS="-I`$CYGPATH_W $coin_mumpssrcdir/MUMPS/libseq` -I`$CYGPATH_W $coin_mumpssrcdir/MUMPS/include`"
+  MUMPS_INCFLAGS="-I\`\$(CYGPATH_W) $coin_mumpssrcdir/MUMPS/libseq\` -I\`\$(CYGPATH_W) $coin_mumpssrcdir/MUMPS/include\`"
   AC_SUBST(MUMPS_INCFLAGS)
 fi
@@ -2843 +2844 @@
 AM_CONDITIONAL([COIN_HAS_MUMPS],[test x"$use_mumps" != x])
 AM_CONDITIONAL([COIN_BUILD_MUMPS],[test "$use_mumps" = BUILD])
+
+AC_MSG_CHECKING([whether MUMPS is available])
 
 if test x"$use_mumps" = x || test "$use_mumps" = no; then
@@ -2851 +2854 @@
             [If defined, the MUMPS Library is available.])
 fi
+AC_MSG_RESULT([$coin_has_mumps])
 ]) # AC_COIN_HAS_MUMPS