Skip to content

Commit 227e005

Browse files
committed
temporarily committing release candidate
1 parent 1eae02c commit 227e005

11 files changed

+127
-46
lines changed

Clp/Makefile.in

+1
Original file line numberDiff line numberDiff line change
@@ -358,6 +358,7 @@ coin_doxy_usedot = @coin_doxy_usedot@
358358
coin_have_doxygen = @coin_have_doxygen@
359359
coin_have_latex = @coin_have_latex@
360360
datadir = @datadir@
361+
dos2unix = @dos2unix@
361362
exec_prefix = @exec_prefix@
362363
have_autoconf = @have_autoconf@
363364
have_automake = @have_automake@

Clp/configure

+55-17
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 Clp 1.17.
3+
# Generated by GNU Autoconf 2.59 for Clp 1.17.4.
44
#
55
# Report bugs to <clp@list.coin-or.org>.
66
#
@@ -429,8 +429,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
429429
# Identity of this package.
430430
PACKAGE_NAME='Clp'
431431
PACKAGE_TARNAME='clp'
432-
PACKAGE_VERSION='1.17'
433-
PACKAGE_STRING='Clp 1.17'
432+
PACKAGE_VERSION='1.17.4'
433+
PACKAGE_STRING='Clp 1.17.4'
434434
PACKAGE_BUGREPORT='clp@list.coin-or.org'
435435

