Changeset 905


Ignore:
Timestamp:
Jan 7, 2008 9:58:10 AM (12 years ago)
Author:
andreasw
Message:

synchronized stable/0.5 with trunk rev 904

Location:
stable/0.5
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • stable/0.5/Makemain.inc

    r862 r905  
    1 # Copyright (C) 2006 International Business Machines and others.
     1# Copyright (C) 2006, 2007 International Business Machines and others.
    22# All Rights Reserved.
    33# This file is distributed under the Common Public License.
     
    1212
    1313DocFiles =  README AUTHORS LICENSE
    14 DocInstallDir = $(prefix)/share/doc/$(PACKAGE_NAME)
     14DocInstallDir = $(prefix)/share/doc/coin/$(PACKAGE_NAME)
    1515
    16 install-doc:
     16install-doc: $(DocFiles)
    1717        test -z "$(DocInstallDir)" || $(mkdir_p) "$(DESTDIR)$(DocInstallDir)"
    1818        for file in $(DocFiles); do \
  • stable/0.5/coin.m4

    r799 r905  
    457457                  [Under Cygwin, compile so that executables run under DOS.
    458458                   Set to mingw to use gcc/g++/ld with -mno-cygwin.
    459                    Set to msvc to use cl/link.
     459                   Set to msvc to use cl/link (or icl/link).
    460460                   Default when mentioned: mingw.
    461461                   Default when not mentioned: disabled.])],
     
    512512  *-cygwin* | *-mingw*)
    513513             if test "$enable_doscompile" = msvc ; then
    514                comps="cl"
     514               comps="icl cl"
    515515             else
    516516               comps="g++ cl"
     
    533533# It seems that we need to cleanup something here for the Windows
    534534case "$CXX" in
    535   cl* | */cl* | CL* | */CL* )
     535  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    536536    sed -e 's/^void exit (int);//' confdefs.h >> confdefs.hh
    537537    mv confdefs.hh confdefs.h
     
    597597            coin_add_cxxflags='-nologo -EHsc -GR -wd4996 -D_CRT_SECURE_NO_DEPRECATE'
    598598            coin_dbg_cxxflags='-MTd'
     599            ;;
     600          icl* | */icl* | ICL* | */ICL*)
     601            # The MT and MTd options are mutually exclusive
     602            coin_opt_cxxflags='-MT -Ox'
     603            coin_add_cxxflags='-nologo -EHsc -GR -D_CRT_SECURE_NO_DEPRECATE'
     604            coin_dbg_cxxflags='-MTd -debug'
    599605            ;;
    600606        esac
     
    863869if test x"$CXX" != x; then
    864870  case "$CXX" in
    865     cl* | */cl* | CL* | */CL*)
     871    cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    866872      if test x"$CC" = x; then
    867873        CC="$CXX"
     
    889895  *-cygwin* | *-mingw*)
    890896             if test "$enable_doscompile" = msvc ; then
    891                comps="cl"
     897               comps="icl cl"
    892898             else
    893899               comps="gcc cl"
     
    965971            coin_add_cflags='-nologo -wd4996 -D_CRT_SECURE_NO_DEPRECATE'
    966972            coin_dbg_cflags='-MTd'
     973            ;;
     974          icl* | */icl* | ICL* | */ICL*)
     975            coin_opt_cflags='-MT -Ox'
     976            coin_add_cflags='-nologo -D_CRT_SECURE_NO_DEPRECATE'
     977            coin_dbg_cflags='-MTd -debug'
    967978            ;;
    968979        esac
     
    10901101# Correct ADDLIBS initialization if we are using the MS compiler
    10911102case "$CC" in
    1092   cl* | */cl* | CL* | */CL*)
     1103  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    10931104    ADDLIBS=
    10941105    AC_COIN_MINGW_LD_FIX
     
    17981809AC_DEFUN([AC_COIN_PATCH_LIBTOOL_CYGWIN],
    17991810[ case "$CXX" in
    1800     cl* | */cl* | CL* | */CL*)
     1811    cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    18011812      AC_MSG_NOTICE(Applying patches to libtool for cl compiler)
    18021813      sed -e 's|fix_srcfile_path=\"`cygpath -w \"\$srcfile\"`\"|fix_srcfile_path=\"\\\`'"$CYGPATH_W"' \\\"\\$srcfile\\\"\\\`\"|' \
     
    20322043fi
    20332044case "$CC" in
    2034   cl* | */cl* | CL* | */CL*)
     2045  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    20352046    coin_link_input_cmd=cp ;;
    20362047esac
     
    20622073  AC_SUBST(LIBEXT)
    20632074  case "$CC" in
    2064     cl* | */cl* | CL* | */CL*)
     2075    cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    20652076         LIBEXT=lib ;;
    20662077      *) LIBEXT=a ;;
     
    23772388  fi
    23782389  case "$CC" in
    2379     cl* | */cl* | CL* | */CL*)
     2390    cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    23802391      lnkcmd=cp ;;
    23812392  esac
     
    26222633# Determine the name of the ASL library
    26232634case "$CC" in
    2624   cl* | */cl* | CL* | */CL*)
     2635  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    26252636    ampllib=amplsolv.lib ;;
    26262637  *)
     
    28382849                         LIBS="$SAVE_LIBS"])
    28392850      ;;
     2851    *-cygwin* | *-mingw*)
    28402852# On cygwin, consider -lblas only if doscompile is disabled. The prebuilt
    28412853# library will want to link with cygwin, hence won't run standalone in DOS.
    2842     *-cygwin*)
    28432854      if test "$enable_doscompile" = mingw; then
    28442855        skip_lblas_check=yes
    28452856      fi
     2857      case "$CC" in
     2858        cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
     2859          SAVE_LIBS="$LIBS"
     2860          AC_MSG_CHECKING([for BLAS in MKL])
     2861          LIBS="mkl_intel_c.lib mkl_sequential.lib mkl_core.lib $LIBS"
     2862          AC_COIN_TRY_FLINK([daxpy],
     2863                            [AC_MSG_RESULT([yes])
     2864                             use_blas='mkl_intel_c.lib mkl_sequential.lib mkl_core.lib'
     2865                             ADDLIBS="mkl_intel_c.lib mkl_sequential.lib mkl_core.lib $ADDLIBS"],
     2866                            [AC_MSG_RESULT([no])
     2867                             LIBS="$SAVE_LIBS"])
     2868          ;;
     2869      esac
    28462870      ;;
    28472871  esac
     
    30533077
    30543078  case "$CC" in
    3055     cl* | */cl* | CL* | */CL*)
     3079    cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    30563080         libe=lib ;;
    30573081      *) libe=a ;;
  • stable/0.5/headers/configall_system_msc.h

    r833 r905  
    1212#define SIZEOF_SIZE_T 4
    1313#define SIZEOF_VOID_P 4
     14#define COINUTILS_MEMPOOL_MAXPOOLED -1
    1415
    1516/* Define to integer type capturing pointer */
Note: See TracChangeset for help on using the changeset viewer.