Changeset 900 for ThirdParty/ASL/trunk


Ignore:
Timestamp:
Jan 5, 2008 7:43:27 PM (12 years ago)
Author:
andreasw
Message:

allow Intel icl compiler

Location:
ThirdParty/ASL/trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/ASL/trunk/Makefile.in

    r870 r900  
    1919# This file is distributed under the Common Public License.
    2020
    21 # Copyright (C) 2006 International Business Machines and others.
     21# Copyright (C) 2006, 2007 International Business Machines and others.
    2222# All Rights Reserved.
    2323# This file is distributed under the Common Public License.
     
    239239DISTCLEANFILES = $(MAKEOKFILE) $(am__append_2) $(VPATH_DISTCLEANFILES)
    240240DocFiles = README AUTHORS LICENSE
    241 DocInstallDir = $(prefix)/share/doc/$(PACKAGE_NAME)
     241DocInstallDir = $(prefix)/share/doc/coin/$(PACKAGE_NAME)
    242242all: all-am
    243243
     
    525525stdio1.h arith.h funcadd0.$(OBJEXT): $(libampl)
    526526
    527 install-doc:
     527install-doc: $(DocFiles)
    528528        test -z "$(DocInstallDir)" || $(mkdir_p) "$(DESTDIR)$(DocInstallDir)"
    529529        for file in $(DocFiles); do \
  • ThirdParty/ASL/trunk/compile_MS_ASL.in

    r725 r900  
    2525
    2626# Acquire the cl version and create details.c
     27# (This is not doing to right thing if we are using the Microsoft compiler)
    2728
    2829clver=`cl 2>&1 | egrep '^Microsoft' | sed -e 's/.*Version \(.*\)/\1/'`
     
    5152libampl=@AMPLSOLVER_A@
    5253MAKEFLAGS=
    53 nmake -f makefile.coin @ASLMAKEFLAGS@
     54nmake -f makefile.coin @ASLMAKEFLAGS@ CC="@CC@"
    5455mv amplsolv.lib ../$libampl
    5556mv stdio1.h arith.h funcadd0.obj ..
  • ThirdParty/ASL/trunk/configure

    r782 r900  
    10631063  --enable-doscompile     Under Cygwin, compile so that executables run under
    10641064                          DOS. Set to mingw to use gcc/g++/ld with
    1065                           -mno-cygwin. Set to msvc to use cl/link. Default
    1066                           when mentioned: mingw. Default when not mentioned:
    1067                           disabled.
     1065                          -mno-cygwin. Set to msvc to use cl/link (or
     1066                          icl/link). Default when mentioned: mingw. Default
     1067                          when not mentioned: disabled.
    10681068  --enable-static[=PKGS]
    10691069                          build static libraries [default=no]
     
    18641864if test x"$CXX" != x; then
    18651865  case "$CXX" in
    1866     cl* | */cl* | CL* | */CL*)
     1866    cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    18671867      if test x"$CC" = x; then
    18681868        CC="$CXX"
     
    18911891  *-cygwin* | *-mingw*)
    18921892             if test "$enable_doscompile" = msvc ; then
    1893                comps="cl"
     1893               comps="icl cl"
    18941894             else
    18951895               comps="gcc cl"
     
    27772777            coin_dbg_cflags='-MTd'
    27782778            ;;
     2779          icl* | */icl* | ICL* | */ICL*)
     2780            coin_opt_cflags='-MT -Ox'
     2781            coin_add_cflags='-nologo -D_CRT_SECURE_NO_DEPRECATE'
     2782            coin_dbg_cflags='-MTd -debug'
     2783            ;;
    27792784        esac
    27802785        ;;
     
    30833088# Correct ADDLIBS initialization if we are using the MS compiler
    30843089case "$CC" in
    3085   cl* | */cl* | CL* | */CL*)
     3090  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    30863091    ADDLIBS=
    30873092    case $build in
     
    47084713*-*-irix6*)
    47094714  # Find out which ABI we are using.
    4710   echo '#line 4710 "configure"' > conftest.$ac_ext
     4715  echo '#line 4715 "configure"' > conftest.$ac_ext
    47114716  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    47124717  (eval $ac_compile) 2>&5
     
    63076312
    63086313# Provide some information about the compiler.
    6309 echo "$as_me:6309:" \
     6314echo "$as_me:6314:" \
    63106315     "checking for Fortran 77 compiler version" >&5
    63116316ac_compiler=`set X $ac_compile; echo $2`
     
    73747379   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    73757380   -e 's:$: $lt_compiler_flag:'`
    7376    (eval echo "\"\$as_me:7376: $lt_compile\"" >&5)
     7381   (eval echo "\"\$as_me:7381: $lt_compile\"" >&5)
    73777382   (eval "$lt_compile" 2>conftest.err)
    73787383   ac_status=$?
    73797384   cat conftest.err >&5
    7380    echo "$as_me:7380: \$? = $ac_status" >&5
     7385   echo "$as_me:7385: \$? = $ac_status" >&5
    73817386   if (exit $ac_status) && test -s "$ac_outfile"; then
    73827387     # The compiler can only warn and ignore the option if not recognized
     
    76427647   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    76437648   -e 's:$: $lt_compiler_flag:'`
    7644    (eval echo "\"\$as_me:7644: $lt_compile\"" >&5)
     7649   (eval echo "\"\$as_me:7649: $lt_compile\"" >&5)
    76457650   (eval "$lt_compile" 2>conftest.err)
    76467651   ac_status=$?
    76477652   cat conftest.err >&5
    7648    echo "$as_me:7648: \$? = $ac_status" >&5
     7653   echo "$as_me:7653: \$? = $ac_status" >&5
    76497654   if (exit $ac_status) && test -s "$ac_outfile"; then
    76507655     # The compiler can only warn and ignore the option if not recognized
     
    77467751   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    77477752   -e 's:$: $lt_compiler_flag:'`
    7748    (eval echo "\"\$as_me:7748: $lt_compile\"" >&5)
     7753   (eval echo "\"\$as_me:7753: $lt_compile\"" >&5)
    77497754   (eval "$lt_compile" 2>out/conftest.err)
    77507755   ac_status=$?
    77517756   cat out/conftest.err >&5
    7752    echo "$as_me:7752: \$? = $ac_status" >&5
     7757   echo "$as_me:7757: \$? = $ac_status" >&5
    77537758   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    77547759   then
     
    1009110096  lt_status=$lt_dlunknown
    1009210097  cat > conftest.$ac_ext <<EOF
    10093 #line 10093 "configure"
     10098#line 10098 "configure"
    1009410099#include "confdefs.h"
    1009510100
     
    1019110196  lt_status=$lt_dlunknown
    1019210197  cat > conftest.$ac_ext <<EOF
    10193 #line 10193 "configure"
     10198#line 10198 "configure"
    1019410199#include "confdefs.h"
    1019510200
     
    1253512540   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1253612541   -e 's:$: $lt_compiler_flag:'`
    12537    (eval echo "\"\$as_me:12537: $lt_compile\"" >&5)
     12542   (eval echo "\"\$as_me:12542: $lt_compile\"" >&5)
    1253812543   (eval "$lt_compile" 2>conftest.err)
    1253912544   ac_status=$?
    1254012545   cat conftest.err >&5
    12541    echo "$as_me:12541: \$? = $ac_status" >&5
     12546   echo "$as_me:12546: \$? = $ac_status" >&5
    1254212547   if (exit $ac_status) && test -s "$ac_outfile"; then
    1254312548     # The compiler can only warn and ignore the option if not recognized
     
    1263912644   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1264012645   -e 's:$: $lt_compiler_flag:'`
    12641    (eval echo "\"\$as_me:12641: $lt_compile\"" >&5)
     12646   (eval echo "\"\$as_me:12646: $lt_compile\"" >&5)
    1264212647   (eval "$lt_compile" 2>out/conftest.err)
    1264312648   ac_status=$?
    1264412649   cat out/conftest.err >&5
    12645    echo "$as_me:12645: \$? = $ac_status" >&5
     12650   echo "$as_me:12650: \$? = $ac_status" >&5
    1264612651   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1264712652   then
     
    1420914214   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1421014215   -e 's:$: $lt_compiler_flag:'`
    14211    (eval echo "\"\$as_me:14211: $lt_compile\"" >&5)
     14216   (eval echo "\"\$as_me:14216: $lt_compile\"" >&5)
    1421214217   (eval "$lt_compile" 2>conftest.err)
    1421314218   ac_status=$?
    1421414219   cat conftest.err >&5
    14215    echo "$as_me:14215: \$? = $ac_status" >&5
     14220   echo "$as_me:14220: \$? = $ac_status" >&5
    1421614221   if (exit $ac_status) && test -s "$ac_outfile"; then
    1421714222     # The compiler can only warn and ignore the option if not recognized
     
    1431314318   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1431414319   -e 's:$: $lt_compiler_flag:'`
    14315    (eval echo "\"\$as_me:14315: $lt_compile\"" >&5)
     14320   (eval echo "\"\$as_me:14320: $lt_compile\"" >&5)
    1431614321   (eval "$lt_compile" 2>out/conftest.err)
    1431714322   ac_status=$?
    1431814323   cat out/conftest.err >&5
    14319    echo "$as_me:14319: \$? = $ac_status" >&5
     14324   echo "$as_me:14324: \$? = $ac_status" >&5
    1432014325   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1432114326   then
     
    1652016525   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1652116526   -e 's:$: $lt_compiler_flag:'`
    16522    (eval echo "\"\$as_me:16522: $lt_compile\"" >&5)
     16527   (eval echo "\"\$as_me:16527: $lt_compile\"" >&5)
    1652316528   (eval "$lt_compile" 2>conftest.err)
    1652416529   ac_status=$?
    1652516530   cat conftest.err >&5
    16526    echo "$as_me:16526: \$? = $ac_status" >&5
     16531   echo "$as_me:16531: \$? = $ac_status" >&5
    1652716532   if (exit $ac_status) && test -s "$ac_outfile"; then
    1652816533     # The compiler can only warn and ignore the option if not recognized
     
    1678816793   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1678916794   -e 's:$: $lt_compiler_flag:'`
    16790    (eval echo "\"\$as_me:16790: $lt_compile\"" >&5)
     16795   (eval echo "\"\$as_me:16795: $lt_compile\"" >&5)
    1679116796   (eval "$lt_compile" 2>conftest.err)
    1679216797   ac_status=$?
    1679316798   cat conftest.err >&5
    16794    echo "$as_me:16794: \$? = $ac_status" >&5
     16799   echo "$as_me:16799: \$? = $ac_status" >&5
    1679516800   if (exit $ac_status) && test -s "$ac_outfile"; then
    1679616801     # The compiler can only warn and ignore the option if not recognized
     
    1689216897   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1689316898   -e 's:$: $lt_compiler_flag:'`
    16894    (eval echo "\"\$as_me:16894: $lt_compile\"" >&5)
     16899   (eval echo "\"\$as_me:16899: $lt_compile\"" >&5)
    1689516900   (eval "$lt_compile" 2>out/conftest.err)
    1689616901   ac_status=$?
    1689716902   cat out/conftest.err >&5
    16898    echo "$as_me:16898: \$? = $ac_status" >&5
     16903   echo "$as_me:16903: \$? = $ac_status" >&5
    1689916904   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1690016905   then
     
    1963219637    *-cygwin* | *-mingw*)
    1963319638       case "$CXX" in
    19634     cl* | */cl* | CL* | */CL*)
     19639    cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    1963519640      { echo "$as_me:$LINENO: Applying patches to libtool for cl compiler" >&5
    1963619641echo "$as_me: Applying patches to libtool for cl compiler" >&6;}
     
    1978619791# Determine the name of the ASL library
    1978719792case "$CC" in
    19788   cl* | */cl* | CL* | */CL*)
     19793  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    1978919794    ampllib=amplsolv.lib ;;
    1979019795  *)
     
    1999920004  AMPLSOLVER_A=$ampllib
    2000020005  case "$CC" in
    20001     cl* | */cl* | CL* | */CL*)
     20006    cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    2000220007      msvc_compile=yes ;;
    2000320008    *)
     
    2025020255fi
    2025120256case "$CC" in
    20252   cl* | */cl* | CL* | */CL*)
     20257  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    2025320258    coin_link_input_cmd=cp ;;
    2025420259esac
     
    2026820273
    2026920274  case "$CC" in
    20270     cl* | */cl* | CL* | */CL*)
     20275    cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    2027120276         LIBEXT=lib ;;
    2027220277      *) LIBEXT=a ;;
  • ThirdParty/ASL/trunk/configure.ac

    r725 r900  
    8686  AMPLSOLVER_A=$ampllib
    8787  case "$CC" in
    88     cl* | */cl* | CL* | */CL*)
     88    cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    8989      msvc_compile=yes ;;
    9090    *)
Note: See TracChangeset for help on using the changeset viewer.