436436
ac_unique_file="src/ClpSimplex.cpp"
@@ -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 CLP_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 COINUTILS_LIBS COINUTILS_CFLAGS COINUTILS_DATA COINUTILS_DEPENDENCIES COINUTILS_LIBS_INSTALLED COINUTILS_CFLAGS_INSTALLED COINUTILS_DATA_INSTALLED CLPLIB_CFLAGS CLPLIB_LIBS CLPLIB_PCLIBS CLPLIB_PCREQUIRES CLPLIB_DEPENDENCIES CLPLIB_CFLAGS_INSTALLED CLPLIB_LIBS_INSTALLED COIN_HAS_COINUTILS_TRUE COIN_HAS_COINUTILS_FALSE OSI_LIBS OSI_CFLAGS OSI_DATA OSI_DEPENDENCIES OSI_LIBS_INSTALLED OSI_CFLAGS_INSTALLED OSI_DATA_INSTALLED OSICLPLIB_CFLAGS OSICLPLIB_LIBS OSICLPLIB_PCLIBS OSICLPLIB_PCREQUIRES OSICLPLIB_DEPENDENCIES OSICLPLIB_CFLAGS_INSTALLED OSICLPLIB_LIBS_INSTALLED COIN_HAS_OSI_TRUE COIN_HAS_OSI_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 COIN_HAS_ABC_TRUE COIN_HAS_ABC_FALSE AMDINCDIR AMDLIB COIN_HAS_AMD_TRUE COIN_HAS_AMD_FALSE CHOLMODINCDIR CHOLMODLIB COIN_HAS_CHOLMOD_TRUE COIN_HAS_CHOLMOD_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 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 ADD_FFLAGS DBG_FFLAGS OPT_FFLAGS MPIF77 FLIBS BLAS_LIBS BLAS_CFLAGS BLAS_DATA BLAS_DEPENDENCIES BLAS_LIBS_INSTALLED BLAS_CFLAGS_INSTALLED BLAS_DATA_INSTALLED COIN_HAS_BLAS_TRUE COIN_HAS_BLAS_FALSE COIN_HAS_WSMP_TRUE COIN_HAS_WSMP_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 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 CLP_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 COINUTILS_LIBS COINUTILS_CFLAGS COINUTILS_DATA COINUTILS_DEPENDENCIES COINUTILS_LIBS_INSTALLED COINUTILS_CFLAGS_INSTALLED COINUTILS_DATA_INSTALLED CLPLIB_CFLAGS CLPLIB_LIBS CLPLIB_PCLIBS CLPLIB_PCREQUIRES CLPLIB_DEPENDENCIES CLPLIB_CFLAGS_INSTALLED CLPLIB_LIBS_INSTALLED COIN_HAS_COINUTILS_TRUE COIN_HAS_COINUTILS_FALSE OSI_LIBS OSI_CFLAGS OSI_DATA OSI_DEPENDENCIES OSI_LIBS_INSTALLED OSI_CFLAGS_INSTALLED OSI_DATA_INSTALLED OSICLPLIB_CFLAGS OSICLPLIB_LIBS OSICLPLIB_PCLIBS OSICLPLIB_PCREQUIRES OSICLPLIB_DEPENDENCIES OSICLPLIB_CFLAGS_INSTALLED OSICLPLIB_LIBS_INSTALLED COIN_HAS_OSI_TRUE COIN_HAS_OSI_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 COIN_HAS_ABC_TRUE COIN_HAS_ABC_FALSE AMDINCDIR AMDLIB COIN_HAS_AMD_TRUE COIN_HAS_AMD_FALSE CHOLMODINCDIR CHOLMODLIB COIN_HAS_CHOLMOD_TRUE COIN_HAS_CHOLMOD_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 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 ADD_FFLAGS DBG_FFLAGS OPT_FFLAGS MPIF77 FLIBS BLAS_LIBS BLAS_CFLAGS BLAS_DATA BLAS_DEPENDENCIES BLAS_LIBS_INSTALLED BLAS_CFLAGS_INSTALLED BLAS_DATA_INSTALLED COIN_HAS_BLAS_TRUE COIN_HAS_BLAS_FALSE COIN_HAS_WSMP_TRUE COIN_HAS_WSMP_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 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.
@@ -1021,7 +1021,7 @@ if test "$ac_init_help" = "long"; then
10211021
# Omit some internal or obsolete options to make the list less imposing.
10221022
# This message is too long to be a string in the A/UX 3.1 sh.
10231023
cat <<_ACEOF
1024-
\`configure' configures Clp 1.17 to adapt to many kinds of systems.
1024+
\`configure' configures Clp 1.17.4 to adapt to many kinds of systems.
10251025

10261026
Usage: $0 [OPTION]... [VAR=VALUE]...
10271027

@@ -1087,7 +1087,7 @@ fi
10871087

10881088
if test -n "$ac_init_help"; then
10891089
case $ac_init_help in
1090-
short | recursive ) echo "Configuration of Clp 1.17:";;
1090+
short | recursive ) echo "Configuration of Clp 1.17.4:";;
10911091
esac
10921092
cat <<\_ACEOF
10931093

@@ -1308,7 +1308,7 @@ fi
13081308
test -n "$ac_init_help" && exit 0
13091309
if $ac_init_version; then
13101310
cat <<\_ACEOF
1311-
Clp configure 1.17
1311+
Clp configure 1.17.4
13121312
generated by GNU Autoconf 2.59
13131313

13141314
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1328,7 +1328,7 @@ cat >&5 <<_ACEOF
13281328
This file contains any messages produced by compilers while
13291329
running configure, to aid debugging if configure makes a mistake.
13301330

1331-
It was created by Clp $as_me 1.17, which was
1331+
It was created by Clp $as_me 1.17.4, which was
13321332
generated by GNU Autoconf 2.59. Invocation command line was
13331333

13341334
$ $0 $@
@@ -1854,7 +1854,7 @@ _ACEOF
18541854

18551855

18561856
# Capture libtool library version, if given.
1857-
1857+
coin_libversion=15:4:14
18581858

18591859

18601860

@@ -4561,7 +4561,7 @@ fi
45614561

45624562
# Define the identity of the package.
45634563
PACKAGE='clp'
4564-
VERSION='1.17'
4564+
VERSION='1.17.4'
45654565

45664566

45674567
cat >>confdefs.h <<_ACEOF
@@ -5280,7 +5280,7 @@ if test x$prefix = xNONE; then
52805280
else
52815281
full_prefix=$prefix
52825282
fi
5283-
full_prefix=`cd $full_prefix ; pwd`
5283+
52845284

52855285
abs_lib_dir=$full_prefix/lib
52865286

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

2026320263
{ echo "$as_me:$LINENO: Build is \"$build\"." >&5
2026420264
echo "$as_me: Build is \"$build\"." >&6;}
20265-
mydos2unix='| dos2unix'
20265+
# Extract the first word of "dos2unix", so it can be a program name with args.
20266+
set dummy dos2unix; ac_word=$2
20267+
echo "$as_me:$LINENO: checking for $ac_word" >&5
20268+
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
20269+
if test "${ac_cv_prog_dos2unix+set}" = set; then
20270+
echo $ECHO_N "(cached) $ECHO_C" >&6
20271+
else
20272+
if test -n "$dos2unix"; then
20273+
ac_cv_prog_dos2unix="$dos2unix" # Let the user override the test.
20274+
else
20275+
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
20276+
for as_dir in $PATH
20277+
do
20278+
IFS=$as_save_IFS
20279+
test -z "$as_dir" && as_dir=.
20280+
for ac_exec_ext in '' $ac_executable_extensions; do
20281+
if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
20282+
ac_cv_prog_dos2unix="dos2unix"
20283+
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
20284+
break 2
20285+
fi
20286+
done
20287+
done
20288+
20289+
fi
20290+
fi
20291+
dos2unix=$ac_cv_prog_dos2unix
20292+
if test -n "$dos2unix"; then
20293+
echo "$as_me:$LINENO: result: $dos2unix" >&5
20294+
echo "${ECHO_T}$dos2unix" >&6
20295+
else
20296+
echo "$as_me:$LINENO: result: no" >&5
20297+
echo "${ECHO_T}no" >&6
20298+
fi
20299+
20300+
if test "$dos2unix" = dos2unix ; then
20301+
mydos2unix="| dos2unix"
20302+
fi
2026620303
case $build in
2026720304
*-mingw*)
2026820305
CYGPATH_W=echo
@@ -24922,7 +24959,7 @@ fi
2492224959

2492324960

2492424961
# Provide some information about the compiler.
24925-
echo "$as_me:24925:" \
24962+
echo "$as_me:24962:" \
2492624963
"checking for Fortran 77 compiler version" >&5
2492724964
ac_compiler=`set X $ac_compile; echo $2`
2492824965
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -25435,7 +25472,7 @@ _ACEOF
2543525472
# flags.
2543625473
ac_save_FFLAGS=$FFLAGS
2543725474
FFLAGS="$FFLAGS $ac_verb"
25438-
(eval echo $as_me:25438: \"$ac_link\") >&5
25475+
(eval echo $as_me:25475: \"$ac_link\") >&5
2543925476
ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
2544025477
echo "$ac_f77_v_output" >&5
2544125478
FFLAGS=$ac_save_FFLAGS
@@ -25513,7 +25550,7 @@ _ACEOF
2551325550
# flags.
2551425551
ac_save_FFLAGS=$FFLAGS
2551525552
FFLAGS="$FFLAGS $ac_cv_prog_f77_v"
25516-
(eval echo $as_me:25516: \"$ac_link\") >&5
25553+
(eval echo $as_me:25553: \"$ac_link\") >&5
2551725554
ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
2551825555
echo "$ac_f77_v_output" >&5
2551925556
FFLAGS=$ac_save_FFLAGS
@@ -32918,7 +32955,7 @@ _ASBOX
3291832955
} >&5
3291932956
cat >&5 <<_CSEOF
3292032957

32921-
This file was extended by Clp $as_me 1.17, which was
32958+
This file was extended by Clp $as_me 1.17.4, which was
3292232959
generated by GNU Autoconf 2.59. Invocation command line was
3292332960

3292432961
CONFIG_FILES = $CONFIG_FILES
@@ -32981,7 +33018,7 @@ _ACEOF
3298133018

3298233019
cat >>$CONFIG_STATUS <<_ACEOF
3298333020
ac_cs_version="\\
32984-
Clp config.status 1.17
33021+
Clp config.status 1.17.4
3298533022
configured by $0, generated by GNU Autoconf 2.59,
3298633023
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
3298733024

@@ -33290,6 +33327,7 @@ s,@ac_ct_F77@,$ac_ct_F77,;t t
3329033327
s,@LIBTOOL@,$LIBTOOL,;t t
3329133328
s,@ac_c_preproc_warn_flag@,$ac_c_preproc_warn_flag,;t t
3329233329
s,@ac_cxx_preproc_warn_flag@,$ac_cxx_preproc_warn_flag,;t t
33330+
s,@dos2unix@,$dos2unix,;t t
3329333331
s,@RPATH_FLAGS@,$RPATH_FLAGS,;t t
3329433332
s,@DEPENDENCY_LINKING_TRUE@,$DEPENDENCY_LINKING_TRUE,;t t
3329533333
s,@DEPENDENCY_LINKING_FALSE@,$DEPENDENCY_LINKING_FALSE,;t t

Clp/configure.ac

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
AC_PREREQ(2.59)
1414

15-
AC_INIT([Clp],[1.17],[clp@list.coin-or.org])
15+
AC_INIT([Clp],[1.17.4],[clp@list.coin-or.org])
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(Clp)
44+
AC_COIN_PROJECTDIR_INIT(Clp,15:4:14)
4545

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

Clp/src/Makefile.in

+1
Original file line numberDiff line numberDiff line change
@@ -562,6 +562,7 @@ coin_doxy_usedot = @coin_doxy_usedot@
562562
coin_have_doxygen = @coin_have_doxygen@
563563
coin_have_latex = @coin_have_latex@
564564
datadir = @datadir@
565+
dos2unix = @dos2unix@
565566
exec_prefix = @exec_prefix@
566567
have_autoconf = @have_autoconf@
567568
have_automake = @have_automake@

Clp/src/OsiClp/Makefile.in

+1
Original file line numberDiff line numberDiff line change
@@ -336,6 +336,7 @@ coin_doxy_usedot = @coin_doxy_usedot@
336336
coin_have_doxygen = @coin_have_doxygen@
337337
coin_have_latex = @coin_have_latex@
338338
datadir = @datadir@
339+
dos2unix = @dos2unix@
339340
exec_prefix = @exec_prefix@
340341
have_autoconf = @have_autoconf@
341342
have_automake = @have_automake@

Clp/src/config_clp_default.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
/***************************************************************************/
66

77
/* Version number of project */
8-
#define CLP_VERSION "1.17"
8+
#define CLP_VERSION "1.17.4"
99

1010
/* Major Version number of project */
1111
#define CLP_VERSION_MAJOR 1
@@ -14,7 +14,7 @@
1414
#define CLP_VERSION_MINOR 17
1515

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

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

Clp/test/Makefile.in

+1
Original file line numberDiff line numberDiff line change
@@ -324,6 +324,7 @@ coin_doxy_usedot = @coin_doxy_usedot@
324324
coin_have_doxygen = @coin_have_doxygen@
325325
coin_have_latex = @coin_have_latex@
326326
datadir = @datadir@
327+
dos2unix = @dos2unix@
327328
exec_prefix = @exec_prefix@
328329
have_autoconf = @have_autoconf@
329330
have_automake = @have_automake@

Dependencies

+11-11
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
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/Metis https://projects.coin-or.org/svn/BuildTools/ThirdParty/Metis/stable/1.3
6-
ThirdParty/Mumps https://projects.coin-or.org/svn/BuildTools/ThirdParty/Mumps/stable/1.6
7-
ThirdParty/Glpk https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/stable/1.10
8-
Data/Netlib https://projects.coin-or.org/svn/Data/Netlib/stable/1.2
9-
Data/Sample https://projects.coin-or.org/svn/Data/Sample/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
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/Metis https://projects.coin-or.org/svn/BuildTools/ThirdParty/Metis/releases/1.3.9/
6+
ThirdParty/Mumps https://projects.coin-or.org/svn/BuildTools/ThirdParty/Mumps/releases/1.6.2/
7+
ThirdParty/Glpk https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/releases/1.10.7/
8+
Data/Netlib https://projects.coin-or.org/svn/Data/Netlib/releases/1.2.9/
9+
Data/Sample https://projects.coin-or.org/svn/Data/Sample/releases/1.2.12/
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

Makefile.in

+1
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)