Skip to content

Commit a736052

Browse files
committed
temporarily committing release candidate
1 parent 3631dd1 commit a736052

File tree

11 files changed

+126
-45
lines changed

11 files changed

+126
-45
lines changed

Cbc/Makefile.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -436,6 +436,7 @@ coin_doxy_usedot = @coin_doxy_usedot@
436436
coin_have_doxygen = @coin_have_doxygen@
437437
coin_have_latex = @coin_have_latex@
438438
datadir = @datadir@
439+
dos2unix = @dos2unix@
439440
exec_prefix = @exec_prefix@
440441
have_autoconf = @have_autoconf@
441442
have_automake = @have_automake@

Cbc/configure

Lines changed: 52 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#! /bin/sh
22
# Guess values for system-dependent variables and create Makefiles.
3-
# Generated by GNU Autoconf 2.59 for Cbc 2.10.
3+
# Generated by GNU Autoconf 2.59 for Cbc 2.10.4.
44
#
55
# Report bugs to <[email protected]>.
66
#
@@ -429,8 +429,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
429429
# Identity of this package.
430430
PACKAGE_NAME='Cbc'
431431
PACKAGE_TARNAME='cbc'
432-
PACKAGE_VERSION='2.10'
433-
PACKAGE_STRING='Cbc 2.10'
432+
PACKAGE_VERSION='2.10.4'
433+
PACKAGE_STRING='Cbc 2.10.4'
434434
PACKAGE_BUGREPORT='[email protected]'
435435

