Changeset 1113
- Timestamp:
- Aug 22, 2008 12:40:06 PM (13 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/coin.m4
r1082 r1113 517 517 fi ;; 518 518 *-*-solaris*) 519 comps="CC xlC aCC g++ c++ pgCC icpc gpp cxx cc++ cl FCC KCC RCC" ;;519 comps="CC xlC_r aCC g++ c++ pgCC icpc gpp cxx cc++ cl FCC KCC RCC" ;; 520 520 *-darwin*) comps="g++ c++ CC" ;; 521 *) comps="xlC aCC CC g++ c++ pgCC icpc gpp cxx cc++ cl FCC KCC RCC" ;;521 *) comps="xlC_r aCC CC g++ c++ pgCC icpc gpp cxx cc++ cl FCC KCC RCC" ;; 522 522 esac 523 523 … … 574 574 coin_add_cxxflags="-pipe" 575 575 coin_dbg_cxxflags="-g" 576 coin_warn_cxxflags="-pedantic-errors -Wimplicit -Wparentheses -Wreturn-type -Wcast-qual -Wall -Wpointer-arith -Wwrite-strings -Wconversion" 577 case $enable_doscompile in 578 mingw) 579 CXXFLAGS="-mno-cygwin" 580 AC_TRY_LINK(,[int i=0; i++;], 581 [coin_add_cxxflags="-mno-cygwin $coin_add_cxxflags"]) 582 CXXFLAGS= 583 ;; 584 esac 576 coin_warn_cxxflags="-Wimplicit -Wparentheses -Wreturn-type -Wcast-qual -Wall -Wpointer-arith -Wwrite-strings -Wconversion -Wno-unknown-pragmas" 577 case $build in 578 *-darwin*) 579 ;; 580 *) 581 coin_warn_cxxflags="-pedantic-errors $coin_warn_cxxflags" 582 ;; 583 esac 584 585 case $enable_doscompile in 586 mingw) 587 CXXFLAGS="-mno-cygwin" 588 AC_TRY_LINK(,[int i=0; i++;],[coin_add_cxxflags="-mno-cygwin $coin_add_cxxflags"]) 589 CXXFLAGS= 590 ;; 591 esac 585 592 esac 586 593 fi … … 609 616 case "$CXX" in 610 617 icpc* | */icpc*) 611 coin_opt_cxxflags="-O3 -ip "618 coin_opt_cxxflags="-O3 -ip -mp1" 612 619 coin_add_cxxflags="" 613 620 coin_dbg_cxxflags="-g" … … 628 635 xlC* | */xlC* | mpxlC* | */mpxlC*) 629 636 coin_opt_cxxflags="-O -qarch=auto -qcache=auto -qtune=auto -qmaxmem=-1" 630 coin_add_cxxflags="-bmaxdata:0x80000000 -qrtti=dyna -qsuppress=1500-036 -qsuppress=1500-029 "637 coin_add_cxxflags="-bmaxdata:0x80000000 -qrtti=dyna -qsuppress=1500-036 -qsuppress=1500-029 -qsourcetype=c++" 631 638 coin_dbg_cxxflags="-g" 632 639 ;; … … 757 764 case "$CXX" in 758 765 icpc* | */icpc*) 759 CXXLIBS=" "766 CXXLIBS="-lstdc++" 760 767 ;; 761 768 *) … … 773 780 case "$CXX" in 774 781 icpc* | */icpc*) 775 CXXLIBS=" "782 CXXLIBS="-lstdc++" 776 783 ;; 777 784 pgCC* | */pgCC*) … … 952 959 coin_add_cflags="-pipe" 953 960 coin_dbg_cflags="-g" 954 coin_warn_cflags="-pedantic-errors -Wimplicit -Wparentheses -Wsequence-point -Wreturn-type -Wcast-qual -Wall" 961 coin_warn_cflags="-Wimplicit -Wparentheses -Wsequence-point -Wreturn-type -Wcast-qual -Wall -Wno-unknown-pragmas" 962 case $build in 963 *-darwin*) 964 ;; 965 *) 966 coin_warn_cflags="-pedantic-errors $coin_warn_cflags" 967 ;; 968 esac 955 969 case $enable_doscompile in 956 970 mingw) … … 982 996 case "$CC" in 983 997 icc* | */icc*) 984 coin_opt_cflags="-O3 -ip "998 coin_opt_cflags="-O3 -ip -mp1" 985 999 coin_add_cflags="" 986 1000 coin_dbg_cflags="-g" … … 1184 1198 case $F77 in 1185 1199 ifort* | */ifort* | IFORT* | */IFORT* ) 1186 coin_opt_fflags='- O3'1187 coin_add_fflags='-fpp -nologo -MT'1188 coin_dbg_fflags='- debug'1200 coin_opt_fflags='-MT -O3' 1201 coin_add_fflags='-fpp -nologo' 1202 coin_dbg_fflags='-MTd -debug' 1189 1203 ;; 1190 1204 compile_f2c*) … … 1357 1371 case $build in 1358 1372 # The following is a fix to define FLIBS for ifort on Windows 1373 # In its original version, it linked in libifcorert.lib or libifcorertd.lib on Windows/ifort explicitly. 1374 # However, this seem to create a dependency on libifcorert.dll (or libifcorertd.dll) in the executables. 1375 # This is seem to be unnecessary, libifcorert(d).lib has been removed from the link line. 1359 1376 *-cygwin* | *-mingw*) 1360 1377 case "$F77" in 1361 1378 ifort* | */ifort* | IFORT* | */IFORT*) 1362 FLIBS="-link libifcorert.lib $LIBS /NODEFAULTLIB:libc.lib";; 1379 FLIBS="-link $LIBS /NODEFAULTLIB:libc.lib" 1380 # if "$coin_debug_compile" = true ; then 1381 # FLIBS="-link $LIBS /NODEFAULTLIB:libc.lib /NODEFAULTLIB:libcmt.lib" 1382 # else 1383 # FLIBS="-link $LIBS /NODEFAULTLIB:libc.lib /NODEFAULTLIB:libcmtd.lib" 1384 # fi 1385 ;; 1363 1386 compile_f2c*) 1364 1387 FLIBS=`$F77 -FLIBS` ;; … … 1410 1433 fi ;; 1411 1434 *-*-solaris*) 1412 coin_f77_comps="f95 f90 f77 xlf fort77 gfortran g77 pgf90 pgf77 ifort ifc frt af77" ;;1413 *) coin_f77_comps="xlf fort77 gfortran f77 g77 pgf90 pgf77 ifort ifc frt af77" ;;1435 coin_f77_comps="f95 f90 f77 xlf_r fort77 gfortran g77 pgf90 pgf77 ifort ifc frt af77" ;; 1436 *) coin_f77_comps="xlf_r fort77 gfortran f77 g77 pgf90 pgf77 ifort ifc frt af77" ;; 1414 1437 esac 1415 1438 ]) … … 2411 2434 $lnkcmd $srcdir/$file $file 2412 2435 done 2413 EXAMPLE_CLEAN_FILES= '$1'2436 EXAMPLE_CLEAN_FILES="$EXAMPLE_CLEAN_FILES $1" 2414 2437 else 2415 EXAMPLE_CLEAN_FILES= 2438 EXAMPLE_CLEAN_FILES="$EXAMPLE_CLEAN_FILES" 2416 2439 fi 2417 2440 … … 3069 3092 MAKEOKFILE=.MakeOk 3070 3093 3071 AC_ARG_WITH([mumps-dir], 3072 AC_HELP_STRING([--with-mumps-dir], 3073 [specify directory where MUMPS is installed]), 3074 [use_mumps="$withval"], [use_mumps=no]) 3075 3076 if test "$use_mumps" != "no"; then 3077 if test -d $use_mumps; then :; else 3078 AC_MSG_ERROR([User provided MUMPS directory $use_mumps does not exist.]) 3079 fi 3080 mumps_dir=`cd $use_mumps; pwd` 3081 3082 # library extension 3083 AC_LANG_PUSH(C) 3084 save_LIBS="$LIBS" 3085 LIBS="$LIBS $FLIBS" 3086 AC_CHECK_LIB([pthread],[pthread_create],[LIBS="-lpthread $save_LIBS"; ADDLIBS="-lpthread $ADDLIBS"],[LIBS="$save_LIBS"]) 3087 AC_LANG_POP(C) 3088 3089 case "$CC" in 3090 cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*) 3091 libe=lib ;; 3092 *) libe=a ;; 3093 esac 3094 3095 # Check if hearders are there 3096 AC_COIN_CHECK_FILE([$mumps_dir/include/dmumps_c.h], 3097 [], 3098 [AC_MSG_ERROR([I cannot find headers for MUMPS])]) 3099 LIBS="$mumps_dir/lib/libdmumps.$libe $mumps_dir/lib/libpord.$libe $mumps_dir/libseq/libmpiseq.$libe $LIBS" 3100 ADDLIBS="$mumps_dir/lib/libdmumps.$libe $mumps_dir/lib/libpord.$libe $mumps_dir/libseq/libmpiseq.$libe $ADDLIBS" 3101 # Check if MUMPS actually works 3102 AC_LANG_PUSH(C) 3103 save_LIBS="$LIBS" 3104 LIBS="$LIBS $FLIBS" 3105 AC_TRY_LINK([void dmumps_c();],[dmumps_c()],[], 3106 [AC_MSG_ERROR([User provided MUMPS library doesn't work])]) 3107 LIBS="$save_LIBS" 3108 AC_LANG_POP(C) 3109 coin_mumpssrcdir="$mumps_dir" 3110 3111 else 3094 #check if user provides a MUMPS library (that works) 3095 AC_LANG_PUSH(C) 3096 AC_COIN_HAS_USER_LIBRARY(mumps, MUMPS, dmumps_c.h, dmumps_c) 3097 AC_LANG_POP(C) 3098 3099 if test "$coin_has_mumps" = "true"; then # user provided mumps library 3100 use_mumps=yes 3101 coin_has_mumps=yes 3102 3103 MUMPS_INCFLAGS="-I\`\$(CYGPATH_W) $MUMPSINCDIR\`" 3104 ADDLIBS="$MUMPSLIB $ADDLIBS" 3105 3106 else # no user provided library, so we try to build our own 3112 3107 use_mumps=BUILD 3113 3108 … … 3122 3117 AC_CHECK_LIB([pthread],[pthread_create],[LIBS="-lpthread $save_LIBS"; ADDLIBS="-lpthread $ADDLIBS"],[LIBS="save_LIBS"]) 3123 3118 AC_LANG_POP(C) 3119 3120 MUMPS_INCFLAGS="-I\`\$(CYGPATH_W) $coin_mumpssrcdir/libseq\` -I\`\$(CYGPATH_W) $coin_mumpssrcdir/include\`" 3124 3121 else 3125 3122 use_mumps= 3126 3123 fi 3127 3124 fi 3125 3126 # if a user provided library is used, then COIN_HAS_USER_LIBRARY takes care of the COIN_HAS_MUMPS conditional and preprocessor symbol 3127 AM_CONDITIONAL([COIN_HAS_MUMPS],[test x"$use_mumps" != x]) 3128 if test x"$use_mumps" != x; then 3129 AC_DEFINE([COIN_HAS_MUMPS],[1],[If defined, the MUMPS Library is available.]) 3130 coin_has_mumps=yes 3131 else 3132 coin_has_mumps=no 3133 fi 3134 AC_MSG_CHECKING([whether MUMPS is available]) 3135 AC_MSG_RESULT([$coin_has_mumps]) 3128 3136 fi 3129 3137 3130 3138 if test x"$use_mumps" != x; then 3131 3132 # and we need the Fortran runtime libraries if we want to link with C/C++ 3139 # we need the Fortran runtime libraries if we want to link with C/C++ 3133 3140 coin_need_flibs=yes 3134 3141 3135 MUMPS_INCFLAGS="-I\`\$(CYGPATH_W) $coin_mumpssrcdir/libseq\` -I\`\$(CYGPATH_W) $coin_mumpssrcdir/include\`"3136 3142 AC_SUBST(MUMPS_INCFLAGS) 3137 3143 fi 3138 3144 3139 AM_CONDITIONAL([COIN_HAS_MUMPS],[test x"$use_mumps" != x])3140 3145 AM_CONDITIONAL([COIN_BUILD_MUMPS],[test "$use_mumps" = BUILD]) 3141 3146 3142 AC_MSG_CHECKING([whether MUMPS is available])3143 3144 if test x"$use_mumps" = x || test "$use_mumps" = no; then3145 coin_has_mumps=no3146 else3147 coin_has_mumps=yes3148 AC_DEFINE([COIN_HAS_MUMPS],[1],3149 [If defined, the MUMPS Library is available.])3150 fi3151 AC_MSG_RESULT([$coin_has_mumps])3152 3147 ]) # AC_COIN_HAS_MUMPS 3153 3148 -
trunk/compile_f2c/INSTALL
r585 r1113 21 21 22 22 In the source directory (libf2c), type 'nmake -f makefile.vc all' 23 24 If you encounter an error during the compilation of "err.c" due to 25 a missing unistd.h, edit the makefile.vc file and add -DNO_ISATTY 26 to the CFLAGS (line 9). 23 27 24 28 If you encounter an error during the compilation of "arithchk.c"
Note: See TracChangeset
for help on using the changeset viewer.