Changeset 933 for ThirdParty


Ignore:
Timestamp:
Jan 30, 2008 6:12:35 PM (12 years ago)
Author:
andreasw
Message:

synchornize stable/1.0 with trunk rev 904

Location:
ThirdParty/HSL/stable/1.0
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/HSL/stable/1.0/Makefile.in

    r867 r933  
    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.
     
    272272DISTCLEANFILES = $(am__append_6) $(VPATH_DISTCLEANFILES)
    273273DocFiles = README AUTHORS LICENSE
    274 DocInstallDir = $(prefix)/share/doc/$(PACKAGE_NAME)
     274DocInstallDir = $(prefix)/share/doc/coin/$(PACKAGE_NAME)
    275275all: all-am
    276276
     
    643643
    644644
    645 install-doc:
     645install-doc: $(DocFiles)
    646646        test -z "$(DocInstallDir)" || $(mkdir_p) "$(DESTDIR)$(DocInstallDir)"
    647647        for file in $(DocFiles); do \
  • ThirdParty/HSL/stable/1.0/configure

    r886 r933  
    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]
     
    18471847if test x"$CXX" != x; then
    18481848  case "$CXX" in
    1849     cl* | */cl* | CL* | */CL*)
     1849    cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    18501850      if test x"$CC" = x; then
    18511851        CC="$CXX"
     
    18741874  *-cygwin* | *-mingw*)
    18751875             if test "$enable_doscompile" = msvc ; then
    1876                comps="cl"
     1876               comps="icl cl"
    18771877             else
    18781878               comps="gcc cl"
     
    27602760            coin_dbg_cflags='-MTd'
    27612761            ;;
     2762          icl* | */icl* | ICL* | */ICL*)
     2763            coin_opt_cflags='-MT -Ox'
     2764            coin_add_cflags='-nologo -D_CRT_SECURE_NO_DEPRECATE'
     2765            coin_dbg_cflags='-MTd -debug'
     2766            ;;
    27622767        esac
    27632768        ;;
     
    30663071# Correct ADDLIBS initialization if we are using the MS compiler
    30673072case "$CC" in
    3068   cl* | */cl* | CL* | */CL*)
     3073  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    30693074    ADDLIBS=
    30703075    case $build in
     
    32753280
    32763281# Provide some information about the compiler.
    3277 echo "$as_me:3277:" \
     3282echo "$as_me:3282:" \
    32783283     "checking for Fortran 77 compiler version" >&5
    32793284ac_compiler=`set X $ac_compile; echo $2`
     
    54165421*-*-irix6*)
    54175422  # Find out which ABI we are using.
    5418   echo '#line 5418 "configure"' > conftest.$ac_ext
     5423  echo '#line 5423 "configure"' > conftest.$ac_ext
    54195424  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    54205425  (eval $ac_compile) 2>&5
     
    78457850   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    78467851   -e 's:$: $lt_compiler_flag:'`
    7847    (eval echo "\"\$as_me:7847: $lt_compile\"" >&5)
     7852   (eval echo "\"\$as_me:7852: $lt_compile\"" >&5)
    78487853   (eval "$lt_compile" 2>conftest.err)
    78497854   ac_status=$?
    78507855   cat conftest.err >&5
    7851    echo "$as_me:7851: \$? = $ac_status" >&5
     7856   echo "$as_me:7856: \$? = $ac_status" >&5
    78527857   if (exit $ac_status) && test -s "$ac_outfile"; then
    78537858     # The compiler can only warn and ignore the option if not recognized
     
    81138118   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    81148119   -e 's:$: $lt_compiler_flag:'`
    8115    (eval echo "\"\$as_me:8115: $lt_compile\"" >&5)
     8120   (eval echo "\"\$as_me:8120: $lt_compile\"" >&5)
    81168121   (eval "$lt_compile" 2>conftest.err)
    81178122   ac_status=$?
    81188123   cat conftest.err >&5
    8119    echo "$as_me:8119: \$? = $ac_status" >&5
     8124   echo "$as_me:8124: \$? = $ac_status" >&5
    81208125   if (exit $ac_status) && test -s "$ac_outfile"; then
    81218126     # The compiler can only warn and ignore the option if not recognized
     
    82178222   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    82188223   -e 's:$: $lt_compiler_flag:'`
    8219    (eval echo "\"\$as_me:8219: $lt_compile\"" >&5)
     8224   (eval echo "\"\$as_me:8224: $lt_compile\"" >&5)
    82208225   (eval "$lt_compile" 2>out/conftest.err)
    82218226   ac_status=$?
    82228227   cat out/conftest.err >&5
    8223    echo "$as_me:8223: \$? = $ac_status" >&5
     8228   echo "$as_me:8228: \$? = $ac_status" >&5
    82248229   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    82258230   then
     
    1056210567  lt_status=$lt_dlunknown
    1056310568  cat > conftest.$ac_ext <<EOF
    10564 #line 10564 "configure"
     10569#line 10569 "configure"
    1056510570#include "confdefs.h"
    1056610571
     
    1066210667  lt_status=$lt_dlunknown
    1066310668  cat > conftest.$ac_ext <<EOF
    10664 #line 10664 "configure"
     10669#line 10669 "configure"
    1066510670#include "confdefs.h"
    1066610671
     
    1300613011   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1300713012   -e 's:$: $lt_compiler_flag:'`
    13008    (eval echo "\"\$as_me:13008: $lt_compile\"" >&5)
     13013   (eval echo "\"\$as_me:13013: $lt_compile\"" >&5)
    1300913014   (eval "$lt_compile" 2>conftest.err)
    1301013015   ac_status=$?
    1301113016   cat conftest.err >&5
    13012    echo "$as_me:13012: \$? = $ac_status" >&5
     13017   echo "$as_me:13017: \$? = $ac_status" >&5
    1301313018   if (exit $ac_status) && test -s "$ac_outfile"; then
    1301413019     # The compiler can only warn and ignore the option if not recognized
     
    1311013115   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1311113116   -e 's:$: $lt_compiler_flag:'`
    13112    (eval echo "\"\$as_me:13112: $lt_compile\"" >&5)
     13117   (eval echo "\"\$as_me:13117: $lt_compile\"" >&5)
    1311313118   (eval "$lt_compile" 2>out/conftest.err)
    1311413119   ac_status=$?
    1311513120   cat out/conftest.err >&5
    13116    echo "$as_me:13116: \$? = $ac_status" >&5
     13121   echo "$as_me:13121: \$? = $ac_status" >&5
    1311713122   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1311813123   then
     
    1468014685   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1468114686   -e 's:$: $lt_compiler_flag:'`
    14682    (eval echo "\"\$as_me:14682: $lt_compile\"" >&5)
     14687   (eval echo "\"\$as_me:14687: $lt_compile\"" >&5)
    1468314688   (eval "$lt_compile" 2>conftest.err)
    1468414689   ac_status=$?
    1468514690   cat conftest.err >&5
    14686    echo "$as_me:14686: \$? = $ac_status" >&5
     14691   echo "$as_me:14691: \$? = $ac_status" >&5
    1468714692   if (exit $ac_status) && test -s "$ac_outfile"; then
    1468814693     # The compiler can only warn and ignore the option if not recognized
     
    1478414789   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1478514790   -e 's:$: $lt_compiler_flag:'`
    14786    (eval echo "\"\$as_me:14786: $lt_compile\"" >&5)
     14791   (eval echo "\"\$as_me:14791: $lt_compile\"" >&5)
    1478714792   (eval "$lt_compile" 2>out/conftest.err)
    1478814793   ac_status=$?
    1478914794   cat out/conftest.err >&5
    14790    echo "$as_me:14790: \$? = $ac_status" >&5
     14795   echo "$as_me:14795: \$? = $ac_status" >&5
    1479114796   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1479214797   then
     
    1699116996   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1699216997   -e 's:$: $lt_compiler_flag:'`
    16993    (eval echo "\"\$as_me:16993: $lt_compile\"" >&5)
     16998   (eval echo "\"\$as_me:16998: $lt_compile\"" >&5)
    1699416999   (eval "$lt_compile" 2>conftest.err)
    1699517000   ac_status=$?
    1699617001   cat conftest.err >&5
    16997    echo "$as_me:16997: \$? = $ac_status" >&5
     17002   echo "$as_me:17002: \$? = $ac_status" >&5
    1699817003   if (exit $ac_status) && test -s "$ac_outfile"; then
    1699917004     # The compiler can only warn and ignore the option if not recognized
     
    1725917264   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1726017265   -e 's:$: $lt_compiler_flag:'`
    17261    (eval echo "\"\$as_me:17261: $lt_compile\"" >&5)
     17266   (eval echo "\"\$as_me:17266: $lt_compile\"" >&5)
    1726217267   (eval "$lt_compile" 2>conftest.err)
    1726317268   ac_status=$?
    1726417269   cat conftest.err >&5
    17265    echo "$as_me:17265: \$? = $ac_status" >&5
     17270   echo "$as_me:17270: \$? = $ac_status" >&5
    1726617271   if (exit $ac_status) && test -s "$ac_outfile"; then
    1726717272     # The compiler can only warn and ignore the option if not recognized
     
    1736317368   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1736417369   -e 's:$: $lt_compiler_flag:'`
    17365    (eval echo "\"\$as_me:17365: $lt_compile\"" >&5)
     17370   (eval echo "\"\$as_me:17370: $lt_compile\"" >&5)
    1736617371   (eval "$lt_compile" 2>out/conftest.err)
    1736717372   ac_status=$?
    1736817373   cat out/conftest.err >&5
    17369    echo "$as_me:17369: \$? = $ac_status" >&5
     17374   echo "$as_me:17374: \$? = $ac_status" >&5
    1737017375   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1737117376   then
     
    2010320108    *-cygwin* | *-mingw*)
    2010420109       case "$CXX" in
    20105     cl* | */cl* | CL* | */CL*)
     20110    cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    2010620111      { echo "$as_me:$LINENO: Applying patches to libtool for cl compiler" >&5
    2010720112echo "$as_me: Applying patches to libtool for cl compiler" >&6;}
     
    2025720262
    2025820263
    20259 
    2026020264if test -r $srcdir/ma27ad.f; then
    2026120265  hsl_files="$hsl_files ma27ad.f"
    20262   coin_has_ma27ad=yes
     20266                     coin_has_ma27ad=yes
     20267  :
    2026320268else
    2026420269  coin_has_ma27ad=no
    20265 fi
     20270  :
     20271fi
     20272
    2026620273
    2026720274
     
    2028820295  fi
    2028920296fi
    20290 
    2029120297if test -r $srcdir/mc19ad.f; then
    2029220298  hsl_files="$hsl_files mc19ad.f"
    20293   coin_has_mc19ad=yes
     20299                     coin_has_mc19ad=yes
     20300  :
    2029420301else
    2029520302  coin_has_mc19ad=no
    20296 fi
     20303  :
     20304fi
     20305
    2029720306
    2029820307
     
    2030520314fi
    2030620315
    20307 
    2030820316if test -r $srcdir/ma57ad.f; then
    2030920317  hsl_files="$hsl_files ma57ad.f"
    20310   coin_has_ma57ad=yes
     20318                     coin_has_ma57ad=yes
     20319  :
    2031120320else
    2031220321  coin_has_ma57ad=no
    20313 fi
     20322  :
     20323fi
     20324
    2031420325
    2031520326
     
    2032220333fi
    2032320334
    20324 
    2032520335if test -r $srcdir/ma28ad.f; then
    2032620336  hsl_files="$hsl_files ma28ad.f"
    20327   coin_has_ma28ad=yes
     20337                     coin_has_ma28ad=yes
     20338  :
    2032820339else
    2032920340  coin_has_ma28ad=no
    20330 fi
     20341  :
     20342fi
     20343
    2033120344
    2033220345
     
    2035820371fi
    2035920372case "$CC" in
    20360   cl* | */cl* | CL* | */CL*)
     20373  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    2036120374    coin_link_input_cmd=cp ;;
    2036220375esac
     
    2037620389
    2037720390  case "$CC" in
    20378     cl* | */cl* | CL* | */CL*)
     20391    cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    2037920392         LIBEXT=lib ;;
    2038020393      *) LIBEXT=a ;;
  • ThirdParty/HSL/stable/1.0/configure.ac

    r886 r933  
    6666
    6767AC_DEFUN([MY_CHECK_HSLFILE],
    68 [
    69 if test -r $srcdir/$1.f; then
    70   hsl_files="$hsl_files $1.f"
    71   coin_has_$1=yes
    72 else
    73   coin_has_$1=no
    74 fi
     68[AC_COIN_CHECK_FILE([$srcdir/$1.f],
     69                    [hsl_files="$hsl_files $1.f"
     70                     coin_has_$1=yes],
     71                    [coin_has_$1=no])
    7572AM_CONDITIONAL([COIN_HAS_$2],[test $coin_has_$1 = yes])])
    7673
Note: See TracChangeset for help on using the changeset viewer.