Changeset 381 for branches


Ignore:
Timestamp:
Jun 19, 2006 3:29:07 PM (13 years ago)
Author:
andreasw
Message:

regenerated compilation files with latest BuildTools?; fixed inclusing of CoinUtilsConfig?.h for unitTestClp so that COIN_HAS_ZLIB is properly defined

Location:
branches/devel/Cbc
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • branches/devel/Cbc/Makefile.in

    r352 r381  
    104104ACLOCAL = @ACLOCAL@
    105105ADDLIBS = @ADDLIBS@
     106ADD_CFLAGS = @ADD_CFLAGS@
     107ADD_CXXFLAGS = @ADD_CXXFLAGS@
    106108ALWAYS_FALSE_FALSE = @ALWAYS_FALSE_FALSE@
    107109ALWAYS_FALSE_TRUE = @ALWAYS_FALSE_TRUE@
  • branches/devel/Cbc/configure

    r365 r381  
    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 ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE COIN_DEBUG_TRUE COIN_DEBUG_FALSE CDEFS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT MPICC CXXDEFS 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 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 LT_LDFLAGS abs_source_dir abs_lib_dir abs_include_dir abs_bin_dir RPATH_FLAGS 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 SYMSRCDIR SYMOBJDIR COIN_HAS_SYM_TRUE COIN_HAS_SYM_FALSE VOLSRCDIR VOLOBJDIR COIN_HAS_VOL_TRUE COIN_HAS_VOL_FALSE CPXINCDIR CPXLIB COIN_HAS_CPX_TRUE COIN_HAS_CPX_FALSE GLPKINCDIR GLPKLIB COIN_HAS_GLPK_TRUE COIN_HAS_GLPK_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 LIBOBJS LTLIBOBJS VPATH_DISTCLEANFILES'
     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 ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE COIN_DEBUG_TRUE COIN_DEBUG_FALSE CDEFS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT ADD_CFLAGS MPICC CXXDEFS CXX CXXFLAGS ac_ct_CXX ADD_CXXFLAGS 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 LT_LDFLAGS RPATH_FLAGS 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 SYMSRCDIR SYMOBJDIR COIN_HAS_SYM_TRUE COIN_HAS_SYM_FALSE VOLSRCDIR VOLOBJDIR COIN_HAS_VOL_TRUE COIN_HAS_VOL_FALSE CPXINCDIR CPXLIB COIN_HAS_CPX_TRUE COIN_HAS_CPX_FALSE GLPKINCDIR GLPKLIB COIN_HAS_GLPK_TRUE COIN_HAS_GLPK_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 LIBOBJS LTLIBOBJS VPATH_DISTCLEANFILES'
    476476ac_subst_files=''
    477477
     
    934934ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
    935935ac_cv_env_CPPFLAGS_value=$CPPFLAGS
     936ac_env_ADD_CFLAGS_set=${ADD_CFLAGS+set}
     937ac_env_ADD_CFLAGS_value=$ADD_CFLAGS
     938ac_cv_env_ADD_CFLAGS_set=${ADD_CFLAGS+set}
     939ac_cv_env_ADD_CFLAGS_value=$ADD_CFLAGS
    936940ac_env_MPICC_set=${MPICC+set}
    937941ac_env_MPICC_value=$MPICC
     
    950954ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set}
    951955ac_cv_env_CXXFLAGS_value=$CXXFLAGS
     956ac_env_ADD_CXXFLAGS_set=${ADD_CXXFLAGS+set}
     957ac_env_ADD_CXXFLAGS_value=$ADD_CXXFLAGS
     958ac_cv_env_ADD_CXXFLAGS_set=${ADD_CXXFLAGS+set}
     959ac_cv_env_ADD_CXXFLAGS_value=$ADD_CXXFLAGS
    952960ac_env_MPICXX_set=${MPICXX+set}
    953961ac_env_MPICXX_value=$MPICXX
     
    11051113  CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
    11061114              headers in a nonstandard directory <include dir>
     1115  ADD_CFLAGS  Additional C compiler options
    11071116  MPICC       C MPI Compiler
    11081117  CXXDEFS     Additional -D flags to be used when compiling C++ code.
    11091118  CXX         C++ compiler command
    11101119  CXXFLAGS    C++ compiler flags
     1120  ADD_CXXFLAGS
     1121              Additional C++ compiler options
    11111122  MPICXX      C++ MPI Compiler
    11121123  CPP         C preprocessor
     
    16681679# We set the following variable so that we know later in AC_COIN_FINALIZE
    16691680# that we are in a project main directory
    1670 
     1681coin_projectdir=yes
    16711682
    16721683
     
    26292640        case "$CC" in
    26302641          xlc* | */xlc* | mpxlc* | */mpxlc*)
    2631             coin_opt_cflags="-O3 -qarch=auto -qcache=auto -qhot -qtune=auto -qmaxmem=-1"
     2642            coin_opt_cflags="-O3 -qarch=auto -qcache=auto -qtune=auto -qmaxmem=-1"
    26322643            coin_add_cflags="-bmaxdata:0x80000000"
    26332644            coin_dbg_cflags="-g"
     
    27092720    CFLAGS="$coin_opt_cflags $coin_add_cflags -DNDEBUG $CDEFS $coin_warn_cflags"
    27102721  fi
     2722fi
     2723
     2724# Check if user wants to have additional CFLAGS options
     2725
     2726if test x"$ADD_CFLAGS" != x; then
     2727  CFLAGS="$CFLAGS $ADD_CFLAGS"
    27112728fi
    27122729
     
    33803397        case "$CXX" in
    33813398          xlC* | */xlC* | mpxlC* | */mpxlC*)
    3382             coin_opt_cxxflags="-O3 -qarch=auto -qcache=auto -qhot -qtune=auto -qmaxmem=-1"
     3399            coin_opt_cxxflags="-O3 -qarch=auto -qcache=auto -qtune=auto -qmaxmem=-1"
    33833400            coin_add_cxxflags="-bmaxdata:0x80000000 -qrtti=dyna"
    33843401            coin_dbg_cxxflags="-g"
     
    34603477    CXXFLAGS="$coin_opt_cxxflags $coin_add_cxxflags -DNDEBUG $CXXDEFS $coin_warn_cxxflags"
    34613478  fi
     3479fi
     3480
     3481# Check if user wants to have additional CXXFLAGS options
     3482
     3483if test x"$ADD_CXXFLAGS" != x; then
     3484  CXXFLAGS="$CXXFLAGS $ADD_CXXFLAGS"
    34623485fi
    34633486
     
    46204643*-*-irix6*)
    46214644  # Find out which ABI we are using.
    4622   echo '#line 4622 "configure"' > conftest.$ac_ext
     4645  echo '#line 4645 "configure"' > conftest.$ac_ext
    46234646  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    46244647  (eval $ac_compile) 2>&5
     
    57545777
    57555778# Provide some information about the compiler.
    5756 echo "$as_me:5756:" \
     5779echo "$as_me:5779:" \
    57575780     "checking for Fortran 77 compiler version" >&5
    57585781ac_compiler=`set X $ac_compile; echo $2`
     
    68216844   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    68226845   -e 's:$: $lt_compiler_flag:'`
    6823    (eval echo "\"\$as_me:6823: $lt_compile\"" >&5)
     6846   (eval echo "\"\$as_me:6846: $lt_compile\"" >&5)
    68246847   (eval "$lt_compile" 2>conftest.err)
    68256848   ac_status=$?
    68266849   cat conftest.err >&5
    6827    echo "$as_me:6827: \$? = $ac_status" >&5
     6850   echo "$as_me:6850: \$? = $ac_status" >&5
    68286851   if (exit $ac_status) && test -s "$ac_outfile"; then
    68296852     # The compiler can only warn and ignore the option if not recognized
     
    70897112   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    70907113   -e 's:$: $lt_compiler_flag:'`
    7091    (eval echo "\"\$as_me:7091: $lt_compile\"" >&5)
     7114   (eval echo "\"\$as_me:7114: $lt_compile\"" >&5)
    70927115   (eval "$lt_compile" 2>conftest.err)
    70937116   ac_status=$?
    70947117   cat conftest.err >&5
    7095    echo "$as_me:7095: \$? = $ac_status" >&5
     7118   echo "$as_me:7118: \$? = $ac_status" >&5
    70967119   if (exit $ac_status) && test -s "$ac_outfile"; then
    70977120     # The compiler can only warn and ignore the option if not recognized
     
    71937216   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    71947217   -e 's:$: $lt_compiler_flag:'`
    7195    (eval echo "\"\$as_me:7195: $lt_compile\"" >&5)
     7218   (eval echo "\"\$as_me:7218: $lt_compile\"" >&5)
    71967219   (eval "$lt_compile" 2>out/conftest.err)
    71977220   ac_status=$?
    71987221   cat out/conftest.err >&5
    7199    echo "$as_me:7199: \$? = $ac_status" >&5
     7222   echo "$as_me:7222: \$? = $ac_status" >&5
    72007223   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    72017224   then
     
    95389561  lt_status=$lt_dlunknown
    95399562  cat > conftest.$ac_ext <<EOF
    9540 #line 9540 "configure"
     9563#line 9563 "configure"
    95419564#include "confdefs.h"
    95429565
     
    96389661  lt_status=$lt_dlunknown
    96399662  cat > conftest.$ac_ext <<EOF
    9640 #line 9640 "configure"
     9663#line 9663 "configure"
    96419664#include "confdefs.h"
    96429665
     
    1198212005   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1198312006   -e 's:$: $lt_compiler_flag:'`
    11984    (eval echo "\"\$as_me:11984: $lt_compile\"" >&5)
     12007   (eval echo "\"\$as_me:12007: $lt_compile\"" >&5)
    1198512008   (eval "$lt_compile" 2>conftest.err)
    1198612009   ac_status=$?
    1198712010   cat conftest.err >&5
    11988    echo "$as_me:11988: \$? = $ac_status" >&5
     12011   echo "$as_me:12011: \$? = $ac_status" >&5
    1198912012   if (exit $ac_status) && test -s "$ac_outfile"; then
    1199012013     # The compiler can only warn and ignore the option if not recognized
     
    1208612109   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1208712110   -e 's:$: $lt_compiler_flag:'`
    12088    (eval echo "\"\$as_me:12088: $lt_compile\"" >&5)
     12111   (eval echo "\"\$as_me:12111: $lt_compile\"" >&5)
    1208912112   (eval "$lt_compile" 2>out/conftest.err)
    1209012113   ac_status=$?
    1209112114   cat out/conftest.err >&5
    12092    echo "$as_me:12092: \$? = $ac_status" >&5
     12115   echo "$as_me:12115: \$? = $ac_status" >&5
    1209312116   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1209412117   then
     
    1365613679   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1365713680   -e 's:$: $lt_compiler_flag:'`
    13658    (eval echo "\"\$as_me:13658: $lt_compile\"" >&5)
     13681   (eval echo "\"\$as_me:13681: $lt_compile\"" >&5)
    1365913682   (eval "$lt_compile" 2>conftest.err)
    1366013683   ac_status=$?
    1366113684   cat conftest.err >&5
    13662    echo "$as_me:13662: \$? = $ac_status" >&5
     13685   echo "$as_me:13685: \$? = $ac_status" >&5
    1366313686   if (exit $ac_status) && test -s "$ac_outfile"; then
    1366413687     # The compiler can only warn and ignore the option if not recognized
     
    1376013783   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1376113784   -e 's:$: $lt_compiler_flag:'`
    13762    (eval echo "\"\$as_me:13762: $lt_compile\"" >&5)
     13785   (eval echo "\"\$as_me:13785: $lt_compile\"" >&5)
    1376313786   (eval "$lt_compile" 2>out/conftest.err)
    1376413787   ac_status=$?
    1376513788   cat out/conftest.err >&5
    13766    echo "$as_me:13766: \$? = $ac_status" >&5
     13789   echo "$as_me:13789: \$? = $ac_status" >&5
    1376713790   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1376813791   then
     
    1596715990   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1596815991   -e 's:$: $lt_compiler_flag:'`
    15969    (eval echo "\"\$as_me:15969: $lt_compile\"" >&5)
     15992   (eval echo "\"\$as_me:15992: $lt_compile\"" >&5)
    1597015993   (eval "$lt_compile" 2>conftest.err)
    1597115994   ac_status=$?
    1597215995   cat conftest.err >&5
    15973    echo "$as_me:15973: \$? = $ac_status" >&5
     15996   echo "$as_me:15996: \$? = $ac_status" >&5
    1597415997   if (exit $ac_status) && test -s "$ac_outfile"; then
    1597515998     # The compiler can only warn and ignore the option if not recognized
     
    1623516258   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1623616259   -e 's:$: $lt_compiler_flag:'`
    16237    (eval echo "\"\$as_me:16237: $lt_compile\"" >&5)
     16260   (eval echo "\"\$as_me:16260: $lt_compile\"" >&5)
    1623816261   (eval "$lt_compile" 2>conftest.err)
    1623916262   ac_status=$?
    1624016263   cat conftest.err >&5
    16241    echo "$as_me:16241: \$? = $ac_status" >&5
     16264   echo "$as_me:16264: \$? = $ac_status" >&5
    1624216265   if (exit $ac_status) && test -s "$ac_outfile"; then
    1624316266     # The compiler can only warn and ignore the option if not recognized
     
    1633916362   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1634016363   -e 's:$: $lt_compiler_flag:'`
    16341    (eval echo "\"\$as_me:16341: $lt_compile\"" >&5)
     16364   (eval echo "\"\$as_me:16364: $lt_compile\"" >&5)
    1634216365   (eval "$lt_compile" 2>out/conftest.err)
    1634316366   ac_status=$?
    1634416367   cat out/conftest.err >&5
    16345    echo "$as_me:16345: \$? = $ac_status" >&5
     16368   echo "$as_me:16368: \$? = $ac_status" >&5
    1634616369   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1634716370   then
     
    1971019733      have_svn=no
    1971119734    fi
     19735    rm -f confauto.out
    1971219736  fi
    1971319737
     
    1973719761fi
    1973819762
    19739 
     19763# helpful variable for the base directory of this package
     19764abs_source_dir=`cd $srcdir; pwd`
     19765
     19766
     19767# Stuff for example Makefiles
     19768if test x$prefix = xNONE; then
     19769  full_prefix=$ac_default_prefix
     19770else
     19771  full_prefix=$prefix
     19772fi
     19773full_prefix=`cd $full_prefix ; pwd`
     19774
     19775abs_lib_dir=$full_prefix/lib
     19776
     19777abs_include_dir=$full_prefix/include
     19778
     19779abs_bin_dir=$full_prefix/bin
    1974019780
    1974119781
     
    1979419834  *-cygwin* | *-mingw*)
    1979519835  case "$CXX" in
    19796     cl | */cl)
     19836    cl* | */cl*)
    1979719837      { echo "$as_me:$LINENO: Applying patches to libtool for cl compiler" >&5
    1979819838echo "$as_me: Applying patches to libtool for cl compiler" >&6;}
     
    1982319863
    1982419864
    19825 
    19826 # helpful variable for the base directory of this package
    19827 abs_source_dir=`cd $srcdir; pwd`
    19828 
    19829 
    19830 # Stuff for example Makefiles
    19831 if test x$prefix = xNONE; then
    19832   full_prefix=$ac_default_prefix
    19833 else
    19834   full_prefix=$prefix
    19835 fi
    19836 full_prefix=`cd $full_prefix ; pwd`
    19837 
    19838 abs_lib_dir=$full_prefix/lib
    19839 
    19840 abs_include_dir=$full_prefix/include
    19841 
    19842 abs_bin_dir=$full_prefix/bin
    1984319865
    1984419866# set RPATH_FLAGS to the compiler link flags required to hardcode location
     
    1990319925
    1990419926coin_has_cbc=unavailable
    19905 if test $PACKAGE_TARNAME = cbc; then
    19906   coin_has_cbc=.
    19907 else
    19908   if test -d $srcdir/../Cbc; then
    19909     coin_has_cbc=../Cbc
     19927if test x"$COIN_SKIP_PROJECTS" != x; then
     19928  for dir in $COIN_SKIP_PROJECTS; do
     19929    if test $dir = Cbc; then
     19930      coin_has_cbc=skipping
     19931    fi
     19932  done
     19933fi
     19934
     19935if test $coin_has_cbc != skipping; then
     19936  if test $PACKAGE_TARNAME = cbc; then
     19937    coin_has_cbc=.
     19938  else
     19939    if test -d $srcdir/../Cbc; then
     19940      coin_has_cbc=../Cbc
     19941    fi
    1991019942  fi
    1991119943fi
    1991219944
    19913 if test $coin_has_cbc != unavailable; then
     19945if test $coin_has_cbc != unavailable &&
     19946   test $coin_has_cbc != skipping; then
    1991419947  # Set the #define if the component is available
    1991519948
     
    1992919962
    1993019963
    19931 if test $coin_has_cbc != unavailable; then
     19964if test $coin_has_cbc != unavailable &&
     19965                test $coin_has_cbc != skipping; then
    1993219966  COIN_HAS_CBC_TRUE=
    1993319967  COIN_HAS_CBC_FALSE='#'
     
    1994719981
    1994819982coin_has_cgl=unavailable
    19949 if test $PACKAGE_TARNAME = cgl; then
    19950   coin_has_cgl=.
    19951 else
    19952   if test -d $srcdir/../Cgl; then
    19953     coin_has_cgl=../Cgl
     19983if test x"$COIN_SKIP_PROJECTS" != x; then
     19984  for dir in $COIN_SKIP_PROJECTS; do
     19985    if test $dir = Cgl; then
     19986      coin_has_cgl=skipping
     19987    fi
     19988  done
     19989fi
     19990
     19991if test $coin_has_cgl != skipping; then
     19992  if test $PACKAGE_TARNAME = cgl; then
     19993    coin_has_cgl=.
     19994  else
     19995    if test -d $srcdir/../Cgl; then
     19996      coin_has_cgl=../Cgl
     19997    fi
    1995419998  fi
    1995519999fi
    1995620000
    19957 if test $coin_has_cgl != unavailable; then
     20001if test $coin_has_cgl != unavailable &&
     20002   test $coin_has_cgl != skipping; then
    1995820003  # Set the #define if the component is available
    1995920004
     
    1997320018
    1997420019
    19975 if test $coin_has_cgl != unavailable; then
     20020if test $coin_has_cgl != unavailable &&
     20021                test $coin_has_cgl != skipping; then
    1997620022  COIN_HAS_CGL_TRUE=
    1997720023  COIN_HAS_CGL_FALSE='#'
     
    1999120037
    1999220038coin_has_clp=unavailable
    19993 if test $PACKAGE_TARNAME = clp; then
    19994   coin_has_clp=.
    19995 else
    19996   if test -d $srcdir/../Clp; then
    19997     coin_has_clp=../Clp
     20039if test x"$COIN_SKIP_PROJECTS" != x; then
     20040  for dir in $COIN_SKIP_PROJECTS; do
     20041    if test $dir = Clp; then
     20042      coin_has_clp=skipping
     20043    fi
     20044  done
     20045fi
     20046
     20047if test $coin_has_clp != skipping; then
     20048  if test $PACKAGE_TARNAME = clp; then
     20049    coin_has_clp=.
     20050  else
     20051    if test -d $srcdir/../Clp; then
     20052      coin_has_clp=../Clp
     20053    fi
    1999820054  fi
    1999920055fi
    2000020056
    20001 if test $coin_has_clp != unavailable; then
     20057if test $coin_has_clp != unavailable &&
     20058   test $coin_has_clp != skipping; then
    2000220059  # Set the #define if the component is available
    2000320060
     
    2001720074
    2001820075
    20019 if test $coin_has_clp != unavailable; then
     20076if test $coin_has_clp != unavailable &&
     20077                test $coin_has_clp != skipping; then
    2002020078  COIN_HAS_CLP_TRUE=
    2002120079  COIN_HAS_CLP_FALSE='#'
     
    2003520093
    2003620094coin_has_coinutils=unavailable
    20037 if test $PACKAGE_TARNAME = coinutils; then
    20038   coin_has_coinutils=.
    20039 else
    20040   if test -d $srcdir/../CoinUtils; then
    20041     coin_has_coinutils=../CoinUtils
     20095if test x"$COIN_SKIP_PROJECTS" != x; then
     20096  for dir in $COIN_SKIP_PROJECTS; do
     20097    if test $dir = CoinUtils; then
     20098      coin_has_coinutils=skipping
     20099    fi
     20100  done
     20101fi
     20102
     20103if test $coin_has_coinutils != skipping; then
     20104  if test $PACKAGE_TARNAME = coinutils; then
     20105    coin_has_coinutils=.
     20106  else
     20107    if test -d $srcdir/../CoinUtils; then
     20108      coin_has_coinutils=../CoinUtils
     20109    fi
    2004220110  fi
    2004320111fi
    2004420112
    20045 if test $coin_has_coinutils != unavailable; then
     20113if test $coin_has_coinutils != unavailable &&
     20114   test $coin_has_coinutils != skipping; then
    2004620115  # Set the #define if the component is available
    2004720116
     
    2006120130
    2006220131
    20063 if test $coin_has_coinutils != unavailable; then
     20132if test $coin_has_coinutils != unavailable &&
     20133                test $coin_has_coinutils != skipping; then
    2006420134  COIN_HAS_COINUTILS_TRUE=
    2006520135  COIN_HAS_COINUTILS_FALSE='#'
     
    2007920149
    2008020150coin_has_dylp=unavailable
    20081 if test $PACKAGE_TARNAME = dylp; then
    20082   coin_has_dylp=.
    20083 else
    20084   if test -d $srcdir/../DyLP; then
    20085     coin_has_dylp=../DyLP
     20151if test x"$COIN_SKIP_PROJECTS" != x; then
     20152  for dir in $COIN_SKIP_PROJECTS; do
     20153    if test $dir = DyLP; then
     20154      coin_has_dylp=skipping
     20155    fi
     20156  done
     20157fi
     20158
     20159if test $coin_has_dylp != skipping; then
     20160  if test $PACKAGE_TARNAME = dylp; then
     20161    coin_has_dylp=.
     20162  else
     20163    if test -d $srcdir/../DyLP; then
     20164      coin_has_dylp=../DyLP
     20165    fi
    2008620166  fi
    2008720167fi
    2008820168
    20089 if test $coin_has_dylp != unavailable; then
     20169if test $coin_has_dylp != unavailable &&
     20170   test $coin_has_dylp != skipping; then
    2009020171  # Set the #define if the component is available
    2009120172
     
    2010520186
    2010620187
    20107 if test $coin_has_dylp != unavailable; then
     20188if test $coin_has_dylp != unavailable &&
     20189                test $coin_has_dylp != skipping; then
    2010820190  COIN_HAS_DYLP_TRUE=
    2010920191  COIN_HAS_DYLP_FALSE='#'
     
    2012320205
    2012420206coin_has_osi=unavailable
    20125 if test $PACKAGE_TARNAME = osi; then
    20126   coin_has_osi=.
    20127 else
    20128   if test -d $srcdir/../Osi; then
    20129     coin_has_osi=../Osi
     20207if test x"$COIN_SKIP_PROJECTS" != x; then
     20208  for dir in $COIN_SKIP_PROJECTS; do
     20209    if test $dir = Osi; then
     20210      coin_has_osi=skipping
     20211    fi
     20212  done
     20213fi
     20214
     20215if test $coin_has_osi != skipping; then
     20216  if test $PACKAGE_TARNAME = osi; then
     20217    coin_has_osi=.
     20218  else
     20219    if test -d $srcdir/../Osi; then
     20220      coin_has_osi=../Osi
     20221    fi
    2013020222  fi
    2013120223fi
    2013220224
    20133 if test $coin_has_osi != unavailable; then
     20225if test $coin_has_osi != unavailable &&
     20226   test $coin_has_osi != skipping; then
    2013420227  # Set the #define if the component is available
    2013520228
     
    2014920242
    2015020243
    20151 if test $coin_has_osi != unavailable; then
     20244if test $coin_has_osi != unavailable &&
     20245                test $coin_has_osi != skipping; then
    2015220246  COIN_HAS_OSI_TRUE=
    2015320247  COIN_HAS_OSI_FALSE='#'
     
    2016720261
    2016820262coin_has_sym=unavailable
    20169 if test $PACKAGE_TARNAME = sym; then
    20170   coin_has_sym=.
    20171 else
    20172   if test -d $srcdir/../Sym; then
    20173     coin_has_sym=../Sym
     20263if test x"$COIN_SKIP_PROJECTS" != x; then
     20264  for dir in $COIN_SKIP_PROJECTS; do
     20265    if test $dir = Sym; then
     20266      coin_has_sym=skipping
     20267    fi
     20268  done
     20269fi
     20270
     20271if test $coin_has_sym != skipping; then
     20272  if test $PACKAGE_TARNAME = sym; then
     20273    coin_has_sym=.
     20274  else
     20275    if test -d $srcdir/../Sym; then
     20276      coin_has_sym=../Sym
     20277    fi
    2017420278  fi
    2017520279fi
    2017620280
    20177 if test $coin_has_sym != unavailable; then
     20281if test $coin_has_sym != unavailable &&
     20282   test $coin_has_sym != skipping; then
    2017820283  # Set the #define if the component is available
    2017920284
     
    2019320298
    2019420299
    20195 if test $coin_has_sym != unavailable; then
     20300if test $coin_has_sym != unavailable &&
     20301                test $coin_has_sym != skipping; then
    2019620302  COIN_HAS_SYM_TRUE=
    2019720303  COIN_HAS_SYM_FALSE='#'
     
    2021120317
    2021220318coin_has_vol=unavailable
    20213 if test $PACKAGE_TARNAME = vol; then
    20214   coin_has_vol=.
    20215 else
    20216   if test -d $srcdir/../Vol; then
    20217     coin_has_vol=../Vol
     20319if test x"$COIN_SKIP_PROJECTS" != x; then
     20320  for dir in $COIN_SKIP_PROJECTS; do
     20321    if test $dir = Vol; then
     20322      coin_has_vol=skipping
     20323    fi
     20324  done
     20325fi
     20326
     20327if test $coin_has_vol != skipping; then
     20328  if test $PACKAGE_TARNAME = vol; then
     20329    coin_has_vol=.
     20330  else
     20331    if test -d $srcdir/../Vol; then
     20332      coin_has_vol=../Vol
     20333    fi
    2021820334  fi
    2021920335fi
    2022020336
    20221 if test $coin_has_vol != unavailable; then
     20337if test $coin_has_vol != unavailable &&
     20338   test $coin_has_vol != skipping; then
    2022220339  # Set the #define if the component is available
    2022320340
     
    2023720354
    2023820355
    20239 if test $coin_has_vol != unavailable; then
     20356if test $coin_has_vol != unavailable &&
     20357                test $coin_has_vol != skipping; then
    2024020358  COIN_HAS_VOL_TRUE=
    2024120359  COIN_HAS_VOL_FALSE='#'
     
    2123621354
    2123721355# Finally, we let configure write all the output...
     21356
     21357if test x"$coin_need_flibs" = xyes; then
     21358  ADDLIBS="$ADDLIBS $FLIBS"
     21359fi
    2123821360
    2123921361cat >confcache <<\_ACEOF
     
    2204122163s,@EXEEXT@,$EXEEXT,;t t
    2204222164s,@OBJEXT@,$OBJEXT,;t t
     22165s,@ADD_CFLAGS@,$ADD_CFLAGS,;t t
    2204322166s,@MPICC@,$MPICC,;t t
    2204422167s,@CXXDEFS@,$CXXDEFS,;t t
     
    2204622169s,@CXXFLAGS@,$CXXFLAGS,;t t
    2204722170s,@ac_ct_CXX@,$ac_ct_CXX,;t t
     22171s,@ADD_CXXFLAGS@,$ADD_CXXFLAGS,;t t
    2204822172s,@MPICXX@,$MPICXX,;t t
    2204922173s,@EGREP@,$EGREP,;t t
     
    2209122215s,@BUILDTOOLSDIR@,$BUILDTOOLSDIR,;t t
    2209222216s,@AUX_DIR@,$AUX_DIR,;t t
     22217s,@abs_source_dir@,$abs_source_dir,;t t
     22218s,@abs_lib_dir@,$abs_lib_dir,;t t
     22219s,@abs_include_dir@,$abs_include_dir,;t t
     22220s,@abs_bin_dir@,$abs_bin_dir,;t t
    2209322221s,@HAVE_EXTERNALS_TRUE@,$HAVE_EXTERNALS_TRUE,;t t
    2209422222s,@HAVE_EXTERNALS_FALSE@,$HAVE_EXTERNALS_FALSE,;t t
     
    2211022238s,@LIBTOOL@,$LIBTOOL,;t t
    2211122239s,@LT_LDFLAGS@,$LT_LDFLAGS,;t t
    22112 s,@abs_source_dir@,$abs_source_dir,;t t
    22113 s,@abs_lib_dir@,$abs_lib_dir,;t t
    22114 s,@abs_include_dir@,$abs_include_dir,;t t
    22115 s,@abs_bin_dir@,$abs_bin_dir,;t t
    2211622240s,@RPATH_FLAGS@,$RPATH_FLAGS,;t t
    2211722241s,@CBCSRCDIR@,$CBCSRCDIR,;t t
     
    2303623160  for file in $coin_vpath_link_files; do
    2303723161    rm -f $file
    23038     $LN_S $srcdir/$file $file
     23162    $LN_S $abs_source_dir/$file $file
    2303923163  done
    2304023164fi
  • branches/devel/Cbc/src/Makefile.am

    r356 r381  
    211211        -I`$(CYGPATH_W) $(CGLSRCDIR)/src/CglTwomir` \
    212212        -I`$(CYGPATH_W) $(COINUTILSSRCDIR)/src` \
     213        -I`$(CYGPATH_W) $(COINUTILSOBJDIR)/inc` \
    213214        -I`$(CYGPATH_W) $(OSISRCDIR)/src`
    214215
  • branches/devel/Cbc/src/Makefile.in

    r356 r381  
    212212ACLOCAL = @ACLOCAL@
    213213ADDLIBS = @ADDLIBS@
     214ADD_CFLAGS = @ADD_CFLAGS@
     215ADD_CXXFLAGS = @ADD_CXXFLAGS@
    214216ALWAYS_FALSE_FALSE = @ALWAYS_FALSE_FALSE@
    215217ALWAYS_FALSE_TRUE = @ALWAYS_FALSE_TRUE@
     
    483485        $(CGLSRCDIR)/src/CglRedSplit` -I`$(CYGPATH_W) \
    484486        $(CGLSRCDIR)/src/CglTwomir` -I`$(CYGPATH_W) \
    485         $(COINUTILSSRCDIR)/src` -I`$(CYGPATH_W) $(OSISRCDIR)/src` \
     487        $(COINUTILSSRCDIR)/src` -I`$(CYGPATH_W) \
     488        $(COINUTILSOBJDIR)/inc` -I`$(CYGPATH_W) $(OSISRCDIR)/src` \
    486489        -DCOIN_NO_CLP_MESSAGE -DUSE_CBCCONFIG
    487490
  • branches/devel/Cbc/src/unitTestClp.cpp

    r379 r381  
    1010#include <iostream>
    1111
     12#include "CoinUtilsConfig.h"
    1213#include "CoinMpsIO.hpp"
    1314#include "CoinPackedMatrix.hpp"
  • branches/devel/Cbc/test/Makefile.in

    r352 r381  
    5757ACLOCAL = @ACLOCAL@
    5858ADDLIBS = @ADDLIBS@
     59ADD_CFLAGS = @ADD_CFLAGS@
     60ADD_CXXFLAGS = @ADD_CXXFLAGS@
    5961ALWAYS_FALSE_FALSE = @ALWAYS_FALSE_FALSE@
    6062ALWAYS_FALSE_TRUE = @ALWAYS_FALSE_TRUE@
Note: See TracChangeset for help on using the changeset viewer.