Changeset 902


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

reran autotools with latest updates (for Intel icl compiler)

Location:
ThirdParty/Mumps/trunk
Files:
2 edited

Legend:

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

    r875 r902  
    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.
     
    310310DISTCLEANFILES = $(MAKEOKFILE) $(am__append_2) $(VPATH_DISTCLEANFILES)
    311311DocFiles = README AUTHORS LICENSE
    312 DocInstallDir = $(prefix)/share/doc/$(PACKAGE_NAME)
     312DocInstallDir = $(prefix)/share/doc/coin/$(PACKAGE_NAME)
    313313all: all-am
    314314
     
    821821dmumps_part5.lo dmumps_part6.lo dmumps_part7.lo dmumps_part8.lo: dmumps_ooc.lo
    822822
    823 install-doc:
     823install-doc: $(DocFiles)
    824824        test -z "$(DocInstallDir)" || $(mkdir_p) "$(DESTDIR)$(DocInstallDir)"
    825825        for file in $(DocFiles); do \
  • ThirdParty/Mumps/trunk/configure

    r805 r902  
    10751075  --enable-doscompile     Under Cygwin, compile so that executables run under
    10761076                          DOS. Set to mingw to use gcc/g++/ld with
    1077                           -mno-cygwin. Set to msvc to use cl/link. Default
    1078                           when mentioned: mingw. Default when not mentioned:
    1079                           disabled.
     1077                          -mno-cygwin. Set to msvc to use cl/link (or
     1078                          icl/link). Default when mentioned: mingw. Default
     1079                          when not mentioned: disabled.
    10801080  --enable-static[=PKGS]
    10811081                          build static libraries [default=no]
     
    18481848if test x"$CXX" != x; then
    18491849  case "$CXX" in
    1850     cl* | */cl* | CL* | */CL*)
     1850    cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    18511851      if test x"$CC" = x; then
    18521852        CC="$CXX"
     
    18751875  *-cygwin* | *-mingw*)
    18761876             if test "$enable_doscompile" = msvc ; then
    1877                comps="cl"
     1877               comps="icl cl"
    18781878             else
    18791879               comps="gcc cl"
     
    27612761            coin_dbg_cflags='-MTd'
    27622762            ;;
     2763          icl* | */icl* | ICL* | */ICL*)
     2764            coin_opt_cflags='-MT -Ox'
     2765            coin_add_cflags='-nologo -D_CRT_SECURE_NO_DEPRECATE'
     2766            coin_dbg_cflags='-MTd -debug'
     2767            ;;
    27632768        esac
    27642769        ;;
     
    30673072# Correct ADDLIBS initialization if we are using the MS compiler
    30683073case "$CC" in
    3069   cl* | */cl* | CL* | */CL*)
     3074  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    30703075    ADDLIBS=
    30713076    case $build in
     
    32763281
    32773282# Provide some information about the compiler.
    3278 echo "$as_me:3278:" \
     3283echo "$as_me:3283:" \
    32793284     "checking for Fortran 77 compiler version" >&5
    32803285ac_compiler=`set X $ac_compile; echo $2`
     
    38443849ac_save_FFLAGS=$FFLAGS
    38453850FFLAGS="$FFLAGS $ac_verb"
    3846 (eval echo $as_me:3846: \"$ac_link\") >&5
     3851(eval echo $as_me:3851: \"$ac_link\") >&5
    38473852ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
    38483853echo "$ac_f77_v_output" >&5
     
    39223927ac_save_FFLAGS=$FFLAGS
    39233928FFLAGS="$FFLAGS $ac_cv_prog_f77_v"
    3924 (eval echo $as_me:3924: \"$ac_link\") >&5
     3929(eval echo $as_me:3929: \"$ac_link\") >&5
    39253930ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
    39263931echo "$ac_f77_v_output" >&5
     
    63146319*-*-irix6*)
    63156320  # Find out which ABI we are using.
    6316   echo '#line 6316 "configure"' > conftest.$ac_ext
     6321  echo '#line 6321 "configure"' > conftest.$ac_ext
    63176322  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    63186323  (eval $ac_compile) 2>&5
     
    87918796   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    87928797   -e 's:$: $lt_compiler_flag:'`
    8793    (eval echo "\"\$as_me:8793: $lt_compile\"" >&5)
     8798   (eval echo "\"\$as_me:8798: $lt_compile\"" >&5)
    87948799   (eval "$lt_compile" 2>conftest.err)
    87958800   ac_status=$?
    87968801   cat conftest.err >&5
    8797    echo "$as_me:8797: \$? = $ac_status" >&5
     8802   echo "$as_me:8802: \$? = $ac_status" >&5
    87988803   if (exit $ac_status) && test -s "$ac_outfile"; then
    87998804     # The compiler can only warn and ignore the option if not recognized
     
    90599064   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    90609065   -e 's:$: $lt_compiler_flag:'`
    9061    (eval echo "\"\$as_me:9061: $lt_compile\"" >&5)
     9066   (eval echo "\"\$as_me:9066: $lt_compile\"" >&5)
    90629067   (eval "$lt_compile" 2>conftest.err)
    90639068   ac_status=$?
    90649069   cat conftest.err >&5
    9065    echo "$as_me:9065: \$? = $ac_status" >&5
     9070   echo "$as_me:9070: \$? = $ac_status" >&5
    90669071   if (exit $ac_status) && test -s "$ac_outfile"; then
    90679072     # The compiler can only warn and ignore the option if not recognized
     
    91639168   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    91649169   -e 's:$: $lt_compiler_flag:'`
    9165    (eval echo "\"\$as_me:9165: $lt_compile\"" >&5)
     9170   (eval echo "\"\$as_me:9170: $lt_compile\"" >&5)
    91669171   (eval "$lt_compile" 2>out/conftest.err)
    91679172   ac_status=$?
    91689173   cat out/conftest.err >&5
    9169    echo "$as_me:9169: \$? = $ac_status" >&5
     9174   echo "$as_me:9174: \$? = $ac_status" >&5
    91709175   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    91719176   then
     
    1158011585  lt_status=$lt_dlunknown
    1158111586  cat > conftest.$ac_ext <<EOF
    11582 #line 11582 "configure"
     11587#line 11587 "configure"
    1158311588#include "confdefs.h"
    1158411589
     
    1168011685  lt_status=$lt_dlunknown
    1168111686  cat > conftest.$ac_ext <<EOF
    11682 #line 11682 "configure"
     11687#line 11687 "configure"
    1168311688#include "confdefs.h"
    1168411689
     
    1404014045   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1404114046   -e 's:$: $lt_compiler_flag:'`
    14042    (eval echo "\"\$as_me:14042: $lt_compile\"" >&5)
     14047   (eval echo "\"\$as_me:14047: $lt_compile\"" >&5)
    1404314048   (eval "$lt_compile" 2>conftest.err)
    1404414049   ac_status=$?
    1404514050   cat conftest.err >&5
    14046    echo "$as_me:14046: \$? = $ac_status" >&5
     14051   echo "$as_me:14051: \$? = $ac_status" >&5
    1404714052   if (exit $ac_status) && test -s "$ac_outfile"; then
    1404814053     # The compiler can only warn and ignore the option if not recognized
     
    1414414149   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1414514150   -e 's:$: $lt_compiler_flag:'`
    14146    (eval echo "\"\$as_me:14146: $lt_compile\"" >&5)
     14151   (eval echo "\"\$as_me:14151: $lt_compile\"" >&5)
    1414714152   (eval "$lt_compile" 2>out/conftest.err)
    1414814153   ac_status=$?
    1414914154   cat out/conftest.err >&5
    14150    echo "$as_me:14150: \$? = $ac_status" >&5
     14155   echo "$as_me:14155: \$? = $ac_status" >&5
    1415114156   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1415214157   then
     
    1571415719   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1571515720   -e 's:$: $lt_compiler_flag:'`
    15716    (eval echo "\"\$as_me:15716: $lt_compile\"" >&5)
     15721   (eval echo "\"\$as_me:15721: $lt_compile\"" >&5)
    1571715722   (eval "$lt_compile" 2>conftest.err)
    1571815723   ac_status=$?
    1571915724   cat conftest.err >&5
    15720    echo "$as_me:15720: \$? = $ac_status" >&5
     15725   echo "$as_me:15725: \$? = $ac_status" >&5
    1572115726   if (exit $ac_status) && test -s "$ac_outfile"; then
    1572215727     # The compiler can only warn and ignore the option if not recognized
     
    1581815823   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1581915824   -e 's:$: $lt_compiler_flag:'`
    15820    (eval echo "\"\$as_me:15820: $lt_compile\"" >&5)
     15825   (eval echo "\"\$as_me:15825: $lt_compile\"" >&5)
    1582115826   (eval "$lt_compile" 2>out/conftest.err)
    1582215827   ac_status=$?
    1582315828   cat out/conftest.err >&5
    15824    echo "$as_me:15824: \$? = $ac_status" >&5
     15829   echo "$as_me:15829: \$? = $ac_status" >&5
    1582515830   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1582615831   then
     
    1802518030   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1802618031   -e 's:$: $lt_compiler_flag:'`
    18027    (eval echo "\"\$as_me:18027: $lt_compile\"" >&5)
     18032   (eval echo "\"\$as_me:18032: $lt_compile\"" >&5)
    1802818033   (eval "$lt_compile" 2>conftest.err)
    1802918034   ac_status=$?
    1803018035   cat conftest.err >&5
    18031    echo "$as_me:18031: \$? = $ac_status" >&5
     18036   echo "$as_me:18036: \$? = $ac_status" >&5
    1803218037   if (exit $ac_status) && test -s "$ac_outfile"; then
    1803318038     # The compiler can only warn and ignore the option if not recognized
     
    1829318298   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1829418299   -e 's:$: $lt_compiler_flag:'`
    18295    (eval echo "\"\$as_me:18295: $lt_compile\"" >&5)
     18300   (eval echo "\"\$as_me:18300: $lt_compile\"" >&5)
    1829618301   (eval "$lt_compile" 2>conftest.err)
    1829718302   ac_status=$?
    1829818303   cat conftest.err >&5
    18299    echo "$as_me:18299: \$? = $ac_status" >&5
     18304   echo "$as_me:18304: \$? = $ac_status" >&5
    1830018305   if (exit $ac_status) && test -s "$ac_outfile"; then
    1830118306     # The compiler can only warn and ignore the option if not recognized
     
    1839718402   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1839818403   -e 's:$: $lt_compiler_flag:'`
    18399    (eval echo "\"\$as_me:18399: $lt_compile\"" >&5)
     18404   (eval echo "\"\$as_me:18404: $lt_compile\"" >&5)
    1840018405   (eval "$lt_compile" 2>out/conftest.err)
    1840118406   ac_status=$?
    1840218407   cat out/conftest.err >&5
    18403    echo "$as_me:18403: \$? = $ac_status" >&5
     18408   echo "$as_me:18408: \$? = $ac_status" >&5
    1840418409   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1840518410   then
     
    2115321158    *-cygwin* | *-mingw*)
    2115421159       case "$CXX" in
    21155     cl* | */cl* | CL* | */CL*)
     21160    cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    2115621161      { echo "$as_me:$LINENO: Applying patches to libtool for cl compiler" >&5
    2115721162echo "$as_me: Applying patches to libtool for cl compiler" >&6;}
     
    2142421429
    2142521430  case "$CC" in
    21426     cl* | */cl* | CL* | */CL*)
     21431    cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    2142721432         libe=lib ;;
    2142821433      *) libe=a ;;
     
    2176521770fi
    2176621771case "$CC" in
    21767   cl* | */cl* | CL* | */CL*)
     21772  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    2176821773    coin_link_input_cmd=cp ;;
    2176921774esac
     
    2178321788
    2178421789  case "$CC" in
    21785     cl* | */cl* | CL* | */CL*)
     21790    cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    2178621791         LIBEXT=lib ;;
    2178721792      *) LIBEXT=a ;;
Note: See TracChangeset for help on using the changeset viewer.