Changeset 1113

Timestamp:

Aug 22, 2008 12:40:06 PM (11 years ago)

Author:

andreasw

Message:

Merged in changes from ​https://projects.coin-or.org/svn/BuildTools/stable/BSP (rev 1055 to rev 1103)

Location:

trunk

Files:

• coin.m4 (modified) (14 diffs)
• compile_f2c/INSTALL (modified) (1 diff)

trunk/coin.m4

@@ -517 +517 @@
              fi ;;
   *-*-solaris*)
-             comps="CC xlC aCC g++ c++ pgCC icpc gpp cxx cc++ cl FCC KCC RCC" ;;
+             comps="CC xlC_r aCC g++ c++ pgCC icpc gpp cxx cc++ cl FCC KCC RCC" ;;
   *-darwin*) comps="g++ c++ CC" ;;
-          *) comps="xlC aCC CC g++ c++ pgCC icpc gpp cxx cc++ cl FCC KCC RCC" ;;
+          *) comps="xlC_r aCC CC g++ c++ pgCC icpc gpp cxx cc++ cl FCC KCC RCC" ;;
 esac
 
@@ -574 +574 @@
         coin_add_cxxflags="-pipe"
         coin_dbg_cxxflags="-g"
-        coin_warn_cxxflags="-pedantic-errors -Wimplicit -Wparentheses -Wreturn-type -Wcast-qual -Wall -Wpointer-arith -Wwrite-strings -Wconversion"
-        case $enable_doscompile in
-          mingw)
-            CXXFLAGS="-mno-cygwin"
-            AC_TRY_LINK(,[int i=0; i++;],
-                        [coin_add_cxxflags="-mno-cygwin $coin_add_cxxflags"])
-            CXXFLAGS=
-            ;;
-        esac
+        coin_warn_cxxflags="-Wimplicit -Wparentheses -Wreturn-type -Wcast-qual -Wall -Wpointer-arith -Wwrite-strings -Wconversion -Wno-unknown-pragmas"
+        case $build in
+          *-darwin*)
+            ;;
+          *)
+            coin_warn_cxxflags="-pedantic-errors $coin_warn_cxxflags"
+            ;;
+        esac
+
+        case $enable_doscompile in
+          mingw)
+            CXXFLAGS="-mno-cygwin"
+            AC_TRY_LINK(,[int i=0; i++;],[coin_add_cxxflags="-mno-cygwin $coin_add_cxxflags"])
+            CXXFLAGS=
+          ;;
+        esac
     esac
   fi
@@ -609 +616 @@
         case "$CXX" in
           icpc* | */icpc*)
-            coin_opt_cxxflags="-O3 -ip"
+            coin_opt_cxxflags="-O3 -ip -mp1"
             coin_add_cxxflags=""
             coin_dbg_cxxflags="-g"
@@ -628 +635 @@
           xlC* | */xlC* | mpxlC* | */mpxlC*)
             coin_opt_cxxflags="-O -qarch=auto -qcache=auto -qtune=auto -qmaxmem=-1"
-            coin_add_cxxflags="-bmaxdata:0x80000000 -qrtti=dyna -qsuppress=1500-036 -qsuppress=1500-029"
+            coin_add_cxxflags="-bmaxdata:0x80000000 -qrtti=dyna -qsuppress=1500-036 -qsuppress=1500-029 -qsourcetype=c++"
             coin_dbg_cxxflags="-g"
             ;;
@@ -757 +764 @@
     case "$CXX" in
       icpc* | */icpc*)
-        CXXLIBS=""
+        CXXLIBS="-lstdc++"
         ;;
       *)
@@ -773 +780 @@
       case "$CXX" in
       icpc* | */icpc*)
-        CXXLIBS=""
+        CXXLIBS="-lstdc++"
              ;;
       pgCC* | */pgCC*)
@@ -952 +959 @@
         coin_add_cflags="-pipe"
         coin_dbg_cflags="-g"
-        coin_warn_cflags="-pedantic-errors -Wimplicit -Wparentheses -Wsequence-point -Wreturn-type -Wcast-qual -Wall"
+        coin_warn_cflags="-Wimplicit -Wparentheses -Wsequence-point -Wreturn-type -Wcast-qual -Wall -Wno-unknown-pragmas"
+        case $build in
+          *-darwin*)
+            ;;
+          *)
+            coin_warn_cflags="-pedantic-errors $coin_warn_cflags"
+            ;;
+        esac
         case $enable_doscompile in
           mingw)
