Changeset 351


Ignore:
Timestamp:
Jun 8, 2006 6:59:45 PM (13 years ago)
Author:
andreasw
Message:

applied changes in BuildTools?

Location:
trunk/Cbc
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cbc/Makefile.in

    r349 r351  
    204204MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
    205205MAKEINFO = @MAKEINFO@
     206MPICC = @MPICC@
     207MPICXX = @MPICXX@
    206208MSKINCDIR = @MSKINCDIR@
    207209MSKLIB = @MSKLIB@
  • trunk/Cbc/configure

    r349 r351  
    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 CXXDEFS CXX CXXFLAGS ac_ct_CXX 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 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 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 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'
    476476ac_subst_files=''
    477477
     
    934934ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
    935935ac_cv_env_CPPFLAGS_value=$CPPFLAGS
     936ac_env_MPICC_set=${MPICC+set}
     937ac_env_MPICC_value=$MPICC
     938ac_cv_env_MPICC_set=${MPICC+set}
     939ac_cv_env_MPICC_value=$MPICC
    936940ac_env_CXXDEFS_set=${CXXDEFS+set}
    937941ac_env_CXXDEFS_value=$CXXDEFS
     
    946950ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set}
    947951ac_cv_env_CXXFLAGS_value=$CXXFLAGS
     952ac_env_MPICXX_set=${MPICXX+set}
     953ac_env_MPICXX_value=$MPICXX
     954ac_cv_env_MPICXX_set=${MPICXX+set}
     955ac_cv_env_MPICXX_value=$MPICXX
    948956ac_env_CPP_set=${CPP+set}
    949957ac_env_CPP_value=$CPP
     
    10971105  CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
    10981106              headers in a nonstandard directory <include dir>
     1107  MPICC       C MPI Compiler
    10991108  CXXDEFS     Additional -D flags to be used when compiling C++ code.
    11001109  CXX         C++ compiler command
    11011110  CXXFLAGS    C++ compiler flags
     1111  MPICXX      C++ MPI Compiler
    11021112  CPP         C preprocessor
    11031113  CXXCPP      C++ preprocessor
     
    28002810CFLAGS="$coin_cv_cflags"
    28012811
     2812
     2813if test x"$MPICC" = x; then :; else
     2814  { echo "$as_me:$LINENO: Will use MPI C compiler $MPICC" >&5
     2815echo "$as_me: Will use MPI C compiler $MPICC" >&6;}
     2816  CC="$MPICC"
     2817fi
     2818
    28022819ac_ext=c
    28032820ac_cpp='$CPP $CPPFLAGS'
     
    35293546CXXFLAGS="$coin_cv_cxxflags"
    35303547
     3548
     3549if test x"$MPICXX" = x; then :; else
     3550  { echo "$as_me:$LINENO: Will use MPI C++ compiler $MPICXX" >&5
     3551echo "$as_me: Will use MPI C++ compiler $MPICXX" >&6;}
     3552  CXX="$MPICXX"
     3553fi
     3554
    35313555ac_ext=c
    35323556ac_cpp='$CPP $CPPFLAGS'
     
    45584582*-*-irix6*)
    45594583  # Find out which ABI we are using.
    4560   echo '#line 4560 "configure"' > conftest.$ac_ext
     4584  echo '#line 4584 "configure"' > conftest.$ac_ext
    45614585  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    45624586  (eval $ac_compile) 2>&5
     
    56925716
    56935717# Provide some information about the compiler.
    5694 echo "$as_me:5694:" \
     5718echo "$as_me:5718:" \
    56955719     "checking for Fortran 77 compiler version" >&5
    56965720ac_compiler=`set X $ac_compile; echo $2`
     
    67596783   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    67606784   -e 's:$: $lt_compiler_flag:'`
    6761    (eval echo "\"\$as_me:6761: $lt_compile\"" >&5)
     6785   (eval echo "\"\$as_me:6785: $lt_compile\"" >&5)
    67626786   (eval "$lt_compile" 2>conftest.err)
    67636787   ac_status=$?
    67646788   cat conftest.err >&5
    6765    echo "$as_me:6765: \$? = $ac_status" >&5
     6789   echo "$as_me:6789: \$? = $ac_status" >&5
    67666790   if (exit $ac_status) && test -s "$ac_outfile"; then
    67676791     # The compiler can only warn and ignore the option if not recognized
     
    70277051   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    70287052   -e 's:$: $lt_compiler_flag:'`
    7029    (eval echo "\"\$as_me:7029: $lt_compile\"" >&5)
     7053   (eval echo "\"\$as_me:7053: $lt_compile\"" >&5)
    70307054   (eval "$lt_compile" 2>conftest.err)
    70317055   ac_status=$?
    70327056   cat conftest.err >&5
    7033    echo "$as_me:7033: \$? = $ac_status" >&5
     7057   echo "$as_me:7057: \$? = $ac_status" >&5
    70347058   if (exit $ac_status) && test -s "$ac_outfile"; then
    70357059     # The compiler can only warn and ignore the option if not recognized
     
    71317155   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    71327156   -e 's:$: $lt_compiler_flag:'`
    7133    (eval echo "\"\$as_me:7133: $lt_compile\"" >&5)
     7157   (eval echo "\"\$as_me:7157: $lt_compile\"" >&5)
    71347158   (eval "$lt_compile" 2>out/conftest.err)
    71357159   ac_status=$?
    71367160   cat out/conftest.err >&5
    7137    echo "$as_me:7137: \$? = $ac_status" >&5
     7161   echo "$as_me:7161: \$? = $ac_status" >&5
    71387162   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    71397163   then
     
    94769500  lt_status=$lt_dlunknown
    94779501  cat > conftest.$ac_ext <<EOF
    9478 #line 9478 "configure"
     9502#line 9502 "configure"
    94799503#include "confdefs.h"
    94809504
     
    95769600  lt_status=$lt_dlunknown
    95779601  cat > conftest.$ac_ext <<EOF
    9578 #line 9578 "configure"
     9602#line 9602 "configure"
    95799603#include "confdefs.h"
    95809604
     
    1192011944   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1192111945   -e 's:$: $lt_compiler_flag:'`
    11922    (eval echo "\"\$as_me:11922: $lt_compile\"" >&5)
     11946   (eval echo "\"\$as_me:11946: $lt_compile\"" >&5)
    1192311947   (eval "$lt_compile" 2>conftest.err)
    1192411948   ac_status=$?
    1192511949   cat conftest.err >&5
    11926    echo "$as_me:11926: \$? = $ac_status" >&5
     11950   echo "$as_me:11950: \$? = $ac_status" >&5
    1192711951   if (exit $ac_status) && test -s "$ac_outfile"; then
    1192811952     # The compiler can only warn and ignore the option if not recognized
     
    1202412048   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1202512049   -e 's:$: $lt_compiler_flag:'`
    12026    (eval echo "\"\$as_me:12026: $lt_compile\"" >&5)
     12050   (eval echo "\"\$as_me:12050: $lt_compile\"" >&5)
    1202712051   (eval "$lt_compile" 2>out/conftest.err)
    1202812052   ac_status=$?
    1202912053   cat out/conftest.err >&5
    12030    echo "$as_me:12030: \$? = $ac_status" >&5
     12054   echo "$as_me:12054: \$? = $ac_status" >&5
    1203112055   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1203212056   then
     
    1359413618   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1359513619   -e 's:$: $lt_compiler_flag:'`
    13596    (eval echo "\"\$as_me:13596: $lt_compile\"" >&5)
     13620   (eval echo "\"\$as_me:13620: $lt_compile\"" >&5)
    1359713621   (eval "$lt_compile" 2>conftest.err)
    1359813622   ac_status=$?
    1359913623   cat conftest.err >&5
    13600    echo "$as_me:13600: \$? = $ac_status" >&5
     13624   echo "$as_me:13624: \$? = $ac_status" >&5
    1360113625   if (exit $ac_status) && test -s "$ac_outfile"; then
    1360213626     # The compiler can only warn and ignore the option if not recognized
     
    1369813722   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1369913723   -e 's:$: $lt_compiler_flag:'`
    13700    (eval echo "\"\$as_me:13700: $lt_compile\"" >&5)
     13724   (eval echo "\"\$as_me:13724: $lt_compile\"" >&5)
    1370113725   (eval "$lt_compile" 2>out/conftest.err)
    1370213726   ac_status=$?
    1370313727   cat out/conftest.err >&5
    13704    echo "$as_me:13704: \$? = $ac_status" >&5
     13728   echo "$as_me:13728: \$? = $ac_status" >&5
    1370513729   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1370613730   then
     
    1590515929   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1590615930   -e 's:$: $lt_compiler_flag:'`
    15907    (eval echo "\"\$as_me:15907: $lt_compile\"" >&5)
     15931   (eval echo "\"\$as_me:15931: $lt_compile\"" >&5)
    1590815932   (eval "$lt_compile" 2>conftest.err)
    1590915933   ac_status=$?
    1591015934   cat conftest.err >&5
    15911    echo "$as_me:15911: \$? = $ac_status" >&5
     15935   echo "$as_me:15935: \$? = $ac_status" >&5
    1591215936   if (exit $ac_status) && test -s "$ac_outfile"; then
    1591315937     # The compiler can only warn and ignore the option if not recognized
     
    1617316197   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1617416198   -e 's:$: $lt_compiler_flag:'`
    16175    (eval echo "\"\$as_me:16175: $lt_compile\"" >&5)
     16199   (eval echo "\"\$as_me:16199: $lt_compile\"" >&5)
    1617616200   (eval "$lt_compile" 2>conftest.err)
    1617716201   ac_status=$?
    1617816202   cat conftest.err >&5
    16179    echo "$as_me:16179: \$? = $ac_status" >&5
     16203   echo "$as_me:16203: \$? = $ac_status" >&5
    1618016204   if (exit $ac_status) && test -s "$ac_outfile"; then
    1618116205     # The compiler can only warn and ignore the option if not recognized
     
    1627716301   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1627816302   -e 's:$: $lt_compiler_flag:'`
    16279    (eval echo "\"\$as_me:16279: $lt_compile\"" >&5)
     16303   (eval echo "\"\$as_me:16303: $lt_compile\"" >&5)
    1628016304   (eval "$lt_compile" 2>out/conftest.err)
    1628116305   ac_status=$?
    1628216306   cat out/conftest.err >&5
    16283    echo "$as_me:16283: \$? = $ac_status" >&5
     16307   echo "$as_me:16307: \$? = $ac_status" >&5
    1628416308   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1628516309   then
     
    2192621950s,@EXEEXT@,$EXEEXT,;t t
    2192721951s,@OBJEXT@,$OBJEXT,;t t
     21952s,@MPICC@,$MPICC,;t t
    2192821953s,@CXXDEFS@,$CXXDEFS,;t t
    2192921954s,@CXX@,$CXX,;t t
    2193021955s,@CXXFLAGS@,$CXXFLAGS,;t t
    2193121956s,@ac_ct_CXX@,$ac_ct_CXX,;t t
     21957s,@MPICXX@,$MPICXX,;t t
    2193221958s,@EGREP@,$EGREP,;t t
    2193321959s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
  • trunk/Cbc/src/Makefile.in

    r349 r351  
    314314MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
    315315MAKEINFO = @MAKEINFO@
     316MPICC = @MPICC@
     317MPICXX = @MPICXX@
    316318MSKINCDIR = @MSKINCDIR@
    317319MSKLIB = @MSKLIB@
  • trunk/Cbc/test/Makefile.in

    r349 r351  
    157157MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
    158158MAKEINFO = @MAKEINFO@
     159MPICC = @MPICC@
     160MPICXX = @MPICXX@
    159161MSKINCDIR = @MSKINCDIR@
    160162MSKLIB = @MSKLIB@
Note: See TracChangeset for help on using the changeset viewer.