diff --git a/Makefile.in b/Makefile.in index 2b49be20..af65c98d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -51,11 +51,11 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = README $(am__configure_deps) \ - $(srcdir)/BuildTools/Makemain.inc $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(top_srcdir)/configure \ - $(top_srcdir)/doxydoc/doxygen.conf.in INSTALL compile \ - config.guess config.sub depcomp install-sh ltmain.sh missing +DIST_COMMON = $(am__configure_deps) $(srcdir)/BuildTools/Makemain.inc \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(top_srcdir)/configure $(top_srcdir)/doxydoc/doxygen.conf.in \ + INSTALL compile config.guess config.sub depcomp install-sh \ + ltmain.sh missing @HAVE_EXTERNALS_TRUE@am__append_1 = Dependencies @HAVE_EXTERNALS_TRUE@am__append_2 = .Dependencies-stamp subdir = . @@ -261,7 +261,7 @@ SUBDIRS = $(subdirs) # Files that are generated and should be cleaned with make distclean DISTCLEANFILES = coin_subdirs.txt $(am__append_2) \ $(VPATH_DISTCLEANFILES) -DocFiles = README AUTHORS LICENSE +DocFiles = README README.md AUTHORS AUTHORS.md LICENSE LICENSE.md DocInstallDir = $(datadir)/coin/doc/$(PACKAGE_NAME) COIN_HAS_DOXYGEN = @COIN_HAS_DOXYGEN_TRUE@TRUE COIN_HAS_LATEX = @COIN_HAS_LATEX_TRUE@TRUE @@ -828,7 +828,7 @@ uninstall-all-doxygen-docs: fi ; \ done ; -install-doc: $(DocFiles) +install-doc: test -z "$(DocInstallDir)" || $(mkdir_p) "$(DESTDIR)$(DocInstallDir)" for file in $(DocFiles); do \ if test -f "$$file"; then dir=; else dir="$(srcdir)/"; fi; \ diff --git a/Osi/configure b/Osi/configure index a67229b2..d50f1e2f 100755 --- a/Osi/configure +++ b/Osi/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for Osi 0.108. +# Generated by GNU Autoconf 2.59 for Osi 0.108.7. # # Report bugs to . # @@ -429,8 +429,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='Osi' PACKAGE_TARNAME='osi' -PACKAGE_VERSION='0.108' -PACKAGE_STRING='Osi 0.108' +PACKAGE_VERSION='0.108.7' +PACKAGE_STRING='Osi 0.108.7' PACKAGE_BUGREPORT='osi@list.coin-or.org' ac_unique_file="src/Osi/OsiAuxInfo.cpp" @@ -1009,7 +1009,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 Osi 0.108 to adapt to many kinds of systems. +\`configure' configures Osi 0.108.7 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1075,7 +1075,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Osi 0.108:";; + short | recursive ) echo "Configuration of Osi 0.108.7:";; esac cat <<\_ACEOF @@ -1285,7 +1285,7 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -Osi configure 0.108 +Osi configure 0.108.7 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1305,7 +1305,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 Osi $as_me 0.108, which was +It was created by Osi $as_me 0.108.7, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1828,7 +1828,7 @@ _ACEOF # Capture libtool library version, if given. - + coin_libversion=14:7:13 @@ -4535,7 +4535,7 @@ fi # Define the identity of the package. PACKAGE='osi' - VERSION='0.108' + VERSION='0.108.7' cat >>confdefs.h <<_ACEOF @@ -25929,7 +25929,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by Osi $as_me 0.108, which was +This file was extended by Osi $as_me 0.108.7, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -25992,7 +25992,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -Osi config.status 0.108 +Osi config.status 0.108.7 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" diff --git a/Osi/configure.ac b/Osi/configure.ac index 32a8b404..c3b904b6 100644 --- a/Osi/configure.ac +++ b/Osi/configure.ac @@ -12,7 +12,7 @@ AC_PREREQ(2.59) -AC_INIT([Osi],[0.108],[osi@list.coin-or.org]) +AC_INIT([Osi],[0.108.7],[osi@list.coin-or.org]) AC_COPYRIGHT([ Copyright 2006 International Business Machines and others. @@ -38,7 +38,7 @@ AC_PREFIX_DEFAULT([`pwd`]) AC_CANONICAL_BUILD # A bit of initial setup -AC_COIN_PROJECTDIR_INIT(Osi) +AC_COIN_PROJECTDIR_INIT(Osi,14:7:13) # Check if user wants to produce debugging code AC_COIN_DEBUG_COMPILE(Osi) diff --git a/Osi/src/Osi/config_osi_default.h b/Osi/src/Osi/config_osi_default.h index d5401f1a..5b4bfacb 100644 --- a/Osi/src/Osi/config_osi_default.h +++ b/Osi/src/Osi/config_osi_default.h @@ -5,13 +5,13 @@ /***************************************************************************/ /* Version number of project */ -#define OSI_VERSION "0.108" +#define OSI_VERSION "0.108.7" /* Major Version number of project */ -#define OSI_VERSION_MAJOR 0 +#define OSI_VERSION_MAJOR 0 /* Minor Version number of project */ -#define OSI_VERSION_MINOR 108 +#define OSI_VERSION_MINOR 108 /* Release Version number of project */ -#define OSI_VERSION_RELEASE 9999 +#define OSI_VERSION_RELEASE 7 diff --git a/README.md b/README.md index 01bb58eb..d69e852c 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Osi 0.108 +# Osi 0.108.7 [![A COIN-OR Project](https://coin-or.github.io/coin-or-badge.png)](https://www.coin-or.org) @@ -62,9 +62,9 @@ Code: [![DOI](https://zenodo.org/badge/173476455.svg)](https://zenodo.org/badge/ ## CURRENT BUILD STATUS -[![Windows Builds](https://github.com/coin-or/Osi/actions/workflows/windows-ci.yml/badge.svg?branch=stable/0.108)](https://github.com/coin-or/Osi/actions/workflows/windows-ci.yml?query=branch%3Astable/0.108) +[![Windows Builds](https://github.com/coin-or/Osi/actions/workflows/windows-ci.yml/badge.svg?branch=releases/0.108.7)](https://github.com/coin-or/Osi/actions/workflows/windows-ci.yml?query=branch%3Areleases/0.108.7) -[![Linux and MacOS Builds](https://github.com/coin-or/Osi/actions/workflows/linux-ci.yml/badge.svg?branch=stable/0.108)](https://github.com/coin-or/Osi/actions/workflows/linux-ci.yml?query=branch%3Astable/0.108) +[![Linux and MacOS Builds](https://github.com/coin-or/Osi/actions/workflows/linux-ci.yml/badge.svg?branch=releases/0.108.7)](https://github.com/coin-or/Osi/actions/workflows/linux-ci.yml?query=branch%3Areleases/0.108.7) ## DOWNLOAD @@ -126,7 +126,7 @@ following on the command line. ``` wget https://raw.githubusercontent.com/coin-or/coinbrew/master/coinbrew chmod u+x coinbrew -./coinbrew fetch Osi@stable/0.108 +./coinbrew fetch Osi@releases/0.108.7 ./coinbrew build Osi ``` For more detailed instructions on coinbrew, see https://coin-or.github.io/coinbrew. @@ -152,7 +152,7 @@ If you have `Doxygen` available, you can build a HTML documentation by typing `make doxygen-docs` in the build directory. If Osi was built via `coinbrew`, then the build -directory will be `./build/Osi/0.108` by default. The doxygen documentation main file +directory will be `./build/Osi/0.108.7` by default. The doxygen documentation main file is found at `/doxydoc/html/index.html`. If you don't have `doxygen` installed locally, you can use also find the diff --git a/configure b/configure index b21da8a2..590604b9 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 Osi 0.108. +# Generated by GNU Autoconf 2.59 for Osi 0.108.7. # # Report bugs to . # @@ -430,8 +430,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='Osi' PACKAGE_TARNAME='osi' -PACKAGE_VERSION='0.108' -PACKAGE_STRING='Osi 0.108' +PACKAGE_VERSION='0.108.7' +PACKAGE_STRING='Osi 0.108.7' PACKAGE_BUGREPORT='osi@lists.coin-or.org' ac_unique_file="configure.ac" @@ -481,7 +481,7 @@ ac_subdirs_all="$ac_subdirs_all Data/Sample" ac_subdirs_all="$ac_subdirs_all Data/Netlib" ac_subdirs_all="$ac_subdirs_all CoinUtils" ac_subdirs_all="$ac_subdirs_all Osi" -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 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 ADD_FFLAGS DBG_FFLAGS OPT_FFLAGS F77 ac_ct_F77 FFLAGS MPIF77 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 LIBTOOL ac_c_preproc_warn_flag ac_cxx_preproc_warn_flag dos2unix RPATH_FLAGS DEPENDENCY_LINKING_TRUE DEPENDENCY_LINKING_FALSE LT_LDFLAGS COIN_SKIP_PROJECTS subdirs 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' +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 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 ADD_FFLAGS DBG_FFLAGS OPT_FFLAGS F77 ac_ct_F77 FFLAGS MPIF77 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 LIBTOOL ac_c_preproc_warn_flag ac_cxx_preproc_warn_flag dos2unix RPATH_FLAGS LT_LDFLAGS DEPENDENCY_LINKING_TRUE DEPENDENCY_LINKING_FALSE COIN_SKIP_PROJECTS subdirs 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' ac_subst_files='' # Initialize some variables set by options. @@ -1018,6 +1018,10 @@ ac_env_CXXCPP_set=${CXXCPP+set} ac_env_CXXCPP_value=$CXXCPP ac_cv_env_CXXCPP_set=${CXXCPP+set} ac_cv_env_CXXCPP_value=$CXXCPP +ac_env_LT_LDFLAGS_set=${LT_LDFLAGS+set} +ac_env_LT_LDFLAGS_value=$LT_LDFLAGS +ac_cv_env_LT_LDFLAGS_set=${LT_LDFLAGS+set} +ac_cv_env_LT_LDFLAGS_value=$LT_LDFLAGS ac_env_COIN_SKIP_PROJECTS_set=${COIN_SKIP_PROJECTS+set} ac_env_COIN_SKIP_PROJECTS_value=$COIN_SKIP_PROJECTS ac_cv_env_COIN_SKIP_PROJECTS_set=${COIN_SKIP_PROJECTS+set} @@ -1030,7 +1034,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 Osi 0.108 to adapt to many kinds of systems. +\`configure' configures Osi 0.108.7 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1096,7 +1100,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Osi 0.108:";; + short | recursive ) echo "Configuration of Osi 0.108.7:";; esac cat <<\_ACEOF @@ -1195,6 +1199,8 @@ Some influential environment variables: MPIF77 Fortran MPI Compiler CPP C preprocessor CXXCPP C++ preprocessor + LT_LDFLAGS Flags passed to libtool when building libraries or executables + that are installed COIN_SKIP_PROJECTS Set to the subdirectories of projects that should be skipped in the configuration @@ -1298,7 +1304,7 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -Osi configure 0.108 +Osi configure 0.108.7 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1318,7 +1324,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 Osi $as_me 0.108, which was +It was created by Osi $as_me 0.108.7, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -4142,7 +4148,7 @@ fi # Provide some information about the compiler. -echo "$as_me:4145:" \ +echo "$as_me:4151:" \ "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 @@ -5075,7 +5081,7 @@ fi # Define the identity of the package. PACKAGE='osi' - VERSION='0.108' + VERSION='0.108.7' cat >>confdefs.h <<_ACEOF @@ -6369,7 +6375,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 6372 "configure"' > conftest.$ac_ext + echo '#line 6378 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -8333,11 +8339,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:8336: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8342: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8340: \$? = $ac_status" >&5 + echo "$as_me:8346: \$? = $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. @@ -8601,11 +8607,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:8604: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8610: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:8608: \$? = $ac_status" >&5 + echo "$as_me:8614: \$? = $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. @@ -8705,11 +8711,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:8708: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8714: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8712: \$? = $ac_status" >&5 + echo "$as_me:8718: \$? = $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 @@ -11050,7 +11056,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:13503: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13501: \$? = $ac_status" >&5 + echo "$as_me:13507: \$? = $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. @@ -13598,11 +13604,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:13601: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13607: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13605: \$? = $ac_status" >&5 + echo "$as_me:13611: \$? = $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 @@ -15168,11 +15174,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:15171: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15177: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15175: \$? = $ac_status" >&5 + echo "$as_me:15181: \$? = $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. @@ -15272,11 +15278,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:15275: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15281: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15279: \$? = $ac_status" >&5 + echo "$as_me:15285: \$? = $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 @@ -17479,11 +17485,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:17482: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17488: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17486: \$? = $ac_status" >&5 + echo "$as_me:17492: \$? = $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. @@ -17747,11 +17753,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:17750: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17756: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17754: \$? = $ac_status" >&5 + echo "$as_me:17760: \$? = $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. @@ -17851,11 +17857,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:17854: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17860: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:17858: \$? = $ac_status" >&5 + echo "$as_me:17864: \$? = $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 @@ -20808,11 +20814,14 @@ if test "$dependency_linking" = auto; then fi fi +# Set up LT_LDFLAGS, user can initialize and we augment below + + if test "$dependency_linking" = yes ; then - LT_LDFLAGS="-no-undefined" + LT_LDFLAGS="$LT_LDFLAGS -no-undefined" else - LT_LDFLAGS= + LT_LDFLAGS="$LT_LDFLAGS" fi @@ -22594,7 +22603,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by Osi $as_me 0.108, which was +This file was extended by Osi $as_me 0.108.7, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -22652,7 +22661,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -Osi config.status 0.108 +Osi config.status 0.108.7 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" @@ -22952,9 +22961,9 @@ s,@ac_c_preproc_warn_flag@,$ac_c_preproc_warn_flag,;t t s,@ac_cxx_preproc_warn_flag@,$ac_cxx_preproc_warn_flag,;t t s,@dos2unix@,$dos2unix,;t t s,@RPATH_FLAGS@,$RPATH_FLAGS,;t t +s,@LT_LDFLAGS@,$LT_LDFLAGS,;t t s,@DEPENDENCY_LINKING_TRUE@,$DEPENDENCY_LINKING_TRUE,;t t s,@DEPENDENCY_LINKING_FALSE@,$DEPENDENCY_LINKING_FALSE,;t t -s,@LT_LDFLAGS@,$LT_LDFLAGS,;t t s,@COIN_SKIP_PROJECTS@,$COIN_SKIP_PROJECTS,;t t s,@subdirs@,$subdirs,;t t s,@coin_have_doxygen@,$coin_have_doxygen,;t t diff --git a/configure.ac b/configure.ac index a6af066b..f288d103 100644 --- a/configure.ac +++ b/configure.ac @@ -12,7 +12,7 @@ AC_PREREQ(2.59) -AC_INIT([Osi],[0.108],[osi@lists.coin-or.org]) +AC_INIT([Osi],[0.108.7],[osi@lists.coin-or.org]) AC_COPYRIGHT([ Copyright 2006 International Business Machines and others.