@@ -982 +996 @@
         case "$CC" in
           icc* | */icc*)
-            coin_opt_cflags="-O3 -ip"
+            coin_opt_cflags="-O3 -ip -mp1"
             coin_add_cflags=""
             coin_dbg_cflags="-g"
@@ -1184 +1198 @@
         case $F77 in
           ifort* | */ifort* | IFORT* | */IFORT* )
-            coin_opt_fflags='-O3'
-            coin_add_fflags='-fpp -nologo -MT'
-            coin_dbg_fflags='-debug'
+            coin_opt_fflags='-MT -O3'
+            coin_add_fflags='-fpp -nologo'
+            coin_dbg_fflags='-MTd -debug'
           ;;
           compile_f2c*)
@@ -1357 +1371 @@
   case $build in
   # The following is a fix to define FLIBS for ifort on Windows
+  # In its original version, it linked in libifcorert.lib or libifcorertd.lib on Windows/ifort explicitly.
+  # However, this seem to create a dependency on libifcorert.dll (or libifcorertd.dll) in the executables.
+  # This is seem to be unnecessary, libifcorert(d).lib has been removed from the link line.
      *-cygwin* | *-mingw*)
        case "$F77" in
          ifort* | */ifort* | IFORT* | */IFORT*)
-           FLIBS="-link libifcorert.lib $LIBS /NODEFAULTLIB:libc.lib";;
+           FLIBS="-link $LIBS /NODEFAULTLIB:libc.lib"
+#           if "$coin_debug_compile" = true ; then
+#             FLIBS="-link $LIBS /NODEFAULTLIB:libc.lib /NODEFAULTLIB:libcmt.lib"
+#           else
+#             FLIBS="-link $LIBS /NODEFAULTLIB:libc.lib /NODEFAULTLIB:libcmtd.lib"
+#           fi
+           ;;
          compile_f2c*)
            FLIBS=`$F77 -FLIBS` ;;
@@ -1410 +1433 @@
      fi ;;
   *-*-solaris*)
-     coin_f77_comps="f95 f90 f77 xlf fort77 gfortran g77 pgf90 pgf77 ifort ifc frt af77" ;;
-  *) coin_f77_comps="xlf fort77 gfortran f77 g77 pgf90 pgf77 ifort ifc frt af77" ;;
+     coin_f77_comps="f95 f90 f77 xlf_r fort77 gfortran g77 pgf90 pgf77 ifort ifc frt af77" ;;
+  *) coin_f77_comps="xlf_r fort77 gfortran f77 g77 pgf90 pgf77 ifort ifc frt af77" ;;
  esac
 ])
@@ -2411 +2434 @@
     $lnkcmd $srcdir/$file $file
   done
-  EXAMPLE_CLEAN_FILES='$1'
+  EXAMPLE_CLEAN_FILES="$EXAMPLE_CLEAN_FILES $1"
 else
-  EXAMPLE_CLEAN_FILES=
+  EXAMPLE_CLEAN_FILES="$EXAMPLE_CLEAN_FILES"
 fi
 
@@ -3069 +3092 @@
 MAKEOKFILE=.MakeOk
 
