Changeset 1516


Ignore:
Timestamp:
Nov 2, 2010 4:11:31 PM (9 years ago)
Author:
tkr
Message:

Making name changes to comply with recent changes in build tools and re-running the autotools

Location:
trunk/Cbc
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cbc/Makefile.in

    r1501 r1516  
    132132AWK = @AWK@
    133133BUILDTOOLSDIR = @BUILDTOOLSDIR@
     134CBCGENERIC_CFLAGS = @CBCGENERIC_CFLAGS@
    134135CBCGENERIC_LIBS = @CBCGENERIC_LIBS@
    135136CBCGENERIC_PCLIBS = @CBCGENERIC_PCLIBS@
    136137CBCGENERIC_PCREQUIRES = @CBCGENERIC_PCREQUIRES@
     138CBCLIB_CFLAGS = @CBCLIB_CFLAGS@
    137139CBCLIB_LIBS = @CBCLIB_LIBS@
    138140CBCLIB_PCLIBS = @CBCLIB_PCLIBS@
  • trunk/Cbc/configure

    r1501 r1516  
    473473#endif"
    474474
    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'
     475ac_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'
    476476ac_subst_files=''
    477477
     
    53345334full_prefix=`cd $full_prefix ; pwd`
    53355335
    5336 abs_lib_dir=$full_prefix/lib
     5336abs_lib_dir=$full_prefix/lib/coin
    53375337
    53385338abs_include_dir=$full_prefix/include
     
    2043620436      if test "$GXX" = "yes"; then
    2043720437        RPATH_FLAGS=
    20438         for dir in $abs_lib_dir/coin $abs_lib_dir/coin/ThirdParty; do
     20438        for dir in $abs_lib_dir $abs_lib_dir/ThirdParty; do
    2043920439          RPATH_FLAGS="$RPATH_FLAGS -Wl,--rpath -Wl,$dir"
    2044020440        done
     
    2045320453    *-*-solaris*)
    2045420454        RPATH_FLAGS=
    20455         for dir in $abs_lib_dir/coin $abs_lib_dir/coin/ThirdParty; do
     20455        for dir in $abs_lib_dir $abs_lib_dir/ThirdParty; do
    2045620456          RPATH_FLAGS="$RPATH_FLAGS -R$dir"
    2045720457        done
     
    2075920759
    2076020760
     20761
     20762
    2076120763#check if user provided LIBS, CFLAGS, or DATA for module
    2076220764if test $coin_has_coindepend != skipping; then
     
    2081320815if test -n "$PKG_CONFIG" ; then
    2081420816  if $PKG_CONFIG --exists "cgl osi coinutils = trunk"; then
    20815     COINDEPEND_VERSIONS="`$PKG_CONFIG --modversion cgl osi coinutils = trunk 2>/dev/null`"
     20817    COINDEPEND_VERSIONS="`$PKG_CONFIG --modversion "cgl osi coinutils = trunk" 2>/dev/null`"
    2081620818     cflags=`$PKG_CONFIG --cflags "cgl osi coinutils = trunk" 2>/dev/null`
    2081720819    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
     
    2110821110
    2110921111
     21112
     21113
    2111021114#check if user provided LIBS, CFLAGS, or DATA for module
    2111121115if test $coin_has_clp != skipping; then
     
    2116221166if test -n "$PKG_CONFIG" ; then
    2116321167  if $PKG_CONFIG --exists "osi-clp"; then
    21164     CLP_VERSIONS="`$PKG_CONFIG --modversion osi-clp 2>/dev/null`"
     21168    CLP_VERSIONS="`$PKG_CONFIG --modversion "osi-clp" 2>/dev/null`"
    2116521169     cflags=`$PKG_CONFIG --cflags "osi-clp" 2>/dev/null`
    2116621170    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
     
    2149521499if test -n "$PKG_CONFIG" ; then
    2149621500  if $PKG_CONFIG --exists "osi-unittests"; then
    21497     OSITESTS_VERSIONS="`$PKG_CONFIG --modversion osi-unittests 2>/dev/null`"
     21501    OSITESTS_VERSIONS="`$PKG_CONFIG --modversion "osi-unittests" 2>/dev/null`"
    2149821502     cflags=`$PKG_CONFIG --cflags "osi-unittests" 2>/dev/null`
    2149921503    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
     
    2178421788if test -n "$PKG_CONFIG" ; then
    2178521789  if $PKG_CONFIG --exists "coindatasample"; then
    21786     SAMPLE_VERSIONS="`$PKG_CONFIG --modversion coindatasample 2>/dev/null`"
     21790    SAMPLE_VERSIONS="`$PKG_CONFIG --modversion "coindatasample" 2>/dev/null`"
    2178721791     cflags=`$PKG_CONFIG --cflags "coindatasample" 2>/dev/null`
    2178821792    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
     
    2207322077if test -n "$PKG_CONFIG" ; then
    2207422078  if $PKG_CONFIG --exists "coindatanetlib"; then
    22075     NETLIB_VERSIONS="`$PKG_CONFIG --modversion coindatanetlib 2>/dev/null`"
     22079    NETLIB_VERSIONS="`$PKG_CONFIG --modversion "coindatanetlib" 2>/dev/null`"
    2207622080     cflags=`$PKG_CONFIG --cflags "coindatanetlib" 2>/dev/null`
    2207722081    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
     
    2236222366if test -n "$PKG_CONFIG" ; then
    2236322367  if $PKG_CONFIG --exists "coindatamiplib3"; then
    22364     MIPLIB3_VERSIONS="`$PKG_CONFIG --modversion coindatamiplib3 2>/dev/null`"
     22368    MIPLIB3_VERSIONS="`$PKG_CONFIG --modversion "coindatamiplib3" 2>/dev/null`"
    2236522369     cflags=`$PKG_CONFIG --cflags "coindatamiplib3" 2>/dev/null`
    2236622370    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
     
    2261522619
    2261622620
     22621
    2261722622#check if user provided LIBS, CFLAGS, or DATA for module
    2261822623if test $coin_has_dylp != skipping; then
     
    2266522670if test -n "$PKG_CONFIG" ; then
    2266622671  if $PKG_CONFIG --exists "osi-dylp"; then
    22667     DYLP_VERSIONS="`$PKG_CONFIG --modversion osi-dylp 2>/dev/null`"
     22672    DYLP_VERSIONS="`$PKG_CONFIG --modversion "osi-dylp" 2>/dev/null`"
    2266822673     cflags=`$PKG_CONFIG --cflags "osi-dylp" 2>/dev/null`
    2266922674    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
     
    2297222977if test -n "$PKG_CONFIG" ; then
    2297322978  if $PKG_CONFIG --exists "osi-vol"; then
    22974     VOL_VERSIONS="`$PKG_CONFIG --modversion osi-vol 2>/dev/null`"
     22979    VOL_VERSIONS="`$PKG_CONFIG --modversion "osi-vol" 2>/dev/null`"
    2297522980     cflags=`$PKG_CONFIG --cflags "osi-vol" 2>/dev/null`
    2297622981    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
     
    2321923224
    2322023225
     23226
    2322123227#check if user provided LIBS, CFLAGS, or DATA for module
    2322223228if test $coin_has_cpx != skipping; then
     
    2326923275if test -n "$PKG_CONFIG" ; then
    2327023276  if $PKG_CONFIG --exists "osi-cplex"; then
    23271     CPX_VERSIONS="`$PKG_CONFIG --modversion osi-cplex 2>/dev/null`"
     23277    CPX_VERSIONS="`$PKG_CONFIG --modversion "osi-cplex" 2>/dev/null`"
    2327223278     cflags=`$PKG_CONFIG --cflags "osi-cplex" 2>/dev/null`
    2327323279    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
     
    2353423540
    2353523541
     23542
    2353623543#check if user provided LIBS, CFLAGS, or DATA for module
    2353723544if test $coin_has_glpk != skipping; then
     
    2358423591if test -n "$PKG_CONFIG" ; then
    2358523592  if $PKG_CONFIG --exists "osi-glpk"; then
    23586     GLPK_VERSIONS="`$PKG_CONFIG --modversion osi-glpk 2>/dev/null`"
     23593    GLPK_VERSIONS="`$PKG_CONFIG --modversion "osi-glpk" 2>/dev/null`"
    2358723594     cflags=`$PKG_CONFIG --cflags "osi-glpk" 2>/dev/null`
    2358823595    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
     
    2389123898if test -n "$PKG_CONFIG" ; then
    2389223899  if $PKG_CONFIG --exists "osi-gurobi"; then
    23893     GRB_VERSIONS="`$PKG_CONFIG --modversion osi-gurobi 2>/dev/null`"
     23900    GRB_VERSIONS="`$PKG_CONFIG --modversion "osi-gurobi" 2>/dev/null`"
    2389423901     cflags=`$PKG_CONFIG --cflags "osi-gurobi" 2>/dev/null`
    2389523902    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
     
    2413824145
    2413924146
     24147
    2414024148#check if user provided LIBS, CFLAGS, or DATA for module
    2414124149if test $coin_has_msk != skipping; then
     
    2418824196if test -n "$PKG_CONFIG" ; then
    2418924197  if $PKG_CONFIG --exists "osi-mosek"; then
    24190     MSK_VERSIONS="`$PKG_CONFIG --modversion osi-mosek 2>/dev/null`"
     24198    MSK_VERSIONS="`$PKG_CONFIG --modversion "osi-mosek" 2>/dev/null`"
    2419124199     cflags=`$PKG_CONFIG --cflags "osi-mosek" 2>/dev/null`
    2419224200    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
     
    2445324461
    2445424462
     24463
    2445524464#check if user provided LIBS, CFLAGS, or DATA for module
    2445624465if test $coin_has_spx != skipping; then
     
    2450324512if test -n "$PKG_CONFIG" ; then
    2450424513  if $PKG_CONFIG --exists "osi-soplex"; then
    24505     SPX_VERSIONS="`$PKG_CONFIG --modversion osi-soplex 2>/dev/null`"
     24514    SPX_VERSIONS="`$PKG_CONFIG --modversion "osi-soplex" 2>/dev/null`"
    2450624515     cflags=`$PKG_CONFIG --cflags "osi-soplex" 2>/dev/null`
    2450724516    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
     
    2481024819if test -n "$PKG_CONFIG" ; then
    2481124820  if $PKG_CONFIG --exists "osi-xpress"; then
    24812     XPR_VERSIONS="`$PKG_CONFIG --modversion osi-xpress 2>/dev/null`"
     24821    XPR_VERSIONS="`$PKG_CONFIG --modversion "osi-xpress" 2>/dev/null`"
    2481324822     cflags=`$PKG_CONFIG --cflags "osi-xpress" 2>/dev/null`
    2481424823    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
     
    2510525114if test -n "$PKG_CONFIG" ; then
    2510625115  if $PKG_CONFIG --exists "coinasl"; then
    25107     ASL_VERSIONS="`$PKG_CONFIG --modversion coinasl 2>/dev/null`"
     25116    ASL_VERSIONS="`$PKG_CONFIG --modversion "coinasl" 2>/dev/null`"
    2510825117     cflags=`$PKG_CONFIG --cflags "coinasl" 2>/dev/null`
    2510925118    # pkg-config cannot handle spaces, so CYGPATH_W cannot be put into .pc files
     
    2719227201s,@COINDEPEND_CFLAGS@,$COINDEPEND_CFLAGS,;t t
    2719327202s,@COINDEPEND_DATA@,$COINDEPEND_DATA,;t t
     27203s,@CBCLIB_CFLAGS@,$CBCLIB_CFLAGS,;t t
    2719427204s,@CBCLIB_LIBS@,$CBCLIB_LIBS,;t t
    2719527205s,@CBCLIB_PCLIBS@,$CBCLIB_PCLIBS,;t t
    2719627206s,@CBCLIB_PCREQUIRES@,$CBCLIB_PCREQUIRES,;t t
     27207s,@CBCGENERIC_CFLAGS@,$CBCGENERIC_CFLAGS,;t t
    2719727208s,@CBCGENERIC_LIBS@,$CBCGENERIC_LIBS,;t t
    2719827209s,@CBCGENERIC_PCLIBS@,$CBCGENERIC_PCLIBS,;t t
  • trunk/Cbc/configure.ac

    r1501 r1516  
    5757#############################################################################
    5858
    59 AC_COIN_HAS_PACKAGE(CoinDepend, [cgl osi coinutils = trunk], [CbcLib CbcGeneric])
     59AC_COIN_CHECK_PACKAGE(CoinDepend, [cgl osi coinutils = trunk], [CbcLib CbcGeneric])
    6060if test $coin_has_coindepend != yes ; then
    6161  AC_MSG_ERROR([Required package CoinUtils, Osi, or Cgl not available.])
     
    6464# Clp and OsiClp are inseparable here.
    6565
    66 AC_COIN_HAS_PACKAGE(Clp, [osi-clp], [CbcLib CbcGeneric])
     66AC_COIN_CHECK_PACKAGE(Clp, [osi-clp], [CbcLib CbcGeneric])
    6767if test $coin_has_clp != yes ; then
    6868  AC_MSG_ERROR("Required package Clp unavailable.")
     
    7171# The rest are not required for linking against Cbc
    7272
    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])
     73AC_COIN_CHECK_PACKAGE(OsiTests, [osi-unittests])
     74AC_COIN_CHECK_PACKAGE(Sample,   [coindatasample])
     75AC_COIN_CHECK_PACKAGE(Netlib,   [coindatanetlib])
     76AC_COIN_CHECK_PACKAGE(Miplib3,  [coindatamiplib3])
    7777
    7878#############################################################################
     
    8181
    8282# 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])
     83AC_COIN_CHECK_PACKAGE(DyLP, [osi-dylp],   [CbcGeneric])
     84AC_COIN_CHECK_PACKAGE(Vol,  [osi-vol])
     85AC_COIN_CHECK_PACKAGE(Cpx,  [osi-cplex],  [CbcGeneric])
     86AC_COIN_CHECK_PACKAGE(Glpk, [osi-glpk],   [CbcGeneric])
     87AC_COIN_CHECK_PACKAGE(Grb,  [osi-gurobi])
     88AC_COIN_CHECK_PACKAGE(Msk,  [osi-mosek],  [CbcGeneric])
     89AC_COIN_CHECK_PACKAGE(Spx,  [osi-soplex], [CbcGeneric])
     90AC_COIN_CHECK_PACKAGE(Xpr,  [osi-xpress])
    9191
    9292#############################################################################
     
    9595
    9696# Ampl Solver library
    97 AC_COIN_HAS_PACKAGE(ASL, [coinasl])
     97AC_COIN_CHECK_PACKAGE(ASL, [coinasl])
    9898
    9999#############################################################################
  • trunk/Cbc/src/Makefile.in

    r1501 r1516  
    218218AWK = @AWK@
    219219BUILDTOOLSDIR = @BUILDTOOLSDIR@
     220CBCGENERIC_CFLAGS = @CBCGENERIC_CFLAGS@
    220221CBCGENERIC_LIBS = @CBCGENERIC_LIBS@
    221222CBCGENERIC_PCLIBS = @CBCGENERIC_PCLIBS@
    222223CBCGENERIC_PCREQUIRES = @CBCGENERIC_PCREQUIRES@
     224CBCLIB_CFLAGS = @CBCLIB_CFLAGS@
    223225CBCLIB_LIBS = @CBCLIB_LIBS@
    224226CBCLIB_PCLIBS = @CBCLIB_PCLIBS@
  • trunk/Cbc/src/OsiCbc/Makefile.in

    r1501 r1516  
    123123AWK = @AWK@
    124124BUILDTOOLSDIR = @BUILDTOOLSDIR@
     125CBCGENERIC_CFLAGS = @CBCGENERIC_CFLAGS@
    125126CBCGENERIC_LIBS = @CBCGENERIC_LIBS@
    126127CBCGENERIC_PCLIBS = @CBCGENERIC_PCLIBS@
    127128CBCGENERIC_PCREQUIRES = @CBCGENERIC_PCREQUIRES@
     129CBCLIB_CFLAGS = @CBCLIB_CFLAGS@
    128130CBCLIB_LIBS = @CBCLIB_LIBS@
    129131CBCLIB_PCLIBS = @CBCLIB_PCLIBS@
  • trunk/Cbc/test/Makefile.in

    r1501 r1516  
    127127AWK = @AWK@
    128128BUILDTOOLSDIR = @BUILDTOOLSDIR@
     129CBCGENERIC_CFLAGS = @CBCGENERIC_CFLAGS@
    129130CBCGENERIC_LIBS = @CBCGENERIC_LIBS@
    130131CBCGENERIC_PCLIBS = @CBCGENERIC_PCLIBS@
    131132CBCGENERIC_PCREQUIRES = @CBCGENERIC_PCREQUIRES@
     133CBCLIB_CFLAGS = @CBCLIB_CFLAGS@
    132134CBCLIB_LIBS = @CBCLIB_LIBS@
    133135CBCLIB_PCLIBS = @CBCLIB_PCLIBS@
Note: See TracChangeset for help on using the changeset viewer.