Changeset 2763


Ignore:
Timestamp:
Jun 1, 2013 8:37:16 AM (7 years ago)
Author:
stefan
Message:

sync with trunk rev 2762

Location:
ThirdParty/HSL/stable/1.4
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • ThirdParty/HSL/stable/1.4

  • ThirdParty/HSL/stable/1.4/config.h.in

    r2543 r2763  
    2727/* Define to 1 if METIS is available */
    2828#undef COINHSL_HAS_METIS
     29
     30/* Define to 1 if HSL library is from 2013 */
     31#undef COINHSL_HSL2013
    2932
    3033/* SVN revision number of project */

  • ThirdParty/HSL/stable/1.4/config_coinhsl.h.in

    r2543 r2763  
    3131#undef COINHSL_HAS_METIS
    3232
     33/* Define to 1 if HSL library is from 2013 */
     34#undef COINHSL_HSL2013
     35
    3336/* Version number of project */
    3437#undef COINHSL_VERSION

  • ThirdParty/HSL/stable/1.4/config_coinhsl_default.h

    r2544 r2763  
    2929/* #undef COINHSL_HAS_MA77 */
    3030
     31/* Define to 1 if MA86 is available */
     32/* #undef COINHSL_HAS_MA86 */
     33
     34/* Define to 1 if MA97 is available */
     35/* #undef COINHSL_HAS_MA97 */
     36
    3137/* Define to 1 if MC19 is available */
    3238#define COINHSL_HAS_MC19 1
     39
     40/* Define to 1 if MC68 is available. */
     41/* #undef COINHSL_HAS_MC68 */
     42
     43/* Define to 1 if METIS is available */
     44/* #undef COINHSL_HAS_METIS */

  • ThirdParty/HSL/stable/1.4/configure

    r2757 r2763  
    53545354
    53555355
     5356# recent autotools versions can recognize OpenMP with the following macro
     5357# this would be useful when using MA86 and MA97
     5358# AC_OPENMP
     5359
    53565360# Initialize autotools
    53575361
    … …  
    69826986*-*-irix6*)
    69836987  # Find out which ABI we are using.
    6984   echo '#line 6984 "configure"' > conftest.$ac_ext
     6988  echo '#line 6988 "configure"' > conftest.$ac_ext
    69856989  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    69866990  (eval $ac_compile) 2>&5
    … …  
    94599463   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    94609464   -e 's:$: $lt_compiler_flag:'`
    9461    (eval echo "\"\$as_me:9461: $lt_compile\"" >&5)
     9465   (eval echo "\"\$as_me:9465: $lt_compile\"" >&5)
    94629466   (eval "$lt_compile" 2>conftest.err)
    94639467   ac_status=$?
    94649468   cat conftest.err >&5
    9465    echo "$as_me:9465: \$? = $ac_status" >&5
     9469   echo "$as_me:9469: \$? = $ac_status" >&5
    94669470   if (exit $ac_status) && test -s "$ac_outfile"; then
    94679471     # The compiler can only warn and ignore the option if not recognized
    … …  
    97279731   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    97289732   -e 's:$: $lt_compiler_flag:'`
    9729    (eval echo "\"\$as_me:9729: $lt_compile\"" >&5)
     9733   (eval echo "\"\$as_me:9733: $lt_compile\"" >&5)
    97309734   (eval "$lt_compile" 2>conftest.err)
    97319735   ac_status=$?
    97329736   cat conftest.err >&5
    9733    echo "$as_me:9733: \$? = $ac_status" >&5
     9737   echo "$as_me:9737: \$? = $ac_status" >&5
    97349738   if (exit $ac_status) && test -s "$ac_outfile"; then
    97359739     # The compiler can only warn and ignore the option if not recognized
    … …  
    98319835   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    98329836   -e 's:$: $lt_compiler_flag:'`
    9833    (eval echo "\"\$as_me:9833: $lt_compile\"" >&5)
     9837   (eval echo "\"\$as_me:9837: $lt_compile\"" >&5)
    98349838   (eval "$lt_compile" 2>out/conftest.err)
    98359839   ac_status=$?
    98369840   cat out/conftest.err >&5
    9837    echo "$as_me:9837: \$? = $ac_status" >&5
     9841   echo "$as_me:9841: \$? = $ac_status" >&5
    98389842   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    98399843   then
    … …  
    1224812252  lt_status=$lt_dlunknown
    1224912253  cat > conftest.$ac_ext <<EOF
    12250 #line 12250 "configure"
     12254#line 12254 "configure"
    1225112255#include "confdefs.h"
    1225212256
    … …  
    1234812352  lt_status=$lt_dlunknown
    1234912353  cat > conftest.$ac_ext <<EOF
    12350 #line 12350 "configure"
     12354#line 12354 "configure"
    1235112355#include "confdefs.h"
    1235212356
    … …  
    1470814712   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1470914713   -e 's:$: $lt_compiler_flag:'`
    14710    (eval echo "\"\$as_me:14710: $lt_compile\"" >&5)
     14714   (eval echo "\"\$as_me:14714: $lt_compile\"" >&5)
    1471114715   (eval "$lt_compile" 2>conftest.err)
    1471214716   ac_status=$?
    1471314717   cat conftest.err >&5
    14714    echo "$as_me:14714: \$? = $ac_status" >&5
     14718   echo "$as_me:14718: \$? = $ac_status" >&5
    1471514719   if (exit $ac_status) && test -s "$ac_outfile"; then
    1471614720     # The compiler can only warn and ignore the option if not recognized
    … …  
    1481214816   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1481314817   -e 's:$: $lt_compiler_flag:'`
    14814    (eval echo "\"\$as_me:14814: $lt_compile\"" >&5)
     14818   (eval echo "\"\$as_me:14818: $lt_compile\"" >&5)
    1481514819   (eval "$lt_compile" 2>out/conftest.err)
    1481614820   ac_status=$?
    1481714821   cat out/conftest.err >&5
    14818    echo "$as_me:14818: \$? = $ac_status" >&5
     14822   echo "$as_me:14822: \$? = $ac_status" >&5
    1481914823   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1482014824   then
    … …  
    1638216386   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1638316387   -e 's:$: $lt_compiler_flag:'`
    16384    (eval echo "\"\$as_me:16384: $lt_compile\"" >&5)
     16388   (eval echo "\"\$as_me:16388: $lt_compile\"" >&5)
    1638516389   (eval "$lt_compile" 2>conftest.err)
    1638616390   ac_status=$?
    1638716391   cat conftest.err >&5
    16388    echo "$as_me:16388: \$? = $ac_status" >&5
     16392   echo "$as_me:16392: \$? = $ac_status" >&5
    1638916393   if (exit $ac_status) && test -s "$ac_outfile"; then
    1639016394     # The compiler can only warn and ignore the option if not recognized
    … …  
    1648616490   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1648716491   -e 's:$: $lt_compiler_flag:'`
    16488    (eval echo "\"\$as_me:16488: $lt_compile\"" >&5)
     16492   (eval echo "\"\$as_me:16492: $lt_compile\"" >&5)
    1648916493   (eval "$lt_compile" 2>out/conftest.err)
    1649016494   ac_status=$?
    1649116495   cat out/conftest.err >&5
    16492    echo "$as_me:16492: \$? = $ac_status" >&5
     16496   echo "$as_me:16496: \$? = $ac_status" >&5
    1649316497   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1649416498   then
    … …  
    1869318697   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1869418698   -e 's:$: $lt_compiler_flag:'`
    18695    (eval echo "\"\$as_me:18695: $lt_compile\"" >&5)
     18699   (eval echo "\"\$as_me:18699: $lt_compile\"" >&5)
    1869618700   (eval "$lt_compile" 2>conftest.err)
    1869718701   ac_status=$?
    1869818702   cat conftest.err >&5
    18699    echo "$as_me:18699: \$? = $ac_status" >&5
     18703   echo "$as_me:18703: \$? = $ac_status" >&5
    1870018704   if (exit $ac_status) && test -s "$ac_outfile"; then
    1870118705     # The compiler can only warn and ignore the option if not recognized
    … …  
    1896118965   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1896218966   -e 's:$: $lt_compiler_flag:'`
    18963    (eval echo "\"\$as_me:18963: $lt_compile\"" >&5)
     18967   (eval echo "\"\$as_me:18967: $lt_compile\"" >&5)
    1896418968   (eval "$lt_compile" 2>conftest.err)
    1896518969   ac_status=$?
    1896618970   cat conftest.err >&5
    18967    echo "$as_me:18967: \$? = $ac_status" >&5
     18971   echo "$as_me:18971: \$? = $ac_status" >&5
    1896818972   if (exit $ac_status) && test -s "$ac_outfile"; then
    1896918973     # The compiler can only warn and ignore the option if not recognized
    … …  
    1906519069   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1906619070   -e 's:$: $lt_compiler_flag:'`
    19067    (eval echo "\"\$as_me:19067: $lt_compile\"" >&5)
     19071   (eval echo "\"\$as_me:19071: $lt_compile\"" >&5)
    1906819072   (eval "$lt_compile" 2>out/conftest.err)
    1906919073   ac_status=$?
    1907019074   cat out/conftest.err >&5
    19071    echo "$as_me:19071: \$? = $ac_status" >&5
     19075   echo "$as_me:19075: \$? = $ac_status" >&5
    1907219076   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1907319077   then
    … …  
    2204922053
    2205022054coin_has_something=no
     22055hsl2013=no
    2205122056
    2205222057
    … …  
    2228022285
    2228122286                      coin_has_something=yes
     22287                      grep -q mc68_default_control_i $srcdir/coinhsl/hsl_mc68/C/hsl_mc68i_ciface.f90 && hsl2013=yes
    2228222288                      coin_has_hsl_mc68=yes
    2228322289  :
    … …  
    2625426260fi
    2625526261
     26262fi
     26263
     26264# MC68 and MA77 changed the interface from HSL 2012 to HSL 2013,
     26265# so we check whether we have the 2013 version (for mc68, we did this test above)
     26266# and set a compiletime define
     26267if test $coin_has_hsl_ma77 = yes ; then
     26268  grep -q ma77_solve_fredholm $srcdir/coinhsl/hsl_ma77/hsl_ma77d.f90 && hsl2013=yes
     26269fi
     26270if test $hsl2013 = yes ; then
     26271
     26272cat >>confdefs.h <<\_ACEOF
     26273#define COINHSL_HSL2013 1
     26274_ACEOF
     26275
     26276  { echo "$as_me:$LINENO: HSL source recognized as HSL 2013" >&5
     26277echo "$as_me: HSL source recognized as HSL 2013" >&6;}
    2625626278fi
    2625726279

  • ThirdParty/HSL/stable/1.4/configure.ac

    r2757 r2763  
    7676fi
    7777AC_PROG_FC
     78
     79# recent autotools versions can recognize OpenMP with the following macro
     80# this would be useful when using MA86 and MA97
     81# AC_OPENMP
    7882
    7983# Initialize autotools
    … …  
    101105
    102106coin_has_something=no
     107hsl2013=no
    103108
    104109AC_DEFUN([MY_CHECK_HSLFILE],
    … …  
    141146                     [AC_DEFINE(COINHSL_HAS_MC68, [1], Define to 1 if MC68 is available.)
    142147                      coin_has_something=yes
     148                      grep -q mc68_default_control_i $srcdir/coinhsl/hsl_mc68/C/hsl_mc68i_ciface.f90 && hsl2013=yes
    143149                      coin_has_hsl_mc68=yes],
    144150                     [coin_has_hsl_mc68=no])
    … …  
    184190  # do as if we had metis, so metis.f is not compiled
    185191  AM_CONDITIONAL(COIN_HAS_METIS, [test 1 = 1])
     192fi
     193
     194# MC68 and MA77 changed the interface from HSL 2012 to HSL 2013,
     195# so we check whether we have the 2013 version (for mc68, we did this test above)
     196# and set a compiletime define
     197if test $coin_has_hsl_ma77 = yes ; then
     198  grep -q ma77_solve_fredholm $srcdir/coinhsl/hsl_ma77/hsl_ma77d.f90 && hsl2013=yes
     199fi
     200if test $hsl2013 = yes ; then
     201  AC_DEFINE(COINHSL_HSL2013, [1], Define to 1 if HSL library is from 2013)
     202  AC_MSG_NOTICE([HSL source recognized as HSL 2013])
    186203fi
    187204
Note: See TracChangeset for help on using the changeset viewer.