436436
ac_unique_file="src/CbcTree.hpp"
@@ -472,7 +472,7 @@ ac_includes_default="\
472472
# include <unistd.h>
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 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 COIN_CC_IS_CL_TRUE COIN_CC_IS_CL_FALSE MPICC CXXDEFS ADD_CXXFLAGS DBG_CXXFLAGS OPT_CXXFLAGS CXX CXXFLAGS ac_ct_CXX COIN_CXX_IS_CL_TRUE COIN_CXX_IS_CL_FALSE MPICXX EGREP LN_S 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 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 DEPENDENCY_LINKING_TRUE DEPENDENCY_LINKING_FALSE LT_LDFLAGS PKG_CONFIG ac_ct_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 COINDEPEND_DEPENDENCIES COINDEPEND_LIBS_INSTALLED COINDEPEND_CFLAGS_INSTALLED COINDEPEND_DATA_INSTALLED CBCLIB_CFLAGS CBCLIB_LIBS CBCLIB_PCLIBS CBCLIB_PCREQUIRES CBCLIB_DEPENDENCIES CBCLIB_CFLAGS_INSTALLED CBCLIB_LIBS_INSTALLED CBCGENERIC_CFLAGS CBCGENERIC_LIBS CBCGENERIC_PCLIBS CBCGENERIC_PCREQUIRES CBCGENERIC_DEPENDENCIES CBCGENERIC_CFLAGS_INSTALLED CBCGENERIC_LIBS_INSTALLED COIN_HAS_COINDEPEND_TRUE COIN_HAS_COINDEPEND_FALSE CLP_LIBS CLP_CFLAGS CLP_DATA CLP_DEPENDENCIES CLP_LIBS_INSTALLED CLP_CFLAGS_INSTALLED CLP_DATA_INSTALLED COIN_HAS_CLP_TRUE COIN_HAS_CLP_FALSE OSITESTS_LIBS OSITESTS_CFLAGS OSITESTS_DATA OSITESTS_DEPENDENCIES OSITESTS_LIBS_INSTALLED OSITESTS_CFLAGS_INSTALLED OSITESTS_DATA_INSTALLED COIN_HAS_OSITESTS_TRUE COIN_HAS_OSITESTS_FALSE SAMPLE_LIBS SAMPLE_CFLAGS SAMPLE_DATA SAMPLE_DEPENDENCIES SAMPLE_LIBS_INSTALLED SAMPLE_CFLAGS_INSTALLED SAMPLE_DATA_INSTALLED COIN_HAS_SAMPLE_TRUE COIN_HAS_SAMPLE_FALSE NETLIB_LIBS NETLIB_CFLAGS NETLIB_DATA NETLIB_DEPENDENCIES NETLIB_LIBS_INSTALLED NETLIB_CFLAGS_INSTALLED NETLIB_DATA_INSTALLED COIN_HAS_NETLIB_TRUE COIN_HAS_NETLIB_FALSE MIPLIB3_LIBS MIPLIB3_CFLAGS MIPLIB3_DATA MIPLIB3_DEPENDENCIES MIPLIB3_LIBS_INSTALLED MIPLIB3_CFLAGS_INSTALLED MIPLIB3_DATA_INSTALLED COIN_HAS_MIPLIB3_TRUE COIN_HAS_MIPLIB3_FALSE DYLP_LIBS DYLP_CFLAGS DYLP_DATA DYLP_DEPENDENCIES DYLP_LIBS_INSTALLED DYLP_CFLAGS_INSTALLED DYLP_DATA_INSTALLED COIN_HAS_DYLP_TRUE COIN_HAS_DYLP_FALSE VOL_LIBS VOL_CFLAGS VOL_DATA VOL_DEPENDENCIES VOL_LIBS_INSTALLED VOL_CFLAGS_INSTALLED VOL_DATA_INSTALLED COIN_HAS_VOL_TRUE COIN_HAS_VOL_FALSE CPX_LIBS CPX_CFLAGS CPX_DATA CPX_DEPENDENCIES CPX_LIBS_INSTALLED CPX_CFLAGS_INSTALLED CPX_DATA_INSTALLED COIN_HAS_CPX_TRUE COIN_HAS_CPX_FALSE GLPK_LIBS GLPK_CFLAGS GLPK_DATA GLPK_DEPENDENCIES GLPK_LIBS_INSTALLED GLPK_CFLAGS_INSTALLED GLPK_DATA_INSTALLED COIN_HAS_GLPK_TRUE COIN_HAS_GLPK_FALSE GRB_LIBS GRB_CFLAGS GRB_DATA GRB_DEPENDENCIES GRB_LIBS_INSTALLED GRB_CFLAGS_INSTALLED GRB_DATA_INSTALLED COIN_HAS_GRB_TRUE COIN_HAS_GRB_FALSE HIGHS_LIBS HIGHS_CFLAGS HIGHS_DATA HIGHS_DEPENDENCIES HIGHS_LIBS_INSTALLED HIGHS_CFLAGS_INSTALLED HIGHS_DATA_INSTALLED COIN_HAS_HIGHS_TRUE COIN_HAS_HIGHS_FALSE MSK_LIBS MSK_CFLAGS MSK_DATA MSK_DEPENDENCIES MSK_LIBS_INSTALLED MSK_CFLAGS_INSTALLED MSK_DATA_INSTALLED COIN_HAS_MSK_TRUE COIN_HAS_MSK_FALSE SPX_LIBS SPX_CFLAGS SPX_DATA SPX_DEPENDENCIES SPX_LIBS_INSTALLED SPX_CFLAGS_INSTALLED SPX_DATA_INSTALLED COIN_HAS_SPX_TRUE COIN_HAS_SPX_FALSE XPR_LIBS XPR_CFLAGS XPR_DATA XPR_DEPENDENCIES XPR_LIBS_INSTALLED XPR_CFLAGS_INSTALLED XPR_DATA_INSTALLED COIN_HAS_XPR_TRUE COIN_HAS_XPR_FALSE ASL_LIBS ASL_CFLAGS ASL_DATA ASL_DEPENDENCIES ASL_LIBS_INSTALLED ASL_CFLAGS_INSTALLED ASL_DATA_INSTALLED COIN_HAS_ASL_TRUE COIN_HAS_ASL_FALSE MUMPS_LIBS MUMPS_CFLAGS MUMPS_DATA MUMPS_DEPENDENCIES MUMPS_LIBS_INSTALLED MUMPS_CFLAGS_INSTALLED MUMPS_DATA_INSTALLED COIN_HAS_MUMPS_TRUE COIN_HAS_MUMPS_FALSE NTYINCDIR NTYLIB COIN_HAS_NTY_TRUE COIN_HAS_NTY_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_HIGHS_TRUE OSICBC_DFLT_SOLVER_HIGHS_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_have_latex coin_doxy_usedot coin_doxy_tagname coin_doxy_logname COIN_HAS_DOXYGEN_TRUE COIN_HAS_DOXYGEN_FALSE COIN_HAS_LATEX_TRUE COIN_HAS_LATEX_FALSE 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 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 COIN_CC_IS_CL_TRUE COIN_CC_IS_CL_FALSE MPICC CXXDEFS ADD_CXXFLAGS DBG_CXXFLAGS OPT_CXXFLAGS CXX CXXFLAGS ac_ct_CXX COIN_CXX_IS_CL_TRUE COIN_CXX_IS_CL_FALSE MPICXX EGREP LN_S 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 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 dos2unix RPATH_FLAGS DEPENDENCY_LINKING_TRUE DEPENDENCY_LINKING_FALSE LT_LDFLAGS PKG_CONFIG ac_ct_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 COINDEPEND_DEPENDENCIES COINDEPEND_LIBS_INSTALLED COINDEPEND_CFLAGS_INSTALLED COINDEPEND_DATA_INSTALLED CBCLIB_CFLAGS CBCLIB_LIBS CBCLIB_PCLIBS CBCLIB_PCREQUIRES CBCLIB_DEPENDENCIES CBCLIB_CFLAGS_INSTALLED CBCLIB_LIBS_INSTALLED CBCGENERIC_CFLAGS CBCGENERIC_LIBS CBCGENERIC_PCLIBS CBCGENERIC_PCREQUIRES CBCGENERIC_DEPENDENCIES CBCGENERIC_CFLAGS_INSTALLED CBCGENERIC_LIBS_INSTALLED COIN_HAS_COINDEPEND_TRUE COIN_HAS_COINDEPEND_FALSE CLP_LIBS CLP_CFLAGS CLP_DATA CLP_DEPENDENCIES CLP_LIBS_INSTALLED CLP_CFLAGS_INSTALLED CLP_DATA_INSTALLED COIN_HAS_CLP_TRUE COIN_HAS_CLP_FALSE OSITESTS_LIBS OSITESTS_CFLAGS OSITESTS_DATA OSITESTS_DEPENDENCIES OSITESTS_LIBS_INSTALLED OSITESTS_CFLAGS_INSTALLED OSITESTS_DATA_INSTALLED COIN_HAS_OSITESTS_TRUE COIN_HAS_OSITESTS_FALSE SAMPLE_LIBS SAMPLE_CFLAGS SAMPLE_DATA SAMPLE_DEPENDENCIES SAMPLE_LIBS_INSTALLED SAMPLE_CFLAGS_INSTALLED SAMPLE_DATA_INSTALLED COIN_HAS_SAMPLE_TRUE COIN_HAS_SAMPLE_FALSE NETLIB_LIBS NETLIB_CFLAGS NETLIB_DATA NETLIB_DEPENDENCIES NETLIB_LIBS_INSTALLED NETLIB_CFLAGS_INSTALLED NETLIB_DATA_INSTALLED COIN_HAS_NETLIB_TRUE COIN_HAS_NETLIB_FALSE MIPLIB3_LIBS MIPLIB3_CFLAGS MIPLIB3_DATA MIPLIB3_DEPENDENCIES MIPLIB3_LIBS_INSTALLED MIPLIB3_CFLAGS_INSTALLED MIPLIB3_DATA_INSTALLED COIN_HAS_MIPLIB3_TRUE COIN_HAS_MIPLIB3_FALSE DYLP_LIBS DYLP_CFLAGS DYLP_DATA DYLP_DEPENDENCIES DYLP_LIBS_INSTALLED DYLP_CFLAGS_INSTALLED DYLP_DATA_INSTALLED COIN_HAS_DYLP_TRUE COIN_HAS_DYLP_FALSE VOL_LIBS VOL_CFLAGS VOL_DATA VOL_DEPENDENCIES VOL_LIBS_INSTALLED VOL_CFLAGS_INSTALLED VOL_DATA_INSTALLED COIN_HAS_VOL_TRUE COIN_HAS_VOL_FALSE CPX_LIBS CPX_CFLAGS CPX_DATA CPX_DEPENDENCIES CPX_LIBS_INSTALLED CPX_CFLAGS_INSTALLED CPX_DATA_INSTALLED COIN_HAS_CPX_TRUE COIN_HAS_CPX_FALSE GLPK_LIBS GLPK_CFLAGS GLPK_DATA GLPK_DEPENDENCIES GLPK_LIBS_INSTALLED GLPK_CFLAGS_INSTALLED GLPK_DATA_INSTALLED COIN_HAS_GLPK_TRUE COIN_HAS_GLPK_FALSE GRB_LIBS GRB_CFLAGS GRB_DATA GRB_DEPENDENCIES GRB_LIBS_INSTALLED GRB_CFLAGS_INSTALLED GRB_DATA_INSTALLED COIN_HAS_GRB_TRUE COIN_HAS_GRB_FALSE HIGHS_LIBS HIGHS_CFLAGS HIGHS_DATA HIGHS_DEPENDENCIES HIGHS_LIBS_INSTALLED HIGHS_CFLAGS_INSTALLED HIGHS_DATA_INSTALLED COIN_HAS_HIGHS_TRUE COIN_HAS_HIGHS_FALSE MSK_LIBS MSK_CFLAGS MSK_DATA MSK_DEPENDENCIES MSK_LIBS_INSTALLED MSK_CFLAGS_INSTALLED MSK_DATA_INSTALLED COIN_HAS_MSK_TRUE COIN_HAS_MSK_FALSE SPX_LIBS SPX_CFLAGS SPX_DATA SPX_DEPENDENCIES SPX_LIBS_INSTALLED SPX_CFLAGS_INSTALLED SPX_DATA_INSTALLED COIN_HAS_SPX_TRUE COIN_HAS_SPX_FALSE XPR_LIBS XPR_CFLAGS XPR_DATA XPR_DEPENDENCIES XPR_LIBS_INSTALLED XPR_CFLAGS_INSTALLED XPR_DATA_INSTALLED COIN_HAS_XPR_TRUE COIN_HAS_XPR_FALSE ASL_LIBS ASL_CFLAGS ASL_DATA ASL_DEPENDENCIES ASL_LIBS_INSTALLED ASL_CFLAGS_INSTALLED ASL_DATA_INSTALLED COIN_HAS_ASL_TRUE COIN_HAS_ASL_FALSE MUMPS_LIBS MUMPS_CFLAGS MUMPS_DATA MUMPS_DEPENDENCIES MUMPS_LIBS_INSTALLED MUMPS_CFLAGS_INSTALLED MUMPS_DATA_INSTALLED COIN_HAS_MUMPS_TRUE COIN_HAS_MUMPS_FALSE NTYINCDIR NTYLIB COIN_HAS_NTY_TRUE COIN_HAS_NTY_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_HIGHS_TRUE OSICBC_DFLT_SOLVER_HIGHS_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_have_latex coin_doxy_usedot coin_doxy_tagname coin_doxy_logname COIN_HAS_DOXYGEN_TRUE COIN_HAS_DOXYGEN_FALSE COIN_HAS_LATEX_TRUE COIN_HAS_LATEX_FALSE coin_doxy_tagfiles coin_doxy_excludes LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR LIBOBJS LTLIBOBJS'
476476
ac_subst_files=''
477477

