Changeset 2763
- Timestamp:
- Jun 1, 2013 8:37:16 AM (8 years ago)
- Location:
- ThirdParty/HSL/stable/1.4
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
ThirdParty/HSL/stable/1.4
- Property svn:mergeinfo changed
/ThirdParty/HSL/trunk merged: 2761-2762
- Property svn:mergeinfo changed
-
ThirdParty/HSL/stable/1.4/config.h.in
r2543 r2763 27 27 /* Define to 1 if METIS is available */ 28 28 #undef COINHSL_HAS_METIS 29 30 /* Define to 1 if HSL library is from 2013 */ 31 #undef COINHSL_HSL2013 29 32 30 33 /* SVN revision number of project */ -
ThirdParty/HSL/stable/1.4/config_coinhsl.h.in
r2543 r2763 31 31 #undef COINHSL_HAS_METIS 32 32 33 /* Define to 1 if HSL library is from 2013 */ 34 #undef COINHSL_HSL2013 35 33 36 /* Version number of project */ 34 37 #undef COINHSL_VERSION -
ThirdParty/HSL/stable/1.4/config_coinhsl_default.h
r2544 r2763 29 29 /* #undef COINHSL_HAS_MA77 */ 30 30 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 31 37 /* Define to 1 if MC19 is available */ 32 38 #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 5354 5354 5355 5355 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 5356 5360 # Initialize autotools 5357 5361 … … 6982 6986 *-*-irix6*) 6983 6987 # Find out which ABI we are using. 6984 echo '#line 698 4"configure"' > conftest.$ac_ext6988 echo '#line 6988 "configure"' > conftest.$ac_ext 6985 6989 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 6986 6990 (eval $ac_compile) 2>&5 … … 9459 9463 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 9460 9464 -e 's:$: $lt_compiler_flag:'` 9461 (eval echo "\"\$as_me:946 1: $lt_compile\"" >&5)9465 (eval echo "\"\$as_me:9465: $lt_compile\"" >&5) 9462 9466 (eval "$lt_compile" 2>conftest.err) 9463 9467 ac_status=$? 9464 9468 cat conftest.err >&5 9465 echo "$as_me:946 5: \$? = $ac_status" >&59469 echo "$as_me:9469: \$? = $ac_status" >&5 9466 9470 if (exit $ac_status) && test -s "$ac_outfile"; then 9467 9471 # The compiler can only warn and ignore the option if not recognized … … 9727 9731 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 9728 9732 -e 's:$: $lt_compiler_flag:'` 9729 (eval echo "\"\$as_me:97 29: $lt_compile\"" >&5)9733 (eval echo "\"\$as_me:9733: $lt_compile\"" >&5) 9730 9734 (eval "$lt_compile" 2>conftest.err) 9731 9735 ac_status=$? 9732 9736 cat conftest.err >&5 9733 echo "$as_me:973 3: \$? = $ac_status" >&59737 echo "$as_me:9737: \$? = $ac_status" >&5 9734 9738 if (exit $ac_status) && test -s "$ac_outfile"; then 9735 9739 # The compiler can only warn and ignore the option if not recognized … … 9831 9835 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 9832 9836 -e 's:$: $lt_compiler_flag:'` 9833 (eval echo "\"\$as_me:983 3: $lt_compile\"" >&5)9837 (eval echo "\"\$as_me:9837: $lt_compile\"" >&5) 9834 9838 (eval "$lt_compile" 2>out/conftest.err) 9835 9839 ac_status=$? 9836 9840 cat out/conftest.err >&5 9837 echo "$as_me:98 37: \$? = $ac_status" >&59841 echo "$as_me:9841: \$? = $ac_status" >&5 9838 9842 if (exit $ac_status) && test -s out/conftest2.$ac_objext 9839 9843 then … … 12248 12252 lt_status=$lt_dlunknown 12249 12253 cat > conftest.$ac_ext <<EOF 12250 #line 1225 0"configure"12254 #line 12254 "configure" 12251 12255 #include "confdefs.h" 12252 12256 … … 12348 12352 lt_status=$lt_dlunknown 12349 12353 cat > conftest.$ac_ext <<EOF 12350 #line 1235 0"configure"12354 #line 12354 "configure" 12351 12355 #include "confdefs.h" 12352 12356 … … 14708 14712 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 14709 14713 -e 's:$: $lt_compiler_flag:'` 14710 (eval echo "\"\$as_me:1471 0: $lt_compile\"" >&5)14714 (eval echo "\"\$as_me:14714: $lt_compile\"" >&5) 14711 14715 (eval "$lt_compile" 2>conftest.err) 14712 14716 ac_status=$? 14713 14717 cat conftest.err >&5 14714 echo "$as_me:1471 4: \$? = $ac_status" >&514718 echo "$as_me:14718: \$? = $ac_status" >&5 14715 14719 if (exit $ac_status) && test -s "$ac_outfile"; then 14716 14720 # The compiler can only warn and ignore the option if not recognized … … 14812 14816 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 14813 14817 -e 's:$: $lt_compiler_flag:'` 14814 (eval echo "\"\$as_me:1481 4: $lt_compile\"" >&5)14818 (eval echo "\"\$as_me:14818: $lt_compile\"" >&5) 14815 14819 (eval "$lt_compile" 2>out/conftest.err) 14816 14820 ac_status=$? 14817 14821 cat out/conftest.err >&5 14818 echo "$as_me:148 18: \$? = $ac_status" >&514822 echo "$as_me:14822: \$? = $ac_status" >&5 14819 14823 if (exit $ac_status) && test -s out/conftest2.$ac_objext 14820 14824 then … … 16382 16386 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 16383 16387 -e 's:$: $lt_compiler_flag:'` 16384 (eval echo "\"\$as_me:1638 4: $lt_compile\"" >&5)16388 (eval echo "\"\$as_me:16388: $lt_compile\"" >&5) 16385 16389 (eval "$lt_compile" 2>conftest.err) 16386 16390 ac_status=$? 16387 16391 cat conftest.err >&5 16388 echo "$as_me:163 88: \$? = $ac_status" >&516392 echo "$as_me:16392: \$? = $ac_status" >&5 16389 16393 if (exit $ac_status) && test -s "$ac_outfile"; then 16390 16394 # The compiler can only warn and ignore the option if not recognized … … 16486 16490 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 16487 16491 -e 's:$: $lt_compiler_flag:'` 16488 (eval echo "\"\$as_me:164 88: $lt_compile\"" >&5)16492 (eval echo "\"\$as_me:16492: $lt_compile\"" >&5) 16489 16493 (eval "$lt_compile" 2>out/conftest.err) 16490 16494 ac_status=$? 16491 16495 cat out/conftest.err >&5 16492 echo "$as_me:1649 2: \$? = $ac_status" >&516496 echo "$as_me:16496: \$? = $ac_status" >&5 16493 16497 if (exit $ac_status) && test -s out/conftest2.$ac_objext 16494 16498 then … … 18693 18697 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 18694 18698 -e 's:$: $lt_compiler_flag:'` 18695 (eval echo "\"\$as_me:1869 5: $lt_compile\"" >&5)18699 (eval echo "\"\$as_me:18699: $lt_compile\"" >&5) 18696 18700 (eval "$lt_compile" 2>conftest.err) 18697 18701 ac_status=$? 18698 18702 cat conftest.err >&5 18699 echo "$as_me:18 699: \$? = $ac_status" >&518703 echo "$as_me:18703: \$? = $ac_status" >&5 18700 18704 if (exit $ac_status) && test -s "$ac_outfile"; then 18701 18705 # The compiler can only warn and ignore the option if not recognized … … 18961 18965 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 18962 18966 -e 's:$: $lt_compiler_flag:'` 18963 (eval echo "\"\$as_me:1896 3: $lt_compile\"" >&5)18967 (eval echo "\"\$as_me:18967: $lt_compile\"" >&5) 18964 18968 (eval "$lt_compile" 2>conftest.err) 18965 18969 ac_status=$? 18966 18970 cat conftest.err >&5 18967 echo "$as_me:189 67: \$? = $ac_status" >&518971 echo "$as_me:18971: \$? = $ac_status" >&5 18968 18972 if (exit $ac_status) && test -s "$ac_outfile"; then 18969 18973 # The compiler can only warn and ignore the option if not recognized … … 19065 19069 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 19066 19070 -e 's:$: $lt_compiler_flag:'` 19067 (eval echo "\"\$as_me:190 67: $lt_compile\"" >&5)19071 (eval echo "\"\$as_me:19071: $lt_compile\"" >&5) 19068 19072 (eval "$lt_compile" 2>out/conftest.err) 19069 19073 ac_status=$? 19070 19074 cat out/conftest.err >&5 19071 echo "$as_me:1907 1: \$? = $ac_status" >&519075 echo "$as_me:19075: \$? = $ac_status" >&5 19072 19076 if (exit $ac_status) && test -s out/conftest2.$ac_objext 19073 19077 then … … 22049 22053 22050 22054 coin_has_something=no 22055 hsl2013=no 22051 22056 22052 22057 … … 22280 22285 22281 22286 coin_has_something=yes 22287 grep -q mc68_default_control_i $srcdir/coinhsl/hsl_mc68/C/hsl_mc68i_ciface.f90 && hsl2013=yes 22282 22288 coin_has_hsl_mc68=yes 22283 22289 : … … 26254 26260 fi 26255 26261 26262 fi 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 26267 if test $coin_has_hsl_ma77 = yes ; then 26268 grep -q ma77_solve_fredholm $srcdir/coinhsl/hsl_ma77/hsl_ma77d.f90 && hsl2013=yes 26269 fi 26270 if test $hsl2013 = yes ; then 26271 26272 cat >>confdefs.h <<\_ACEOF 26273 #define COINHSL_HSL2013 1 26274 _ACEOF 26275 26276 { echo "$as_me:$LINENO: HSL source recognized as HSL 2013" >&5 26277 echo "$as_me: HSL source recognized as HSL 2013" >&6;} 26256 26278 fi 26257 26279 -
ThirdParty/HSL/stable/1.4/configure.ac
r2757 r2763 76 76 fi 77 77 AC_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 78 82 79 83 # Initialize autotools … … 101 105 102 106 coin_has_something=no 107 hsl2013=no 103 108 104 109 AC_DEFUN([MY_CHECK_HSLFILE], … … 141 146 [AC_DEFINE(COINHSL_HAS_MC68, [1], Define to 1 if MC68 is available.) 142 147 coin_has_something=yes 148 grep -q mc68_default_control_i $srcdir/coinhsl/hsl_mc68/C/hsl_mc68i_ciface.f90 && hsl2013=yes 143 149 coin_has_hsl_mc68=yes], 144 150 [coin_has_hsl_mc68=no]) … … 184 190 # do as if we had metis, so metis.f is not compiled 185 191 AM_CONDITIONAL(COIN_HAS_METIS, [test 1 = 1]) 192 fi 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 197 if test $coin_has_hsl_ma77 = yes ; then 198 grep -q ma77_solve_fredholm $srcdir/coinhsl/hsl_ma77/hsl_ma77d.f90 && hsl2013=yes 199 fi 200 if 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]) 186 203 fi 187 204
Note: See TracChangeset
for help on using the changeset viewer.