Changeset 2762
- Timestamp:
- Jun 1, 2013 8:35:30 AM (8 years ago)
- Location:
- ThirdParty/HSL/trunk
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
ThirdParty/HSL/trunk/config.h.in
r2543 r2762 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/trunk/config_coinhsl.h.in
r2543 r2762 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/trunk/config_coinhsl_default.h
r2546 r2762 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/trunk/configure
r2695 r2762 5517 5517 5518 5518 5519 # recent autotools versions can recognize OpenMP with the following macro 5520 # this would be useful when using MA86 and MA97 5521 # AC_OPENMP 5522 5519 5523 # Initialize autotools 5520 5524 … … 7145 7149 *-*-irix6*) 7146 7150 # Find out which ABI we are using. 7147 echo '#line 71 47"configure"' > conftest.$ac_ext7151 echo '#line 7151 "configure"' > conftest.$ac_ext 7148 7152 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 7149 7153 (eval $ac_compile) 2>&5 … … 9622 9626 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 9623 9627 -e 's:$: $lt_compiler_flag:'` 9624 (eval echo "\"\$as_me:962 4: $lt_compile\"" >&5)9628 (eval echo "\"\$as_me:9628: $lt_compile\"" >&5) 9625 9629 (eval "$lt_compile" 2>conftest.err) 9626 9630 ac_status=$? 9627 9631 cat conftest.err >&5 9628 echo "$as_me:96 28: \$? = $ac_status" >&59632 echo "$as_me:9632: \$? = $ac_status" >&5 9629 9633 if (exit $ac_status) && test -s "$ac_outfile"; then 9630 9634 # The compiler can only warn and ignore the option if not recognized … … 9890 9894 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 9891 9895 -e 's:$: $lt_compiler_flag:'` 9892 (eval echo "\"\$as_me:989 2: $lt_compile\"" >&5)9896 (eval echo "\"\$as_me:9896: $lt_compile\"" >&5) 9893 9897 (eval "$lt_compile" 2>conftest.err) 9894 9898 ac_status=$? 9895 9899 cat conftest.err >&5 9896 echo "$as_me:9 896: \$? = $ac_status" >&59900 echo "$as_me:9900: \$? = $ac_status" >&5 9897 9901 if (exit $ac_status) && test -s "$ac_outfile"; then 9898 9902 # The compiler can only warn and ignore the option if not recognized … … 9994 9998 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 9995 9999 -e 's:$: $lt_compiler_flag:'` 9996 (eval echo "\"\$as_me: 9996: $lt_compile\"" >&5)10000 (eval echo "\"\$as_me:10000: $lt_compile\"" >&5) 9997 10001 (eval "$lt_compile" 2>out/conftest.err) 9998 10002 ac_status=$? 9999 10003 cat out/conftest.err >&5 10000 echo "$as_me:1000 0: \$? = $ac_status" >&510004 echo "$as_me:10004: \$? = $ac_status" >&5 10001 10005 if (exit $ac_status) && test -s out/conftest2.$ac_objext 10002 10006 then … … 12411 12415 lt_status=$lt_dlunknown 12412 12416 cat > conftest.$ac_ext <<EOF 12413 #line 1241 3"configure"12417 #line 12417 "configure" 12414 12418 #include "confdefs.h" 12415 12419 … … 12511 12515 lt_status=$lt_dlunknown 12512 12516 cat > conftest.$ac_ext <<EOF 12513 #line 1251 3"configure"12517 #line 12517 "configure" 12514 12518 #include "confdefs.h" 12515 12519 … … 14871 14875 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 14872 14876 -e 's:$: $lt_compiler_flag:'` 14873 (eval echo "\"\$as_me:1487 3: $lt_compile\"" >&5)14877 (eval echo "\"\$as_me:14877: $lt_compile\"" >&5) 14874 14878 (eval "$lt_compile" 2>conftest.err) 14875 14879 ac_status=$? 14876 14880 cat conftest.err >&5 14877 echo "$as_me:148 77: \$? = $ac_status" >&514881 echo "$as_me:14881: \$? = $ac_status" >&5 14878 14882 if (exit $ac_status) && test -s "$ac_outfile"; then 14879 14883 # The compiler can only warn and ignore the option if not recognized … … 14975 14979 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 14976 14980 -e 's:$: $lt_compiler_flag:'` 14977 (eval echo "\"\$as_me:149 77: $lt_compile\"" >&5)14981 (eval echo "\"\$as_me:14981: $lt_compile\"" >&5) 14978 14982 (eval "$lt_compile" 2>out/conftest.err) 14979 14983 ac_status=$? 14980 14984 cat out/conftest.err >&5 14981 echo "$as_me:1498 1: \$? = $ac_status" >&514985 echo "$as_me:14985: \$? = $ac_status" >&5 14982 14986 if (exit $ac_status) && test -s out/conftest2.$ac_objext 14983 14987 then … … 16545 16549 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 16546 16550 -e 's:$: $lt_compiler_flag:'` 16547 (eval echo "\"\$as_me:165 47: $lt_compile\"" >&5)16551 (eval echo "\"\$as_me:16551: $lt_compile\"" >&5) 16548 16552 (eval "$lt_compile" 2>conftest.err) 16549 16553 ac_status=$? 16550 16554 cat conftest.err >&5 16551 echo "$as_me:1655 1: \$? = $ac_status" >&516555 echo "$as_me:16555: \$? = $ac_status" >&5 16552 16556 if (exit $ac_status) && test -s "$ac_outfile"; then 16553 16557 # The compiler can only warn and ignore the option if not recognized … … 16649 16653 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 16650 16654 -e 's:$: $lt_compiler_flag:'` 16651 (eval echo "\"\$as_me:1665 1: $lt_compile\"" >&5)16655 (eval echo "\"\$as_me:16655: $lt_compile\"" >&5) 16652 16656 (eval "$lt_compile" 2>out/conftest.err) 16653 16657 ac_status=$? 16654 16658 cat out/conftest.err >&5 16655 echo "$as_me:1665 5: \$? = $ac_status" >&516659 echo "$as_me:16659: \$? = $ac_status" >&5 16656 16660 if (exit $ac_status) && test -s out/conftest2.$ac_objext 16657 16661 then … … 18856 18860 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 18857 18861 -e 's:$: $lt_compiler_flag:'` 18858 (eval echo "\"\$as_me:188 58: $lt_compile\"" >&5)18862 (eval echo "\"\$as_me:18862: $lt_compile\"" >&5) 18859 18863 (eval "$lt_compile" 2>conftest.err) 18860 18864 ac_status=$? 18861 18865 cat conftest.err >&5 18862 echo "$as_me:1886 2: \$? = $ac_status" >&518866 echo "$as_me:18866: \$? = $ac_status" >&5 18863 18867 if (exit $ac_status) && test -s "$ac_outfile"; then 18864 18868 # The compiler can only warn and ignore the option if not recognized … … 19124 19128 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 19125 19129 -e 's:$: $lt_compiler_flag:'` 19126 (eval echo "\"\$as_me:191 26: $lt_compile\"" >&5)19130 (eval echo "\"\$as_me:19130: $lt_compile\"" >&5) 19127 19131 (eval "$lt_compile" 2>conftest.err) 19128 19132 ac_status=$? 19129 19133 cat conftest.err >&5 19130 echo "$as_me:1913 0: \$? = $ac_status" >&519134 echo "$as_me:19134: \$? = $ac_status" >&5 19131 19135 if (exit $ac_status) && test -s "$ac_outfile"; then 19132 19136 # The compiler can only warn and ignore the option if not recognized … … 19228 19232 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 19229 19233 -e 's:$: $lt_compiler_flag:'` 19230 (eval echo "\"\$as_me:1923 0: $lt_compile\"" >&5)19234 (eval echo "\"\$as_me:19234: $lt_compile\"" >&5) 19231 19235 (eval "$lt_compile" 2>out/conftest.err) 19232 19236 ac_status=$? 19233 19237 cat out/conftest.err >&5 19234 echo "$as_me:1923 4: \$? = $ac_status" >&519238 echo "$as_me:19238: \$? = $ac_status" >&5 19235 19239 if (exit $ac_status) && test -s out/conftest2.$ac_objext 19236 19240 then … … 22212 22216 22213 22217 coin_has_something=no 22218 hsl2013=no 22214 22219 22215 22220 … … 22443 22448 22444 22449 coin_has_something=yes 22450 grep -q mc68_default_control_i $srcdir/coinhsl/hsl_mc68/C/hsl_mc68i_ciface.f90 && hsl2013=yes 22445 22451 coin_has_hsl_mc68=yes 22446 22452 : … … 26417 26423 fi 26418 26424 26425 fi 26426 26427 # MC68 and MA77 changed the interface from HSL 2012 to HSL 2013, 26428 # so we check whether we have the 2013 version (for mc68, we did this test above) 26429 # and set a compiletime define 26430 if test $coin_has_hsl_ma77 = yes ; then 26431 grep -q ma77_solve_fredholm $srcdir/coinhsl/hsl_ma77/hsl_ma77d.f90 && hsl2013=yes 26432 fi 26433 if test $hsl2013 = yes ; then 26434 26435 cat >>confdefs.h <<\_ACEOF 26436 #define COINHSL_HSL2013 1 26437 _ACEOF 26438 26439 { echo "$as_me:$LINENO: HSL source recognized as HSL 2013" >&5 26440 echo "$as_me: HSL source recognized as HSL 2013" >&6;} 26419 26441 fi 26420 26442 -
ThirdParty/HSL/trunk/configure.ac
r2761 r2762 105 105 106 106 coin_has_something=no 107 hsl2013=no 107 108 108 109 AC_DEFUN([MY_CHECK_HSLFILE], … … 145 146 [AC_DEFINE(COINHSL_HAS_MC68, [1], Define to 1 if MC68 is available.) 146 147 coin_has_something=yes 148 grep -q mc68_default_control_i $srcdir/coinhsl/hsl_mc68/C/hsl_mc68i_ciface.f90 && hsl2013=yes 147 149 coin_has_hsl_mc68=yes], 148 150 [coin_has_hsl_mc68=no]) … … 188 190 # do as if we had metis, so metis.f is not compiled 189 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]) 190 203 fi 191 204
Note: See TracChangeset
for help on using the changeset viewer.