Changeset 313 for trunk


Ignore:
Timestamp:
May 13, 2006 10:26:19 AM (14 years ago)
Author:
andreasw
Message:

renamed CoinBase? to CoinUtils?

Location:
trunk
Files:
13 edited

Legend:

Unmodified
Added
Removed
  • trunk

    • Property svn:externals
      •  

        old new  
        33Data/Sample   https://www.coin-or.org/svn/Data/trunk/Sample
        44Data/miplib3  https://www.coin-or.org/svn/Data/trunk/miplib3
        5 CoinBase      https://www.coin-or.org/svn/CoinBase/trunk/CoinBase
         5CoinUtils     https://www.coin-or.org/svn/CoinUtils/trunk/CoinUtils
        66Cgl           https://www.coin-or.org/svn/Cgl/trunk/Cgl
        77Clp           https://www.coin-or.org/svn/Clp/trunk/Clp
  • trunk/Cbc/Makefile.in

    r312 r313  
    5151        $(srcdir)/../ltmain.sh $(srcdir)/../missing \
    5252        $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
    53         $(srcdir)/cbc_addlibs.txt.in $(top_srcdir)/configure \
    54         $(top_srcdir)/inc/config_cbc.h.in AUTHORS INSTALL
     53        $(srcdir)/cbc_addlibs.txt.in \
     54        $(top_srcdir)/../Clp/src/CbcOrClpParam.cpp \
     55        $(top_srcdir)/../Clp/src/CbcOrClpParam.hpp \
     56        $(top_srcdir)/configure $(top_srcdir)/inc/config_cbc.h.in \
     57        AUTHORS INSTALL
    5558subdir = .
    5659ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
     
    109112CLPOBJDIR = @CLPOBJDIR@
    110113CLPSRCDIR = @CLPSRCDIR@
    111 COINBASEOBJDIR = @COINBASEOBJDIR@
    112 COINBASESRCDIR = @COINBASESRCDIR@
     114COINUTILSOBJDIR = @COINUTILSOBJDIR@
     115COINUTILSSRCDIR = @COINUTILSSRCDIR@
    113116COIN_DEBUG_FALSE = @COIN_DEBUG_FALSE@
    114117COIN_DEBUG_TRUE = @COIN_DEBUG_TRUE@
     
    119122COIN_HAS_CLP_FALSE = @COIN_HAS_CLP_FALSE@
    120123COIN_HAS_CLP_TRUE = @COIN_HAS_CLP_TRUE@
    121 COIN_HAS_COINBASE_FALSE = @COIN_HAS_COINBASE_FALSE@
    122 COIN_HAS_COINBASE_TRUE = @COIN_HAS_COINBASE_TRUE@
     124COIN_HAS_COINUTILS_FALSE = @COIN_HAS_COINUTILS_FALSE@
     125COIN_HAS_COINUTILS_TRUE = @COIN_HAS_COINUTILS_TRUE@
    123126COIN_HAS_CPX_FALSE = @COIN_HAS_CPX_FALSE@
    124127COIN_HAS_CPX_TRUE = @COIN_HAS_CPX_TRUE@
     
    482485        $(am__remove_distdir)
    483486        mkdir $(distdir)
    484         $(mkdir_p) $(distdir)/. $(distdir)/.. $(distdir)/inc
     487        $(mkdir_p) $(distdir)/. $(distdir)/.. $(distdir)/../Clp/src $(distdir)/inc
    485488        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
    486489        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
  • trunk/Cbc/configure

    r312 r313  
    474474#endif"
    475475
    476 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 ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE COIN_DEBUG_TRUE COIN_DEBUG_FALSE CXXDEFS CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT 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 CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBTOOLM4 have_autoconf have_automake BUILDTOOLSDIR AUX_DIR HAVE_EXTERNALS_TRUE HAVE_EXTERNALS_FALSE MAINTAINER_SMALL_TRUE MAINTAINER_SMALL_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_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 pkg_lib_dir pkg_include_dir pkg_bin_dir CBCSRCDIR CBCOBJDIR COIN_HAS_CBC_TRUE COIN_HAS_CBC_FALSE CGLSRCDIR CGLOBJDIR COIN_HAS_CGL_TRUE COIN_HAS_CGL_FALSE CLPSRCDIR CLPOBJDIR COIN_HAS_CLP_TRUE COIN_HAS_CLP_FALSE COINBASESRCDIR COINBASEOBJDIR COIN_HAS_COINBASE_TRUE COIN_HAS_COINBASE_FALSE DYLPSRCDIR DYLPOBJDIR COIN_HAS_DYLP_TRUE COIN_HAS_DYLP_FALSE OSISRCDIR OSIOBJDIR COIN_HAS_OSI_TRUE COIN_HAS_OSI_FALSE SYMSRCDIR SYMOBJDIR COIN_HAS_SYM_TRUE COIN_HAS_SYM_FALSE VOLSRCDIR VOLOBJDIR COIN_HAS_VOL_TRUE COIN_HAS_VOL_FALSE CPXINCDIR CPXLIBDIR COIN_HAS_CPX_TRUE COIN_HAS_CPX_FALSE GLPKINCDIR GLPKLIBDIR COIN_HAS_GLPK_TRUE COIN_HAS_GLPK_FALSE FMPINCDIR FMPLIBDIR COIN_HAS_FMP_TRUE COIN_HAS_FMP_FALSE MSKINCDIR MSKLIBDIR COIN_HAS_MSK_TRUE COIN_HAS_MSK_FALSE OSLINCDIR OSLLIBDIR COIN_HAS_OSL_TRUE COIN_HAS_OSL_FALSE SPXINCDIR SPXLIBDIR COIN_HAS_SPX_TRUE COIN_HAS_SPX_FALSE XPRINCDIR XPRLIBDIR COIN_HAS_XPR_TRUE COIN_HAS_XPR_FALSE LIBOBJS LTLIBOBJS'
     476ac_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 ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE COIN_DEBUG_TRUE COIN_DEBUG_FALSE CXXDEFS CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT 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 CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBTOOLM4 have_autoconf have_automake BUILDTOOLSDIR AUX_DIR HAVE_EXTERNALS_TRUE HAVE_EXTERNALS_FALSE MAINTAINER_SMALL_TRUE MAINTAINER_SMALL_FALSE CC CFLAGS ac_ct_CC CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_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 pkg_lib_dir pkg_include_dir pkg_bin_dir CBCSRCDIR CBCOBJDIR COIN_HAS_CBC_TRUE COIN_HAS_CBC_FALSE CGLSRCDIR CGLOBJDIR COIN_HAS_CGL_TRUE COIN_HAS_CGL_FALSE CLPSRCDIR CLPOBJDIR COIN_HAS_CLP_TRUE COIN_HAS_CLP_FALSE COINUTILSSRCDIR COINUTILSOBJDIR COIN_HAS_COINUTILS_TRUE COIN_HAS_COINUTILS_FALSE DYLPSRCDIR DYLPOBJDIR COIN_HAS_DYLP_TRUE COIN_HAS_DYLP_FALSE OSISRCDIR OSIOBJDIR COIN_HAS_OSI_TRUE COIN_HAS_OSI_FALSE SYMSRCDIR SYMOBJDIR COIN_HAS_SYM_TRUE COIN_HAS_SYM_FALSE VOLSRCDIR VOLOBJDIR COIN_HAS_VOL_TRUE COIN_HAS_VOL_FALSE CPXINCDIR CPXLIBDIR COIN_HAS_CPX_TRUE COIN_HAS_CPX_FALSE GLPKINCDIR GLPKLIBDIR COIN_HAS_GLPK_TRUE COIN_HAS_GLPK_FALSE FMPINCDIR FMPLIBDIR COIN_HAS_FMP_TRUE COIN_HAS_FMP_FALSE MSKINCDIR MSKLIBDIR COIN_HAS_MSK_TRUE COIN_HAS_MSK_FALSE OSLINCDIR OSLLIBDIR COIN_HAS_OSL_TRUE COIN_HAS_OSL_FALSE SPXINCDIR SPXLIBDIR COIN_HAS_SPX_TRUE COIN_HAS_SPX_FALSE XPRINCDIR XPRLIBDIR COIN_HAS_XPR_TRUE COIN_HAS_XPR_FALSE LIBOBJS LTLIBOBJS'
    477477ac_subst_files=''
    478478
     
    1966419664echo "${ECHO_T}$coin_has_clp" >&6
    1966519665
    19666 echo "$as_me:$LINENO: checking for COIN project CoinBase" >&5
    19667 echo $ECHO_N "checking for COIN project CoinBase... $ECHO_C" >&6
     19666echo "$as_me:$LINENO: checking for COIN project CoinUtils" >&5
     19667echo $ECHO_N "checking for COIN project CoinUtils... $ECHO_C" >&6
    1966819668
    1966919669# First check, if the sub-project is actually available (ToDo: allow
    1967019670# other locations)
    1967119671
    19672 coin_has_coinbase=unavailable
    19673 if test $PACKAGE_TARNAME = coinbase; then
    19674   coin_has_coinbase=.
    19675 else
    19676   if test -d $srcdir/../CoinBase; then
    19677     coin_has_coinbase=../CoinBase
     19672coin_has_coinutils=unavailable
     19673if test $PACKAGE_TARNAME = coinutils; then
     19674  coin_has_coinutils=.
     19675else
     19676  if test -d $srcdir/../CoinUtils; then
     19677    coin_has_coinutils=../CoinUtils
    1967819678  fi
    1967919679fi
    1968019680
    19681 if test $coin_has_coinbase != unavailable; then
     19681if test $coin_has_coinutils != unavailable; then
    1968219682  # Set the #define if the component is available
    1968319683
    1968419684cat >>confdefs.h <<\_ACEOF
    19685 #define COIN_HAS_COINBASE 1
     19685#define COIN_HAS_COINUTILS 1
    1968619686_ACEOF
    1968719687
     
    1968919689  # Set the variables for source and object code location
    1969019690
    19691   COINBASESRCDIR=`cd $srcdir/$coin_has_coinbase; pwd`
    19692 
    19693   COINBASEOBJDIR=`pwd`/$coin_has_coinbase
     19691  COINUTILSSRCDIR=`cd $srcdir/$coin_has_coinutils; pwd`
     19692
     19693  COINUTILSOBJDIR=`pwd`/$coin_has_coinutils
    1969419694fi
    1969519695
     
    1969719697
    1969819698
    19699 if test $coin_has_coinbase != unavailable; then
    19700   COIN_HAS_COINBASE_TRUE=
    19701   COIN_HAS_COINBASE_FALSE='#'
    19702 else
    19703   COIN_HAS_COINBASE_TRUE='#'
    19704   COIN_HAS_COINBASE_FALSE=
    19705 fi
    19706 
    19707 echo "$as_me:$LINENO: result: $coin_has_coinbase" >&5
    19708 echo "${ECHO_T}$coin_has_coinbase" >&6
     19699if test $coin_has_coinutils != unavailable; then
     19700  COIN_HAS_COINUTILS_TRUE=
     19701  COIN_HAS_COINUTILS_FALSE='#'
     19702else
     19703  COIN_HAS_COINUTILS_TRUE='#'
     19704  COIN_HAS_COINUTILS_FALSE=
     19705fi
     19706
     19707echo "$as_me:$LINENO: result: $coin_has_coinutils" >&5
     19708echo "${ECHO_T}$coin_has_coinutils" >&6
    1970919709
    1971019710echo "$as_me:$LINENO: checking for COIN project Dylp" >&5
     
    1992819928  { echo "$as_me:$LINENO: Stealing CbcOrClpParam's files from Clp" >&5
    1992919929echo "$as_me: Stealing CbcOrClpParam's files from Clp" >&6;}
    19930   rm -f src/CbcOrClpParam.cpp src/CbcOrClpParam.hpp
    19931   $LN_S $CLPSRCDIR/src/CbcOrClpParam.cpp src/CbcOrClpParam.cpp
    19932   $LN_S $CLPSRCDIR/src/CbcOrClpParam.hpp src/CbcOrClpParam.hpp
     19930                      ac_config_links="$ac_config_links src/CbcOrClpParam.cpp:../Clp/src/CbcOrClpParam.cpp src/CbcOrClpParam.hpp:../Clp/src/CbcOrClpParam.hpp"
     19931
    1993319932fi
    1993419933
     
    2122621225   { (exit 1); exit 1; }; }
    2122721226fi
    21228 if test -z "${COIN_HAS_COINBASE_TRUE}" && test -z "${COIN_HAS_COINBASE_FALSE}"; then
    21229   { { echo "$as_me:$LINENO: error: conditional \"COIN_HAS_COINBASE\" was never defined.
     21227if test -z "${COIN_HAS_COINUTILS_TRUE}" && test -z "${COIN_HAS_COINUTILS_FALSE}"; then
     21228  { { echo "$as_me:$LINENO: error: conditional \"COIN_HAS_COINUTILS\" was never defined.
    2123021229Usually this means the macro was only invoked conditionally." >&5
    21231 echo "$as_me: error: conditional \"COIN_HAS_COINBASE\" was never defined.
     21230echo "$as_me: error: conditional \"COIN_HAS_COINUTILS\" was never defined.
    2123221231Usually this means the macro was only invoked conditionally." >&2;}
    2123321232   { (exit 1); exit 1; }; }
     
    2163621635$config_headers
    2163721636
     21637Configuration links:
     21638$config_links
     21639
    2163821640Configuration commands:
    2163921641$config_commands
     
    2175821760  "test/Makefile" ) CONFIG_FILES="$CONFIG_FILES test/Makefile" ;;
    2175921761  "cbc_addlibs.txt" ) CONFIG_FILES="$CONFIG_FILES cbc_addlibs.txt" ;;
     21762  "src/CbcOrClpParam.cpp" ) CONFIG_LINKS="$CONFIG_LINKS src/CbcOrClpParam.cpp:../Clp/src/CbcOrClpParam.cpp" ;;
     21763  "src/CbcOrClpParam.hpp" ) CONFIG_LINKS="$CONFIG_LINKS src/CbcOrClpParam.hpp:../Clp/src/CbcOrClpParam.hpp" ;;
    2176021764  "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
    2176121765  "inc/config_cbc.h" ) CONFIG_HEADERS="$CONFIG_HEADERS inc/config_cbc.h" ;;
     
    2177321777  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
    2177421778  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
     21779  test "${CONFIG_LINKS+set}" = set || CONFIG_LINKS=$config_links
    2177521780  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
    2177621781fi
     
    2194321948s,@COIN_HAS_CLP_TRUE@,$COIN_HAS_CLP_TRUE,;t t
    2194421949s,@COIN_HAS_CLP_FALSE@,$COIN_HAS_CLP_FALSE,;t t
    21945 s,@COINBASESRCDIR@,$COINBASESRCDIR,;t t
    21946 s,@COINBASEOBJDIR@,$COINBASEOBJDIR,;t t
    21947 s,@COIN_HAS_COINBASE_TRUE@,$COIN_HAS_COINBASE_TRUE,;t t
    21948 s,@COIN_HAS_COINBASE_FALSE@,$COIN_HAS_COINBASE_FALSE,;t t
     21950s,@COINUTILSSRCDIR@,$COINUTILSSRCDIR,;t t
     21951s,@COINUTILSOBJDIR@,$COINUTILSOBJDIR,;t t
     21952s,@COIN_HAS_COINUTILS_TRUE@,$COIN_HAS_COINUTILS_TRUE,;t t
     21953s,@COIN_HAS_COINUTILS_FALSE@,$COIN_HAS_COINUTILS_FALSE,;t t
    2194921954s,@DYLPSRCDIR@,$DYLPSRCDIR,;t t
    2195021955s,@DYLPOBJDIR@,$DYLPOBJDIR,;t t
     
    2247422479          /^X\(\/\).*/{ s//\1/; q; }
    2247522480          s/.*/./; q'`/stamp-h$_am_stamp_count
     22481done
     22482_ACEOF
     22483cat >>$CONFIG_STATUS <<\_ACEOF
     22484
     22485#
     22486# CONFIG_LINKS section.
     22487#
     22488
     22489for ac_file in : $CONFIG_LINKS; do test "x$ac_file" = x: && continue
     22490  ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
     22491  ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
     22492
     22493  { echo "$as_me:$LINENO: linking $srcdir/$ac_source to $ac_dest" >&5
     22494echo "$as_me: linking $srcdir/$ac_source to $ac_dest" >&6;}
     22495
     22496  if test ! -r $srcdir/$ac_source; then
     22497    { { echo "$as_me:$LINENO: error: $srcdir/$ac_source: file not found" >&5
     22498echo "$as_me: error: $srcdir/$ac_source: file not found" >&2;}
     22499   { (exit 1); exit 1; }; }
     22500  fi
     22501  rm -f $ac_dest
     22502
     22503  # Make relative symlinks.
     22504  ac_dest_dir=`(dirname "$ac_dest") 2>/dev/null ||
     22505$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
     22506         X"$ac_dest" : 'X\(//\)[^/]' \| \
     22507         X"$ac_dest" : 'X\(//\)$' \| \
     22508         X"$ac_dest" : 'X\(/\)' \| \
     22509         .     : '\(.\)' 2>/dev/null ||
     22510echo X"$ac_dest" |
     22511    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
     22512          /^X\(\/\/\)[^/].*/{ s//\1/; q; }
     22513          /^X\(\/\/\)$/{ s//\1/; q; }
     22514          /^X\(\/\).*/{ s//\1/; q; }
     22515          s/.*/./; q'`
     22516  { if $as_mkdir_p; then
     22517    mkdir -p "$ac_dest_dir"
     22518  else
     22519    as_dir="$ac_dest_dir"
     22520    as_dirs=
     22521    while test ! -d "$as_dir"; do
     22522      as_dirs="$as_dir $as_dirs"
     22523      as_dir=`(dirname "$as_dir") 2>/dev/null ||
     22524$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
     22525         X"$as_dir" : 'X\(//\)[^/]' \| \
     22526         X"$as_dir" : 'X\(//\)$' \| \
     22527         X"$as_dir" : 'X\(/\)' \| \
     22528         .     : '\(.\)' 2>/dev/null ||
     22529echo X"$as_dir" |
     22530    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
     22531          /^X\(\/\/\)[^/].*/{ s//\1/; q; }
     22532          /^X\(\/\/\)$/{ s//\1/; q; }
     22533          /^X\(\/\).*/{ s//\1/; q; }
     22534          s/.*/./; q'`
     22535    done
     22536    test ! -n "$as_dirs" || mkdir $as_dirs
     22537  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dest_dir\"" >&5
     22538echo "$as_me: error: cannot create directory \"$ac_dest_dir\"" >&2;}
     22539   { (exit 1); exit 1; }; }; }
     22540
     22541  ac_builddir=.
     22542
     22543if test "$ac_dest_dir" != .; then
     22544  ac_dir_suffix=/`echo "$ac_dest_dir" | sed 's,^\.[\\/],,'`
     22545  # A "../" for each directory in $ac_dir_suffix.
     22546  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
     22547else
     22548  ac_dir_suffix= ac_top_builddir=
     22549fi
     22550
     22551case $srcdir in
     22552  .)  # No --srcdir option.  We are building in place.
     22553    ac_srcdir=.
     22554    if test -z "$ac_top_builddir"; then
     22555       ac_top_srcdir=.
     22556    else
     22557       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
     22558    fi ;;
     22559  [\\/]* | ?:[\\/]* )  # Absolute path.
     22560    ac_srcdir=$srcdir$ac_dir_suffix;
     22561    ac_top_srcdir=$srcdir ;;
     22562  *) # Relative path.
     22563    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
     22564    ac_top_srcdir=$ac_top_builddir$srcdir ;;
     22565esac
     22566
     22567# Do not use `cd foo && pwd` to compute absolute paths, because
     22568# the directories may not exist.
     22569case `pwd` in
     22570.) ac_abs_builddir="$ac_dest_dir";;
     22571*)
     22572  case "$ac_dest_dir" in
     22573  .) ac_abs_builddir=`pwd`;;
     22574  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dest_dir";;
     22575  *) ac_abs_builddir=`pwd`/"$ac_dest_dir";;
     22576  esac;;
     22577esac
     22578case $ac_abs_builddir in
     22579.) ac_abs_top_builddir=${ac_top_builddir}.;;
     22580*)
     22581  case ${ac_top_builddir}. in
     22582  .) ac_abs_top_builddir=$ac_abs_builddir;;
     22583  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
     22584  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
     22585  esac;;
     22586esac
     22587case $ac_abs_builddir in
     22588.) ac_abs_srcdir=$ac_srcdir;;
     22589*)
     22590  case $ac_srcdir in
     22591  .) ac_abs_srcdir=$ac_abs_builddir;;
     22592  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
     22593  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
     22594  esac;;
     22595esac
     22596case $ac_abs_builddir in
     22597.) ac_abs_top_srcdir=$ac_top_srcdir;;
     22598*)
     22599  case $ac_top_srcdir in
     22600  .) ac_abs_top_srcdir=$ac_abs_builddir;;
     22601  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
     22602  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
     22603  esac;;
     22604esac
     22605
     22606
     22607  case $srcdir in
     22608  [\\/$]* | ?:[\\/]* ) ac_rel_source=$srcdir/$ac_source ;;
     22609      *) ac_rel_source=$ac_top_builddir$srcdir/$ac_source ;;
     22610  esac
     22611
     22612  # Try a symlink, then a hard link, then a copy.
     22613  ln -s $ac_rel_source $ac_dest 2>/dev/null ||
     22614    ln $srcdir/$ac_source $ac_dest 2>/dev/null ||
     22615    cp -p $srcdir/$ac_source $ac_dest ||
     22616    { { echo "$as_me:$LINENO: error: cannot link or copy $srcdir/$ac_source to $ac_dest" >&5
     22617echo "$as_me: error: cannot link or copy $srcdir/$ac_source to $ac_dest" >&2;}
     22618   { (exit 1); exit 1; }; }
    2247622619done
    2247722620_ACEOF
  • trunk/Cbc/configure.ac

    r312 r313  
    6262AC_COIN_HAS_PROJECT(Cgl)
    6363AC_COIN_HAS_PROJECT(Clp)
    64 AC_COIN_HAS_PROJECT(CoinBase)
     64AC_COIN_HAS_PROJECT(CoinUtils)
    6565AC_COIN_HAS_PROJECT(Dylp)
    6666AC_COIN_HAS_PROJECT(Osi)
     
    9797if test x"$coin_has_clp" != xunavailable; then
    9898  AC_MSG_NOTICE([Stealing CbcOrClpParam's files from Clp])
    99   rm -f src/CbcOrClpParam.cpp src/CbcOrClpParam.hpp
    100   $LN_S $CLPSRCDIR/src/CbcOrClpParam.cpp src/CbcOrClpParam.cpp
    101   $LN_S $CLPSRCDIR/src/CbcOrClpParam.hpp src/CbcOrClpParam.hpp
     99  AC_CONFIG_LINKS([src/CbcOrClpParam.cpp:../Clp/src/CbcOrClpParam.cpp
     100                   src/CbcOrClpParam.hpp:../Clp/src/CbcOrClpParam.hpp])
    102101fi
    103102
  • trunk/Cbc/inc/config_cbc.h.in

    r312 r313  
    1717#undef COIN_HAS_CLP
    1818
    19 /* Define to 1 if the CoinBase package is used */
    20 #undef COIN_HAS_COINBASE
     19/* Define to 1 if the CoinUtils package is used */
     20#undef COIN_HAS_COINUTILS
    2121
    2222/* Define to 1 if the Cplex package is used */
  • trunk/Cbc/src/Makefile.am

    r312 r313  
    4848
    4949########################################################################
    50 #                        cbc_solver program                            #
     50#                            cbc program                               #
    5151########################################################################
    5252
    5353# Name of the executable compiled in this directory.  We want it to be
    5454# installed in the 'bin' directory
    55 bin_PROGRAMS = cbc_solver
     55bin_PROGRAMS = cbc
    5656
    5757# List all source files for this executable, including headers
    58 cbc_solver_SOURCES = \
     58cbc_SOURCES = \
    5959        CbcMain.cpp \
    6060        CbcParam.cpp CbcParam.hpp \
     
    6262
    6363# The following file is not to be distributed, since it is "borrowed" from Clp
    64 nodist_cbc_solver_SOURCES = CbcOrClpParam.cpp
    65 
    66 cbc_solver_LDADD = libCbc.la \
     64nodist_cbc_SOURCES = CbcOrClpParam.cpp
     65
     66cbc_LDADD = libCbc.la \
    6767        $(CGLOBJDIR)/src/libCgl.la
    6868
     
    7272        -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiClp` \
    7373        -I`$(CYGPATH_W) $(CLPOBJDIR)/inc`
    74   cbc_solver_LDADD += $(OSIOBJDIR)/src/OsiClp/libOsiClp.la \
     74  cbc_LDADD += $(OSIOBJDIR)/src/OsiClp/libOsiClp.la \
    7575        $(CLPOBJDIR)/src/libClp.la
    7676  LIBS  += `cat $(CLPOBJDIR)/clp_addlibs.txt`
     
    8080  CXXFLAGS += -I`$(CYGPATH_W) $(CBCSRCDIR)/src` \
    8181        -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiCbc`
    82   cbc_solver_LDADD += $(OSIOBJDIR)/src/OsiCbc/libOsiCbc.la \
     82  cbc_LDADD += $(OSIOBJDIR)/src/OsiCbc/libOsiCbc.la \
    8383        $(CBCOBJDIR)/src/libCbc.la
    8484  LIBS += `cat $(CBCOBJDIR)/cbc_addlibs.txt`
     
    8888  CXXFLAGS += -I`$(CYGPATH_W) $(CPXINCDIR)` \
    8989        -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiCpx`
    90   cbc_solver_LDADD += $(OSIOBJDIR)/src/OsiCpx/libOsiCpx.la
     90  cbc_LDADD += $(OSIOBJDIR)/src/OsiCpx/libOsiCpx.la
    9191endif
    9292
     
    9494  CXXFLAGS += -I`$(CYGPATH_W) $(DYLPSRCDIR)/src` \
    9595        -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiDylp`
    96   cbc_solver_LDADD += $(OSIOBJDIR)/src/OsiDylp/libOsiDylp.la \
     96  cbc_LDADD += $(OSIOBJDIR)/src/OsiDylp/libOsiDylp.la \
    9797        $(DYLPOBJDIR)/src/libDylp.la
    9898  LIBS += `cat $(DYLPOBJDIR)/dylp_addlibs.txt`
     
    101101if COIN_HAS_FMP
    102102  CXXFLAGS += -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiFmp`
    103   cbc_solver_LDADD += $(OSIOBJDIR)/src/OsiFmp/libOsiFmp.la
     103  cbc_LDADD += $(OSIOBJDIR)/src/OsiFmp/libOsiFmp.la
    104104endif
    105105
     
    107107  CXXFLAGS += -I`$(CYGPATH_W) $(GLPKINCDIR)` \
    108108        -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiGlpk`
    109   cbc_solver_LDADD += $(OSIOBJDIR)/src/OsiGlpk/libOsiGlpk.la
     109  cbc_LDADD += $(OSIOBJDIR)/src/OsiGlpk/libOsiGlpk.la
    110110endif
    111111
     
    113113  CXXFLAGS += -I`$(CYGPATH_W) $(MSKINCDIR)` \
    114114        -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiMsk`
    115   cbc_solver_LDADD += $(OSIOBJDIR)/src/OsiMsk/libOsiMsk.la
     115  cbc_LDADD += $(OSIOBJDIR)/src/OsiMsk/libOsiMsk.la
    116116endif
    117117
     
    119119  CXXFLAGS += -I`$(CYGPATH_W) $(OSLINCDIR)` \
    120120        -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiOsl`
    121   cbc_solver_LDADD += $(OSIOBJDIR)/src/OsiOsl/libOsiOsl.la
     121  cbc_LDADD += $(OSIOBJDIR)/src/OsiOsl/libOsiOsl.la
    122122endif
    123123
     
    125125  CXXFLAGS += -I`$(CYGPATH_W) $(SPXINCDIR)` \
    126126        -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiSpx`
    127   cbc_solver_LDADD += $(OSIOBJDIR)/src/OsiSpx/libOsiSpx.la
     127  cbc_LDADD += $(OSIOBJDIR)/src/OsiSpx/libOsiSpx.la
    128128endif
    129129
     
    131131  CXXFLAGS += -I`$(CYGPATH_W) $(SYMSRCDIR)/src` \
    132132        -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiSym`
    133   cbc_solver_LDADD += $(OSIOBJDIR)/src/OsiSym/libOsiSym.la \
     133  cbc_LDADD += $(OSIOBJDIR)/src/OsiSym/libOsiSym.la \
    134134        $(SYMOBJDIR)/src/libSym.la
    135135  LIBS += `cat $(SYMOBJDIR)/sym_addlibs.txt`
     
    139139  CXXFLAGS += -I`$(CYGPATH_W) $(VOLSRCDIR)/src` \
    140140        -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiVol`
    141   cbc_solver_LDADD += $(OSIOBJDIR)/src/OsiVol/libOsiVol.la \
     141  cbc_LDADD += $(OSIOBJDIR)/src/OsiVol/libOsiVol.la \
    142142        $(VOLOBJDIR)/src/libVol.la
    143143  LIBS += `cat $(VOLOBJDIR)/vol_addlibs.txt`
     
    147147  CXXFLAGS += -I`$(CYGPATH_W) $(XPRINCDIR)` \
    148148        -I`$(CYGPATH_W) $(OSISRCDIR)/src/OsiXpr`
    149   cbc_solver_LDADD += $(OSIOBJDIR)/src/OsiXpr/libOsiXpr.la
     149  cbc_LDADD += $(OSIOBJDIR)/src/OsiXpr/libOsiXpr.la
    150150endif
    151151
    152152# Finally the Osi Coin library (many of the above need it)
    153 cbc_solver_LDADD += $(OSIOBJDIR)/src/libOsi.la \
    154         $(COINBASEOBJDIR)/src/libCoinBase.la
    155 LIBS += `cat $(COINBASEOBJDIR)/coinbase_addlibs.txt` $(ADDLIBS)
     153cbc_LDADD += $(OSIOBJDIR)/src/libOsi.la \
     154        $(COINUTILSOBJDIR)/src/libCoinUtils.la
     155LIBS += `cat $(COINUTILSOBJDIR)/coinutils_addlibs.txt` $(ADDLIBS)
    156156
    157157# Finally, the -rpath flag is used by libtool to make sure that the shared
    158158# library is found (in the lib install directory) when we are using dynamic
    159159# libraries.
    160 cbc_solver_LDFLAGS = -rpath $(libdir)
     160cbc_LDFLAGS = -rpath $(libdir)
    161161
    162162########################################################################
     
    185185        $(OSIOBJDIR)/src/libOsi.la \
    186186        $(CLPOBJDIR)/src/libClp.la \
    187         $(COINBASEOBJDIR)/src/libCoinBase.la
     187        $(COINUTILSOBJDIR)/src/libCoinUtils.la
    188188
    189189# Finally, the -rpath flag is used by libtool to make sure that the shared
     
    213213        -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglRedSplit` \
    214214        -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglTwomir` \
    215         -I`$(CYGPATH_W) $(COINBASESRCDIR)/src` \
     215        -I`$(CYGPATH_W) $(COINUTILSSRCDIR)/src` \
    216216        -I`$(CYGPATH_W) $(OSISRCDIR)/src`
    217217
     
    272272CLEANFILES = bla.tmp
    273273
    274 DISTCLEANFILES = ../inc/$(CONFIG_DIST) \
    275         CbcOrClpParam.cpp \
    276         CbcOrClpParam.hpp
     274DISTCLEANFILES = ../inc/$(CONFIG_DIST)
  • trunk/Cbc/src/Makefile.in

    r312 r313  
    4545build_triplet = @build@
    4646host_triplet = @host@
    47 bin_PROGRAMS = cbc_solver$(EXEEXT) solve$(EXEEXT)
     47bin_PROGRAMS = cbc$(EXEEXT) solve$(EXEEXT)
    4848
    4949# List all additionally required solver and Osi libraries
     
    120120mkinstalldirs = $(install_sh) -d
    121121CONFIG_HEADER = $(top_builddir)/inc/config_cbc.h
    122 CONFIG_CLEAN_FILES =
     122CONFIG_CLEAN_FILES = CbcOrClpParam.cpp CbcOrClpParam.hpp
    123123am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
    124124am__vpath_adj = case $$p in \
     
    142142binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
    143143PROGRAMS = $(bin_PROGRAMS)
    144 am_cbc_solver_OBJECTS = CbcMain.$(OBJEXT) CbcParam.$(OBJEXT) \
     144am_cbc_OBJECTS = CbcMain.$(OBJEXT) CbcParam.$(OBJEXT) \
    145145        unitTest.$(OBJEXT)
    146 nodist_cbc_solver_OBJECTS = CbcOrClpParam.$(OBJEXT)
    147 cbc_solver_OBJECTS = $(am_cbc_solver_OBJECTS) \
    148         $(nodist_cbc_solver_OBJECTS)
     146nodist_cbc_OBJECTS = CbcOrClpParam.$(OBJEXT)
     147cbc_OBJECTS = $(am_cbc_OBJECTS) $(nodist_cbc_OBJECTS)
    149148@COIN_HAS_CLP_TRUE@am__DEPENDENCIES_1 =  \
    150149@COIN_HAS_CLP_TRUE@     $(OSIOBJDIR)/src/OsiClp/libOsiClp.la \
     
    176175@COIN_HAS_XPR_TRUE@am__DEPENDENCIES_12 =  \
    177176@COIN_HAS_XPR_TRUE@     $(OSIOBJDIR)/src/OsiXpr/libOsiXpr.la
    178 cbc_solver_DEPENDENCIES = libCbc.la $(CGLOBJDIR)/src/libCgl.la \
     177cbc_DEPENDENCIES = libCbc.la $(CGLOBJDIR)/src/libCgl.la \
    179178        $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \
    180179        $(am__DEPENDENCIES_3) $(am__DEPENDENCIES_4) \
     
    184183        $(am__DEPENDENCIES_11) $(am__DEPENDENCIES_12) \
    185184        $(OSIOBJDIR)/src/libOsi.la \
    186         $(COINBASEOBJDIR)/src/libCoinBase.la
     185        $(COINUTILSOBJDIR)/src/libCoinUtils.la
    187186am_solve_OBJECTS = CoinSolve.$(OBJEXT) Cbc_ampl.$(OBJEXT) \
    188187        unitTestClp.$(OBJEXT)
     
    192191        $(OSIOBJDIR)/src/OsiClp/libOsiClp.la \
    193192        $(OSIOBJDIR)/src/libOsi.la $(CLPOBJDIR)/src/libClp.la \
    194         $(COINBASEOBJDIR)/src/libCoinBase.la
     193        $(COINUTILSOBJDIR)/src/libCoinUtils.la
    195194DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/inc
    196195depcomp = $(SHELL) $(top_srcdir)/../depcomp
     
    212211LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
    213212        $(AM_LDFLAGS) $(LDFLAGS) -o $@
    214 SOURCES = $(libCbc_la_SOURCES) $(cbc_solver_SOURCES) \
    215         $(nodist_cbc_solver_SOURCES) $(solve_SOURCES) \
    216         $(nodist_solve_SOURCES)
    217 DIST_SOURCES = $(libCbc_la_SOURCES) $(cbc_solver_SOURCES) \
    218         $(solve_SOURCES)
     213SOURCES = $(libCbc_la_SOURCES) $(cbc_SOURCES) $(nodist_cbc_SOURCES) \
     214        $(solve_SOURCES) $(nodist_solve_SOURCES)
     215DIST_SOURCES = $(libCbc_la_SOURCES) $(cbc_SOURCES) $(solve_SOURCES)
    219216includeHEADERS_INSTALL = $(INSTALL_HEADER)
    220217nodist_includeHEADERS_INSTALL = $(INSTALL_HEADER)
     
    246243CLPOBJDIR = @CLPOBJDIR@
    247244CLPSRCDIR = @CLPSRCDIR@
    248 COINBASEOBJDIR = @COINBASEOBJDIR@
    249 COINBASESRCDIR = @COINBASESRCDIR@
     245COINUTILSOBJDIR = @COINUTILSOBJDIR@
     246COINUTILSSRCDIR = @COINUTILSSRCDIR@
    250247COIN_DEBUG_FALSE = @COIN_DEBUG_FALSE@
    251248COIN_DEBUG_TRUE = @COIN_DEBUG_TRUE@
     
    256253COIN_HAS_CLP_FALSE = @COIN_HAS_CLP_FALSE@
    257254COIN_HAS_CLP_TRUE = @COIN_HAS_CLP_TRUE@
    258 COIN_HAS_COINBASE_FALSE = @COIN_HAS_COINBASE_FALSE@
    259 COIN_HAS_COINBASE_TRUE = @COIN_HAS_COINBASE_TRUE@
     255COIN_HAS_COINUTILS_FALSE = @COIN_HAS_COINUTILS_FALSE@
     256COIN_HAS_COINUTILS_TRUE = @COIN_HAS_COINUTILS_TRUE@
    260257COIN_HAS_CPX_FALSE = @COIN_HAS_CPX_FALSE@
    261258COIN_HAS_CPX_TRUE = @COIN_HAS_CPX_TRUE@
     
    313310        $(CGLSRCDIR)/src/CglRedSplit` -I`$(CYGPATH_W) \
    314311        $(CGLSRCDIR)/src/CglTwomir` -I`$(CYGPATH_W) \
    315         $(COINBASESRCDIR)/src` -I`$(CYGPATH_W) $(OSISRCDIR)/src`
     312        $(COINUTILSSRCDIR)/src` -I`$(CYGPATH_W) $(OSISRCDIR)/src`
    316313CYGPATH_W = @CYGPATH_W@
    317314
     
    343340LIBS = @LIBS@ $(am__append_3) $(am__append_6) $(am__append_11) \
    344341        $(am__append_24) $(am__append_27) `cat \
    345         $(COINBASEOBJDIR)/coinbase_addlibs.txt` $(ADDLIBS)
     342        $(COINUTILSOBJDIR)/coinutils_addlibs.txt` $(ADDLIBS)
    346343LIBTOOL = @LIBTOOL@
    347344LIBTOOLM4 = @LIBTOOLM4@
     
    471468
    472469# List all source files for this executable, including headers
    473 cbc_solver_SOURCES = \
     470cbc_SOURCES = \
    474471        CbcMain.cpp \
    475472        CbcParam.cpp CbcParam.hpp \
     
    478475
    479476# The following file is not to be distributed, since it is "borrowed" from Clp
    480 nodist_cbc_solver_SOURCES = CbcOrClpParam.cpp
     477nodist_cbc_SOURCES = CbcOrClpParam.cpp
    481478
    482479# Finally the Osi Coin library (many of the above need it)
    483 cbc_solver_LDADD = libCbc.la $(CGLOBJDIR)/src/libCgl.la \
    484         $(am__append_2) $(am__append_5) $(am__append_8) \
    485         $(am__append_10) $(am__append_13) $(am__append_15) \
    486         $(am__append_17) $(am__append_19) $(am__append_21) \
    487         $(am__append_23) $(am__append_26) $(am__append_29) \
    488         $(OSIOBJDIR)/src/libOsi.la \
    489         $(COINBASEOBJDIR)/src/libCoinBase.la
     480cbc_LDADD = libCbc.la $(CGLOBJDIR)/src/libCgl.la $(am__append_2) \
     481        $(am__append_5) $(am__append_8) $(am__append_10) \
     482        $(am__append_13) $(am__append_15) $(am__append_17) \
     483        $(am__append_19) $(am__append_21) $(am__append_23) \
     484        $(am__append_26) $(am__append_29) $(OSIOBJDIR)/src/libOsi.la \
     485        $(COINUTILSOBJDIR)/src/libCoinUtils.la
    490486
    491487# Finally, the -rpath flag is used by libtool to make sure that the shared
    492488# library is found (in the lib install directory) when we are using dynamic
    493489# libraries.
    494 cbc_solver_LDFLAGS = -rpath $(libdir)
     490cbc_LDFLAGS = -rpath $(libdir)
    495491
    496492# List all source files for this executable, including headers
     
    510506        $(OSIOBJDIR)/src/libOsi.la \
    511507        $(CLPOBJDIR)/src/libClp.la \
    512         $(COINBASEOBJDIR)/src/libCoinBase.la
     508        $(COINUTILSOBJDIR)/src/libCoinUtils.la
    513509
    514510
     
    550546nodist_include_HEADERS = ../inc/$(CONFIG_DIST)
    551547CLEANFILES = bla.tmp
    552 DISTCLEANFILES = ../inc/$(CONFIG_DIST) \
    553         CbcOrClpParam.cpp \
    554         CbcOrClpParam.hpp
    555 
     548DISTCLEANFILES = ../inc/$(CONFIG_DIST)
    556549all: all-am
    557550
     
    644637          rm -f $$p $$f ; \
    645638        done
    646 cbc_solver$(EXEEXT): $(cbc_solver_OBJECTS) $(cbc_solver_DEPENDENCIES)
    647         @rm -f cbc_solver$(EXEEXT)
    648         $(CXXLINK) $(cbc_solver_LDFLAGS) $(cbc_solver_OBJECTS) $(cbc_solver_LDADD) $(LIBS)
     639cbc$(EXEEXT): $(cbc_OBJECTS) $(cbc_DEPENDENCIES)
     640        @rm -f cbc$(EXEEXT)
     641        $(CXXLINK) $(cbc_LDFLAGS) $(cbc_OBJECTS) $(cbc_LDADD) $(LIBS)
    649642solve$(EXEEXT): $(solve_OBJECTS) $(solve_DEPENDENCIES)
    650643        @rm -f solve$(EXEEXT)
  • trunk/Cbc/test/Makefile.in

    r312 r313  
    7878CLPOBJDIR = @CLPOBJDIR@
    7979CLPSRCDIR = @CLPSRCDIR@
    80 COINBASEOBJDIR = @COINBASEOBJDIR@
    81 COINBASESRCDIR = @COINBASESRCDIR@
     80COINUTILSOBJDIR = @COINUTILSOBJDIR@
     81COINUTILSSRCDIR = @COINUTILSSRCDIR@
    8282COIN_DEBUG_FALSE = @COIN_DEBUG_FALSE@
    8383COIN_DEBUG_TRUE = @COIN_DEBUG_TRUE@
     
    8888COIN_HAS_CLP_FALSE = @COIN_HAS_CLP_FALSE@
    8989COIN_HAS_CLP_TRUE = @COIN_HAS_CLP_TRUE@
    90 COIN_HAS_COINBASE_FALSE = @COIN_HAS_COINBASE_FALSE@
    91 COIN_HAS_COINBASE_TRUE = @COIN_HAS_COINBASE_TRUE@
     90COIN_HAS_COINUTILS_FALSE = @COIN_HAS_COINUTILS_FALSE@
     91COIN_HAS_COINUTILS_TRUE = @COIN_HAS_COINUTILS_TRUE@
    9292COIN_HAS_CPX_FALSE = @COIN_HAS_CPX_FALSE@
    9393COIN_HAS_CPX_TRUE = @COIN_HAS_CPX_TRUE@
  • trunk/Externals

    r312 r313  
    33Data/Sample   https://www.coin-or.org/svn/Data/trunk/Sample
    44Data/miplib3  https://www.coin-or.org/svn/Data/trunk/miplib3
    5 CoinBase      https://www.coin-or.org/svn/CoinBase/trunk/CoinBase
     5CoinUtils     https://www.coin-or.org/svn/CoinUtils/trunk/CoinUtils
    66Cgl           https://www.coin-or.org/svn/Cgl/trunk/Cgl
    77Clp           https://www.coin-or.org/svn/Clp/trunk/Clp
  • trunk/Makefile.am

    r312 r313  
    2323########################################################################
    2424
    25 test:
     25test: all
    2626        cd Cbc; make test
    2727
  • trunk/Makefile.in

    r312 r313  
    580580########################################################################
    581581
    582 test:
     582test: all
    583583        cd Cbc; make test
    584584
  • trunk/configure

    r312 r313  
    283283ac_unique_file="configure.ac"
    284284ac_default_prefix=`pwd`
    285 ac_subdirs_all="$ac_subdirs_all CoinBase"
     285ac_subdirs_all="$ac_subdirs_all CoinUtils"
    286286ac_subdirs_all="$ac_subdirs_all Data/Netlib"
    287287ac_subdirs_all="$ac_subdirs_all Data/Sample"
     
    20702070
    20712071coin_subdirs=
    2072 echo "$as_me:$LINENO: checking whether directory CoinBase is available" >&5
    2073 echo $ECHO_N "checking whether directory CoinBase is available... $ECHO_C" >&6
    2074                 if test -r $srcdir/CoinBase/configure; then
    2075                   coin_subdirs="$coin_subdirs CoinBase"
     2072echo "$as_me:$LINENO: checking whether directory CoinUtils is available" >&5
     2073echo $ECHO_N "checking whether directory CoinUtils is available... $ECHO_C" >&6
     2074                if test -r $srcdir/CoinUtils/configure; then
     2075                  coin_subdirs="$coin_subdirs CoinUtils"
    20762076                  echo "$as_me:$LINENO: result: yes" >&5
    20772077echo "${ECHO_T}yes" >&6
    20782078
    20792079
    2080 subdirs="$subdirs CoinBase"
     2080subdirs="$subdirs CoinUtils"
    20812081
    20822082                else
  • trunk/configure.ac

    r312 r313  
    4444#############################################################################
    4545
    46 AC_COIN_MAIN_SUBDIRS(CoinBase)
     46AC_COIN_MAIN_SUBDIRS(CoinUtils)
    4747AC_COIN_MAIN_SUBDIRS(Data/Netlib)
    4848AC_COIN_MAIN_SUBDIRS(Data/Sample)
Note: See TracChangeset for help on using the changeset viewer.