Changeset 796


Ignore:
Timestamp:
Jun 8, 2006 7:00:26 PM (14 years ago)
Author:
andreasw
Message:

applied changes in BuildTools?

Location:
trunk/Clp
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/Clp/Makefile.in

    r794 r796  
    164164MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
    165165MAKEINFO = @MAKEINFO@
     166MPICC = @MPICC@
     167MPICXX = @MPICXX@
    166168OBJEXT = @OBJEXT@
    167169PACKAGE = @PACKAGE@
  • trunk/Clp/configure

    r794 r796  
    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 COINUTILSSRCDIR COINUTILSOBJDIR COIN_HAS_COINUTILS_TRUE COIN_HAS_COINUTILS_FALSE CLPSRCDIR CLPOBJDIR COIN_HAS_CLP_TRUE COIN_HAS_CLP_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 COINUTILSSRCDIR COINUTILSOBJDIR COIN_HAS_COINUTILS_TRUE COIN_HAS_COINUTILS_FALSE CLPSRCDIR CLPOBJDIR COIN_HAS_CLP_TRUE COIN_HAS_CLP_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
     
    10741082  CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
    10751083              headers in a nonstandard directory <include dir>
     1084  MPICC       C MPI Compiler
    10761085  CXXDEFS     Additional -D flags to be used when compiling C++ code.
    10771086  CXX         C++ compiler command
    10781087  CXXFLAGS    C++ compiler flags
     1088  MPICXX      C++ MPI Compiler
    10791089  CPP         C preprocessor
    10801090  CXXCPP      C++ preprocessor
     
    27772787CFLAGS="$coin_cv_cflags"
    27782788
     2789
     2790if test x"$MPICC" = x; then :; else
     2791  { echo "$as_me:$LINENO: Will use MPI C compiler $MPICC" >&5
     2792echo "$as_me: Will use MPI C compiler $MPICC" >&6;}
     2793  CC="$MPICC"
     2794fi
     2795
    27792796ac_ext=c
    27802797ac_cpp='$CPP $CPPFLAGS'
     
    35063523CXXFLAGS="$coin_cv_cxxflags"
    35073524
     3525
     3526if test x"$MPICXX" = x; then :; else
     3527  { echo "$as_me:$LINENO: Will use MPI C++ compiler $MPICXX" >&5
     3528echo "$as_me: Will use MPI C++ compiler $MPICXX" >&6;}
     3529  CXX="$MPICXX"
     3530fi
     3531
    35083532ac_ext=c
    35093533ac_cpp='$CPP $CPPFLAGS'
     
    45354559*-*-irix6*)
    45364560  # Find out which ABI we are using.
    4537   echo '#line 4537 "configure"' > conftest.$ac_ext
     4561  echo '#line 4561 "configure"' > conftest.$ac_ext
    45384562  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    45394563  (eval $ac_compile) 2>&5
     
    56695693
    56705694# Provide some information about the compiler.
    5671 echo "$as_me:5671:" \
     5695echo "$as_me:5695:" \
    56725696     "checking for Fortran 77 compiler version" >&5
    56735697ac_compiler=`set X $ac_compile; echo $2`
     
    67366760   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    67376761   -e 's:$: $lt_compiler_flag:'`
    6738    (eval echo "\"\$as_me:6738: $lt_compile\"" >&5)
     6762   (eval echo "\"\$as_me:6762: $lt_compile\"" >&5)
    67396763   (eval "$lt_compile" 2>conftest.err)
    67406764   ac_status=$?
    67416765   cat conftest.err >&5
    6742    echo "$as_me:6742: \$? = $ac_status" >&5
     6766   echo "$as_me:6766: \$? = $ac_status" >&5
    67436767   if (exit $ac_status) && test -s "$ac_outfile"; then
    67446768     # The compiler can only warn and ignore the option if not recognized
     
    70047028   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    70057029   -e 's:$: $lt_compiler_flag:'`
    7006    (eval echo "\"\$as_me:7006: $lt_compile\"" >&5)
     7030   (eval echo "\"\$as_me:7030: $lt_compile\"" >&5)
    70077031   (eval "$lt_compile" 2>conftest.err)
    70087032   ac_status=$?
    70097033   cat conftest.err >&5
    7010    echo "$as_me:7010: \$? = $ac_status" >&5
     7034   echo "$as_me:7034: \$? = $ac_status" >&5
    70117035   if (exit $ac_status) && test -s "$ac_outfile"; then
    70127036     # The compiler can only warn and ignore the option if not recognized
     
    71087132   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    71097133   -e 's:$: $lt_compiler_flag:'`
    7110    (eval echo "\"\$as_me:7110: $lt_compile\"" >&5)
     7134   (eval echo "\"\$as_me:7134: $lt_compile\"" >&5)
    71117135   (eval "$lt_compile" 2>out/conftest.err)
    71127136   ac_status=$?
    71137137   cat out/conftest.err >&5
    7114    echo "$as_me:7114: \$? = $ac_status" >&5
     7138   echo "$as_me:7138: \$? = $ac_status" >&5
    71157139   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    71167140   then
     
    94539477  lt_status=$lt_dlunknown
    94549478  cat > conftest.$ac_ext <<EOF
    9455 #line 9455 "configure"
     9479#line 9479 "configure"
    94569480#include "confdefs.h"
    94579481
     
    95539577  lt_status=$lt_dlunknown
    95549578  cat > conftest.$ac_ext <<EOF
    9555 #line 9555 "configure"
     9579#line 9579 "configure"
    95569580#include "confdefs.h"
    95579581
     
    1189711921   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1189811922   -e 's:$: $lt_compiler_flag:'`
    11899    (eval echo "\"\$as_me:11899: $lt_compile\"" >&5)
     11923   (eval echo "\"\$as_me:11923: $lt_compile\"" >&5)
    1190011924   (eval "$lt_compile" 2>conftest.err)
    1190111925   ac_status=$?
    1190211926   cat conftest.err >&5
    11903    echo "$as_me:11903: \$? = $ac_status" >&5
     11927   echo "$as_me:11927: \$? = $ac_status" >&5
    1190411928   if (exit $ac_status) && test -s "$ac_outfile"; then
    1190511929     # The compiler can only warn and ignore the option if not recognized
     
    1200112025   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1200212026   -e 's:$: $lt_compiler_flag:'`
    12003    (eval echo "\"\$as_me:12003: $lt_compile\"" >&5)
     12027   (eval echo "\"\$as_me:12027: $lt_compile\"" >&5)
    1200412028   (eval "$lt_compile" 2>out/conftest.err)
    1200512029   ac_status=$?
    1200612030   cat out/conftest.err >&5
    12007    echo "$as_me:12007: \$? = $ac_status" >&5
     12031   echo "$as_me:12031: \$? = $ac_status" >&5
    1200812032   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1200912033   then
     
    1357113595   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1357213596   -e 's:$: $lt_compiler_flag:'`
    13573    (eval echo "\"\$as_me:13573: $lt_compile\"" >&5)
     13597   (eval echo "\"\$as_me:13597: $lt_compile\"" >&5)
    1357413598   (eval "$lt_compile" 2>conftest.err)
    1357513599   ac_status=$?
    1357613600   cat conftest.err >&5
    13577    echo "$as_me:13577: \$? = $ac_status" >&5
     13601   echo "$as_me:13601: \$? = $ac_status" >&5
    1357813602   if (exit $ac_status) && test -s "$ac_outfile"; then
    1357913603     # The compiler can only warn and ignore the option if not recognized
     
    1367513699   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1367613700   -e 's:$: $lt_compiler_flag:'`
    13677    (eval echo "\"\$as_me:13677: $lt_compile\"" >&5)
     13701   (eval echo "\"\$as_me:13701: $lt_compile\"" >&5)
    1367813702   (eval "$lt_compile" 2>out/conftest.err)
    1367913703   ac_status=$?
    1368013704   cat out/conftest.err >&5
    13681    echo "$as_me:13681: \$? = $ac_status" >&5
     13705   echo "$as_me:13705: \$? = $ac_status" >&5
    1368213706   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1368313707   then
     
    1588215906   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1588315907   -e 's:$: $lt_compiler_flag:'`
    15884    (eval echo "\"\$as_me:15884: $lt_compile\"" >&5)
     15908   (eval echo "\"\$as_me:15908: $lt_compile\"" >&5)
    1588515909   (eval "$lt_compile" 2>conftest.err)
    1588615910   ac_status=$?
    1588715911   cat conftest.err >&5
    15888    echo "$as_me:15888: \$? = $ac_status" >&5
     15912   echo "$as_me:15912: \$? = $ac_status" >&5
    1588915913   if (exit $ac_status) && test -s "$ac_outfile"; then
    1589015914     # The compiler can only warn and ignore the option if not recognized
     
    1615016174   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1615116175   -e 's:$: $lt_compiler_flag:'`
    16152    (eval echo "\"\$as_me:16152: $lt_compile\"" >&5)
     16176   (eval echo "\"\$as_me:16176: $lt_compile\"" >&5)
    1615316177   (eval "$lt_compile" 2>conftest.err)
    1615416178   ac_status=$?
    1615516179   cat conftest.err >&5
    16156    echo "$as_me:16156: \$? = $ac_status" >&5
     16180   echo "$as_me:16180: \$? = $ac_status" >&5
    1615716181   if (exit $ac_status) && test -s "$ac_outfile"; then
    1615816182     # The compiler can only warn and ignore the option if not recognized
     
    1625416278   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1625516279   -e 's:$: $lt_compiler_flag:'`
    16256    (eval echo "\"\$as_me:16256: $lt_compile\"" >&5)
     16280   (eval echo "\"\$as_me:16280: $lt_compile\"" >&5)
    1625716281   (eval "$lt_compile" 2>out/conftest.err)
    1625816282   ac_status=$?
    1625916283   cat out/conftest.err >&5
    16260    echo "$as_me:16260: \$? = $ac_status" >&5
     16284   echo "$as_me:16284: \$? = $ac_status" >&5
    1626116285   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1626216286   then
     
    2090520929s,@EXEEXT@,$EXEEXT,;t t
    2090620930s,@OBJEXT@,$OBJEXT,;t t
     20931s,@MPICC@,$MPICC,;t t
    2090720932s,@CXXDEFS@,$CXXDEFS,;t t
    2090820933s,@CXX@,$CXX,;t t
    2090920934s,@CXXFLAGS@,$CXXFLAGS,;t t
    2091020935s,@ac_ct_CXX@,$ac_ct_CXX,;t t
     20936s,@MPICXX@,$MPICXX,;t t
    2091120937s,@EGREP@,$EGREP,;t t
    2091220938s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
  • trunk/Clp/src/Makefile.in

    r794 r796  
    183183MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
    184184MAKEINFO = @MAKEINFO@
     185MPICC = @MPICC@
     186MPICXX = @MPICXX@
    185187OBJEXT = @OBJEXT@
    186188PACKAGE = @PACKAGE@
  • trunk/Clp/test/Makefile.in

    r794 r796  
    119119MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
    120120MAKEINFO = @MAKEINFO@
     121MPICC = @MPICC@
     122MPICXX = @MPICXX@
    121123OBJEXT = @OBJEXT@
    122124PACKAGE = @PACKAGE@
Note: See TracChangeset for help on using the changeset viewer.