Changeset 904
- Timestamp:
- Jan 5, 2008 7:44:52 PM (13 years ago)
- Location:
- ThirdParty/HSL/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
ThirdParty/HSL/trunk/Makefile.in
r873 r904 19 19 # This file is distributed under the Common Public License. 20 20 21 # Copyright (C) 2006 International Business Machines and others.21 # Copyright (C) 2006, 2007 International Business Machines and others. 22 22 # All Rights Reserved. 23 23 # This file is distributed under the Common Public License. … … 272 272 DISTCLEANFILES = $(am__append_6) $(VPATH_DISTCLEANFILES) 273 273 DocFiles = README AUTHORS LICENSE 274 DocInstallDir = $(prefix)/share/doc/ $(PACKAGE_NAME)274 DocInstallDir = $(prefix)/share/doc/coin/$(PACKAGE_NAME) 275 275 all: all-am 276 276 … … 643 643 644 644 645 install-doc: 645 install-doc: $(DocFiles) 646 646 test -z "$(DocInstallDir)" || $(mkdir_p) "$(DESTDIR)$(DocInstallDir)" 647 647 for file in $(DocFiles); do \ -
ThirdParty/HSL/trunk/configure
r801 r904 1075 1075 --enable-doscompile Under Cygwin, compile so that executables run under 1076 1076 DOS. Set to mingw to use gcc/g++/ld with 1077 -mno-cygwin. Set to msvc to use cl/link . Default1078 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. 1080 1080 --enable-static[=PKGS] 1081 1081 build static libraries [default=no] … … 1847 1847 if test x"$CXX" != x; then 1848 1848 case "$CXX" in 1849 cl* | */cl* | CL* | */CL* )1849 cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*) 1850 1850 if test x"$CC" = x; then 1851 1851 CC="$CXX" … … 1874 1874 *-cygwin* | *-mingw*) 1875 1875 if test "$enable_doscompile" = msvc ; then 1876 comps=" cl"1876 comps="icl cl" 1877 1877 else 1878 1878 comps="gcc cl" … … 2760 2760 coin_dbg_cflags='-MTd' 2761 2761 ;; 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 ;; 2762 2767 esac 2763 2768 ;; … … 3066 3071 # Correct ADDLIBS initialization if we are using the MS compiler 3067 3072 case "$CC" in 3068 cl* | */cl* | CL* | */CL* )3073 cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*) 3069 3074 ADDLIBS= 3070 3075 case $build in … … 3275 3280 3276 3281 # Provide some information about the compiler. 3277 echo "$as_me:32 77:" \3282 echo "$as_me:3282:" \ 3278 3283 "checking for Fortran 77 compiler version" >&5 3279 3284 ac_compiler=`set X $ac_compile; echo $2` … … 5416 5421 *-*-irix6*) 5417 5422 # Find out which ABI we are using. 5418 echo '#line 54 18"configure"' > conftest.$ac_ext5423 echo '#line 5423 "configure"' > conftest.$ac_ext 5419 5424 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 5420 5425 (eval $ac_compile) 2>&5 … … 7845 7850 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 7846 7851 -e 's:$: $lt_compiler_flag:'` 7847 (eval echo "\"\$as_me:78 47: $lt_compile\"" >&5)7852 (eval echo "\"\$as_me:7852: $lt_compile\"" >&5) 7848 7853 (eval "$lt_compile" 2>conftest.err) 7849 7854 ac_status=$? 7850 7855 cat conftest.err >&5 7851 echo "$as_me:785 1: \$? = $ac_status" >&57856 echo "$as_me:7856: \$? = $ac_status" >&5 7852 7857 if (exit $ac_status) && test -s "$ac_outfile"; then 7853 7858 # The compiler can only warn and ignore the option if not recognized … … 8113 8118 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 8114 8119 -e 's:$: $lt_compiler_flag:'` 8115 (eval echo "\"\$as_me:81 15: $lt_compile\"" >&5)8120 (eval echo "\"\$as_me:8120: $lt_compile\"" >&5) 8116 8121 (eval "$lt_compile" 2>conftest.err) 8117 8122 ac_status=$? 8118 8123 cat conftest.err >&5 8119 echo "$as_me:81 19: \$? = $ac_status" >&58124 echo "$as_me:8124: \$? = $ac_status" >&5 8120 8125 if (exit $ac_status) && test -s "$ac_outfile"; then 8121 8126 # The compiler can only warn and ignore the option if not recognized … … 8217 8222 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 8218 8223 -e 's:$: $lt_compiler_flag:'` 8219 (eval echo "\"\$as_me:82 19: $lt_compile\"" >&5)8224 (eval echo "\"\$as_me:8224: $lt_compile\"" >&5) 8220 8225 (eval "$lt_compile" 2>out/conftest.err) 8221 8226 ac_status=$? 8222 8227 cat out/conftest.err >&5 8223 echo "$as_me:822 3: \$? = $ac_status" >&58228 echo "$as_me:8228: \$? = $ac_status" >&5 8224 8229 if (exit $ac_status) && test -s out/conftest2.$ac_objext 8225 8230 then … … 10562 10567 lt_status=$lt_dlunknown 10563 10568 cat > conftest.$ac_ext <<EOF 10564 #line 1056 4"configure"10569 #line 10569 "configure" 10565 10570 #include "confdefs.h" 10566 10571 … … 10662 10667 lt_status=$lt_dlunknown 10663 10668 cat > conftest.$ac_ext <<EOF 10664 #line 1066 4"configure"10669 #line 10669 "configure" 10665 10670 #include "confdefs.h" 10666 10671 … … 13006 13011 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 13007 13012 -e 's:$: $lt_compiler_flag:'` 13008 (eval echo "\"\$as_me:130 08: $lt_compile\"" >&5)13013 (eval echo "\"\$as_me:13013: $lt_compile\"" >&5) 13009 13014 (eval "$lt_compile" 2>conftest.err) 13010 13015 ac_status=$? 13011 13016 cat conftest.err >&5 13012 echo "$as_me:1301 2: \$? = $ac_status" >&513017 echo "$as_me:13017: \$? = $ac_status" >&5 13013 13018 if (exit $ac_status) && test -s "$ac_outfile"; then 13014 13019 # The compiler can only warn and ignore the option if not recognized … … 13110 13115 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 13111 13116 -e 's:$: $lt_compiler_flag:'` 13112 (eval echo "\"\$as_me:1311 2: $lt_compile\"" >&5)13117 (eval echo "\"\$as_me:13117: $lt_compile\"" >&5) 13113 13118 (eval "$lt_compile" 2>out/conftest.err) 13114 13119 ac_status=$? 13115 13120 cat out/conftest.err >&5 13116 echo "$as_me:131 16: \$? = $ac_status" >&513121 echo "$as_me:13121: \$? = $ac_status" >&5 13117 13122 if (exit $ac_status) && test -s out/conftest2.$ac_objext 13118 13123 then … … 14680 14685 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 14681 14686 -e 's:$: $lt_compiler_flag:'` 14682 (eval echo "\"\$as_me:1468 2: $lt_compile\"" >&5)14687 (eval echo "\"\$as_me:14687: $lt_compile\"" >&5) 14683 14688 (eval "$lt_compile" 2>conftest.err) 14684 14689 ac_status=$? 14685 14690 cat conftest.err >&5 14686 echo "$as_me:146 86: \$? = $ac_status" >&514691 echo "$as_me:14691: \$? = $ac_status" >&5 14687 14692 if (exit $ac_status) && test -s "$ac_outfile"; then 14688 14693 # The compiler can only warn and ignore the option if not recognized … … 14784 14789 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 14785 14790 -e 's:$: $lt_compiler_flag:'` 14786 (eval echo "\"\$as_me:147 86: $lt_compile\"" >&5)14791 (eval echo "\"\$as_me:14791: $lt_compile\"" >&5) 14787 14792 (eval "$lt_compile" 2>out/conftest.err) 14788 14793 ac_status=$? 14789 14794 cat out/conftest.err >&5 14790 echo "$as_me:1479 0: \$? = $ac_status" >&514795 echo "$as_me:14795: \$? = $ac_status" >&5 14791 14796 if (exit $ac_status) && test -s out/conftest2.$ac_objext 14792 14797 then … … 16991 16996 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 16992 16997 -e 's:$: $lt_compiler_flag:'` 16993 (eval echo "\"\$as_me:1699 3: $lt_compile\"" >&5)16998 (eval echo "\"\$as_me:16998: $lt_compile\"" >&5) 16994 16999 (eval "$lt_compile" 2>conftest.err) 16995 17000 ac_status=$? 16996 17001 cat conftest.err >&5 16997 echo "$as_me:1 6997: \$? = $ac_status" >&517002 echo "$as_me:17002: \$? = $ac_status" >&5 16998 17003 if (exit $ac_status) && test -s "$ac_outfile"; then 16999 17004 # The compiler can only warn and ignore the option if not recognized … … 17259 17264 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 17260 17265 -e 's:$: $lt_compiler_flag:'` 17261 (eval echo "\"\$as_me:1726 1: $lt_compile\"" >&5)17266 (eval echo "\"\$as_me:17266: $lt_compile\"" >&5) 17262 17267 (eval "$lt_compile" 2>conftest.err) 17263 17268 ac_status=$? 17264 17269 cat conftest.err >&5 17265 echo "$as_me:172 65: \$? = $ac_status" >&517270 echo "$as_me:17270: \$? = $ac_status" >&5 17266 17271 if (exit $ac_status) && test -s "$ac_outfile"; then 17267 17272 # The compiler can only warn and ignore the option if not recognized … … 17363 17368 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 17364 17369 -e 's:$: $lt_compiler_flag:'` 17365 (eval echo "\"\$as_me:173 65: $lt_compile\"" >&5)17370 (eval echo "\"\$as_me:17370: $lt_compile\"" >&5) 17366 17371 (eval "$lt_compile" 2>out/conftest.err) 17367 17372 ac_status=$? 17368 17373 cat out/conftest.err >&5 17369 echo "$as_me:173 69: \$? = $ac_status" >&517374 echo "$as_me:17374: \$? = $ac_status" >&5 17370 17375 if (exit $ac_status) && test -s out/conftest2.$ac_objext 17371 17376 then … … 20103 20108 *-cygwin* | *-mingw*) 20104 20109 case "$CXX" in 20105 cl* | */cl* | CL* | */CL* )20110 cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*) 20106 20111 { echo "$as_me:$LINENO: Applying patches to libtool for cl compiler" >&5 20107 20112 echo "$as_me: Applying patches to libtool for cl compiler" >&6;} … … 20366 20371 fi 20367 20372 case "$CC" in 20368 cl* | */cl* | CL* | */CL* )20373 cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*) 20369 20374 coin_link_input_cmd=cp ;; 20370 20375 esac … … 20384 20389 20385 20390 case "$CC" in 20386 cl* | */cl* | CL* | */CL* )20391 cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*) 20387 20392 LIBEXT=lib ;; 20388 20393 *) LIBEXT=a ;;
Note: See TracChangeset
for help on using the changeset viewer.