-AC_ARG_WITH([mumps-dir],
-            AC_HELP_STRING([--with-mumps-dir],
-                           [specify directory where MUMPS is installed]),
-            [use_mumps="$withval"], [use_mumps=no])
-
-if test "$use_mumps" != "no"; then
-  if test -d $use_mumps; then :; else
-    AC_MSG_ERROR([User provided MUMPS directory $use_mumps does not exist.])
-  fi
-  mumps_dir=`cd $use_mumps; pwd`
-
-  # library extension
-  AC_LANG_PUSH(C)
-  save_LIBS="$LIBS"
-  LIBS="$LIBS $FLIBS"
-  AC_CHECK_LIB([pthread],[pthread_create],[LIBS="-lpthread $save_LIBS"; ADDLIBS="-lpthread $ADDLIBS"],[LIBS="$save_LIBS"])
-  AC_LANG_POP(C)
-
-  case "$CC" in
-    cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
-         libe=lib ;;
-      *) libe=a ;;
-  esac
-
-  # Check if hearders are there
-  AC_COIN_CHECK_FILE([$mumps_dir/include/dmumps_c.h],
-                     [],
-                     [AC_MSG_ERROR([I cannot find headers for MUMPS])])
-  LIBS="$mumps_dir/lib/libdmumps.$libe $mumps_dir/lib/libpord.$libe $mumps_dir/libseq/libmpiseq.$libe $LIBS"
-  ADDLIBS="$mumps_dir/lib/libdmumps.$libe $mumps_dir/lib/libpord.$libe $mumps_dir/libseq/libmpiseq.$libe $ADDLIBS"
-  # Check if MUMPS actually works
-  AC_LANG_PUSH(C)
-  save_LIBS="$LIBS"
-  LIBS="$LIBS $FLIBS"
-  AC_TRY_LINK([void dmumps_c();],[dmumps_c()],[],
-              [AC_MSG_ERROR([User provided MUMPS library doesn't work])])
-  LIBS="$save_LIBS"
-  AC_LANG_POP(C)
-  coin_mumpssrcdir="$mumps_dir"
-
-else
+#check if user provides a MUMPS library (that works)
+AC_LANG_PUSH(C)
+AC_COIN_HAS_USER_LIBRARY(mumps, MUMPS, dmumps_c.h, dmumps_c)
+AC_LANG_POP(C)
+
+if test "$coin_has_mumps" = "true"; then  # user provided mumps library
+  use_mumps=yes
+  coin_has_mumps=yes
+
+  MUMPS_INCFLAGS="-I\`\$(CYGPATH_W) $MUMPSINCDIR\`"
+  ADDLIBS="$MUMPSLIB $ADDLIBS"
+
+else # no user provided library, so we try to build our own
   use_mumps=BUILD
 
@@ -3122 +3117 @@
       AC_CHECK_LIB([pthread],[pthread_create],[LIBS="-lpthread $save_LIBS"; ADDLIBS="-lpthread $ADDLIBS"],[LIBS="save_LIBS"])
       AC_LANG_POP(C)
+  
+      MUMPS_INCFLAGS="-I\`\$(CYGPATH_W) $coin_mumpssrcdir/libseq\` -I\`\$(CYGPATH_W) $coin_mumpssrcdir/include\`"
     else
       use_mumps=
     fi
   fi
+
+  # if a user provided library is used, then COIN_HAS_USER_LIBRARY takes care of the COIN_HAS_MUMPS conditional and preprocessor symbol
+  AM_CONDITIONAL([COIN_HAS_MUMPS],[test x"$use_mumps" != x])
+  if test x"$use_mumps" != x; then
+    AC_DEFINE([COIN_HAS_MUMPS],[1],[If defined, the MUMPS Library is available.])
+    coin_has_mumps=yes
+  else
+    coin_has_mumps=no
+  fi
+  AC_MSG_CHECKING([whether MUMPS is available])
+  AC_MSG_RESULT([$coin_has_mumps])
 fi
 
 if test x"$use_mumps" != x; then
-
-  # and we need the Fortran runtime libraries if we want to link with C/C++
+  # we need the Fortran runtime libraries if we want to link with C/C++
   coin_need_flibs=yes
 
-  MUMPS_INCFLAGS="-I\`\$(CYGPATH_W) $coin_mumpssrcdir/libseq\` -I\`\$(CYGPATH_W) $coin_mumpssrcdir/include\`"
   AC_SUBST(MUMPS_INCFLAGS)
 fi
 
-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
-  coin_has_mumps=no
-else
-  coin_has_mumps=yes
-  AC_DEFINE([COIN_HAS_MUMPS],[1],
-            [If defined, the MUMPS Library is available.])
-fi
-AC_MSG_RESULT([$coin_has_mumps])
 ]) # AC_COIN_HAS_MUMPS
 

trunk/compile_f2c/INSTALL

@@ -21 +21 @@
 
    In the source directory (libf2c), type 'nmake -f makefile.vc all'
+
+   If you encounter an error during the compilation of "err.c" due to
+   a missing unistd.h, edit the makefile.vc file and add -DNO_ISATTY
+   to the CFLAGS (line 9).
 
    If you encounter an error during the compilation of "arithchk.c"