478478
# Initialize some variables set by options.
@@ -1005,7 +1005,7 @@ if test "$ac_init_help" = "long"; then
10051005
# Omit some internal or obsolete options to make the list less imposing.
10061006
# This message is too long to be a string in the A/UX 3.1 sh.
10071007
cat <<_ACEOF
1008-
\`configure' configures Cbc 2.10 to adapt to many kinds of systems.
1008+
\`configure' configures Cbc 2.10.4 to adapt to many kinds of systems.
10091009

10101010
Usage: $0 [OPTION]... [VAR=VALUE]...
10111011

@@ -1071,7 +1071,7 @@ fi
10711071

10721072
if test -n "$ac_init_help"; then
10731073
case $ac_init_help in
1074-
short | recursive ) echo "Configuration of Cbc 2.10:";;
1074+
short | recursive ) echo "Configuration of Cbc 2.10.4:";;
10751075
esac
10761076
cat <<\_ACEOF
10771077

@@ -1318,7 +1318,7 @@ fi
13181318
test -n "$ac_init_help" && exit 0
13191319
if $ac_init_version; then
13201320
cat <<\_ACEOF
1321-
Cbc configure 2.10
1321+
Cbc configure 2.10.4
13221322
generated by GNU Autoconf 2.59
13231323

13241324
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1338,7 +1338,7 @@ cat >&5 <<_ACEOF
13381338
This file contains any messages produced by compilers while
13391339
running configure, to aid debugging if configure makes a mistake.
13401340

1341-
It was created by Cbc $as_me 2.10, which was
1341+
It was created by Cbc $as_me 2.10.4, which was
13421342
generated by GNU Autoconf 2.59. Invocation command line was
13431343

13441344
$ $0 $@
@@ -1864,7 +1864,7 @@ _ACEOF
18641864

18651865

18661866
# Capture libtool library version, if given.
1867-
1867+
coin_libversion=13:4:10
18681868

18691869

18701870

@@ -4571,7 +4571,7 @@ fi
45714571

45724572
# Define the identity of the package.
45734573
PACKAGE='cbc'
4574-
VERSION='2.10'
4574+
VERSION='2.10.4'
45754575

45764576

45774577
cat >>confdefs.h <<_ACEOF
@@ -5290,7 +5290,7 @@ if test x$prefix = xNONE; then
52905290
else
52915291
full_prefix=$prefix
52925292
fi
5293-
full_prefix=`cd $full_prefix ; pwd`
5293+
52945294

52955295
abs_lib_dir=$full_prefix/lib
52965296

@@ -20272,7 +20272,44 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
2027220272

2027320273
{ echo "$as_me:$LINENO: Build is \"$build\"." >&5
2027420274
echo "$as_me: Build is \"$build\"." >&6;}
20275-
mydos2unix='| dos2unix'
20275+
# Extract the first word of "dos2unix", so it can be a program name with args.
20276+
set dummy dos2unix; ac_word=$2
20277+
echo "$as_me:$LINENO: checking for $ac_word" >&5
20278+
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
20279+
if test "${ac_cv_prog_dos2unix+set}" = set; then
20280+
echo $ECHO_N "(cached) $ECHO_C" >&6
20281+
else
20282+
if test -n "$dos2unix"; then
20283+
ac_cv_prog_dos2unix="$dos2unix" # Let the user override the test.
20284+
else
20285+
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
20286+
for as_dir in $PATH
20287+
do
20288+
IFS=$as_save_IFS
20289+
test -z "$as_dir" && as_dir=.
20290+
for ac_exec_ext in '' $ac_executable_extensions; do
20291+
if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
20292+
ac_cv_prog_dos2unix="dos2unix"
20293+
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
20294+
break 2
20295+
fi
20296+
done
20297+
done
20298+
20299+
fi
20300+
fi
20301+
dos2unix=$ac_cv_prog_dos2unix
20302+
if test -n "$dos2unix"; then
20303+
echo "$as_me:$LINENO: result: $dos2unix" >&5
20304+
echo "${ECHO_T}$dos2unix" >&6
20305+
else
20306+
echo "$as_me:$LINENO: result: no" >&5
20307+
echo "${ECHO_T}no" >&6
20308+
fi
20309+
20310+
if test "$dos2unix" = dos2unix ; then
20311+
mydos2unix="| dos2unix"
20312+
fi
2027620313
case $build in
2027720314
*-mingw*)
2027820315
CYGPATH_W=echo
@@ -32496,7 +32533,7 @@ _ASBOX
3249632533
} >&5
3249732534
cat >&5 <<_CSEOF
3249832535

32499-
This file was extended by Cbc $as_me 2.10, which was
32536+
This file was extended by Cbc $as_me 2.10.4, which was
3250032537
generated by GNU Autoconf 2.59. Invocation command line was
3250132538

3250232539
CONFIG_FILES = $CONFIG_FILES
@@ -32559,7 +32596,7 @@ _ACEOF
3255932596

3256032597
cat >>$CONFIG_STATUS <<_ACEOF
3256132598
ac_cs_version="\\
32562-
Cbc config.status 2.10
32599+
Cbc config.status 2.10.4
3256332600
configured by $0, generated by GNU Autoconf 2.59,
3256432601
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
3256532602

@@ -32868,6 +32905,7 @@ s,@ac_ct_F77@,$ac_ct_F77,;t t
3286832905
s,@LIBTOOL@,$LIBTOOL,;t t
3286932906
s,@ac_c_preproc_warn_flag@,$ac_c_preproc_warn_flag,;t t
3287032907
s,@ac_cxx_preproc_warn_flag@,$ac_cxx_preproc_warn_flag,;t t
32908+
s,@dos2unix@,$dos2unix,;t t
3287132909
s,@RPATH_FLAGS@,$RPATH_FLAGS,;t t
3287232910
s,@DEPENDENCY_LINKING_TRUE@,$DEPENDENCY_LINKING_TRUE,;t t
3287332911
s,@DEPENDENCY_LINKING_FALSE@,$DEPENDENCY_LINKING_FALSE,;t t

Cbc/configure.ac

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
AC_PREREQ(2.59)
1414

15-
AC_INIT([Cbc],[2.10],[[email protected]])
15+
AC_INIT([Cbc],[2.10.4],[[email protected]])
1616

1717
AC_COPYRIGHT([
1818
Copyright 2006 International Business Machines and others.
@@ -41,7 +41,7 @@ AC_CANONICAL_BUILD
4141
# the source root directory contains definition of where to find those
4242
# externals. The following macro ensures that those externals are
4343
# retrieved by svn if they are not there yet.
44-
AC_COIN_PROJECTDIR_INIT(Cbc)
44+
AC_COIN_PROJECTDIR_INIT(Cbc,13:4:10)
4545

4646
# Check if user wants to produce debugging code
4747
AC_COIN_DEBUG_COMPILE(Cbc)

Cbc/src/Makefile.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -504,6 +504,7 @@ coin_doxy_usedot = @coin_doxy_usedot@
504504
coin_have_doxygen = @coin_have_doxygen@
505505
coin_have_latex = @coin_have_latex@
506506
datadir = @datadir@
507+
dos2unix = @dos2unix@
507508
exec_prefix = @exec_prefix@
508509
have_autoconf = @have_autoconf@
509510
have_automake = @have_automake@

Cbc/src/OsiCbc/Makefile.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -430,6 +430,7 @@ coin_doxy_usedot = @coin_doxy_usedot@
430430
coin_have_doxygen = @coin_have_doxygen@
431431
coin_have_latex = @coin_have_latex@
432432
datadir = @datadir@
433+
dos2unix = @dos2unix@
433434
exec_prefix = @exec_prefix@
434435
have_autoconf = @have_autoconf@
435436
have_automake = @have_automake@

Cbc/src/config_cbc_default.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
/***************************************************************************/
66

77
/* Version number of project */
8-
#define CBC_VERSION "2.10"
8+
#define CBC_VERSION "2.10.4"
99

1010
/* Major Version number of project */
1111
#define CBC_VERSION_MAJOR 2
@@ -14,7 +14,7 @@
1414
#define CBC_VERSION_MINOR 10
1515

1616
/* Release Version number of project */
17-
#define CBC_VERSION_RELEASE 9999
17+
#define CBC_VERSION_RELEASE 4
1818

1919
/* vi: softtabstop=2 shiftwidth=2 expandtab tabstop=2
2020
*/

Cbc/test/Makefile.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -423,6 +423,7 @@ coin_doxy_usedot = @coin_doxy_usedot@
423423
coin_have_doxygen = @coin_have_doxygen@
424424
coin_have_latex = @coin_have_latex@
425425
datadir = @datadir@
426+
dos2unix = @dos2unix@
426427
exec_prefix = @exec_prefix@
427428
have_autoconf = @have_autoconf@
428429
have_automake = @have_automake@

Dependencies

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
BuildTools https://projects.coin-or.org/svn/BuildTools/stable/0.8
2-
ThirdParty/ASL https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/stable/1.4
3-
ThirdParty/Blas https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.4
4-
ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.6
5-
ThirdParty/Glpk https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/stable/1.10
6-
ThirdParty/Metis https://projects.coin-or.org/svn/BuildTools/ThirdParty/Metis/stable/1.3
7-
ThirdParty/Mumps https://projects.coin-or.org/svn/BuildTools/ThirdParty/Mumps/stable/1.6
8-
Data/Sample https://projects.coin-or.org/svn/Data/Sample/stable/1.2
9-
Data/miplib3 https://projects.coin-or.org/svn/Data/miplib3/stable/1.2
10-
CoinUtils https://projects.coin-or.org/svn/CoinUtils/stable/2.11/CoinUtils
11-
Osi https://projects.coin-or.org/svn/Osi/stable/0.108/Osi
12-
Clp https://projects.coin-or.org/svn/Clp/stable/1.17/Clp
13-
Cgl https://projects.coin-or.org/svn/Cgl/stable/0.60/Cgl
1+
BuildTools https://projects.coin-or.org/svn/BuildTools/releases/0.8.10/
2+
ThirdParty/ASL https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/releases/1.4.2/
3+
ThirdParty/Blas https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/releases/1.4.8/
4+
ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/releases/1.6.1/
5+
ThirdParty/Glpk https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/releases/1.10.7/
6+
ThirdParty/Metis https://projects.coin-or.org/svn/BuildTools/ThirdParty/Metis/releases/1.3.9/
7+
ThirdParty/Mumps https://projects.coin-or.org/svn/BuildTools/ThirdParty/Mumps/releases/1.6.2/
8+
Data/Sample https://projects.coin-or.org/svn/Data/Sample/releases/1.2.12/
9+
Data/miplib3 https://projects.coin-or.org/svn/Data/miplib3/releases/1.2.8/
10+
CoinUtils https://projects.coin-or.org/svn/CoinUtils/releases/2.11.4/CoinUtils
11+
Osi https://projects.coin-or.org/svn/Osi/releases/0.108.6/Osi
12+
Clp https://projects.coin-or.org/svn/Clp/releases/1.17.4/Clp
13+
Cgl https://projects.coin-or.org/svn/Cgl/releases/0.60.3/Cgl

Makefile.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,7 @@ coin_doxy_usedot = @coin_doxy_usedot@
216216
coin_have_doxygen = @coin_have_doxygen@
217217
coin_have_latex = @coin_have_latex@
218218
datadir = @datadir@
219+
dos2unix = @dos2unix@
219220
exec_prefix = @exec_prefix@
220221
have_autoconf = @have_autoconf@
221222
have_automake = @have_automake@

0 commit comments

Comments
 (0)