diff --git a/Clp/configure b/Clp/configure index e44d79ebd..bcb7529cf 100755 --- a/Clp/configure +++ b/Clp/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for Clp 1.17. +# Generated by GNU Autoconf 2.59 for Clp 1.17.2. # # Report bugs to . # @@ -429,8 +429,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='Clp' PACKAGE_TARNAME='clp' -PACKAGE_VERSION='1.17' -PACKAGE_STRING='Clp 1.17' +PACKAGE_VERSION='1.17.2' +PACKAGE_STRING='Clp 1.17.2' PACKAGE_BUGREPORT='clp@list.coin-or.org' ac_unique_file="src/ClpSimplex.cpp" @@ -1021,7 +1021,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Clp 1.17 to adapt to many kinds of systems. +\`configure' configures Clp 1.17.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1087,7 +1087,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Clp 1.17:";; + short | recursive ) echo "Configuration of Clp 1.17.2:";; esac cat <<\_ACEOF @@ -1308,7 +1308,7 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -Clp configure 1.17 +Clp configure 1.17.2 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1328,7 +1328,7 @@ cat >&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Clp $as_me 1.17, which was +It was created by Clp $as_me 1.17.2, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1854,6 +1854,7 @@ _ACEOF # Capture libtool library version, if given. + coin_libversion=15:2:14 @@ -4561,7 +4562,7 @@ fi # Define the identity of the package. PACKAGE='clp' - VERSION='1.17' + VERSION='1.17.2' cat >>confdefs.h <<_ACEOF @@ -5857,7 +5858,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5860 "configure"' > conftest.$ac_ext + echo '#line 5861 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -6991,7 +6992,7 @@ fi # Provide some information about the compiler. -echo "$as_me:6994:" \ +echo "$as_me:6995:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 @@ -8058,11 +8059,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8061: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8062: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8065: \$? = $ac_status" >&5 + echo "$as_me:8066: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8326,11 +8327,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8329: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8330: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8333: \$? = $ac_status" >&5 + echo "$as_me:8334: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -8430,11 +8431,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:8433: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8434: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8437: \$? = $ac_status" >&5 + echo "$as_me:8438: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -10775,7 +10776,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:13223: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13226: \$? = $ac_status" >&5 + echo "$as_me:13227: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -13323,11 +13324,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13326: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13327: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13330: \$? = $ac_status" >&5 + echo "$as_me:13331: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14893,11 +14894,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:14896: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14897: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14900: \$? = $ac_status" >&5 + echo "$as_me:14901: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -14997,11 +14998,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15000: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15001: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15004: \$? = $ac_status" >&5 + echo "$as_me:15005: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -17204,11 +17205,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17207: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17208: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17211: \$? = $ac_status" >&5 + echo "$as_me:17212: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -17472,11 +17473,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17475: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17476: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17479: \$? = $ac_status" >&5 + echo "$as_me:17480: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -17576,11 +17577,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17579: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17580: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:17583: \$? = $ac_status" >&5 + echo "$as_me:17584: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -24913,7 +24914,7 @@ fi # Provide some information about the compiler. -echo "$as_me:24916:" \ +echo "$as_me:24917:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 @@ -25425,7 +25426,7 @@ _ACEOF # flags. ac_save_FFLAGS=$FFLAGS FFLAGS="$FFLAGS $ac_verb" -(eval echo $as_me:25428: \"$ac_link\") >&5 +(eval echo $as_me:25429: \"$ac_link\") >&5 ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'` echo "$ac_f77_v_output" >&5 FFLAGS=$ac_save_FFLAGS @@ -25503,7 +25504,7 @@ _ACEOF # flags. ac_save_FFLAGS=$FFLAGS FFLAGS="$FFLAGS $ac_cv_prog_f77_v" -(eval echo $as_me:25506: \"$ac_link\") >&5 +(eval echo $as_me:25507: \"$ac_link\") >&5 ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'` echo "$ac_f77_v_output" >&5 FFLAGS=$ac_save_FFLAGS @@ -32908,7 +32909,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by Clp $as_me 1.17, which was +This file was extended by Clp $as_me 1.17.2, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -32971,7 +32972,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -Clp config.status 1.17 +Clp config.status 1.17.2 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff --git a/Clp/configure.ac b/Clp/configure.ac index b67206fd3..82462867b 100644 --- a/Clp/configure.ac +++ b/Clp/configure.ac @@ -12,7 +12,7 @@ AC_PREREQ(2.59) -AC_INIT([Clp],[1.17],[clp@list.coin-or.org]) +AC_INIT([Clp],[1.17.2],[clp@list.coin-or.org]) AC_COPYRIGHT([ Copyright 2006 International Business Machines and others. @@ -41,7 +41,7 @@ AC_CANONICAL_BUILD # the source root directory contains definition of where to find those # externals. The following macro ensures that those externals are # retrieved by svn if they are not there yet. -AC_COIN_PROJECTDIR_INIT(Clp) +AC_COIN_PROJECTDIR_INIT(Clp,15:2:14) # Check if user wants to produce debugging code AC_COIN_DEBUG_COMPILE(Clp) diff --git a/Clp/src/config_clp_default.h b/Clp/src/config_clp_default.h index 784cfe4fa..82bd9d4ed 100644 --- a/Clp/src/config_clp_default.h +++ b/Clp/src/config_clp_default.h @@ -5,7 +5,7 @@ /***************************************************************************/ /* Version number of project */ -#define CLP_VERSION "1.17" +#define CLP_VERSION "1.17.2" /* Major Version number of project */ #define CLP_VERSION_MAJOR 1 @@ -14,7 +14,7 @@ #define CLP_VERSION_MINOR 17 /* Release Version number of project */ -#define CLP_VERSION_RELEASE 9999 +#define CLP_VERSION_RELEASE 2 /* vi: softtabstop=2 shiftwidth=2 expandtab tabstop=2 */ diff --git a/Dependencies b/Dependencies index c45adc9bb..cc5098815 100644 --- a/Dependencies +++ b/Dependencies @@ -1,11 +1,11 @@ -BuildTools https://projects.coin-or.org/svn/BuildTools/stable/0.8 -ThirdParty/ASL https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/stable/1.4 -ThirdParty/Blas https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.4 -ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.6 -ThirdParty/Metis https://projects.coin-or.org/svn/BuildTools/ThirdParty/Metis/stable/1.3 -ThirdParty/Mumps https://projects.coin-or.org/svn/BuildTools/ThirdParty/Mumps/stable/1.6 -ThirdParty/Glpk https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/stable/1.10 -Data/Netlib https://projects.coin-or.org/svn/Data/Netlib/stable/1.2 -Data/Sample https://projects.coin-or.org/svn/Data/Sample/stable/1.2 -CoinUtils https://projects.coin-or.org/svn/CoinUtils/stable/2.11/CoinUtils -Osi https://projects.coin-or.org/svn/Osi/stable/0.108/Osi +BuildTools https://projects.coin-or.org/svn/BuildTools/releases/0.8.8/ +ThirdParty/ASL https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/releases/1.4.1/ +ThirdParty/Blas https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/releases/1.4.7/ +ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/releases/1.6.0/ +ThirdParty/Metis https://projects.coin-or.org/svn/BuildTools/ThirdParty/Metis/releases/1.3.7/ +ThirdParty/Mumps https://projects.coin-or.org/svn/BuildTools/ThirdParty/Mumps/releases/1.6.1/ +ThirdParty/Glpk https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/releases/1.10.6/ +Data/Netlib https://projects.coin-or.org/svn/Data/Netlib/releases/1.2.7/ +Data/Sample https://projects.coin-or.org/svn/Data/Sample/releases/1.2.11/ +CoinUtils https://projects.coin-or.org/svn/CoinUtils/releases/2.11.2/CoinUtils +Osi https://projects.coin-or.org/svn/Osi/releases/0.108.4/Osi diff --git a/configure b/configure index 31c1ec418..f45a7f359 100755 --- a/configure +++ b/configure @@ -1,7 +1,7 @@ #! /bin/sh # From configure.ac 0.9. # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for Clp 1.17. +# Generated by GNU Autoconf 2.59 for Clp 1.17.2. # # Report bugs to . # @@ -430,8 +430,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='Clp' PACKAGE_TARNAME='clp' -PACKAGE_VERSION='1.17' -PACKAGE_STRING='Clp 1.17' +PACKAGE_VERSION='1.17.2' +PACKAGE_STRING='Clp 1.17.2' PACKAGE_BUGREPORT='coin-clp@lists.coin-or.org' ac_unique_file="configure.ac" @@ -1033,7 +1033,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Clp 1.17 to adapt to many kinds of systems. +\`configure' configures Clp 1.17.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1099,7 +1099,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Clp 1.17:";; + short | recursive ) echo "Configuration of Clp 1.17.2:";; esac cat <<\_ACEOF @@ -1310,7 +1310,7 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -Clp configure 1.17 +Clp configure 1.17.2 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1330,7 +1330,7 @@ cat >&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Clp $as_me 1.17, which was +It was created by Clp $as_me 1.17.2, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -5086,7 +5086,7 @@ fi # Define the identity of the package. PACKAGE='clp' - VERSION='1.17' + VERSION='1.17.2' cat >>confdefs.h <<_ACEOF @@ -22930,7 +22930,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by Clp $as_me 1.17, which was +This file was extended by Clp $as_me 1.17.2, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -22988,7 +22988,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -Clp config.status 1.17 +Clp config.status 1.17.2 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff --git a/configure.ac b/configure.ac index 509c26177..74baecae3 100644 --- a/configure.ac +++ b/configure.ac @@ -12,7 +12,7 @@ AC_PREREQ(2.59) -AC_INIT([Clp],[1.17],[coin-clp@lists.coin-or.org]) +AC_INIT([Clp],[1.17.2],[coin-clp@lists.coin-or.org]) AC_COPYRIGHT([ Copyright 2006 International Business Machines and others.