Changeset 1438 for branches/split/Cbc


Ignore:
Timestamp:
Mar 14, 2010 11:20:53 AM (11 years ago)
Author:
stefan
Message:

add no pkg-config fallback (not tested)

Location:
branches/split/Cbc
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • branches/split/Cbc/Makefile.in

    r1437 r1438  
    140140CDEFS = @CDEFS@
    141141CFLAGS = @CFLAGS@
     142CGLDOCDIR = @CGLDOCDIR@
     143CGLOBJDIR = @CGLOBJDIR@
     144CGLSRCDIR = @CGLSRCDIR@
     145CLPDOCDIR = @CLPDOCDIR@
     146CLPOBJDIR = @CLPOBJDIR@
     147CLPSRCDIR = @CLPSRCDIR@
    142148CLP_CFLAGS = @CLP_CFLAGS@
    143149CLP_DATA = @CLP_DATA@
    … …  
    146152COINDEPEND_DATA = @COINDEPEND_DATA@
    147153COINDEPEND_LIBS = @COINDEPEND_LIBS@
     154COINUTILSDOCDIR = @COINUTILSDOCDIR@
     155COINUTILSOBJDIR = @COINUTILSOBJDIR@
     156COINUTILSSRCDIR = @COINUTILSSRCDIR@
    148157COIN_HAS_ASL_FALSE = @COIN_HAS_ASL_FALSE@
    149158COIN_HAS_ASL_TRUE = @COIN_HAS_ASL_TRUE@
     159COIN_HAS_CGL_FALSE = @COIN_HAS_CGL_FALSE@
     160COIN_HAS_CGL_TRUE = @COIN_HAS_CGL_TRUE@
    150161COIN_HAS_CLP_FALSE = @COIN_HAS_CLP_FALSE@
    151162COIN_HAS_CLP_TRUE = @COIN_HAS_CLP_TRUE@
    152163COIN_HAS_COINDEPEND_FALSE = @COIN_HAS_COINDEPEND_FALSE@
    153164COIN_HAS_COINDEPEND_TRUE = @COIN_HAS_COINDEPEND_TRUE@
     165COIN_HAS_COINUTILS_FALSE = @COIN_HAS_COINUTILS_FALSE@
     166COIN_HAS_COINUTILS_TRUE = @COIN_HAS_COINUTILS_TRUE@
    154167COIN_HAS_CPX_FALSE = @COIN_HAS_CPX_FALSE@
    155168COIN_HAS_CPX_TRUE = @COIN_HAS_CPX_TRUE@
    … …  
    166179COIN_HAS_OSITESTS_FALSE = @COIN_HAS_OSITESTS_FALSE@
    167180COIN_HAS_OSITESTS_TRUE = @COIN_HAS_OSITESTS_TRUE@
     181COIN_HAS_OSI_FALSE = @COIN_HAS_OSI_FALSE@
     182COIN_HAS_OSI_TRUE = @COIN_HAS_OSI_TRUE@
    168183COIN_HAS_SAMPLE_FALSE = @COIN_HAS_SAMPLE_FALSE@
    169184COIN_HAS_SAMPLE_TRUE = @COIN_HAS_SAMPLE_TRUE@
    … …  
    235250OPT_CFLAGS = @OPT_CFLAGS@
    236251OPT_CXXFLAGS = @OPT_CXXFLAGS@
     252OSIDOCDIR = @OSIDOCDIR@
     253OSIOBJDIR = @OSIOBJDIR@
     254OSISRCDIR = @OSISRCDIR@
    237255OSITESTS_CFLAGS = @OSITESTS_CFLAGS@
    238256OSITESTS_DATA = @OSITESTS_DATA@

  • branches/split/Cbc/configure

    r1437 r1438  
    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 FADDLIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE 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 COINDEPEND_LIBS COINDEPEND_CFLAGS COINDEPEND_DATA REQUIREDPACKAGES COIN_HAS_COINDEPEND_TRUE COIN_HAS_COINDEPEND_FALSE CLP_LIBS CLP_CFLAGS CLP_DATA COIN_HAS_CLP_TRUE COIN_HAS_CLP_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 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 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 MSK_LIBS MSK_CFLAGS MSK_DATA COIN_HAS_MSK_TRUE COIN_HAS_MSK_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 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 FADDLIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE 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 COINDEPEND_LIBS COINDEPEND_CFLAGS COINDEPEND_DATA REQUIREDPACKAGES COIN_HAS_COINDEPEND_TRUE COIN_HAS_COINDEPEND_FALSE CLP_LIBS CLP_CFLAGS CLP_DATA COIN_HAS_CLP_TRUE COIN_HAS_CLP_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 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 COINUTILSSRCDIR COINUTILSOBJDIR COINUTILSDOCDIR COIN_HAS_COINUTILS_TRUE COIN_HAS_COINUTILS_FALSE OSISRCDIR OSIOBJDIR OSIDOCDIR COIN_HAS_OSI_TRUE COIN_HAS_OSI_FALSE CGLSRCDIR CGLOBJDIR CGLDOCDIR COIN_HAS_CGL_TRUE COIN_HAS_CGL_FALSE CLPSRCDIR CLPOBJDIR CLPDOCDIR 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 MSK_LIBS MSK_CFLAGS MSK_DATA COIN_HAS_MSK_TRUE COIN_HAS_MSK_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 LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR LIBOBJS LTLIBOBJS'
    476476ac_subst_files=''
    477477
    … …  
    2211722117
    2211822118
    22119 #TODO! fallbacks!
     22119# fallbacks for CoinDepend and Clp if no pkg-config is available
     22120if test "$coin_has_coindepend" != yes ; then
     22121  echo "$as_me:$LINENO: checking for COIN project CoinUtils" >&5
     22122echo $ECHO_N "checking for COIN project CoinUtils... $ECHO_C" >&6
     22123
     22124# First check, if the sub-project is actually available (ToDo: allow
     22125# other locations)
     22126
     22127coin_has_coinutils=unavailable
     22128if test x"$COIN_SKIP_PROJECTS" != x; then
     22129  for dir in $COIN_SKIP_PROJECTS; do
     22130    if test $dir = CoinUtils; then
     22131      coin_has_coinutils=skipping
     22132    fi
     22133  done
     22134fi
     22135
     22136if test $coin_has_coinutils != skipping; then
     22137  if test $PACKAGE_TARNAME = coinutils; then
     22138    coin_has_coinutils=.
     22139  else
     22140    if test -d $srcdir/../CoinUtils; then
     22141      coin_has_coinutils=../CoinUtils
     22142    fi
     22143  fi
     22144fi
     22145
     22146if test $coin_has_coinutils != unavailable &&
     22147   test $coin_has_coinutils != skipping; then
     22148  # Set the #define if the component is available
     22149
     22150cat >>confdefs.h <<\_ACEOF
     22151#define COIN_HAS_COINUTILS 1
     22152_ACEOF
     22153
     22154
     22155  # Set the variables for source and object code location
     22156
     22157  COINUTILSSRCDIR=`cd $srcdir/$coin_has_coinutils; pwd`
     22158
     22159  COINUTILSOBJDIR=`pwd`/$coin_has_coinutils
     22160
     22161  COINUTILSDOCDIR=$abs_lib_dir/../share/doc/coin/CoinUtils
     22162fi
     22163
     22164  # Define the Makefile conditional
     22165
     22166
     22167if test $coin_has_coinutils != unavailable &&
     22168                test $coin_has_coinutils != skipping; then
     22169  COIN_HAS_COINUTILS_TRUE=
     22170  COIN_HAS_COINUTILS_FALSE='#'
     22171else
     22172  COIN_HAS_COINUTILS_TRUE='#'
     22173  COIN_HAS_COINUTILS_FALSE=
     22174fi
     22175
     22176echo "$as_me:$LINENO: result: $coin_has_coinutils" >&5
     22177echo "${ECHO_T}$coin_has_coinutils" >&6
     22178
     22179  echo "$as_me:$LINENO: checking for COIN project Osi" >&5
     22180echo $ECHO_N "checking for COIN project Osi... $ECHO_C" >&6
     22181
     22182# First check, if the sub-project is actually available (ToDo: allow
     22183# other locations)
     22184
     22185coin_has_osi=unavailable
     22186if test x"$COIN_SKIP_PROJECTS" != x; then
     22187  for dir in $COIN_SKIP_PROJECTS; do
     22188    if test $dir = Osi; then
     22189      coin_has_osi=skipping
     22190    fi
     22191  done
     22192fi
     22193
     22194if test $coin_has_osi != skipping; then
     22195  if test $PACKAGE_TARNAME = osi; then
     22196    coin_has_osi=.
     22197  else
     22198    if test -d $srcdir/../Osi; then
     22199      coin_has_osi=../Osi
     22200    fi
     22201  fi
     22202fi
     22203
     22204if test $coin_has_osi != unavailable &&
     22205   test $coin_has_osi != skipping; then
     22206  # Set the #define if the component is available
     22207
     22208cat >>confdefs.h <<\_ACEOF
     22209#define COIN_HAS_OSI 1
     22210_ACEOF
     22211
     22212
     22213  # Set the variables for source and object code location
     22214
     22215  OSISRCDIR=`cd $srcdir/$coin_has_osi; pwd`
     22216
     22217  OSIOBJDIR=`pwd`/$coin_has_osi
     22218
     22219  OSIDOCDIR=$abs_lib_dir/../share/doc/coin/Osi
     22220fi
     22221
     22222  # Define the Makefile conditional
     22223
     22224
     22225if test $coin_has_osi != unavailable &&
     22226                test $coin_has_osi != skipping; then
     22227  COIN_HAS_OSI_TRUE=
     22228  COIN_HAS_OSI_FALSE='#'
     22229else
     22230  COIN_HAS_OSI_TRUE='#'
     22231  COIN_HAS_OSI_FALSE=
     22232fi
     22233
     22234echo "$as_me:$LINENO: result: $coin_has_osi" >&5
     22235echo "${ECHO_T}$coin_has_osi" >&6
     22236
     22237  echo "$as_me:$LINENO: checking for COIN project Cgl" >&5
     22238echo $ECHO_N "checking for COIN project Cgl... $ECHO_C" >&6
     22239
     22240# First check, if the sub-project is actually available (ToDo: allow
     22241# other locations)
     22242
     22243coin_has_cgl=unavailable
     22244if test x"$COIN_SKIP_PROJECTS" != x; then
     22245  for dir in $COIN_SKIP_PROJECTS; do
     22246    if test $dir = Cgl; then
     22247      coin_has_cgl=skipping
     22248    fi
     22249  done
     22250fi
     22251
     22252if test $coin_has_cgl != skipping; then
     22253  if test $PACKAGE_TARNAME = cgl; then
     22254    coin_has_cgl=.
     22255  else
     22256    if test -d $srcdir/../Cgl; then
     22257      coin_has_cgl=../Cgl
     22258    fi
     22259  fi
     22260fi
     22261
     22262if test $coin_has_cgl != unavailable &&
     22263   test $coin_has_cgl != skipping; then
     22264  # Set the #define if the component is available
     22265
     22266cat >>confdefs.h <<\_ACEOF
     22267#define COIN_HAS_CGL 1
     22268_ACEOF
     22269
     22270
     22271  # Set the variables for source and object code location
     22272
     22273  CGLSRCDIR=`cd $srcdir/$coin_has_cgl; pwd`
     22274
     22275  CGLOBJDIR=`pwd`/$coin_has_cgl
     22276
     22277  CGLDOCDIR=$abs_lib_dir/../share/doc/coin/Cgl
     22278fi
     22279
     22280  # Define the Makefile conditional
     22281
     22282
     22283if test $coin_has_cgl != unavailable &&
     22284                test $coin_has_cgl != skipping; then
     22285  COIN_HAS_CGL_TRUE=
     22286  COIN_HAS_CGL_FALSE='#'
     22287else
     22288  COIN_HAS_CGL_TRUE='#'
     22289  COIN_HAS_CGL_FALSE=
     22290fi
     22291
     22292echo "$as_me:$LINENO: result: $coin_has_cgl" >&5
     22293echo "${ECHO_T}$coin_has_cgl" >&6
     22294
     22295  if test $coin_has_coinutils != notGiven && test $coin_has_coinutils != skipping ; then
     22296    COINDEPEND_CFLAGS="-I`${CYGPATH_W} ${COINUTILSSRCDIR}/src` -I`${CYGPATH_W} ${COINUTILSOBJDIR}/inc`"
     22297    COINDEPEND_LIBS="${COINUTILSOBJDIR}/src/libCoinUtils.la `cat ${COINUTILSOBJDIR}/coinutils_addlibs.txt`"
     22298  else
     22299    { { echo "$as_me:$LINENO: error: \"Required package CoinUtils unavailable.\"" >&5
     22300echo "$as_me: error: \"Required package CoinUtils unavailable.\"" >&2;}
     22301   { (exit 1); exit 1; }; }
     22302  fi
     22303  if test $coin_has_osi != notGiven && test $coin_has_osi != skipping ; then
     22304    COINDEPEND_CFLAGS="${COINDEPEND_CFLAGS} -I`${CYGPATH_W} ${OSISRCDIR}/src` -I`${CYGPATH_W} ${OSIOBJDIR}/inc`"
     22305    COINDEPEND_LIBS="${COINDEPEND_LIBS} ${OSIOBJDIR}/src/libOsi.la `cat ${OSIOBJDIR}/osi_addlibs.txt`"
     22306  else
     22307    { { echo "$as_me:$LINENO: error: \"Required package Osi unavailable.\"" >&5
     22308echo "$as_me: error: \"Required package Osi unavailable.\"" >&2;}
     22309   { (exit 1); exit 1; }; }
     22310  fi
     22311  if test $coin_has_cgl != notGiven && test $coin_has_cgl != skipping ; then
     22312    COINDEPEND_CFLAGS="${COINDEPEND_CFLAGS} -I`${CYGPATH_W} ${CGLSRCDIR}/src` -I`${CYGPATH_W} ${CGLOBJDIR}/inc` -I`${CYGPATH_W} ${CGLSRCDIR}/src/CglAllDifferent` -I`${CYGPATH_W} ${CGLSRCDIR}/src/CglClique` -I`${CYGPATH_W} ${CGLSRCDIR}/src/CglDuplicateRow` -I`${CYGPATH_W} ${CGLSRCDIR}/src/CglFlowCover` -I`${CYGPATH_W} ${CGLSRCDIR}/src/CglGomory` -I`${CYGPATH_W} ${CGLSRCDIR}/src/CglKnapsackCover` -I`${CYGPATH_W} ${CGLSRCDIR}/src/CglLandP` -I`${CYGPATH_W} ${CGLSRCDIR}/src/CglLiftAndProject` -I`${CYGPATH_W} ${CGLSRCDIR}/src/CglMixedIntegerRounding` -I`${CYGPATH_W} ${CGLSRCDIR}/src/CglMixedIntegerRounding2` -I`${CYGPATH_W} ${CGLSRCDIR}/src/CglOddHole` -I`${CYGPATH_W} ${CGLSRCDIR}/src/CglPreProcess` -I`${CYGPATH_W} ${CGLSRCDIR}/src/CglProbing` -I`${CYGPATH_W} ${CGLSRCDIR}/src/CglRedSplit` -I`${CYGPATH_W} ${CGLSRCDIR}/src/CglResidualCapacity` -I`${CYGPATH_W} ${CGLSRCDIR}/src/CglSimpleRounding` -I`${CYGPATH_W} ${CGLSRCDIR}/src/CglTwomir`"
     22313    COINDEPEND_LIBS="${COINDEPEND_LIBS} ${CGLOBJDIR}/src/libCgl.la `cat ${CGLOBJDIR}/cgl_addlibs.txt`"
     22314  else
     22315    { { echo "$as_me:$LINENO: error: \"Required package Cgl unavailable.\"" >&5
     22316echo "$as_me: error: \"Required package Cgl unavailable.\"" >&2;}
     22317   { (exit 1); exit 1; }; }
     22318  fi
     22319  coin_has_coindepend=yes
     22320
     22321cat >>confdefs.h <<\_ACEOF
     22322#define COIN_HAS_COINDEPEND 1
     22323_ACEOF
     22324
     22325else
     22326  # to please configure
     22327
     22328
     22329if test 0 = 1; then
     22330  COIN_HAS_COINUTILS_TRUE=
     22331  COIN_HAS_COINUTILS_FALSE='#'
     22332else
     22333  COIN_HAS_COINUTILS_TRUE='#'
     22334  COIN_HAS_COINUTILS_FALSE=
     22335fi
     22336
     22337
     22338
     22339if test 0 = 1; then
     22340  COIN_HAS_OSI_TRUE=
     22341  COIN_HAS_OSI_FALSE='#'
     22342else
     22343  COIN_HAS_OSI_TRUE='#'
     22344  COIN_HAS_OSI_FALSE=
     22345fi
     22346
     22347
     22348
     22349if test 0 = 1; then
     22350  COIN_HAS_CGL_TRUE=
     22351  COIN_HAS_CGL_FALSE='#'
     22352else
     22353  COIN_HAS_CGL_TRUE='#'
     22354  COIN_HAS_CGL_FALSE=
     22355fi
     22356
     22357fi
     22358
     22359if test "$coin_has_clp" != yes ; then
     22360  echo "$as_me:$LINENO: checking for COIN project Clp" >&5
     22361echo $ECHO_N "checking for COIN project Clp... $ECHO_C" >&6
     22362
     22363# First check, if the sub-project is actually available (ToDo: allow
     22364# other locations)
     22365
     22366coin_has_clp=unavailable
     22367if test x"$COIN_SKIP_PROJECTS" != x; then
     22368  for dir in $COIN_SKIP_PROJECTS; do
     22369    if test $dir = Clp; then
     22370      coin_has_clp=skipping
     22371    fi
     22372  done
     22373fi
     22374
     22375if test $coin_has_clp != skipping; then
     22376  if test $PACKAGE_TARNAME = clp; then
     22377    coin_has_clp=.
     22378  else
     22379    if test -d $srcdir/../Clp; then
     22380      coin_has_clp=../Clp
     22381    fi
     22382  fi
     22383fi
     22384
     22385if test $coin_has_clp != unavailable &&
     22386   test $coin_has_clp != skipping; then
     22387  # Set the #define if the component is available
     22388
     22389cat >>confdefs.h <<\_ACEOF
     22390#define COIN_HAS_CLP 1
     22391_ACEOF
     22392
     22393
     22394  # Set the variables for source and object code location
     22395
     22396  CLPSRCDIR=`cd $srcdir/$coin_has_clp; pwd`
     22397
     22398  CLPOBJDIR=`pwd`/$coin_has_clp
     22399
     22400  CLPDOCDIR=$abs_lib_dir/../share/doc/coin/Clp
     22401fi
     22402
     22403  # Define the Makefile conditional
     22404
     22405
     22406if test $coin_has_clp != unavailable &&
     22407                test $coin_has_clp != skipping; then
     22408  COIN_HAS_CLP_TRUE=
     22409  COIN_HAS_CLP_FALSE='#'
     22410else
     22411  COIN_HAS_CLP_TRUE='#'
     22412  COIN_HAS_CLP_FALSE=
     22413fi
     22414
     22415echo "$as_me:$LINENO: result: $coin_has_clp" >&5
     22416echo "${ECHO_T}$coin_has_clp" >&6
     22417
     22418  if test $coin_has_clp != notGiven && test $coin_has_clp != skipping ; then
     22419    CLP_CFLAGS="-I`${CYGPATH_W} ${CLPSRCDIR}/src` -I`${CYGPATH_W} ${CLPSRCDIR}/src/OsiClp` -I`${CYGPATH_W} ${CLPOBJDIR}/inc`"
     22420    CLP_LIBS="${CLPOBJDIR}/src/libClp.la ${CLPOBJDIR}/src/OsiClp/libOsiClp.la `cat ${CLPOBJDIR}/clp_addlibs.txt`"
     22421
     22422cat >>confdefs.h <<\_ACEOF
     22423#define COIN_HAS_CLP 1
     22424_ACEOF
     22425
     22426  else
     22427    { { echo "$as_me:$LINENO: error: \"Required package Clp unavailable.\"" >&5
     22428echo "$as_me: error: \"Required package Clp unavailable.\"" >&2;}
     22429   { (exit 1); exit 1; }; }
     22430  fi
     22431fi
    2212022432
    2212122433#############################################################################
    … …  
    2362923941Usually this means the macro was only invoked conditionally." >&5
    2363023942echo "$as_me: error: conditional \"COIN_HAS_MIPLIB3\" was never defined.
     23943Usually this means the macro was only invoked conditionally." >&2;}
     23944   { (exit 1); exit 1; }; }
     23945fi
     23946if test -z "${COIN_HAS_COINUTILS_TRUE}" && test -z "${COIN_HAS_COINUTILS_FALSE}"; then
     23947  { { echo "$as_me:$LINENO: error: conditional \"COIN_HAS_COINUTILS\" was never defined.
     23948Usually this means the macro was only invoked conditionally." >&5
     23949echo "$as_me: error: conditional \"COIN_HAS_COINUTILS\" was never defined.
     23950Usually this means the macro was only invoked conditionally." >&2;}
     23951   { (exit 1); exit 1; }; }
     23952fi
     23953if test -z "${COIN_HAS_OSI_TRUE}" && test -z "${COIN_HAS_OSI_FALSE}"; then
     23954  { { echo "$as_me:$LINENO: error: conditional \"COIN_HAS_OSI\" was never defined.
     23955Usually this means the macro was only invoked conditionally." >&5
     23956echo "$as_me: error: conditional \"COIN_HAS_OSI\" was never defined.
     23957Usually this means the macro was only invoked conditionally." >&2;}
     23958   { (exit 1); exit 1; }; }
     23959fi
     23960if test -z "${COIN_HAS_CGL_TRUE}" && test -z "${COIN_HAS_CGL_FALSE}"; then
     23961  { { echo "$as_me:$LINENO: error: conditional \"COIN_HAS_CGL\" was never defined.
     23962Usually this means the macro was only invoked conditionally." >&5
     23963echo "$as_me: error: conditional \"COIN_HAS_CGL\" was never defined.
     23964Usually this means the macro was only invoked conditionally." >&2;}
     23965   { (exit 1); exit 1; }; }
     23966fi
     23967if test -z "${COIN_HAS_COINUTILS_TRUE}" && test -z "${COIN_HAS_COINUTILS_FALSE}"; then
     23968  { { echo "$as_me:$LINENO: error: conditional \"COIN_HAS_COINUTILS\" was never defined.
     23969Usually this means the macro was only invoked conditionally." >&5
     23970echo "$as_me: error: conditional \"COIN_HAS_COINUTILS\" was never defined.
     23971Usually this means the macro was only invoked conditionally." >&2;}
     23972   { (exit 1); exit 1; }; }
     23973fi
     23974if test -z "${COIN_HAS_OSI_TRUE}" && test -z "${COIN_HAS_OSI_FALSE}"; then
     23975  { { echo "$as_me:$LINENO: error: conditional \"COIN_HAS_OSI\" was never defined.
     23976Usually this means the macro was only invoked conditionally." >&5
     23977echo "$as_me: error: conditional \"COIN_HAS_OSI\" was never defined.
     23978Usually this means the macro was only invoked conditionally." >&2;}
     23979   { (exit 1); exit 1; }; }
     23980fi
     23981if test -z "${COIN_HAS_CGL_TRUE}" && test -z "${COIN_HAS_CGL_FALSE}"; then
     23982  { { echo "$as_me:$LINENO: error: conditional \"COIN_HAS_CGL\" was never defined.
     23983Usually this means the macro was only invoked conditionally." >&5
     23984echo "$as_me: error: conditional \"COIN_HAS_CGL\" was never defined.
     23985Usually this means the macro was only invoked conditionally." >&2;}
     23986   { (exit 1); exit 1; }; }
     23987fi
     23988if test -z "${COIN_HAS_CLP_TRUE}" && test -z "${COIN_HAS_CLP_FALSE}"; then
     23989  { { echo "$as_me:$LINENO: error: conditional \"COIN_HAS_CLP\" was never defined.
     23990Usually this means the macro was only invoked conditionally." >&5
     23991echo "$as_me: error: conditional \"COIN_HAS_CLP\" was never defined.
    2363123992Usually this means the macro was only invoked conditionally." >&2;}
    2363223993   { (exit 1); exit 1; }; }
    … …  
    2435424715s,@COIN_HAS_MIPLIB3_TRUE@,$COIN_HAS_MIPLIB3_TRUE,;t t
    2435524716s,@COIN_HAS_MIPLIB3_FALSE@,$COIN_HAS_MIPLIB3_FALSE,;t t
     24717s,@COINUTILSSRCDIR@,$COINUTILSSRCDIR,;t t
     24718s,@COINUTILSOBJDIR@,$COINUTILSOBJDIR,;t t
     24719s,@COINUTILSDOCDIR@,$COINUTILSDOCDIR,;t t
     24720s,@COIN_HAS_COINUTILS_TRUE@,$COIN_HAS_COINUTILS_TRUE,;t t
     24721s,@COIN_HAS_COINUTILS_FALSE@,$COIN_HAS_COINUTILS_FALSE,;t t
     24722s,@OSISRCDIR@,$OSISRCDIR,;t t
     24723s,@OSIOBJDIR@,$OSIOBJDIR,;t t
     24724s,@OSIDOCDIR@,$OSIDOCDIR,;t t
     24725s,@COIN_HAS_OSI_TRUE@,$COIN_HAS_OSI_TRUE,;t t
     24726s,@COIN_HAS_OSI_FALSE@,$COIN_HAS_OSI_FALSE,;t t
     24727s,@CGLSRCDIR@,$CGLSRCDIR,;t t
     24728s,@CGLOBJDIR@,$CGLOBJDIR,;t t
     24729s,@CGLDOCDIR@,$CGLDOCDIR,;t t
     24730s,@COIN_HAS_CGL_TRUE@,$COIN_HAS_CGL_TRUE,;t t
     24731s,@COIN_HAS_CGL_FALSE@,$COIN_HAS_CGL_FALSE,;t t
     24732s,@CLPSRCDIR@,$CLPSRCDIR,;t t
     24733s,@CLPOBJDIR@,$CLPOBJDIR,;t t
     24734s,@CLPDOCDIR@,$CLPDOCDIR,;t t
    2435624735s,@CPX_LIBS@,$CPX_LIBS,;t t
    2435724736s,@CPX_CFLAGS@,$CPX_CFLAGS,;t t

  • branches/split/Cbc/configure.ac

    r1437 r1438  
    6666AC_COIN_HAS_MODULE(Miplib3,    [coindatamiplib3], [required=0])
    6767
    68 #TODO! fallbacks!
     68# fallbacks for CoinDepend and Clp if no pkg-config is available
     69if test "$coin_has_coindepend" != yes ; then
     70  AC_COIN_HAS_PROJECT(CoinUtils)
     71  AC_COIN_HAS_PROJECT(Osi)
     72  AC_COIN_HAS_PROJECT(Cgl)
     73  if test $coin_has_coinutils != notGiven && test $coin_has_coinutils != skipping ; then
     74    COINDEPEND_CFLAGS="-I`${CYGPATH_W} ${COINUTILSSRCDIR}/src` -I`${CYGPATH_W} ${COINUTILSOBJDIR}/inc`"
     75    COINDEPEND_LIBS="${COINUTILSOBJDIR}/src/libCoinUtils.la `cat ${COINUTILSOBJDIR}/coinutils_addlibs.txt`"
     76  else
     77    AC_MSG_ERROR("Required package CoinUtils unavailable.")
     78  fi
     79  if test $coin_has_osi != notGiven && test $coin_has_osi != skipping ; then
     80    COINDEPEND_CFLAGS="${COINDEPEND_CFLAGS} -I`${CYGPATH_W} ${OSISRCDIR}/src` -I`${CYGPATH_W} ${OSIOBJDIR}/inc`"
     81    COINDEPEND_LIBS="${COINDEPEND_LIBS} ${OSIOBJDIR}/src/libOsi.la `cat ${OSIOBJDIR}/osi_addlibs.txt`"
     82  else
     83    AC_MSG_ERROR("Required package Osi unavailable.")
     84  fi
     85  if test $coin_has_cgl != notGiven && test $coin_has_cgl != skipping ; then
     86    COINDEPEND_CFLAGS="${COINDEPEND_CFLAGS} -I`${CYGPATH_W} ${CGLSRCDIR}/src` -I`${CYGPATH_W} ${CGLOBJDIR}/inc` -I`${CYGPATH_W} ${CGLSRCDIR}/src/CglAllDifferent` -I`${CYGPATH_W} ${CGLSRCDIR}/src/CglClique` -I`${CYGPATH_W} ${CGLSRCDIR}/src/CglDuplicateRow` -I`${CYGPATH_W} ${CGLSRCDIR}/src/CglFlowCover` -I`${CYGPATH_W} ${CGLSRCDIR}/src/CglGomory` -I`${CYGPATH_W} ${CGLSRCDIR}/src/CglKnapsackCover` -I`${CYGPATH_W} ${CGLSRCDIR}/src/CglLandP` -I`${CYGPATH_W} ${CGLSRCDIR}/src/CglLiftAndProject` -I`${CYGPATH_W} ${CGLSRCDIR}/src/CglMixedIntegerRounding` -I`${CYGPATH_W} ${CGLSRCDIR}/src/CglMixedIntegerRounding2` -I`${CYGPATH_W} ${CGLSRCDIR}/src/CglOddHole` -I`${CYGPATH_W} ${CGLSRCDIR}/src/CglPreProcess` -I`${CYGPATH_W} ${CGLSRCDIR}/src/CglProbing` -I`${CYGPATH_W} ${CGLSRCDIR}/src/CglRedSplit` -I`${CYGPATH_W} ${CGLSRCDIR}/src/CglResidualCapacity` -I`${CYGPATH_W} ${CGLSRCDIR}/src/CglSimpleRounding` -I`${CYGPATH_W} ${CGLSRCDIR}/src/CglTwomir`"
     87    COINDEPEND_LIBS="${COINDEPEND_LIBS} ${CGLOBJDIR}/src/libCgl.la `cat ${CGLOBJDIR}/cgl_addlibs.txt`"
     88  else
     89    AC_MSG_ERROR("Required package Cgl unavailable.")
     90  fi
     91  coin_has_coindepend=yes
     92  AC_DEFINE(COIN_HAS_COINDEPEND,[1],[Define to 1 if the CoinDepend module is available])
     93else
     94  # to please configure
     95  AM_CONDITIONAL(COIN_HAS_COINUTILS, [test 0 = 1])
     96  AM_CONDITIONAL(COIN_HAS_OSI,       [test 0 = 1])
     97  AM_CONDITIONAL(COIN_HAS_CGL,       [test 0 = 1])
     98fi
     99
     100if test "$coin_has_clp" != yes ; then
     101  AC_COIN_HAS_PROJECT(Clp)
     102  if test $coin_has_clp != notGiven && test $coin_has_clp != skipping ; then
     103    CLP_CFLAGS="-I`${CYGPATH_W} ${CLPSRCDIR}/src` -I`${CYGPATH_W} ${CLPSRCDIR}/src/OsiClp` -I`${CYGPATH_W} ${CLPOBJDIR}/inc`"
     104    CLP_LIBS="${CLPOBJDIR}/src/libClp.la ${CLPOBJDIR}/src/OsiClp/libOsiClp.la `cat ${CLPOBJDIR}/clp_addlibs.txt`"
     105    AC_DEFINE(COIN_HAS_CLP,[1],[Define to 1 if the Clp module is available])
     106  else
     107    AC_MSG_ERROR("Required package Clp unavailable.")
     108  fi
     109fi
    69110
    70111#############################################################################

  • branches/split/Cbc/inc/config_cbc.h.in

    r1437 r1438  
    2020#undef COIN_HAS_ASL
    2121
     22/* Define to 1 if the Cgl package is used */
     23#undef COIN_HAS_CGL
     24
    2225/* Define to 1 if the Clp module is available */
    2326#undef COIN_HAS_CLP
    … …  
    2528/* Define to 1 if the CoinDepend module is available */
    2629#undef COIN_HAS_COINDEPEND
     30
     31/* Define to 1 if the CoinUtils package is used */
     32#undef COIN_HAS_COINUTILS
    2733
    2834/* Define to 1 if the Cpx module is available */
    … …  
    4349/* Define to 1 if the Netlib module is available */
    4450#undef COIN_HAS_NETLIB
     51
     52/* Define to 1 if the Osi package is used */
     53#undef COIN_HAS_OSI
    4554
    4655/* Define to 1 if the OsiTests module is available */

  • branches/split/Cbc/src/Makefile.in

    r1437 r1438  
    255255CDEFS = @CDEFS@
    256256CFLAGS = @CFLAGS@
     257CGLDOCDIR = @CGLDOCDIR@
     258CGLOBJDIR = @CGLOBJDIR@
     259CGLSRCDIR = @CGLSRCDIR@
     260CLPDOCDIR = @CLPDOCDIR@
     261CLPOBJDIR = @CLPOBJDIR@
     262CLPSRCDIR = @CLPSRCDIR@
    257263CLP_CFLAGS = @CLP_CFLAGS@
    258264CLP_DATA = @CLP_DATA@
    … …  
    261267COINDEPEND_DATA = @COINDEPEND_DATA@
    262268COINDEPEND_LIBS = @COINDEPEND_LIBS@
     269COINUTILSDOCDIR = @COINUTILSDOCDIR@
     270COINUTILSOBJDIR = @COINUTILSOBJDIR@
     271COINUTILSSRCDIR = @COINUTILSSRCDIR@
    263272COIN_HAS_ASL_FALSE = @COIN_HAS_ASL_FALSE@
    264273COIN_HAS_ASL_TRUE = @COIN_HAS_ASL_TRUE@
     274COIN_HAS_CGL_FALSE = @COIN_HAS_CGL_FALSE@
     275COIN_HAS_CGL_TRUE = @COIN_HAS_CGL_TRUE@
    265276COIN_HAS_CLP_FALSE = @COIN_HAS_CLP_FALSE@
    266277COIN_HAS_CLP_TRUE = @COIN_HAS_CLP_TRUE@
    267278COIN_HAS_COINDEPEND_FALSE = @COIN_HAS_COINDEPEND_FALSE@
    268279COIN_HAS_COINDEPEND_TRUE = @COIN_HAS_COINDEPEND_TRUE@
     280COIN_HAS_COINUTILS_FALSE = @COIN_HAS_COINUTILS_FALSE@
     281COIN_HAS_COINUTILS_TRUE = @COIN_HAS_COINUTILS_TRUE@
    269282COIN_HAS_CPX_FALSE = @COIN_HAS_CPX_FALSE@
    270283COIN_HAS_CPX_TRUE = @COIN_HAS_CPX_TRUE@
    … …  
    281294COIN_HAS_OSITESTS_FALSE = @COIN_HAS_OSITESTS_FALSE@
    282295COIN_HAS_OSITESTS_TRUE = @COIN_HAS_OSITESTS_TRUE@
     296COIN_HAS_OSI_FALSE = @COIN_HAS_OSI_FALSE@
     297COIN_HAS_OSI_TRUE = @COIN_HAS_OSI_TRUE@
    283298COIN_HAS_SAMPLE_FALSE = @COIN_HAS_SAMPLE_FALSE@
    284299COIN_HAS_SAMPLE_TRUE = @COIN_HAS_SAMPLE_TRUE@
    … …  
    350365OPT_CFLAGS = @OPT_CFLAGS@
    351366OPT_CXXFLAGS = @OPT_CXXFLAGS@
     367OSIDOCDIR = @OSIDOCDIR@
     368OSIOBJDIR = @OSIOBJDIR@
     369OSISRCDIR = @OSISRCDIR@
    352370OSITESTS_CFLAGS = @OSITESTS_CFLAGS@
    353371OSITESTS_DATA = @OSITESTS_DATA@

  • branches/split/Cbc/test/Makefile.in

    r1437 r1438  
    141141CDEFS = @CDEFS@
    142142CFLAGS = @CFLAGS@
     143CGLDOCDIR = @CGLDOCDIR@
     144CGLOBJDIR = @CGLOBJDIR@
     145CGLSRCDIR = @CGLSRCDIR@
     146CLPDOCDIR = @CLPDOCDIR@
     147CLPOBJDIR = @CLPOBJDIR@
     148CLPSRCDIR = @CLPSRCDIR@
    143149CLP_CFLAGS = @CLP_CFLAGS@
    144150CLP_DATA = @CLP_DATA@
    … …  
    147153COINDEPEND_DATA = @COINDEPEND_DATA@
    148154COINDEPEND_LIBS = @COINDEPEND_LIBS@
     155COINUTILSDOCDIR = @COINUTILSDOCDIR@
     156COINUTILSOBJDIR = @COINUTILSOBJDIR@
     157COINUTILSSRCDIR = @COINUTILSSRCDIR@
    149158COIN_HAS_ASL_FALSE = @COIN_HAS_ASL_FALSE@
    150159COIN_HAS_ASL_TRUE = @COIN_HAS_ASL_TRUE@
     160COIN_HAS_CGL_FALSE = @COIN_HAS_CGL_FALSE@
     161COIN_HAS_CGL_TRUE = @COIN_HAS_CGL_TRUE@
    151162COIN_HAS_CLP_FALSE = @COIN_HAS_CLP_FALSE@
    152163COIN_HAS_CLP_TRUE = @COIN_HAS_CLP_TRUE@
    153164COIN_HAS_COINDEPEND_FALSE = @COIN_HAS_COINDEPEND_FALSE@
    154165COIN_HAS_COINDEPEND_TRUE = @COIN_HAS_COINDEPEND_TRUE@
     166COIN_HAS_COINUTILS_FALSE = @COIN_HAS_COINUTILS_FALSE@
     167COIN_HAS_COINUTILS_TRUE = @COIN_HAS_COINUTILS_TRUE@
    155168COIN_HAS_CPX_FALSE = @COIN_HAS_CPX_FALSE@
    156169COIN_HAS_CPX_TRUE = @COIN_HAS_CPX_TRUE@
    … …  
    167180COIN_HAS_OSITESTS_FALSE = @COIN_HAS_OSITESTS_FALSE@
    168181COIN_HAS_OSITESTS_TRUE = @COIN_HAS_OSITESTS_TRUE@
     182COIN_HAS_OSI_FALSE = @COIN_HAS_OSI_FALSE@
     183COIN_HAS_OSI_TRUE = @COIN_HAS_OSI_TRUE@
    169184COIN_HAS_SAMPLE_FALSE = @COIN_HAS_SAMPLE_FALSE@
    170185COIN_HAS_SAMPLE_TRUE = @COIN_HAS_SAMPLE_TRUE@
    … …  
    236251OPT_CFLAGS = @OPT_CFLAGS@
    237252OPT_CXXFLAGS = @OPT_CXXFLAGS@
     253OSIDOCDIR = @OSIDOCDIR@
     254OSIOBJDIR = @OSIOBJDIR@
     255OSISRCDIR = @OSISRCDIR@
    238256OSITESTS_CFLAGS = @OSITESTS_CFLAGS@
    239257OSITESTS_DATA = @OSITESTS_DATA@
Note: See TracChangeset for help on using the changeset viewer.