Changeset 880


Ignore:
Timestamp:
Feb 22, 2008 12:28:03 PM (12 years ago)
Author:
tkr
Message:

Merging r865 r866 r876 from trunk to stable

Location:
stable/2.0/Cbc
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • stable/2.0/Cbc/Makefile.am

    r845 r880  
    114114
    115115addlibsfile = cbc_addlibs.txt
     116addlibsdir = $(prefix)/share/doc/coin/$(PACKAGE_NAME)/
    116117
    117118install-exec-local: install-doc
    118         $(install_sh_DATA) $(addlibsfile) $(DESTDIR)$(libdir)/$(addlibsfile)
     119        $(install_sh_DATA) $(addlibsfile) $(DESTDIR)$(addlibsdir)/$(addlibsfile)
    119120
    120121uninstall-local: uninstall-doc
    121         rm -f $(DESTDIR)$(libdir)/$(addlibsfile)
     122        rm -f $(DESTDIR)$(addlibsdir)/$(addlibsfile)
    122123
    123124########################################################################
  • stable/2.0/Cbc/Makefile.in

    r845 r880  
    2121# Author:  Andreas Waechter           IBM    2006-04-13
    2222
    23 # Copyright (C) 2006 International Business Machines and others.
     23# Copyright (C) 2006, 2007 International Business Machines and others.
    2424# All Rights Reserved.
    2525# This file is distributed under the Common Public License.
     
    6464        $(srcdir)/cbc_addlibs.txt.in $(top_srcdir)/configure \
    6565        $(top_srcdir)/examples/Makefile.in \
    66         $(top_srcdir)/inc/config_cbc.h.in AUTHORS
     66        $(top_srcdir)/inc/config_cbc.h.in AUTHORS INSTALL
    6767@HAVE_EXTERNALS_TRUE@am__append_2 = Externals
    6868@HAVE_EXTERNALS_TRUE@am__append_3 = .Externals-stamp
     
    118118AWK = @AWK@
    119119BUILDTOOLSDIR = @BUILDTOOLSDIR@
     120CBCDOCDIR = @CBCDOCDIR@
    120121CBCOBJDIR = @CBCOBJDIR@
    121122CBCSRCDIR = @CBCSRCDIR@
     
    126127CDEFS = @CDEFS@
    127128CFLAGS = @CFLAGS@
     129CGLDOCDIR = @CGLDOCDIR@
    128130CGLOBJDIR = @CGLOBJDIR@
    129131CGLSRCDIR = @CGLSRCDIR@
     132CLPDOCDIR = @CLPDOCDIR@
    130133CLPOBJDIR = @CLPOBJDIR@
    131134CLPSRCDIR = @CLPSRCDIR@
     135COINUTILSDOCDIR = @COINUTILSDOCDIR@
    132136COINUTILSOBJDIR = @COINUTILSOBJDIR@
    133137COINUTILSSRCDIR = @COINUTILSSRCDIR@
     
    180184DEFS = @DEFS@
    181185DEPDIR = @DEPDIR@
     186DYLPDOCDIR = @DYLPDOCDIR@
    182187DYLPOBJDIR = @DYLPOBJDIR@
    183188DYLPSRCDIR = @DYLPSRCDIR@
     
    221226OPT_CFLAGS = @OPT_CFLAGS@
    222227OPT_CXXFLAGS = @OPT_CXXFLAGS@
     228OSIDOCDIR = @OSIDOCDIR@
    223229OSIOBJDIR = @OSIOBJDIR@
    224230OSISRCDIR = @OSISRCDIR@
     
    239245SPXLIB = @SPXLIB@
    240246STRIP = @STRIP@
     247SYMPHONYDOCDIR = @SYMPHONYDOCDIR@
    241248SYMPHONYOBJDIR = @SYMPHONYOBJDIR@
    242249SYMPHONYSRCDIR = @SYMPHONYSRCDIR@
    243250VERSION = @VERSION@
     251VOLDOCDIR = @VOLDOCDIR@
    244252VOLOBJDIR = @VOLOBJDIR@
    245253VOLSRCDIR = @VOLSRCDIR@
     
    342350########################################################################
    343351addlibsfile = cbc_addlibs.txt
     352addlibsdir = $(prefix)/share/doc/coin/$(PACKAGE_NAME)/
    344353
    345354########################################################################
     
    350359DISTCLEANFILES = $(am__append_3) $(VPATH_DISTCLEANFILES)
    351360DocFiles = README AUTHORS LICENSE
    352 DocInstallDir = $(prefix)/share/doc/$(PACKAGE_NAME)
     361DocInstallDir = $(prefix)/share/doc/coin/$(PACKAGE_NAME)
    353362all: all-recursive
    354363
     
    811820
    812821install-exec-local: install-doc
    813         $(install_sh_DATA) $(addlibsfile) $(DESTDIR)$(libdir)/$(addlibsfile)
     822        $(install_sh_DATA) $(addlibsfile) $(DESTDIR)$(addlibsdir)/$(addlibsfile)
    814823
    815824uninstall-local: uninstall-doc
    816         rm -f $(DESTDIR)$(libdir)/$(addlibsfile)
    817 
    818 install-doc:
     825        rm -f $(DESTDIR)$(addlibsdir)/$(addlibsfile)
     826
     827install-doc: $(DocFiles)
    819828        test -z "$(DocInstallDir)" || $(mkdir_p) "$(DESTDIR)$(DocInstallDir)"
    820829        for file in $(DocFiles); do \
  • stable/2.0/Cbc/configure

    r845 r880  
    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 ADDLIBS FADDLIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE CDEFS ADD_CFLAGS DBG_CFLAGS OPT_CFLAGS sol_cc_compiler CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT MPICC CXXDEFS ADD_CXXFLAGS DBG_CXXFLAGS OPT_CXXFLAGS CXX CXXFLAGS ac_ct_CXX MPICXX 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 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 LN_S 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 LT_LDFLAGS 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 VOLSRCDIR VOLOBJDIR COIN_HAS_VOL_TRUE COIN_HAS_VOL_FALSE SYMPHONYSRCDIR SYMPHONYOBJDIR COIN_HAS_SYMPHONY_TRUE COIN_HAS_SYMPHONY_FALSE CPXINCDIR CPXLIB COIN_HAS_CPX_TRUE COIN_HAS_CPX_FALSE FMPINCDIR FMPLIB COIN_HAS_FMP_TRUE COIN_HAS_FMP_FALSE MSKINCDIR MSKLIB COIN_HAS_MSK_TRUE COIN_HAS_MSK_FALSE OSLINCDIR OSLLIB COIN_HAS_OSL_TRUE COIN_HAS_OSL_FALSE SPXINCDIR SPXLIB COIN_HAS_SPX_TRUE COIN_HAS_SPX_FALSE XPRINCDIR XPRLIB COIN_HAS_XPR_TRUE COIN_HAS_XPR_FALSE GLPKINCDIR GLPKLIB COIN_HAS_GLPK_TRUE COIN_HAS_GLPK_FALSE COIN_BUILD_GLPK_TRUE COIN_BUILD_GLPK_FALSE ASLLIB ASL_CPPFLAGS COIN_HAS_ASL_TRUE COIN_HAS_ASL_FALSE CBC_BUILD_CBC_GENERIC_TRUE CBC_BUILD_CBC_GENERIC_FALSE LIBEXT VPATH_DISTCLEANFILES LIBOBJS LTLIBOBJS'
     475ac_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 FADDLIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE CDEFS ADD_CFLAGS DBG_CFLAGS OPT_CFLAGS sol_cc_compiler CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT MPICC CXXDEFS ADD_CXXFLAGS DBG_CXXFLAGS OPT_CXXFLAGS CXX CXXFLAGS ac_ct_CXX MPICXX 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 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 LN_S 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 LT_LDFLAGS CBCSRCDIR CBCOBJDIR CBCDOCDIR COIN_HAS_CBC_TRUE COIN_HAS_CBC_FALSE CGLSRCDIR CGLOBJDIR CGLDOCDIR COIN_HAS_CGL_TRUE COIN_HAS_CGL_FALSE CLPSRCDIR CLPOBJDIR CLPDOCDIR COIN_HAS_CLP_TRUE COIN_HAS_CLP_FALSE COINUTILSSRCDIR COINUTILSOBJDIR COINUTILSDOCDIR COIN_HAS_COINUTILS_TRUE COIN_HAS_COINUTILS_FALSE DYLPSRCDIR DYLPOBJDIR DYLPDOCDIR COIN_HAS_DYLP_TRUE COIN_HAS_DYLP_FALSE OSISRCDIR OSIOBJDIR OSIDOCDIR COIN_HAS_OSI_TRUE COIN_HAS_OSI_FALSE VOLSRCDIR VOLOBJDIR VOLDOCDIR COIN_HAS_VOL_TRUE COIN_HAS_VOL_FALSE SYMPHONYSRCDIR SYMPHONYOBJDIR SYMPHONYDOCDIR COIN_HAS_SYMPHONY_TRUE COIN_HAS_SYMPHONY_FALSE CPXINCDIR CPXLIB COIN_HAS_CPX_TRUE COIN_HAS_CPX_FALSE FMPINCDIR FMPLIB COIN_HAS_FMP_TRUE COIN_HAS_FMP_FALSE MSKINCDIR MSKLIB COIN_HAS_MSK_TRUE COIN_HAS_MSK_FALSE OSLINCDIR OSLLIB COIN_HAS_OSL_TRUE COIN_HAS_OSL_FALSE SPXINCDIR SPXLIB COIN_HAS_SPX_TRUE COIN_HAS_SPX_FALSE XPRINCDIR XPRLIB COIN_HAS_XPR_TRUE COIN_HAS_XPR_FALSE GLPKINCDIR GLPKLIB COIN_HAS_GLPK_TRUE COIN_HAS_GLPK_FALSE COIN_BUILD_GLPK_TRUE COIN_BUILD_GLPK_FALSE ASLLIB ASL_CPPFLAGS COIN_HAS_ASL_TRUE COIN_HAS_ASL_FALSE CBC_BUILD_CBC_GENERIC_TRUE CBC_BUILD_CBC_GENERIC_FALSE LIBEXT VPATH_DISTCLEANFILES LIBOBJS LTLIBOBJS'
    476476ac_subst_files=''
    477477
     
    10791079  --enable-doscompile     Under Cygwin, compile so that executables run under
    10801080                          DOS. Set to mingw to use gcc/g++/ld with
    1081                           -mno-cygwin. Set to msvc to use cl/link. Default
    1082                           when mentioned: mingw. Default when not mentioned:
    1083                           disabled.
     1081                          -mno-cygwin. Set to msvc to use cl/link (or
     1082                          icl/link). Default when mentioned: mingw. Default
     1083                          when not mentioned: disabled.
    10841084  --enable-static[=PKGS]
    10851085                          build static libraries [default=no]
     
    18921892if test x"$CXX" != x; then
    18931893  case "$CXX" in
    1894     cl* | */cl* | CL* | */CL*)
     1894    cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    18951895      if test x"$CC" = x; then
    18961896        CC="$CXX"
     
    19191919  *-cygwin* | *-mingw*)
    19201920             if test "$enable_doscompile" = msvc ; then
    1921                comps="cl"
     1921               comps="icl cl"
    19221922             else
    19231923               comps="gcc cl"
     
    28052805            coin_dbg_cflags='-MTd'
    28062806            ;;
     2807          icl* | */icl* | ICL* | */ICL*)
     2808            coin_opt_cflags='-MT -Ox'
     2809            coin_add_cflags='-nologo -D_CRT_SECURE_NO_DEPRECATE'
     2810            coin_dbg_cflags='-MTd -debug'
     2811            ;;
    28072812        esac
    28082813        ;;
     
    31113116# Correct ADDLIBS initialization if we are using the MS compiler
    31123117case "$CC" in
    3113   cl* | */cl* | CL* | */CL*)
     3118  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    31143119    ADDLIBS=
    31153120    case $build in
     
    31603165  *-cygwin* | *-mingw*)
    31613166             if test "$enable_doscompile" = msvc ; then
    3162                comps="cl"
     3167               comps="icl cl"
    31633168             else
    31643169               comps="g++ cl"
     
    35373542# It seems that we need to cleanup something here for the Windows
    35383543case "$CXX" in
    3539   cl* | */cl* | CL* | */CL* )
     3544  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    35403545    sed -e 's/^void exit (int);//' confdefs.h >> confdefs.hh
    35413546    mv confdefs.hh confdefs.h
     
    36453650            coin_add_cxxflags='-nologo -EHsc -GR -wd4996 -D_CRT_SECURE_NO_DEPRECATE'
    36463651            coin_dbg_cxxflags='-MTd'
     3652            ;;
     3653          icl* | */icl* | ICL* | */ICL*)
     3654            # The MT and MTd options are mutually exclusive
     3655            coin_opt_cxxflags='-MT -Ox'
     3656            coin_add_cxxflags='-nologo -EHsc -GR -D_CRT_SECURE_NO_DEPRECATE'
     3657            coin_dbg_cxxflags='-MTd -debug'
    36473658            ;;
    36483659        esac
     
    57165727*-*-irix6*)
    57175728  # Find out which ABI we are using.
    5718   echo '#line 5718 "configure"' > conftest.$ac_ext
     5729  echo '#line 5729 "configure"' > conftest.$ac_ext
    57195730  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    57205731  (eval $ac_compile) 2>&5
     
    68506861
    68516862# Provide some information about the compiler.
    6852 echo "$as_me:6852:" \
     6863echo "$as_me:6863:" \
    68536864     "checking for Fortran 77 compiler version" >&5
    68546865ac_compiler=`set X $ac_compile; echo $2`
     
    79177928   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    79187929   -e 's:$: $lt_compiler_flag:'`
    7919    (eval echo "\"\$as_me:7919: $lt_compile\"" >&5)
     7930   (eval echo "\"\$as_me:7930: $lt_compile\"" >&5)
    79207931   (eval "$lt_compile" 2>conftest.err)
    79217932   ac_status=$?
    79227933   cat conftest.err >&5
    7923    echo "$as_me:7923: \$? = $ac_status" >&5
     7934   echo "$as_me:7934: \$? = $ac_status" >&5
    79247935   if (exit $ac_status) && test -s "$ac_outfile"; then
    79257936     # The compiler can only warn and ignore the option if not recognized
     
    81858196   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    81868197   -e 's:$: $lt_compiler_flag:'`
    8187    (eval echo "\"\$as_me:8187: $lt_compile\"" >&5)
     8198   (eval echo "\"\$as_me:8198: $lt_compile\"" >&5)
    81888199   (eval "$lt_compile" 2>conftest.err)
    81898200   ac_status=$?
    81908201   cat conftest.err >&5
    8191    echo "$as_me:8191: \$? = $ac_status" >&5
     8202   echo "$as_me:8202: \$? = $ac_status" >&5
    81928203   if (exit $ac_status) && test -s "$ac_outfile"; then
    81938204     # The compiler can only warn and ignore the option if not recognized
     
    82898300   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    82908301   -e 's:$: $lt_compiler_flag:'`
    8291    (eval echo "\"\$as_me:8291: $lt_compile\"" >&5)
     8302   (eval echo "\"\$as_me:8302: $lt_compile\"" >&5)
    82928303   (eval "$lt_compile" 2>out/conftest.err)
    82938304   ac_status=$?
    82948305   cat out/conftest.err >&5
    8295    echo "$as_me:8295: \$? = $ac_status" >&5
     8306   echo "$as_me:8306: \$? = $ac_status" >&5
    82968307   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    82978308   then
     
    1063410645  lt_status=$lt_dlunknown
    1063510646  cat > conftest.$ac_ext <<EOF
    10636 #line 10636 "configure"
     10647#line 10647 "configure"
    1063710648#include "confdefs.h"
    1063810649
     
    1073410745  lt_status=$lt_dlunknown
    1073510746  cat > conftest.$ac_ext <<EOF
    10736 #line 10736 "configure"
     10747#line 10747 "configure"
    1073710748#include "confdefs.h"
    1073810749
     
    1307813089   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1307913090   -e 's:$: $lt_compiler_flag:'`
    13080    (eval echo "\"\$as_me:13080: $lt_compile\"" >&5)
     13091   (eval echo "\"\$as_me:13091: $lt_compile\"" >&5)
    1308113092   (eval "$lt_compile" 2>conftest.err)
    1308213093   ac_status=$?
    1308313094   cat conftest.err >&5
    13084    echo "$as_me:13084: \$? = $ac_status" >&5
     13095   echo "$as_me:13095: \$? = $ac_status" >&5
    1308513096   if (exit $ac_status) && test -s "$ac_outfile"; then
    1308613097     # The compiler can only warn and ignore the option if not recognized
     
    1318213193   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1318313194   -e 's:$: $lt_compiler_flag:'`
    13184    (eval echo "\"\$as_me:13184: $lt_compile\"" >&5)
     13195   (eval echo "\"\$as_me:13195: $lt_compile\"" >&5)
    1318513196   (eval "$lt_compile" 2>out/conftest.err)
    1318613197   ac_status=$?
    1318713198   cat out/conftest.err >&5
    13188    echo "$as_me:13188: \$? = $ac_status" >&5
     13199   echo "$as_me:13199: \$? = $ac_status" >&5
    1318913200   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1319013201   then
     
    1475214763   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1475314764   -e 's:$: $lt_compiler_flag:'`
    14754    (eval echo "\"\$as_me:14754: $lt_compile\"" >&5)
     14765   (eval echo "\"\$as_me:14765: $lt_compile\"" >&5)
    1475514766   (eval "$lt_compile" 2>conftest.err)
    1475614767   ac_status=$?
    1475714768   cat conftest.err >&5
    14758    echo "$as_me:14758: \$? = $ac_status" >&5
     14769   echo "$as_me:14769: \$? = $ac_status" >&5
    1475914770   if (exit $ac_status) && test -s "$ac_outfile"; then
    1476014771     # The compiler can only warn and ignore the option if not recognized
     
    1485614867   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1485714868   -e 's:$: $lt_compiler_flag:'`
    14858    (eval echo "\"\$as_me:14858: $lt_compile\"" >&5)
     14869   (eval echo "\"\$as_me:14869: $lt_compile\"" >&5)
    1485914870   (eval "$lt_compile" 2>out/conftest.err)
    1486014871   ac_status=$?
    1486114872   cat out/conftest.err >&5
    14862    echo "$as_me:14862: \$? = $ac_status" >&5
     14873   echo "$as_me:14873: \$? = $ac_status" >&5
    1486314874   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1486414875   then
     
    1706317074   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1706417075   -e 's:$: $lt_compiler_flag:'`
    17065    (eval echo "\"\$as_me:17065: $lt_compile\"" >&5)
     17076   (eval echo "\"\$as_me:17076: $lt_compile\"" >&5)
    1706617077   (eval "$lt_compile" 2>conftest.err)
    1706717078   ac_status=$?
    1706817079   cat conftest.err >&5
    17069    echo "$as_me:17069: \$? = $ac_status" >&5
     17080   echo "$as_me:17080: \$? = $ac_status" >&5
    1707017081   if (exit $ac_status) && test -s "$ac_outfile"; then
    1707117082     # The compiler can only warn and ignore the option if not recognized
     
    1733117342   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1733217343   -e 's:$: $lt_compiler_flag:'`
    17333    (eval echo "\"\$as_me:17333: $lt_compile\"" >&5)
     17344   (eval echo "\"\$as_me:17344: $lt_compile\"" >&5)
    1733417345   (eval "$lt_compile" 2>conftest.err)
    1733517346   ac_status=$?
    1733617347   cat conftest.err >&5
    17337    echo "$as_me:17337: \$? = $ac_status" >&5
     17348   echo "$as_me:17348: \$? = $ac_status" >&5
    1733817349   if (exit $ac_status) && test -s "$ac_outfile"; then
    1733917350     # The compiler can only warn and ignore the option if not recognized
     
    1743517446   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1743617447   -e 's:$: $lt_compiler_flag:'`
    17437    (eval echo "\"\$as_me:17437: $lt_compile\"" >&5)
     17448   (eval echo "\"\$as_me:17448: $lt_compile\"" >&5)
    1743817449   (eval "$lt_compile" 2>out/conftest.err)
    1743917450   ac_status=$?
    1744017451   cat out/conftest.err >&5
    17441    echo "$as_me:17441: \$? = $ac_status" >&5
     17452   echo "$as_me:17452: \$? = $ac_status" >&5
    1744217453   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1744317454   then
     
    2017520186    *-cygwin* | *-mingw*)
    2017620187       case "$CXX" in
    20177     cl* | */cl* | CL* | */CL*)
     20188    cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    2017820189      { echo "$as_me:$LINENO: Applying patches to libtool for cl compiler" >&5
    2017920190echo "$as_me: Applying patches to libtool for cl compiler" >&6;}
     
    2036620377
    2036720378  CBCOBJDIR=`pwd`/$coin_has_cbc
     20379
     20380  CBCDOCDIR=$abs_lib_dir/../share/doc/coin/Cbc
    2036820381fi
    2036920382
     
    2042220435
    2042320436  CGLOBJDIR=`pwd`/$coin_has_cgl
     20437
     20438  CGLDOCDIR=$abs_lib_dir/../share/doc/coin/Cgl
    2042420439fi
    2042520440
     
    2047820493
    2047920494  CLPOBJDIR=`pwd`/$coin_has_clp
     20495
     20496  CLPDOCDIR=$abs_lib_dir/../share/doc/coin/Clp
    2048020497fi
    2048120498
     
    2053420551
    2053520552  COINUTILSOBJDIR=`pwd`/$coin_has_coinutils
     20553
     20554  COINUTILSDOCDIR=$abs_lib_dir/../share/doc/coin/CoinUtils
    2053620555fi
    2053720556
     
    2059020609
    2059120610  DYLPOBJDIR=`pwd`/$coin_has_dylp
     20611
     20612  DYLPDOCDIR=$abs_lib_dir/../share/doc/coin/DyLP
    2059220613fi
    2059320614
     
    2064620667
    2064720668  OSIOBJDIR=`pwd`/$coin_has_osi
     20669
     20670  OSIDOCDIR=$abs_lib_dir/../share/doc/coin/Osi
    2064820671fi
    2064920672
     
    2070220725
    2070320726  VOLOBJDIR=`pwd`/$coin_has_vol
     20727
     20728  VOLDOCDIR=$abs_lib_dir/../share/doc/coin/Vol
    2070420729fi
    2070520730
     
    2075820783
    2075920784  SYMPHONYOBJDIR=`pwd`/$coin_has_symphony
     20785
     20786  SYMPHONYDOCDIR=$abs_lib_dir/../share/doc/coin/SYMPHONY
    2076020787fi
    2076120788
     
    2198722014# Determine the name of the ASL library
    2198822015case "$CC" in
    21989   cl* | */cl* | CL* | */CL*)
     22016  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    2199022017    ampllib=amplsolv.lib ;;
    2199122018  *)
     
    2245622483fi
    2245722484case "$CC" in
    22458   cl* | */cl* | CL* | */CL*)
     22485  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    2245922486    coin_link_input_cmd=cp ;;
    2246022487esac
     
    2247422501
    2247522502  case "$CC" in
    22476     cl* | */cl* | CL* | */CL*)
     22503    cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    2247722504         LIBEXT=lib ;;
    2247822505      *) LIBEXT=a ;;
     
    2340523432s,@CBCSRCDIR@,$CBCSRCDIR,;t t
    2340623433s,@CBCOBJDIR@,$CBCOBJDIR,;t t
     23434s,@CBCDOCDIR@,$CBCDOCDIR,;t t
    2340723435s,@COIN_HAS_CBC_TRUE@,$COIN_HAS_CBC_TRUE,;t t
    2340823436s,@COIN_HAS_CBC_FALSE@,$COIN_HAS_CBC_FALSE,;t t
    2340923437s,@CGLSRCDIR@,$CGLSRCDIR,;t t
    2341023438s,@CGLOBJDIR@,$CGLOBJDIR,;t t
     23439s,@CGLDOCDIR@,$CGLDOCDIR,;t t
    2341123440s,@COIN_HAS_CGL_TRUE@,$COIN_HAS_CGL_TRUE,;t t
    2341223441s,@COIN_HAS_CGL_FALSE@,$COIN_HAS_CGL_FALSE,;t t
    2341323442s,@CLPSRCDIR@,$CLPSRCDIR,;t t
    2341423443s,@CLPOBJDIR@,$CLPOBJDIR,;t t
     23444s,@CLPDOCDIR@,$CLPDOCDIR,;t t
    2341523445s,@COIN_HAS_CLP_TRUE@,$COIN_HAS_CLP_TRUE,;t t
    2341623446s,@COIN_HAS_CLP_FALSE@,$COIN_HAS_CLP_FALSE,;t t
    2341723447s,@COINUTILSSRCDIR@,$COINUTILSSRCDIR,;t t
    2341823448s,@COINUTILSOBJDIR@,$COINUTILSOBJDIR,;t t
     23449s,@COINUTILSDOCDIR@,$COINUTILSDOCDIR,;t t
    2341923450s,@COIN_HAS_COINUTILS_TRUE@,$COIN_HAS_COINUTILS_TRUE,;t t
    2342023451s,@COIN_HAS_COINUTILS_FALSE@,$COIN_HAS_COINUTILS_FALSE,;t t
    2342123452s,@DYLPSRCDIR@,$DYLPSRCDIR,;t t
    2342223453s,@DYLPOBJDIR@,$DYLPOBJDIR,;t t
     23454s,@DYLPDOCDIR@,$DYLPDOCDIR,;t t
    2342323455s,@COIN_HAS_DYLP_TRUE@,$COIN_HAS_DYLP_TRUE,;t t
    2342423456s,@COIN_HAS_DYLP_FALSE@,$COIN_HAS_DYLP_FALSE,;t t
    2342523457s,@OSISRCDIR@,$OSISRCDIR,;t t
    2342623458s,@OSIOBJDIR@,$OSIOBJDIR,;t t
     23459s,@OSIDOCDIR@,$OSIDOCDIR,;t t
    2342723460s,@COIN_HAS_OSI_TRUE@,$COIN_HAS_OSI_TRUE,;t t
    2342823461s,@COIN_HAS_OSI_FALSE@,$COIN_HAS_OSI_FALSE,;t t
    2342923462s,@VOLSRCDIR@,$VOLSRCDIR,;t t
    2343023463s,@VOLOBJDIR@,$VOLOBJDIR,;t t
     23464s,@VOLDOCDIR@,$VOLDOCDIR,;t t
    2343123465s,@COIN_HAS_VOL_TRUE@,$COIN_HAS_VOL_TRUE,;t t
    2343223466s,@COIN_HAS_VOL_FALSE@,$COIN_HAS_VOL_FALSE,;t t
    2343323467s,@SYMPHONYSRCDIR@,$SYMPHONYSRCDIR,;t t
    2343423468s,@SYMPHONYOBJDIR@,$SYMPHONYOBJDIR,;t t
     23469s,@SYMPHONYDOCDIR@,$SYMPHONYDOCDIR,;t t
    2343523470s,@COIN_HAS_SYMPHONY_TRUE@,$COIN_HAS_SYMPHONY_TRUE,;t t
    2343623471s,@COIN_HAS_SYMPHONY_FALSE@,$COIN_HAS_SYMPHONY_FALSE,;t t
  • stable/2.0/Cbc/examples/Makefile.in

    r845 r880  
    6363LIBS = -L$(COINLIBDIR) -lCbc -lCgl -lOsiClp -lOsiCbc -lOsi -lClp -lCoinUtils \
    6464        @ADDLIBS@ \
    65         `cat $(COINLIBDIR)/cgl_addlibs.txt` \
    66         `cat $(COINLIBDIR)/osi_addlibs.txt` \
    67         `cat $(COINLIBDIR)/clp_addlibs.txt` \
    68         `cat $(COINLIBDIR)/coinutils_addlibs.txt`
     65        `cat @CGLDOCDIR@/cgl_addlibs.txt` \
     66        `cat @OSIDOCDIR@/osi_addlibs.txt` \
     67        `cat @CLPDOCDIR@/clp_addlibs.txt` \
     68        `cat @COINUTILSDOCDIR@/coinutils_addlibs.txt`
    6969
    7070# Necessary Include dirs (we use the CYGPATH_W variables to allow
  • stable/2.0/Cbc/src/Makefile.in

    r845 r880  
    286286AWK = @AWK@
    287287BUILDTOOLSDIR = @BUILDTOOLSDIR@
     288CBCDOCDIR = @CBCDOCDIR@
    288289CBCOBJDIR = @CBCOBJDIR@
    289290CBCSRCDIR = @CBCSRCDIR@
     
    294295CDEFS = @CDEFS@
    295296CFLAGS = @CFLAGS@
     297CGLDOCDIR = @CGLDOCDIR@
    296298CGLOBJDIR = @CGLOBJDIR@
    297299CGLSRCDIR = @CGLSRCDIR@
     300CLPDOCDIR = @CLPDOCDIR@
    298301CLPOBJDIR = @CLPOBJDIR@
    299302CLPSRCDIR = @CLPSRCDIR@
     303COINUTILSDOCDIR = @COINUTILSDOCDIR@
    300304COINUTILSOBJDIR = @COINUTILSOBJDIR@
    301305COINUTILSSRCDIR = @COINUTILSSRCDIR@
     
    348352DEFS = @DEFS@
    349353DEPDIR = @DEPDIR@
     354DYLPDOCDIR = @DYLPDOCDIR@
    350355DYLPOBJDIR = @DYLPOBJDIR@
    351356DYLPSRCDIR = @DYLPSRCDIR@
     
    393398OPT_CFLAGS = @OPT_CFLAGS@
    394399OPT_CXXFLAGS = @OPT_CXXFLAGS@
     400OSIDOCDIR = @OSIDOCDIR@
    395401OSIOBJDIR = @OSIOBJDIR@
    396402OSISRCDIR = @OSISRCDIR@
     
    411417SPXLIB = @SPXLIB@
    412418STRIP = @STRIP@
     419SYMPHONYDOCDIR = @SYMPHONYDOCDIR@
    413420SYMPHONYOBJDIR = @SYMPHONYOBJDIR@
    414421SYMPHONYSRCDIR = @SYMPHONYSRCDIR@
    415422VERSION = @VERSION@
     423VOLDOCDIR = @VOLDOCDIR@
    416424VOLOBJDIR = @VOLOBJDIR@
    417425VOLSRCDIR = @VOLSRCDIR@
  • stable/2.0/Cbc/test/Makefile.in

    r845 r880  
    7575AWK = @AWK@
    7676BUILDTOOLSDIR = @BUILDTOOLSDIR@
     77CBCDOCDIR = @CBCDOCDIR@
    7778CBCOBJDIR = @CBCOBJDIR@
    7879CBCSRCDIR = @CBCSRCDIR@
     
    8384CDEFS = @CDEFS@
    8485CFLAGS = @CFLAGS@
     86CGLDOCDIR = @CGLDOCDIR@
    8587CGLOBJDIR = @CGLOBJDIR@
    8688CGLSRCDIR = @CGLSRCDIR@
     89CLPDOCDIR = @CLPDOCDIR@
    8790CLPOBJDIR = @CLPOBJDIR@
    8891CLPSRCDIR = @CLPSRCDIR@
     92COINUTILSDOCDIR = @COINUTILSDOCDIR@
    8993COINUTILSOBJDIR = @COINUTILSOBJDIR@
    9094COINUTILSSRCDIR = @COINUTILSSRCDIR@
     
    137141DEFS = @DEFS@
    138142DEPDIR = @DEPDIR@
     143DYLPDOCDIR = @DYLPDOCDIR@
    139144DYLPOBJDIR = @DYLPOBJDIR@
    140145DYLPSRCDIR = @DYLPSRCDIR@
     
    178183OPT_CFLAGS = @OPT_CFLAGS@
    179184OPT_CXXFLAGS = @OPT_CXXFLAGS@
     185OSIDOCDIR = @OSIDOCDIR@
    180186OSIOBJDIR = @OSIOBJDIR@
    181187OSISRCDIR = @OSISRCDIR@
     
    196202SPXLIB = @SPXLIB@
    197203STRIP = @STRIP@
     204SYMPHONYDOCDIR = @SYMPHONYDOCDIR@
    198205SYMPHONYOBJDIR = @SYMPHONYOBJDIR@
    199206SYMPHONYSRCDIR = @SYMPHONYSRCDIR@
    200207VERSION = @VERSION@
     208VOLDOCDIR = @VOLDOCDIR@
    201209VOLOBJDIR = @VOLOBJDIR@
    202210VOLSRCDIR = @VOLSRCDIR@
Note: See TracChangeset for help on using the changeset viewer.