- Timestamp:
- Jul 18, 2010 12:33:34 PM (11 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Clp/src/Makefile.am
r1559 r1574 18 18 19 19 # Name of the library compiled in this directory. We want it to be installed 20 # in the 'lib ' directory20 # in the 'lib/coin' directory 21 21 coinlibdir = ${libdir}/coin 22 22 coinlib_LTLIBRARIES = libClp.la … … 120 120 121 121 # Here list all the header files that are required by a user of the library, 122 # and that therefore should be installed in 'in stall/coin'122 # and that therefore should be installed in 'include/coin' 123 123 includecoindir = $(includedir)/coin 124 124 includecoin_HEADERS = \ -
trunk/Clp/src/Makefile.in
r1573 r1574 303 303 304 304 # Name of the library compiled in this directory. We want it to be installed 305 # in the 'lib ' directory305 # in the 'lib/coin' directory 306 306 coinlibdir = ${libdir}/coin 307 307 coinlib_LTLIBRARIES = libClp.la … … 399 399 400 400 # Here list all the header files that are required by a user of the library, 401 # and that therefore should be installed in 'in stall/coin'401 # and that therefore should be installed in 'include/coin' 402 402 includecoindir = $(includedir)/coin 403 403 -
trunk/configure
r1572 r1574 479 479 ac_subdirs_all="$ac_subdirs_all Data/Netlib" 480 480 ac_subdirs_all="$ac_subdirs_all CoinUtils" 481 ac_subdirs_all="$ac_subdirs_all Osi" 481 482 ac_subdirs_all="$ac_subdirs_all Clp" 482 483 ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os CDEFS ADD_CFLAGS DBG_CFLAGS OPT_CFLAGS sol_cc_compiler CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT MPICC CXXDEFS ADD_CXXFLAGS DBG_CXXFLAGS OPT_CXXFLAGS CXX CXXFLAGS ac_ct_CXX MPICXX ADD_FFLAGS DBG_FFLAGS OPT_FFLAGS F77 FFLAGS ac_ct_F77 MPIF77 EGREP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBTOOLM4 have_autoconf have_automake have_svn BUILDTOOLSDIR AUX_DIR abs_source_dir abs_lib_dir abs_include_dir abs_bin_dir HAVE_EXTERNALS_TRUE HAVE_EXTERNALS_FALSE host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXXCPP LIBTOOL ac_c_preproc_warn_flag ac_cxx_preproc_warn_flag RPATH_FLAGS LT_LDFLAGS PKG_CONFIG ac_pt_PKG_CONFIG COIN_HAS_PKGCONFIG_TRUE COIN_HAS_PKGCONFIG_FALSE COIN_PKG_CONFIG_PATH COIN_SKIP_PROJECTS subdirs LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR LIBOBJS LTLIBOBJS' … … 1155 1156 directory with data files for using project 1156 1157 CoinUtils 1158 --with-osi-lib linker flags for using project Osi 1159 --with-osi-incdir directory with header files for using project Osi 1160 --with-osi-datadir directory with data files for using project Osi 1157 1161 --with-clp-lib linker flags for using project Clp 1158 1162 --with-clp-incdir directory with header files for using project Clp … … 4194 4198 4195 4199 # Provide some information about the compiler. 4196 echo "$as_me:4 196:" \4200 echo "$as_me:4200:" \ 4197 4201 "checking for Fortran 77 compiler version" >&5 4198 4202 ac_compiler=`set X $ac_compile; echo $2` … … 6453 6457 *-*-irix6*) 6454 6458 # Find out which ABI we are using. 6455 echo '#line 645 5"configure"' > conftest.$ac_ext6459 echo '#line 6459 "configure"' > conftest.$ac_ext 6456 6460 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 6457 6461 (eval $ac_compile) 2>&5 … … 8417 8421 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 8418 8422 -e 's:$: $lt_compiler_flag:'` 8419 (eval echo "\"\$as_me:84 19: $lt_compile\"" >&5)8423 (eval echo "\"\$as_me:8423: $lt_compile\"" >&5) 8420 8424 (eval "$lt_compile" 2>conftest.err) 8421 8425 ac_status=$? 8422 8426 cat conftest.err >&5 8423 echo "$as_me:842 3: \$? = $ac_status" >&58427 echo "$as_me:8427: \$? = $ac_status" >&5 8424 8428 if (exit $ac_status) && test -s "$ac_outfile"; then 8425 8429 # The compiler can only warn and ignore the option if not recognized … … 8685 8689 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 8686 8690 -e 's:$: $lt_compiler_flag:'` 8687 (eval echo "\"\$as_me:86 87: $lt_compile\"" >&5)8691 (eval echo "\"\$as_me:8691: $lt_compile\"" >&5) 8688 8692 (eval "$lt_compile" 2>conftest.err) 8689 8693 ac_status=$? 8690 8694 cat conftest.err >&5 8691 echo "$as_me:869 1: \$? = $ac_status" >&58695 echo "$as_me:8695: \$? = $ac_status" >&5 8692 8696 if (exit $ac_status) && test -s "$ac_outfile"; then 8693 8697 # The compiler can only warn and ignore the option if not recognized … … 8789 8793 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 8790 8794 -e 's:$: $lt_compiler_flag:'` 8791 (eval echo "\"\$as_me:879 1: $lt_compile\"" >&5)8795 (eval echo "\"\$as_me:8795: $lt_compile\"" >&5) 8792 8796 (eval "$lt_compile" 2>out/conftest.err) 8793 8797 ac_status=$? 8794 8798 cat out/conftest.err >&5 8795 echo "$as_me:879 5: \$? = $ac_status" >&58799 echo "$as_me:8799: \$? = $ac_status" >&5 8796 8800 if (exit $ac_status) && test -s out/conftest2.$ac_objext 8797 8801 then … … 11134 11138 lt_status=$lt_dlunknown 11135 11139 cat > conftest.$ac_ext <<EOF 11136 #line 111 36"configure"11140 #line 11140 "configure" 11137 11141 #include "confdefs.h" 11138 11142 … … 11234 11238 lt_status=$lt_dlunknown 11235 11239 cat > conftest.$ac_ext <<EOF 11236 #line 112 36"configure"11240 #line 11240 "configure" 11237 11241 #include "confdefs.h" 11238 11242 … … 13578 13582 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 13579 13583 -e 's:$: $lt_compiler_flag:'` 13580 (eval echo "\"\$as_me:1358 0: $lt_compile\"" >&5)13584 (eval echo "\"\$as_me:13584: $lt_compile\"" >&5) 13581 13585 (eval "$lt_compile" 2>conftest.err) 13582 13586 ac_status=$? 13583 13587 cat conftest.err >&5 13584 echo "$as_me:1358 4: \$? = $ac_status" >&513588 echo "$as_me:13588: \$? = $ac_status" >&5 13585 13589 if (exit $ac_status) && test -s "$ac_outfile"; then 13586 13590 # The compiler can only warn and ignore the option if not recognized … … 13682 13686 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 13683 13687 -e 's:$: $lt_compiler_flag:'` 13684 (eval echo "\"\$as_me:1368 4: $lt_compile\"" >&5)13688 (eval echo "\"\$as_me:13688: $lt_compile\"" >&5) 13685 13689 (eval "$lt_compile" 2>out/conftest.err) 13686 13690 ac_status=$? 13687 13691 cat out/conftest.err >&5 13688 echo "$as_me:136 88: \$? = $ac_status" >&513692 echo "$as_me:13692: \$? = $ac_status" >&5 13689 13693 if (exit $ac_status) && test -s out/conftest2.$ac_objext 13690 13694 then … … 15252 15256 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 15253 15257 -e 's:$: $lt_compiler_flag:'` 15254 (eval echo "\"\$as_me:1525 4: $lt_compile\"" >&5)15258 (eval echo "\"\$as_me:15258: $lt_compile\"" >&5) 15255 15259 (eval "$lt_compile" 2>conftest.err) 15256 15260 ac_status=$? 15257 15261 cat conftest.err >&5 15258 echo "$as_me:152 58: \$? = $ac_status" >&515262 echo "$as_me:15262: \$? = $ac_status" >&5 15259 15263 if (exit $ac_status) && test -s "$ac_outfile"; then 15260 15264 # The compiler can only warn and ignore the option if not recognized … … 15356 15360 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 15357 15361 -e 's:$: $lt_compiler_flag:'` 15358 (eval echo "\"\$as_me:153 58: $lt_compile\"" >&5)15362 (eval echo "\"\$as_me:15362: $lt_compile\"" >&5) 15359 15363 (eval "$lt_compile" 2>out/conftest.err) 15360 15364 ac_status=$? 15361 15365 cat out/conftest.err >&5 15362 echo "$as_me:1536 2: \$? = $ac_status" >&515366 echo "$as_me:15366: \$? = $ac_status" >&5 15363 15367 if (exit $ac_status) && test -s out/conftest2.$ac_objext 15364 15368 then … … 17563 17567 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 17564 17568 -e 's:$: $lt_compiler_flag:'` 17565 (eval echo "\"\$as_me:1756 5: $lt_compile\"" >&5)17569 (eval echo "\"\$as_me:17569: $lt_compile\"" >&5) 17566 17570 (eval "$lt_compile" 2>conftest.err) 17567 17571 ac_status=$? 17568 17572 cat conftest.err >&5 17569 echo "$as_me:175 69: \$? = $ac_status" >&517573 echo "$as_me:17573: \$? = $ac_status" >&5 17570 17574 if (exit $ac_status) && test -s "$ac_outfile"; then 17571 17575 # The compiler can only warn and ignore the option if not recognized … … 17831 17835 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 17832 17836 -e 's:$: $lt_compiler_flag:'` 17833 (eval echo "\"\$as_me:1783 3: $lt_compile\"" >&5)17837 (eval echo "\"\$as_me:17837: $lt_compile\"" >&5) 17834 17838 (eval "$lt_compile" 2>conftest.err) 17835 17839 ac_status=$? 17836 17840 cat conftest.err >&5 17837 echo "$as_me:178 37: \$? = $ac_status" >&517841 echo "$as_me:17841: \$? = $ac_status" >&5 17838 17842 if (exit $ac_status) && test -s "$ac_outfile"; then 17839 17843 # The compiler can only warn and ignore the option if not recognized … … 17935 17939 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 17936 17940 -e 's:$: $lt_compiler_flag:'` 17937 (eval echo "\"\$as_me:179 37: $lt_compile\"" >&5)17941 (eval echo "\"\$as_me:17941: $lt_compile\"" >&5) 17938 17942 (eval "$lt_compile" 2>out/conftest.err) 17939 17943 ac_status=$? 17940 17944 cat out/conftest.err >&5 17941 echo "$as_me:1794 1: \$? = $ac_status" >&517945 echo "$as_me:17945: \$? = $ac_status" >&5 17942 17946 if (exit $ac_status) && test -s out/conftest2.$ac_objext 17943 17947 then … … 21747 21751 21748 21752 21753 echo "$as_me:$LINENO: checking whether project Osi is available" >&5 21754 echo $ECHO_N "checking whether project Osi is available... $ECHO_C" >&6 21755 21756 coin_has_osi=notGiven 21757 coin_have_project_dir=no 21758 21759 # check if user wants to skip project in any case 21760 21761 if test x"$COIN_SKIP_PROJECTS" != x; then 21762 for dir in $COIN_SKIP_PROJECTS; do 21763 if test $dir = "Osi"; then 21764 coin_has_osi=skipping 21765 fi 21766 if test $dir = "/Osi"; then 21767 coin_has_osi=skipping 21768 fi 21769 done 21770 fi 21771 21772 if test $coin_has_osi != skipping; then 21773 if test $PACKAGE_TARNAME = osi; then 21774 coin_has_osi=. 21775 coin_have_project_dir=yes 21776 fi 21777 21778 21779 # Check whether --with-m4_tolower(Osi)-lib or --without-m4_tolower(Osi)-lib was given. 21780 if test "${with_osi_lib+set}" = set; then 21781 withval="$with_osi_lib" 21782 coin_has_osi=installed 21783 fi; 21784 21785 21786 # Check whether --with-m4_tolower(Osi)-incdir or --without-m4_tolower(Osi)-incdir was given. 21787 if test "${with_osi_incdir+set}" = set; then 21788 withval="$with_osi_incdir" 21789 coin_has_osi=installed 21790 fi; 21791 21792 21793 # Check whether --with-m4_tolower(Osi)-datadir or --without-m4_tolower(Osi)-datadir was given. 21794 if test "${with_osi_datadir+set}" = set; then 21795 withval="$with_osi_datadir" 21796 coin_has_osi=installed 21797 fi; 21798 21799 21800 21801 21802 21803 fi 21804 21805 if test $coin_has_osi = notGiven; then 21806 #only if pkg-config is available: 21807 #see if user gives directory where project might be installed: assemble search path for pkg-config 21808 if test -n "$PKG_CONFIG" ; then 21809 coin_save_PKG_CONFIG_PATH="$PKG_CONFIG_PATH" 21810 21811 # let's assume that when installing into $prefix, then the user may have installed some other coin projects there before, so it's worth to have a look into there 21812 if test -d "$prefix"; then 21813 PKG_CONFIG_PATH="$prefix/lib/pkgconfig:$PKG_CONFIG_PATH" 21814 fi 21815 21816 21817 # Check whether --with-coin-instdir or --without-coin-instdir was given. 21818 if test "${with_coin_instdir+set}" = set; then 21819 withval="$with_coin_instdir" 21820 if test -d "$withval"; then : ; else 21821 { { echo "$as_me:$LINENO: error: argument for --with-coin-instdir not a directory" >&5 21822 echo "$as_me: error: argument for --with-coin-instdir not a directory" >&2;} 21823 { (exit 1); exit 1; }; } 21824 fi 21825 PKG_CONFIG_PATH="$withval/lib/pkgconfig:$PKG_CONFIG_PATH" 21826 21827 fi; 21828 21829 # let pkgconfig check if the project is already installed somewhere 21830 # need to export variable to be sure that the following pkg-config call gets these values 21831 export PKG_CONFIG_PATH 21832 21833 if test -n "$PKG_CONFIG" ; then 21834 if $PKG_CONFIG --exists "osi"; then 21835 OSI_VERSION=`$PKG_CONFIG --modversion "osi" 2>/dev/null` 21836 coin_has_osi="$OSI_VERSION" 21837 else 21838 OSI_PKG_ERRORS=`$PKG_CONFIG $pkg_short_errors --errors-to-stdout --print-errors "osi"` 21839 21840 fi 21841 else 21842 { { echo "$as_me:$LINENO: error: \"Cannot check for existance of module Osi without pkg-config\"" >&5 21843 echo "$as_me: error: \"Cannot check for existance of module Osi without pkg-config\"" >&2;} 21844 { (exit 1); exit 1; }; } 21845 fi 21846 21847 21848 PKG_CONFIG_PATH="$coin_save_PKG_CONFIG_PATH" 21849 fi 21850 fi 21851 21852 # if not found yet, check if project is available in present directory 21853 if test "$coin_has_osi" = notGiven; then 21854 if test -d $srcdir//Osi; then 21855 # If a third argument is given, then we have to check if one one the files given in that third argument is present. 21856 # If none of the files in the third argument is available, then we consider the project directory as non-existing. 21857 # However, if no third argument is given, then this means that there should be no check, and existence of the directory is sufficient. 21858 coin_have_project_dir=yes 21859 21860 if test $coin_have_project_dir = yes; then 21861 coin_has_osi=Osi 21862 fi 21863 fi 21864 fi 21865 21866 echo "$as_me:$LINENO: result: $coin_has_osi" >&5 21867 echo "${ECHO_T}$coin_has_osi" >&6 21868 21869 echo "$as_me:$LINENO: checking whether project Osi need to be configured" >&5 21870 echo $ECHO_N "checking whether project Osi need to be configured... $ECHO_C" >&6 21871 if test "$coin_have_project_dir" = yes ; then 21872 21873 if test -r $srcdir/Osi/configure; then 21874 coin_subdirs="$coin_subdirs Osi" 21875 echo "$as_me:$LINENO: result: yes" >&5 21876 echo "${ECHO_T}yes" >&6 21877 21878 21879 subdirs="$subdirs Osi" 21880 21881 else 21882 echo "$as_me:$LINENO: result: no" >&5 21883 echo "${ECHO_T}no" >&6 21884 fi 21885 else 21886 echo "$as_me:$LINENO: result: no" >&5 21887 echo "${ECHO_T}no" >&6 21888 fi 21889 21890 21749 21891 echo "$as_me:$LINENO: checking whether project Clp is available" >&5 21750 21892 echo $ECHO_N "checking whether project Clp is available... $ECHO_C" >&6 … … 21920 22062 ADDLIBS="$ADDLIBS $FLIBS" 21921 22063 fi 22064 PCADDLIBS="$PCADDLIBS $ADDLIBS" 21922 22065 21923 22066 # library extension -
trunk/configure.ac
r1559 r1574 48 48 AC_COIN_MAIN_PACKAGEDIR(Netlib,Data,,coindatanetlib) 49 49 AC_COIN_MAIN_PACKAGEDIR(CoinUtils) 50 AC_COIN_MAIN_PACKAGEDIR(Osi) 50 51 AC_COIN_MAIN_PACKAGEDIR(Clp) 51 52
Note: See TracChangeset
for help on using the changeset viewer.