Changeset 827 for trunk


Ignore:
Timestamp:
Jun 25, 2006 7:43:27 PM (14 years ago)
Author:
andreasw
Message:

integrated latest fixed in BuildTools?

Location:
trunk/Clp
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/Clp/Makefile.in

    r814 r827  
    147147EXEEXT = @EXEEXT@
    148148F77 = @F77@
     149FADDLIBS = @FADDLIBS@
    149150FFLAGS = @FFLAGS@
    150151HAVE_EXTERNALS_FALSE = @HAVE_EXTERNALS_FALSE@
     
    155156INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
    156157LDFLAGS = @LDFLAGS@
     158LIBEXT = @LIBEXT@
    157159LIBOBJS = @LIBOBJS@
    158160LIBS = @LIBS@
  • trunk/Clp/configure

    r826 r827  
    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 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 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 FADDLIBS 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 COINUTILSSRCDIR COINUTILSOBJDIR COIN_HAS_COINUTILS_TRUE COIN_HAS_COINUTILS_FALSE CLPSRCDIR CLPOBJDIR COIN_HAS_CLP_TRUE COIN_HAS_CLP_FALSE LIBEXT VPATH_DISTCLEANFILES LIBOBJS LTLIBOBJS'
    476476ac_subst_files=''
    477477
     
    16421642
    16431643
     1644# Initialize the FADDLIBS variable (which is to be used with a fortran
     1645# compiler and will not include FLIBS)
     1646FADDLIBS=
     1647
     1648
    16441649# A useful makefile conditional that is always false
    16451650
     
    17281733# compiler, if the C++ is set, but the C compiler isn't (only for CXX=cl)
    17291734if test x"$CXX" != x; then
    1730   case $CXX in
     1735  case "$CXX" in
    17311736    cl*)
    17321737      if test x"$CC" = x; then
     
    17501755  *)         comps="xlc cc gcc pgcc icc" ;;
    17511756esac
     1757
     1758# We delete the cached value, since the test might not have been
     1759# performed with out choise of compilers earlier
     1760ac_cv_prog_CC=
    17521761ac_ext=c
    17531762ac_cpp='$CPP $CPPFLAGS'
     
    28632872          *) comps="xlC aCC CC g++ c++ pgCC icpc" ;;
    28642873esac
     2874
     2875# We delete the cached value, since the test might not have been
     2876# performed with out choise of compilers earlier
     2877ac_cv_prog_CXX=
    28652878ac_ext=cc
    28662879ac_cpp='$CXXCPP $CPPFLAGS'
     
    36083621  ;;
    36093622  *-mingw*)
    3610     case "$CXX" in
    3611       cl*)
    3612         coin_disable_shared=yes
    3613         platform="Msys with cl"
    3614     ;;
    3615     esac
     3623    coin_disable_shared=yes
     3624    platform="Msys"
     3625#    case "$CXX" in
     3626#      cl*)
     3627#        coin_disable_shared=yes
     3628#        platform="Msys with cl"
     3629#    ;;
     3630#    esac
    36163631  ;;
    36173632esac
     
    46204635*-*-irix6*)
    46214636  # Find out which ABI we are using.
    4622   echo '#line 4622 "configure"' > conftest.$ac_ext
     4637  echo '#line 4637 "configure"' > conftest.$ac_ext
    46234638  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    46244639  (eval $ac_compile) 2>&5
     
    57545769
    57555770# Provide some information about the compiler.
    5756 echo "$as_me:5756:" \
     5771echo "$as_me:5771:" \
    57575772     "checking for Fortran 77 compiler version" >&5
    57585773ac_compiler=`set X $ac_compile; echo $2`
     
    68216836   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    68226837   -e 's:$: $lt_compiler_flag:'`
    6823    (eval echo "\"\$as_me:6823: $lt_compile\"" >&5)
     6838   (eval echo "\"\$as_me:6838: $lt_compile\"" >&5)
    68246839   (eval "$lt_compile" 2>conftest.err)
    68256840   ac_status=$?
    68266841   cat conftest.err >&5
    6827    echo "$as_me:6827: \$? = $ac_status" >&5
     6842   echo "$as_me:6842: \$? = $ac_status" >&5
    68286843   if (exit $ac_status) && test -s "$ac_outfile"; then
    68296844     # The compiler can only warn and ignore the option if not recognized
     
    70897104   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    70907105   -e 's:$: $lt_compiler_flag:'`
    7091    (eval echo "\"\$as_me:7091: $lt_compile\"" >&5)
     7106   (eval echo "\"\$as_me:7106: $lt_compile\"" >&5)
    70927107   (eval "$lt_compile" 2>conftest.err)
    70937108   ac_status=$?
    70947109   cat conftest.err >&5
    7095    echo "$as_me:7095: \$? = $ac_status" >&5
     7110   echo "$as_me:7110: \$? = $ac_status" >&5
    70967111   if (exit $ac_status) && test -s "$ac_outfile"; then
    70977112     # The compiler can only warn and ignore the option if not recognized
     
    71937208   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    71947209   -e 's:$: $lt_compiler_flag:'`
    7195    (eval echo "\"\$as_me:7195: $lt_compile\"" >&5)
     7210   (eval echo "\"\$as_me:7210: $lt_compile\"" >&5)
    71967211   (eval "$lt_compile" 2>out/conftest.err)
    71977212   ac_status=$?
    71987213   cat out/conftest.err >&5
    7199    echo "$as_me:7199: \$? = $ac_status" >&5
     7214   echo "$as_me:7214: \$? = $ac_status" >&5
    72007215   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    72017216   then
     
    95389553  lt_status=$lt_dlunknown
    95399554  cat > conftest.$ac_ext <<EOF
    9540 #line 9540 "configure"
     9555#line 9555 "configure"
    95419556#include "confdefs.h"
    95429557
     
    96389653  lt_status=$lt_dlunknown
    96399654  cat > conftest.$ac_ext <<EOF
    9640 #line 9640 "configure"
     9655#line 9655 "configure"
    96419656#include "confdefs.h"
    96429657
     
    1198211997   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1198311998   -e 's:$: $lt_compiler_flag:'`
    11984    (eval echo "\"\$as_me:11984: $lt_compile\"" >&5)
     11999   (eval echo "\"\$as_me:11999: $lt_compile\"" >&5)
    1198512000   (eval "$lt_compile" 2>conftest.err)
    1198612001   ac_status=$?
    1198712002   cat conftest.err >&5
    11988    echo "$as_me:11988: \$? = $ac_status" >&5
     12003   echo "$as_me:12003: \$? = $ac_status" >&5
    1198912004   if (exit $ac_status) && test -s "$ac_outfile"; then
    1199012005     # The compiler can only warn and ignore the option if not recognized
     
    1208612101   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1208712102   -e 's:$: $lt_compiler_flag:'`
    12088    (eval echo "\"\$as_me:12088: $lt_compile\"" >&5)
     12103   (eval echo "\"\$as_me:12103: $lt_compile\"" >&5)
    1208912104   (eval "$lt_compile" 2>out/conftest.err)
    1209012105   ac_status=$?
    1209112106   cat out/conftest.err >&5
    12092    echo "$as_me:12092: \$? = $ac_status" >&5
     12107   echo "$as_me:12107: \$? = $ac_status" >&5
    1209312108   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1209412109   then
     
    1365613671   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1365713672   -e 's:$: $lt_compiler_flag:'`
    13658    (eval echo "\"\$as_me:13658: $lt_compile\"" >&5)
     13673   (eval echo "\"\$as_me:13673: $lt_compile\"" >&5)
    1365913674   (eval "$lt_compile" 2>conftest.err)
    1366013675   ac_status=$?
    1366113676   cat conftest.err >&5
    13662    echo "$as_me:13662: \$? = $ac_status" >&5
     13677   echo "$as_me:13677: \$? = $ac_status" >&5
    1366313678   if (exit $ac_status) && test -s "$ac_outfile"; then
    1366413679     # The compiler can only warn and ignore the option if not recognized
     
    1376013775   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1376113776   -e 's:$: $lt_compiler_flag:'`
    13762    (eval echo "\"\$as_me:13762: $lt_compile\"" >&5)
     13777   (eval echo "\"\$as_me:13777: $lt_compile\"" >&5)
    1376313778   (eval "$lt_compile" 2>out/conftest.err)
    1376413779   ac_status=$?
    1376513780   cat out/conftest.err >&5
    13766    echo "$as_me:13766: \$? = $ac_status" >&5
     13781   echo "$as_me:13781: \$? = $ac_status" >&5
    1376713782   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1376813783   then
     
    1596715982   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1596815983   -e 's:$: $lt_compiler_flag:'`
    15969    (eval echo "\"\$as_me:15969: $lt_compile\"" >&5)
     15984   (eval echo "\"\$as_me:15984: $lt_compile\"" >&5)
    1597015985   (eval "$lt_compile" 2>conftest.err)
    1597115986   ac_status=$?
    1597215987   cat conftest.err >&5
    15973    echo "$as_me:15973: \$? = $ac_status" >&5
     15988   echo "$as_me:15988: \$? = $ac_status" >&5
    1597415989   if (exit $ac_status) && test -s "$ac_outfile"; then
    1597515990     # The compiler can only warn and ignore the option if not recognized
     
    1623516250   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1623616251   -e 's:$: $lt_compiler_flag:'`
    16237    (eval echo "\"\$as_me:16237: $lt_compile\"" >&5)
     16252   (eval echo "\"\$as_me:16252: $lt_compile\"" >&5)
    1623816253   (eval "$lt_compile" 2>conftest.err)
    1623916254   ac_status=$?
    1624016255   cat conftest.err >&5
    16241    echo "$as_me:16241: \$? = $ac_status" >&5
     16256   echo "$as_me:16256: \$? = $ac_status" >&5
    1624216257   if (exit $ac_status) && test -s "$ac_outfile"; then
    1624316258     # The compiler can only warn and ignore the option if not recognized
     
    1633916354   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1634016355   -e 's:$: $lt_compiler_flag:'`
    16341    (eval echo "\"\$as_me:16341: $lt_compile\"" >&5)
     16356   (eval echo "\"\$as_me:16356: $lt_compile\"" >&5)
    1634216357   (eval "$lt_compile" 2>out/conftest.err)
    1634316358   ac_status=$?
    1634416359   cat out/conftest.err >&5
    16345    echo "$as_me:16345: \$? = $ac_status" >&5
     16360   echo "$as_me:16360: \$? = $ac_status" >&5
    1634616361   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1634716362   then
     
    1983419849      sed -e 's|fix_srcfile_path=\"`cygpath -w \"\$srcfile\"`\"|fix_srcfile_path=\"\\\`'"$CYGPATH_W"' \\\"\\$srcfile\\\"\\\`\"|' \
    1983519850          -e 's|"lib /OUT:\\$oldlib\\$oldobjs\\$old_deplibs"|"\\$AR \\$AR_FLAGS \\$oldlib\\$oldobjs\\$old_deplibs~\\$RANLIB \\$oldlib"|' \
     19851          -e 's|libext="lib"|libext="a"|' \
    1983619852      libtool > conftest.bla
    1983719853
     
    1985719873  case $build in
    1985819874    *-linux-*)
    19859       case "$CXX" in
    19860       icpc* | */icpc*)
     19875      if test "$GXX" = "yes"; then
    1986119876        RPATH_FLAGS=
    1986219877        for dir in $abs_lib_dir; do
    1986319878          RPATH_FLAGS="$RPATH_FLAGS -Wl,--rpath -Wl,$dir"
    1986419879        done
    19865       esac ;;
     19880      fi ;;
     19881    *-darwin*)
     19882        RPATH_FLAGS=nothing ;;
    1986619883    *-ibm-*)
    1986719884      case "$CXX" in
     
    2036120378# Finally, we let configure write all the output...
    2036220379
     20380FADDLIBS="$ADDLIBS"
    2036320381if test x"$coin_need_flibs" = xyes; then
    2036420382  ADDLIBS="$ADDLIBS $FLIBS"
    2036520383fi
     20384
     20385# library extension
     20386
     20387case "$CC" in
     20388  cl*) LIBEXT=lib ;;
     20389    *) LIBEXT=a ;;
     20390esac
     20391
     20392# Define VPATH_DISTCLEANFILES to be everything that needs to be
     20393# cleaned for distclean in a vpath configuration
     20394
     20395VPATH_DISTCLEANFILES="$coin_vpath_link_files"
    2036620396
    2036720397cat >confcache <<\_ACEOF
     
    2106021090s,@build_os@,$build_os,;t t
    2106121091s,@ADDLIBS@,$ADDLIBS,;t t
     21092s,@FADDLIBS@,$FADDLIBS,;t t
    2106221093s,@ALWAYS_FALSE_TRUE@,$ALWAYS_FALSE_TRUE,;t t
    2106321094s,@ALWAYS_FALSE_FALSE@,$ALWAYS_FALSE_FALSE,;t t
     
    2115621187s,@COIN_HAS_CLP_TRUE@,$COIN_HAS_CLP_TRUE,;t t
    2115721188s,@COIN_HAS_CLP_FALSE@,$COIN_HAS_CLP_FALSE,;t t
     21189s,@LIBEXT@,$LIBEXT,;t t
     21190s,@VPATH_DISTCLEANFILES@,$VPATH_DISTCLEANFILES,;t t
    2115821191s,@LIBOBJS@,$LIBOBJS,;t t
    2115921192s,@LTLIBOBJS@,$LTLIBOBJS,;t t
     
    2188321916fi
    2188421917
    21885 # Define VPATH_DISTCLEANFILES to be everything that needs to be
    21886 # cleaned for distclean in a vpath configuration
    21887 
    21888 VPATH_DISTCLEANFILES="$coin_vpath_link_files"
    21889 
    2189021918if test x$coin_projectdir = xyes; then
    2189121919  { echo "$as_me:$LINENO: Configuration of $PACKAGE_NAME successful" >&5
  • trunk/Clp/src/Makefile.in

    r814 r827  
    163163EXEEXT = @EXEEXT@
    164164F77 = @F77@
     165FADDLIBS = @FADDLIBS@
    165166FFLAGS = @FFLAGS@
    166167HAVE_EXTERNALS_FALSE = @HAVE_EXTERNALS_FALSE@
     
    171172INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
    172173LDFLAGS = @LDFLAGS@
     174LIBEXT = @LIBEXT@
    173175LIBOBJS = @LIBOBJS@
    174176
  • trunk/Clp/test/Makefile.in

    r814 r827  
    102102EXEEXT = @EXEEXT@
    103103F77 = @F77@
     104FADDLIBS = @FADDLIBS@
    104105FFLAGS = @FFLAGS@
    105106HAVE_EXTERNALS_FALSE = @HAVE_EXTERNALS_FALSE@
     
    110111INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
    111112LDFLAGS = @LDFLAGS@
     113LIBEXT = @LIBEXT@
    112114LIBOBJS = @LIBOBJS@
    113115LIBS = @LIBS@
Note: See TracChangeset for help on using the changeset viewer.