Changeset 1516
- Timestamp:
- Nov 2, 2010 4:11:31 PM (9 years ago)
- Location:
- trunk/Cbc
- Files:
-
- 6 edited
-
Makefile.in (modified) (1 diff)
-
configure (modified) (27 diffs)
-
configure.ac (modified) (5 diffs)
-
src/Makefile.in (modified) (1 diff)
-
src/OsiCbc/Makefile.in (modified) (1 diff)
-
test/Makefile.in (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Cbc/Makefile.in
r1501 r1516 132 132 AWK = @AWK@ 133 133 BUILDTOOLSDIR = @BUILDTOOLSDIR@ 134 CBCGENERIC_CFLAGS = @CBCGENERIC_CFLAGS@ 134 135 CBCGENERIC_LIBS = @CBCGENERIC_LIBS@ 135 136 CBCGENERIC_PCLIBS = @CBCGENERIC_PCLIBS@ 136 137 CBCGENERIC_PCREQUIRES = @CBCGENERIC_PCREQUIRES@ 138 CBCLIB_CFLAGS = @CBCLIB_CFLAGS@ 137 139 CBCLIB_LIBS = @CBCLIB_LIBS@ 138 140 CBCLIB_PCLIBS = @CBCLIB_PCLIBS@ -
trunk/Cbc/configure
r1501 r1516 473 473 #endif" 474 474 475 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 ADDLIBS PCADDLIBS FADDLIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE have_svnversion CBC_SVN_REV 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 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 F77 FFLAGS ac_ct_F77 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_PKG_CONFIG_PATH_UNINSTALLED COINDEPEND_LIBS COINDEPEND_CFLAGS COINDEPEND_DATA CBCLIB_ LIBS CBCLIB_PCLIBS CBCLIB_PCREQUIRES CBCGENERIC_LIBS CBCGENERIC_PCLIBS CBCGENERIC_PCREQUIRES COIN_HAS_COINDEPEND_TRUE COIN_HAS_COINDEPEND_FALSE CLP_LIBS CLP_CFLAGS CLP_DATA COIN_HAS_CLP_TRUE COIN_HAS_CLP_FALSE OSITESTS_LIBS OSITESTS_CFLAGS OSITESTS_DATA COIN_HAS_OSITESTS_TRUE COIN_HAS_OSITESTS_FALSE SAMPLE_LIBS SAMPLE_CFLAGS SAMPLE_DATA COIN_HAS_SAMPLE_TRUE COIN_HAS_SAMPLE_FALSE NETLIB_LIBS NETLIB_CFLAGS NETLIB_DATA COIN_HAS_NETLIB_TRUE COIN_HAS_NETLIB_FALSE MIPLIB3_LIBS MIPLIB3_CFLAGS MIPLIB3_DATA COIN_HAS_MIPLIB3_TRUE COIN_HAS_MIPLIB3_FALSE DYLP_LIBS DYLP_CFLAGS DYLP_DATA COIN_HAS_DYLP_TRUE COIN_HAS_DYLP_FALSE VOL_LIBS VOL_CFLAGS VOL_DATA COIN_HAS_VOL_TRUE COIN_HAS_VOL_FALSE CPX_LIBS CPX_CFLAGS CPX_DATA COIN_HAS_CPX_TRUE COIN_HAS_CPX_FALSE GLPK_LIBS GLPK_CFLAGS GLPK_DATA COIN_HAS_GLPK_TRUE COIN_HAS_GLPK_FALSE GRB_LIBS GRB_CFLAGS GRB_DATA COIN_HAS_GRB_TRUE COIN_HAS_GRB_FALSE MSK_LIBS MSK_CFLAGS MSK_DATA COIN_HAS_MSK_TRUE COIN_HAS_MSK_FALSE SPX_LIBS SPX_CFLAGS SPX_DATA COIN_HAS_SPX_TRUE COIN_HAS_SPX_FALSE XPR_LIBS XPR_CFLAGS XPR_DATA COIN_HAS_XPR_TRUE COIN_HAS_XPR_FALSE ASL_LIBS ASL_CFLAGS ASL_DATA COIN_HAS_ASL_TRUE COIN_HAS_ASL_FALSE CBC_BUILD_CBC_GENERIC_TRUE CBC_BUILD_CBC_GENERIC_FALSE OSICBC_DFLT_SOLVER_CLP_TRUE OSICBC_DFLT_SOLVER_CLP_FALSE OSICBC_DFLT_SOLVER_CPX_TRUE OSICBC_DFLT_SOLVER_CPX_FALSE OSICBC_DFLT_SOLVER_DYLP_TRUE OSICBC_DFLT_SOLVER_DYLP_FALSE OSICBC_DFLT_SOLVER_GLPK_TRUE OSICBC_DFLT_SOLVER_GLPK_FALSE OSICBC_DFLT_SOLVER_GRB_TRUE OSICBC_DFLT_SOLVER_GRB_FALSE OSICBC_DFLT_SOLVER_MSK_TRUE OSICBC_DFLT_SOLVER_MSK_FALSE OSICBC_DFLT_SOLVER_SPX_TRUE OSICBC_DFLT_SOLVER_SPX_FALSE OSICBC_DFLT_SOLVER_SYM_TRUE OSICBC_DFLT_SOLVER_SYM_FALSE OSICBC_DFLT_SOLVER_VOL_TRUE OSICBC_DFLT_SOLVER_VOL_FALSE OSICBC_DFLT_SOLVER_XPR_TRUE OSICBC_DFLT_SOLVER_XPR_FALSE coin_have_doxygen coin_doxy_usedot coin_doxy_tagname coin_doxy_logname coin_doxy_tagfiles coin_doxy_excludes LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR LIBOBJS LTLIBOBJS'475 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 ADDLIBS PCADDLIBS FADDLIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE have_svnversion CBC_SVN_REV 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 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 F77 FFLAGS ac_ct_F77 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_PKG_CONFIG_PATH_UNINSTALLED COINDEPEND_LIBS COINDEPEND_CFLAGS COINDEPEND_DATA CBCLIB_CFLAGS CBCLIB_LIBS CBCLIB_PCLIBS CBCLIB_PCREQUIRES CBCGENERIC_CFLAGS CBCGENERIC_LIBS CBCGENERIC_PCLIBS CBCGENERIC_PCREQUIRES COIN_HAS_COINDEPEND_TRUE COIN_HAS_COINDEPEND_FALSE CLP_LIBS CLP_CFLAGS CLP_DATA COIN_HAS_CLP_TRUE COIN_HAS_CLP_FALSE OSITESTS_LIBS OSITESTS_CFLAGS OSITESTS_DATA COIN_HAS_OSITESTS_TRUE COIN_HAS_OSITESTS_FALSE SAMPLE_LIBS SAMPLE_CFLAGS SAMPLE_DATA COIN_HAS_SAMPLE_TRUE COIN_HAS_SAMPLE_FALSE NETLIB_LIBS NETLIB_CFLAGS NETLIB_DATA COIN_HAS_NETLIB_TRUE COIN_HAS_NETLIB_FALSE MIPLIB3_LIBS MIPLIB3_CFLAGS MIPLIB3_DATA COIN_HAS_MIPLIB3_TRUE COIN_HAS_MIPLIB3_FALSE DYLP_LIBS DYLP_CFLAGS DYLP_DATA COIN_HAS_DYLP_TRUE COIN_HAS_DYLP_FALSE VOL_LIBS VOL_CFLAGS VOL_DATA COIN_HAS_VOL_TRUE COIN_HAS_VOL_FALSE CPX_LIBS CPX_CFLAGS CPX_DATA COIN_HAS_CPX_TRUE COIN_HAS_CPX_FALSE GLPK_LIBS GLPK_CFLAGS GLPK_DATA COIN_HAS_GLPK_TRUE COIN_HAS_GLPK_FALSE GRB_LIBS GRB_CFLAGS GRB_DATA COIN_HAS_GRB_TRUE COIN_HAS_GRB_FALSE MSK_LIBS MSK_CFLAGS MSK_DATA COIN_HAS_MSK_TRUE COIN_HAS_MSK_FALSE SPX_LIBS SPX_CFLAGS SPX_DATA COIN_HAS_SPX_TRUE COIN_HAS_SPX_FALSE XPR_LIBS XPR_CFLAGS XPR_DATA COIN_HAS_XPR_TRUE COIN_HAS_XPR_FALSE ASL_LIBS ASL_CFLAGS ASL_DATA COIN_HAS_ASL_TRUE COIN_HAS_ASL_FALSE CBC_BUILD_CBC_GENERIC_TRUE CBC_BUILD_CBC_GENERIC_FALSE OSICBC_DFLT_SOLVER_CLP_TRUE OSICBC_DFLT_SOLVER_CLP_FALSE OSICBC_DFLT_SOLVER_CPX_TRUE OSICBC_DFLT_SOLVER_CPX_FALSE OSICBC_DFLT_SOLVER_DYLP_TRUE OSICBC_DFLT_SOLVER_DYLP_FALSE OSICBC_DFLT_SOLVER_GLPK_TRUE OSICBC_DFLT_SOLVER_GLPK_FALSE OSICBC_DFLT_SOLVER_GRB_TRUE OSICBC_DFLT_SOLVER_GRB_FALSE OSICBC_DFLT_SOLVER_MSK_TRUE OSICBC_DFLT_SOLVER_MSK_FALSE OSICBC_DFLT_SOLVER_SPX_TRUE OSICBC_DFLT_SOLVER_SPX_FALSE OSICBC_DFLT_SOLVER_SYM_TRUE OSICBC_DFLT_SOLVER_SYM_FALSE OSICBC_DFLT_SOLVER_VOL_TRUE OSICBC_DFLT_SOLVER_VOL_FALSE OSICBC_DFLT_SOLVER_XPR_TRUE OSICBC_DFLT_SOLVER_XPR_FALSE coin_have_doxygen coin_doxy_usedot coin_doxy_tagname coin_doxy_logname coin_doxy_tagfiles coin_doxy_excludes LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR LIBOBJS LTLIBOBJS' 476 476 ac_subst_files='' 477 477 … … 5334 5334 full_prefix=`cd $full_prefix ; pwd` 5335 5335 5336 abs_lib_dir=$full_prefix/lib 5336 abs_lib_dir=$full_prefix/lib/coin 5337 5337 5338 5338 abs_include_dir=$full_prefix/include … … 20436 20436 if test "$GXX" = "yes"; then 20437 20437 RPATH_FLAGS= 20438 for dir in $abs_lib_dir /coin $abs_lib_dir/coin/ThirdParty; do20438 for dir in $abs_lib_dir $abs_lib_dir/ThirdParty; do 20439 20439 RPATH_FLAGS="$RPATH_FLAGS -Wl,--rpath -Wl,$dir" 20440 20440 done … … 20453 20453 *-*-solaris*) 20454 20454 RPATH_FLAGS= 20455 for dir in $abs_lib_dir /coin $abs_lib_dir/coin/ThirdParty; do20455 for dir in $abs_lib_dir $abs_lib_dir/ThirdParty; do 20456 20456 RPATH_FLAGS="$RPATH_FLAGS -R$dir" 20457 20457 done … … 20759 20759 20760 20760 20761 20762 20761 20763 #check if user provided LIBS, CFLAGS, or DATA for module 20762 20764 if test $coin_has_coindepend != skipping; then … … 20813 20815 if test -n "$PKG_CONFIG" ; then 20814 20816 if $PKG_CONFIG --exists "cgl osi coinutils = trunk"; then 20815 COINDEPEND_VERSIONS="`$PKG_CONFIG --modversion cgl osi coinutils = trunk2>/dev/null`"20817 COINDEPEND_VERSIONS="`$PKG_CONFIG --modversion "cgl osi coinutils = trunk" 2>/dev/null`" 20816 20818 cflags=`$PKG_CONFIG --cflags "cgl osi coinutils = trunk" 2>/dev/null` 20817 20819 # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files … … 21108 21110 21109 21111 21112 21113 21110 21114 #check if user provided LIBS, CFLAGS, or DATA for module 21111 21115 if test $coin_has_clp != skipping; then … … 21162 21166 if test -n "$PKG_CONFIG" ; then 21163 21167 if $PKG_CONFIG --exists "osi-clp"; then 21164 CLP_VERSIONS="`$PKG_CONFIG --modversion osi-clp2>/dev/null`"21168 CLP_VERSIONS="`$PKG_CONFIG --modversion "osi-clp" 2>/dev/null`" 21165 21169 cflags=`$PKG_CONFIG --cflags "osi-clp" 2>/dev/null` 21166 21170 # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files … … 21495 21499 if test -n "$PKG_CONFIG" ; then 21496 21500 if $PKG_CONFIG --exists "osi-unittests"; then 21497 OSITESTS_VERSIONS="`$PKG_CONFIG --modversion osi-unittests2>/dev/null`"21501 OSITESTS_VERSIONS="`$PKG_CONFIG --modversion "osi-unittests" 2>/dev/null`" 21498 21502 cflags=`$PKG_CONFIG --cflags "osi-unittests" 2>/dev/null` 21499 21503 # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files … … 21784 21788 if test -n "$PKG_CONFIG" ; then 21785 21789 if $PKG_CONFIG --exists "coindatasample"; then 21786 SAMPLE_VERSIONS="`$PKG_CONFIG --modversion coindatasample2>/dev/null`"21790 SAMPLE_VERSIONS="`$PKG_CONFIG --modversion "coindatasample" 2>/dev/null`" 21787 21791 cflags=`$PKG_CONFIG --cflags "coindatasample" 2>/dev/null` 21788 21792 # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files … … 22073 22077 if test -n "$PKG_CONFIG" ; then 22074 22078 if $PKG_CONFIG --exists "coindatanetlib"; then 22075 NETLIB_VERSIONS="`$PKG_CONFIG --modversion coindatanetlib2>/dev/null`"22079 NETLIB_VERSIONS="`$PKG_CONFIG --modversion "coindatanetlib" 2>/dev/null`" 22076 22080 cflags=`$PKG_CONFIG --cflags "coindatanetlib" 2>/dev/null` 22077 22081 # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files … … 22362 22366 if test -n "$PKG_CONFIG" ; then 22363 22367 if $PKG_CONFIG --exists "coindatamiplib3"; then 22364 MIPLIB3_VERSIONS="`$PKG_CONFIG --modversion coindatamiplib32>/dev/null`"22368 MIPLIB3_VERSIONS="`$PKG_CONFIG --modversion "coindatamiplib3" 2>/dev/null`" 22365 22369 cflags=`$PKG_CONFIG --cflags "coindatamiplib3" 2>/dev/null` 22366 22370 # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files … … 22615 22619 22616 22620 22621 22617 22622 #check if user provided LIBS, CFLAGS, or DATA for module 22618 22623 if test $coin_has_dylp != skipping; then … … 22665 22670 if test -n "$PKG_CONFIG" ; then 22666 22671 if $PKG_CONFIG --exists "osi-dylp"; then 22667 DYLP_VERSIONS="`$PKG_CONFIG --modversion osi-dylp2>/dev/null`"22672 DYLP_VERSIONS="`$PKG_CONFIG --modversion "osi-dylp" 2>/dev/null`" 22668 22673 cflags=`$PKG_CONFIG --cflags "osi-dylp" 2>/dev/null` 22669 22674 # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files … … 22972 22977 if test -n "$PKG_CONFIG" ; then 22973 22978 if $PKG_CONFIG --exists "osi-vol"; then 22974 VOL_VERSIONS="`$PKG_CONFIG --modversion osi-vol2>/dev/null`"22979 VOL_VERSIONS="`$PKG_CONFIG --modversion "osi-vol" 2>/dev/null`" 22975 22980 cflags=`$PKG_CONFIG --cflags "osi-vol" 2>/dev/null` 22976 22981 # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files … … 23219 23224 23220 23225 23226 23221 23227 #check if user provided LIBS, CFLAGS, or DATA for module 23222 23228 if test $coin_has_cpx != skipping; then … … 23269 23275 if test -n "$PKG_CONFIG" ; then 23270 23276 if $PKG_CONFIG --exists "osi-cplex"; then 23271 CPX_VERSIONS="`$PKG_CONFIG --modversion osi-cplex2>/dev/null`"23277 CPX_VERSIONS="`$PKG_CONFIG --modversion "osi-cplex" 2>/dev/null`" 23272 23278 cflags=`$PKG_CONFIG --cflags "osi-cplex" 2>/dev/null` 23273 23279 # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files … … 23534 23540 23535 23541 23542 23536 23543 #check if user provided LIBS, CFLAGS, or DATA for module 23537 23544 if test $coin_has_glpk != skipping; then … … 23584 23591 if test -n "$PKG_CONFIG" ; then 23585 23592 if $PKG_CONFIG --exists "osi-glpk"; then 23586 GLPK_VERSIONS="`$PKG_CONFIG --modversion osi-glpk2>/dev/null`"23593 GLPK_VERSIONS="`$PKG_CONFIG --modversion "osi-glpk" 2>/dev/null`" 23587 23594 cflags=`$PKG_CONFIG --cflags "osi-glpk" 2>/dev/null` 23588 23595 # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files … … 23891 23898 if test -n "$PKG_CONFIG" ; then 23892 23899 if $PKG_CONFIG --exists "osi-gurobi"; then 23893 GRB_VERSIONS="`$PKG_CONFIG --modversion osi-gurobi2>/dev/null`"23900 GRB_VERSIONS="`$PKG_CONFIG --modversion "osi-gurobi" 2>/dev/null`" 23894 23901 cflags=`$PKG_CONFIG --cflags "osi-gurobi" 2>/dev/null` 23895 23902 # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files … … 24138 24145 24139 24146 24147 24140 24148 #check if user provided LIBS, CFLAGS, or DATA for module 24141 24149 if test $coin_has_msk != skipping; then … … 24188 24196 if test -n "$PKG_CONFIG" ; then 24189 24197 if $PKG_CONFIG --exists "osi-mosek"; then 24190 MSK_VERSIONS="`$PKG_CONFIG --modversion osi-mosek2>/dev/null`"24198 MSK_VERSIONS="`$PKG_CONFIG --modversion "osi-mosek" 2>/dev/null`" 24191 24199 cflags=`$PKG_CONFIG --cflags "osi-mosek" 2>/dev/null` 24192 24200 # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files … … 24453 24461 24454 24462 24463 24455 24464 #check if user provided LIBS, CFLAGS, or DATA for module 24456 24465 if test $coin_has_spx != skipping; then … … 24503 24512 if test -n "$PKG_CONFIG" ; then 24504 24513 if $PKG_CONFIG --exists "osi-soplex"; then 24505 SPX_VERSIONS="`$PKG_CONFIG --modversion osi-soplex2>/dev/null`"24514 SPX_VERSIONS="`$PKG_CONFIG --modversion "osi-soplex" 2>/dev/null`" 24506 24515 cflags=`$PKG_CONFIG --cflags "osi-soplex" 2>/dev/null` 24507 24516 # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files … … 24810 24819 if test -n "$PKG_CONFIG" ; then 24811 24820 if $PKG_CONFIG --exists "osi-xpress"; then 24812 XPR_VERSIONS="`$PKG_CONFIG --modversion osi-xpress2>/dev/null`"24821 XPR_VERSIONS="`$PKG_CONFIG --modversion "osi-xpress" 2>/dev/null`" 24813 24822 cflags=`$PKG_CONFIG --cflags "osi-xpress" 2>/dev/null` 24814 24823 # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files … … 25105 25114 if test -n "$PKG_CONFIG" ; then 25106 25115 if $PKG_CONFIG --exists "coinasl"; then 25107 ASL_VERSIONS="`$PKG_CONFIG --modversion coinasl2>/dev/null`"25116 ASL_VERSIONS="`$PKG_CONFIG --modversion "coinasl" 2>/dev/null`" 25108 25117 cflags=`$PKG_CONFIG --cflags "coinasl" 2>/dev/null` 25109 25118 # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files … … 27192 27201 s,@COINDEPEND_CFLAGS@,$COINDEPEND_CFLAGS,;t t 27193 27202 s,@COINDEPEND_DATA@,$COINDEPEND_DATA,;t t 27203 s,@CBCLIB_CFLAGS@,$CBCLIB_CFLAGS,;t t 27194 27204 s,@CBCLIB_LIBS@,$CBCLIB_LIBS,;t t 27195 27205 s,@CBCLIB_PCLIBS@,$CBCLIB_PCLIBS,;t t 27196 27206 s,@CBCLIB_PCREQUIRES@,$CBCLIB_PCREQUIRES,;t t 27207 s,@CBCGENERIC_CFLAGS@,$CBCGENERIC_CFLAGS,;t t 27197 27208 s,@CBCGENERIC_LIBS@,$CBCGENERIC_LIBS,;t t 27198 27209 s,@CBCGENERIC_PCLIBS@,$CBCGENERIC_PCLIBS,;t t -
trunk/Cbc/configure.ac
r1501 r1516 57 57 ############################################################################# 58 58 59 AC_COIN_ HAS_PACKAGE(CoinDepend, [cgl osi coinutils = trunk], [CbcLib CbcGeneric])59 AC_COIN_CHECK_PACKAGE(CoinDepend, [cgl osi coinutils = trunk], [CbcLib CbcGeneric]) 60 60 if test $coin_has_coindepend != yes ; then 61 61 AC_MSG_ERROR([Required package CoinUtils, Osi, or Cgl not available.]) … … 64 64 # Clp and OsiClp are inseparable here. 65 65 66 AC_COIN_ HAS_PACKAGE(Clp, [osi-clp], [CbcLib CbcGeneric])66 AC_COIN_CHECK_PACKAGE(Clp, [osi-clp], [CbcLib CbcGeneric]) 67 67 if test $coin_has_clp != yes ; then 68 68 AC_MSG_ERROR("Required package Clp unavailable.") … … 71 71 # The rest are not required for linking against Cbc 72 72 73 AC_COIN_ HAS_PACKAGE(OsiTests, [osi-unittests])74 AC_COIN_ HAS_PACKAGE(Sample, [coindatasample])75 AC_COIN_ HAS_PACKAGE(Netlib, [coindatanetlib])76 AC_COIN_ HAS_PACKAGE(Miplib3, [coindatamiplib3])73 AC_COIN_CHECK_PACKAGE(OsiTests, [osi-unittests]) 74 AC_COIN_CHECK_PACKAGE(Sample, [coindatasample]) 75 AC_COIN_CHECK_PACKAGE(Netlib, [coindatanetlib]) 76 AC_COIN_CHECK_PACKAGE(Miplib3, [coindatamiplib3]) 77 77 78 78 ############################################################################# … … 81 81 82 82 # Check which other LP solvers are available, some of them become a dependency of CbcGeneric 83 AC_COIN_ HAS_PACKAGE(DyLP, [osi-dylp], [CbcGeneric])84 AC_COIN_ HAS_PACKAGE(Vol, [osi-vol])85 AC_COIN_ HAS_PACKAGE(Cpx, [osi-cplex], [CbcGeneric])86 AC_COIN_ HAS_PACKAGE(Glpk, [osi-glpk], [CbcGeneric])87 AC_COIN_ HAS_PACKAGE(Grb, [osi-gurobi])88 AC_COIN_ HAS_PACKAGE(Msk, [osi-mosek], [CbcGeneric])89 AC_COIN_ HAS_PACKAGE(Spx, [osi-soplex], [CbcGeneric])90 AC_COIN_ HAS_PACKAGE(Xpr, [osi-xpress])83 AC_COIN_CHECK_PACKAGE(DyLP, [osi-dylp], [CbcGeneric]) 84 AC_COIN_CHECK_PACKAGE(Vol, [osi-vol]) 85 AC_COIN_CHECK_PACKAGE(Cpx, [osi-cplex], [CbcGeneric]) 86 AC_COIN_CHECK_PACKAGE(Glpk, [osi-glpk], [CbcGeneric]) 87 AC_COIN_CHECK_PACKAGE(Grb, [osi-gurobi]) 88 AC_COIN_CHECK_PACKAGE(Msk, [osi-mosek], [CbcGeneric]) 89 AC_COIN_CHECK_PACKAGE(Spx, [osi-soplex], [CbcGeneric]) 90 AC_COIN_CHECK_PACKAGE(Xpr, [osi-xpress]) 91 91 92 92 ############################################################################# … … 95 95 96 96 # Ampl Solver library 97 AC_COIN_ HAS_PACKAGE(ASL, [coinasl])97 AC_COIN_CHECK_PACKAGE(ASL, [coinasl]) 98 98 99 99 ############################################################################# -
trunk/Cbc/src/Makefile.in
r1501 r1516 218 218 AWK = @AWK@ 219 219 BUILDTOOLSDIR = @BUILDTOOLSDIR@ 220 CBCGENERIC_CFLAGS = @CBCGENERIC_CFLAGS@ 220 221 CBCGENERIC_LIBS = @CBCGENERIC_LIBS@ 221 222 CBCGENERIC_PCLIBS = @CBCGENERIC_PCLIBS@ 222 223 CBCGENERIC_PCREQUIRES = @CBCGENERIC_PCREQUIRES@ 224 CBCLIB_CFLAGS = @CBCLIB_CFLAGS@ 223 225 CBCLIB_LIBS = @CBCLIB_LIBS@ 224 226 CBCLIB_PCLIBS = @CBCLIB_PCLIBS@ -
trunk/Cbc/src/OsiCbc/Makefile.in
r1501 r1516 123 123 AWK = @AWK@ 124 124 BUILDTOOLSDIR = @BUILDTOOLSDIR@ 125 CBCGENERIC_CFLAGS = @CBCGENERIC_CFLAGS@ 125 126 CBCGENERIC_LIBS = @CBCGENERIC_LIBS@ 126 127 CBCGENERIC_PCLIBS = @CBCGENERIC_PCLIBS@ 127 128 CBCGENERIC_PCREQUIRES = @CBCGENERIC_PCREQUIRES@ 129 CBCLIB_CFLAGS = @CBCLIB_CFLAGS@ 128 130 CBCLIB_LIBS = @CBCLIB_LIBS@ 129 131 CBCLIB_PCLIBS = @CBCLIB_PCLIBS@ -
trunk/Cbc/test/Makefile.in
r1501 r1516 127 127 AWK = @AWK@ 128 128 BUILDTOOLSDIR = @BUILDTOOLSDIR@ 129 CBCGENERIC_CFLAGS = @CBCGENERIC_CFLAGS@ 129 130 CBCGENERIC_LIBS = @CBCGENERIC_LIBS@ 130 131 CBCGENERIC_PCLIBS = @CBCGENERIC_PCLIBS@ 131 132 CBCGENERIC_PCREQUIRES = @CBCGENERIC_PCREQUIRES@ 133 CBCLIB_CFLAGS = @CBCLIB_CFLAGS@ 132 134 CBCLIB_LIBS = @CBCLIB_LIBS@ 133 135 CBCLIB_PCLIBS = @CBCLIB_PCLIBS@
Note: See TracChangeset
for help on using the changeset viewer.
