Changeset 814


Ignore:
Timestamp:
Jun 15, 2006 2:38:50 PM (14 years ago)
Author:
andreasw
Message:

integrated latest changes in BuildTools?

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/Clp/Makefile.in

    r797 r814  
    102102ACLOCAL = @ACLOCAL@
    103103ADDLIBS = @ADDLIBS@
     104ADD_CFLAGS = @ADD_CFLAGS@
     105ADD_CXXFLAGS = @ADD_CXXFLAGS@
    104106ALWAYS_FALSE_FALSE = @ALWAYS_FALSE_FALSE@
    105107ALWAYS_FALSE_TRUE = @ALWAYS_FALSE_TRUE@
  • trunk/Clp/configure

    r812 r814  
    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 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 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'
    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
     
    10821090  CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
    10831091              headers in a nonstandard directory <include dir>
     1092  ADD_CFLAGS  Additional C compiler options
    10841093  MPICC       C MPI Compiler
    10851094  CXXDEFS     Additional -D flags to be used when compiling C++ code.
    10861095  CXX         C++ compiler command
    10871096  CXXFLAGS    C++ compiler flags
     1097  ADD_CXXFLAGS
     1098              Additional C++ compiler options
    10881099  MPICXX      C++ MPI Compiler
    10891100  CPP         C preprocessor
     
    16451656# We set the following variable so that we know later in AC_COIN_FINALIZE
    16461657# that we are in a project main directory
    1647 
     1658coin_projectdir=yes
    16481659
    16491660
     
    26062617        case "$CC" in
    26072618          xlc* | */xlc* | mpxlc* | */mpxlc*)
    2608             coin_opt_cflags="-O3 -qarch=auto -qcache=auto -qhot -qtune=auto -qmaxmem=-1"
     2619            coin_opt_cflags="-O3 -qarch=auto -qcache=auto -qtune=auto -qmaxmem=-1"
    26092620            coin_add_cflags="-bmaxdata:0x80000000"
    26102621            coin_dbg_cflags="-g"
     
    26862697    CFLAGS="$coin_opt_cflags $coin_add_cflags -DNDEBUG $CDEFS $coin_warn_cflags"
    26872698  fi
     2699fi
     2700
     2701# Check if user wants to have additional CFLAGS options
     2702
     2703if test x"$ADD_CFLAGS" != x; then
     2704  CFLAGS="$CFLAGS $ADD_CFLAGS"
    26882705fi
    26892706
     
    33573374        case "$CXX" in
    33583375          xlC* | */xlC* | mpxlC* | */mpxlC*)
    3359             coin_opt_cxxflags="-O3 -qarch=auto -qcache=auto -qhot -qtune=auto -qmaxmem=-1"
     3376            coin_opt_cxxflags="-O3 -qarch=auto -qcache=auto -qtune=auto -qmaxmem=-1"
    33603377            coin_add_cxxflags="-bmaxdata:0x80000000 -qrtti=dyna"
    33613378            coin_dbg_cxxflags="-g"
     
    34373454    CXXFLAGS="$coin_opt_cxxflags $coin_add_cxxflags -DNDEBUG $CXXDEFS $coin_warn_cxxflags"
    34383455  fi
     3456fi
     3457
     3458# Check if user wants to have additional CXXFLAGS options
     3459
     3460if test x"$ADD_CXXFLAGS" != x; then
     3461  CXXFLAGS="$CXXFLAGS $ADD_CXXFLAGS"
    34393462fi
    34403463
     
    45974620*-*-irix6*)
    45984621  # Find out which ABI we are using.
    4599   echo '#line 4599 "configure"' > conftest.$ac_ext
     4622  echo '#line 4622 "configure"' > conftest.$ac_ext
    46004623  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    46014624  (eval $ac_compile) 2>&5
     
    57315754
    57325755# Provide some information about the compiler.
    5733 echo "$as_me:5733:" \
     5756echo "$as_me:5756:" \
    57345757     "checking for Fortran 77 compiler version" >&5
    57355758ac_compiler=`set X $ac_compile; echo $2`
     
    67986821   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    67996822   -e 's:$: $lt_compiler_flag:'`
    6800    (eval echo "\"\$as_me:6800: $lt_compile\"" >&5)
     6823   (eval echo "\"\$as_me:6823: $lt_compile\"" >&5)
    68016824   (eval "$lt_compile" 2>conftest.err)
    68026825   ac_status=$?
    68036826   cat conftest.err >&5
    6804    echo "$as_me:6804: \$? = $ac_status" >&5
     6827   echo "$as_me:6827: \$? = $ac_status" >&5
    68056828   if (exit $ac_status) && test -s "$ac_outfile"; then
    68066829     # The compiler can only warn and ignore the option if not recognized
     
    70667089   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    70677090   -e 's:$: $lt_compiler_flag:'`
    7068    (eval echo "\"\$as_me:7068: $lt_compile\"" >&5)
     7091   (eval echo "\"\$as_me:7091: $lt_compile\"" >&5)
    70697092   (eval "$lt_compile" 2>conftest.err)
    70707093   ac_status=$?
    70717094   cat conftest.err >&5
    7072    echo "$as_me:7072: \$? = $ac_status" >&5
     7095   echo "$as_me:7095: \$? = $ac_status" >&5
    70737096   if (exit $ac_status) && test -s "$ac_outfile"; then
    70747097     # The compiler can only warn and ignore the option if not recognized
     
    71707193   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    71717194   -e 's:$: $lt_compiler_flag:'`
    7172    (eval echo "\"\$as_me:7172: $lt_compile\"" >&5)
     7195   (eval echo "\"\$as_me:7195: $lt_compile\"" >&5)
    71737196   (eval "$lt_compile" 2>out/conftest.err)
    71747197   ac_status=$?
    71757198   cat out/conftest.err >&5
    7176    echo "$as_me:7176: \$? = $ac_status" >&5
     7199   echo "$as_me:7199: \$? = $ac_status" >&5
    71777200   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    71787201   then
     
    95159538  lt_status=$lt_dlunknown
    95169539  cat > conftest.$ac_ext <<EOF
    9517 #line 9517 "configure"
     9540#line 9540 "configure"
    95189541#include "confdefs.h"
    95199542
     
    96159638  lt_status=$lt_dlunknown
    96169639  cat > conftest.$ac_ext <<EOF
    9617 #line 9617 "configure"
     9640#line 9640 "configure"
    96189641#include "confdefs.h"
    96199642
     
    1195911982   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1196011983   -e 's:$: $lt_compiler_flag:'`
    11961    (eval echo "\"\$as_me:11961: $lt_compile\"" >&5)
     11984   (eval echo "\"\$as_me:11984: $lt_compile\"" >&5)
    1196211985   (eval "$lt_compile" 2>conftest.err)
    1196311986   ac_status=$?
    1196411987   cat conftest.err >&5
    11965    echo "$as_me:11965: \$? = $ac_status" >&5
     11988   echo "$as_me:11988: \$? = $ac_status" >&5
    1196611989   if (exit $ac_status) && test -s "$ac_outfile"; then
    1196711990     # The compiler can only warn and ignore the option if not recognized
     
    1206312086   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1206412087   -e 's:$: $lt_compiler_flag:'`
    12065    (eval echo "\"\$as_me:12065: $lt_compile\"" >&5)
     12088   (eval echo "\"\$as_me:12088: $lt_compile\"" >&5)
    1206612089   (eval "$lt_compile" 2>out/conftest.err)
    1206712090   ac_status=$?
    1206812091   cat out/conftest.err >&5
    12069    echo "$as_me:12069: \$? = $ac_status" >&5
     12092   echo "$as_me:12092: \$? = $ac_status" >&5
    1207012093   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1207112094   then
     
    1363313656   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1363413657   -e 's:$: $lt_compiler_flag:'`
    13635    (eval echo "\"\$as_me:13635: $lt_compile\"" >&5)
     13658   (eval echo "\"\$as_me:13658: $lt_compile\"" >&5)
    1363613659   (eval "$lt_compile" 2>conftest.err)
    1363713660   ac_status=$?
    1363813661   cat conftest.err >&5
    13639    echo "$as_me:13639: \$? = $ac_status" >&5
     13662   echo "$as_me:13662: \$? = $ac_status" >&5
    1364013663   if (exit $ac_status) && test -s "$ac_outfile"; then
    1364113664     # The compiler can only warn and ignore the option if not recognized
     
    1373713760   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1373813761   -e 's:$: $lt_compiler_flag:'`
    13739    (eval echo "\"\$as_me:13739: $lt_compile\"" >&5)
     13762   (eval echo "\"\$as_me:13762: $lt_compile\"" >&5)
    1374013763   (eval "$lt_compile" 2>out/conftest.err)
    1374113764   ac_status=$?
    1374213765   cat out/conftest.err >&5
    13743    echo "$as_me:13743: \$? = $ac_status" >&5
     13766   echo "$as_me:13766: \$? = $ac_status" >&5
    1374413767   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1374513768   then
     
    1594415967   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1594515968   -e 's:$: $lt_compiler_flag:'`
    15946    (eval echo "\"\$as_me:15946: $lt_compile\"" >&5)
     15969   (eval echo "\"\$as_me:15969: $lt_compile\"" >&5)
    1594715970   (eval "$lt_compile" 2>conftest.err)
    1594815971   ac_status=$?
    1594915972   cat conftest.err >&5
    15950    echo "$as_me:15950: \$? = $ac_status" >&5
     15973   echo "$as_me:15973: \$? = $ac_status" >&5
    1595115974   if (exit $ac_status) && test -s "$ac_outfile"; then
    1595215975     # The compiler can only warn and ignore the option if not recognized
     
    1621216235   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1621316236   -e 's:$: $lt_compiler_flag:'`
    16214    (eval echo "\"\$as_me:16214: $lt_compile\"" >&5)
     16237   (eval echo "\"\$as_me:16237: $lt_compile\"" >&5)
    1621516238   (eval "$lt_compile" 2>conftest.err)
    1621616239   ac_status=$?
    1621716240   cat conftest.err >&5
    16218    echo "$as_me:16218: \$? = $ac_status" >&5
     16241   echo "$as_me:16241: \$? = $ac_status" >&5
    1621916242   if (exit $ac_status) && test -s "$ac_outfile"; then
    1622016243     # The compiler can only warn and ignore the option if not recognized
     
    1631616339   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1631716340   -e 's:$: $lt_compiler_flag:'`
    16318    (eval echo "\"\$as_me:16318: $lt_compile\"" >&5)
     16341   (eval echo "\"\$as_me:16341: $lt_compile\"" >&5)
    1631916342   (eval "$lt_compile" 2>out/conftest.err)
    1632016343   ac_status=$?
    1632116344   cat out/conftest.err >&5
    16322    echo "$as_me:16322: \$? = $ac_status" >&5
     16345   echo "$as_me:16345: \$? = $ac_status" >&5
    1632316346   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1632416347   then
     
    2031220335# Finally, we let configure write all the output...
    2031320336
     20337if test x"$coin_need_flibs" = xyes; then
     20338  ADDLIBS="$ADDLIBS $FLIBS"
     20339fi
     20340
    2031420341cat >confcache <<\_ACEOF
    2031520342# This file is a shell script that caches the results of configure
     
    2101921046s,@EXEEXT@,$EXEEXT,;t t
    2102021047s,@OBJEXT@,$OBJEXT,;t t
     21048s,@ADD_CFLAGS@,$ADD_CFLAGS,;t t
    2102121049s,@MPICC@,$MPICC,;t t
    2102221050s,@CXXDEFS@,$CXXDEFS,;t t
     
    2102421052s,@CXXFLAGS@,$CXXFLAGS,;t t
    2102521053s,@ac_ct_CXX@,$ac_ct_CXX,;t t
     21054s,@ADD_CXXFLAGS@,$ADD_CXXFLAGS,;t t
    2102621055s,@MPICXX@,$MPICXX,;t t
    2102721056s,@EGREP@,$EGREP,;t t
  • trunk/Clp/src/Makefile.in

    r806 r814  
    118118ACLOCAL = @ACLOCAL@
    119119ADDLIBS = @ADDLIBS@
     120ADD_CFLAGS = @ADD_CFLAGS@
     121ADD_CXXFLAGS = @ADD_CXXFLAGS@
    120122ALWAYS_FALSE_FALSE = @ALWAYS_FALSE_FALSE@
    121123ALWAYS_FALSE_TRUE = @ALWAYS_FALSE_TRUE@
  • trunk/Clp/test/Makefile.in

    r797 r814  
    5757ACLOCAL = @ACLOCAL@
    5858ADDLIBS = @ADDLIBS@
     59ADD_CFLAGS = @ADD_CFLAGS@
     60ADD_CXXFLAGS = @ADD_CXXFLAGS@
    5961ALWAYS_FALSE_FALSE = @ALWAYS_FALSE_FALSE@
    6062ALWAYS_FALSE_TRUE = @ALWAYS_FALSE_TRUE@
  • trunk/Makefile.in

    r797 r814  
    9696AWK = @AWK@
    9797BUILDTOOLSDIR = @BUILDTOOLSDIR@
     98COIN_SKIP_PROJECTS = @COIN_SKIP_PROJECTS@
    9899CYGPATH_W = @CYGPATH_W@
    99100DEFS = @DEFS@
     
    128129VERSION = @VERSION@
    129130VPATH_DISTCLEANFILES = @VPATH_DISTCLEANFILES@
     131abs_bin_dir = @abs_bin_dir@
     132abs_include_dir = @abs_include_dir@
     133abs_lib_dir = @abs_lib_dir@
     134abs_source_dir = @abs_source_dir@
    130135ac_ct_STRIP = @ac_ct_STRIP@
    131136am__leading_dot = @am__leading_dot@
  • trunk/configure

    r797 r814  
    287287ac_subdirs_all="$ac_subdirs_all Data/Sample"
    288288ac_subdirs_all="$ac_subdirs_all Clp"
    289 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 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 MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBTOOLM4 have_autoconf have_automake have_svn BUILDTOOLSDIR AUX_DIR HAVE_EXTERNALS_TRUE HAVE_EXTERNALS_FALSE subdirs LIBOBJS LTLIBOBJS VPATH_DISTCLEANFILES'
     289ac_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 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 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 COIN_SKIP_PROJECTS subdirs LIBOBJS LTLIBOBJS VPATH_DISTCLEANFILES'
    290290ac_subst_files=''
    291291
     
    728728ac_cv_env_target_alias_set=${target_alias+set}
    729729ac_cv_env_target_alias_value=$target_alias
     730ac_env_COIN_SKIP_PROJECTS_set=${COIN_SKIP_PROJECTS+set}
     731ac_env_COIN_SKIP_PROJECTS_value=$COIN_SKIP_PROJECTS
     732ac_cv_env_COIN_SKIP_PROJECTS_set=${COIN_SKIP_PROJECTS+set}
     733ac_cv_env_COIN_SKIP_PROJECTS_value=$COIN_SKIP_PROJECTS
    730734
    731735#
     
    807811  --enable-maintainer-mode  enable make rules and dependencies not useful
    808812                          (and sometimes confusing) to the casual installer
     813
     814Some influential environment variables:
     815  COIN_SKIP_PROJECTS
     816              Set to the subdirectories of projects that should be skipped in
     817              the configuration
     818
     819Use these variables to override the choices made by `configure' or to help
     820it to find libraries and programs with nonstandard names/locations.
    809821
    810822Report bugs to <coin-clp@lists.coin-or.org>.
     
    20712083      have_svn=no
    20722084    fi
     2085    rm -f confauto.out
    20732086  fi
    20742087
     
    20982111fi
    20992112
    2100 
     2113# helpful variable for the base directory of this package
     2114abs_source_dir=`cd $srcdir; pwd`
     2115
     2116
     2117# Stuff for example Makefiles
     2118if test x$prefix = xNONE; then
     2119  full_prefix=$ac_default_prefix
     2120else
     2121  full_prefix=$prefix
     2122fi
     2123full_prefix=`cd $full_prefix ; pwd`
     2124
     2125abs_lib_dir=$full_prefix/lib
     2126
     2127abs_include_dir=$full_prefix/include
     2128
     2129abs_bin_dir=$full_prefix/bin
    21012130
    21022131
     
    21162145#############################################################################
    21172146
    2118 coin_subdirs=
     2147
     2148
    21192149echo "$as_me:$LINENO: checking whether directory CoinUtils is available" >&5
    21202150echo $ECHO_N "checking whether directory CoinUtils is available... $ECHO_C" >&6
    2121                 if test -r $srcdir/CoinUtils/configure; then
     2151                coin_skip=no
     2152                if test x"$COIN_SKIP_PROJECTS" != x; then
     2153                  for dir in $COIN_SKIP_PROJECTS; do
     2154                    if test $dir = CoinUtils; then
     2155                      coin_skip=yes
     2156                    fi
     2157                  done
     2158                fi
     2159                if test $coin_skip = yes; then
     2160                  echo "$as_me:$LINENO: result: skipping" >&5
     2161echo "${ECHO_T}skipping" >&6
     2162                elif test -r $srcdir/CoinUtils/configure; then
    21222163                  coin_subdirs="$coin_subdirs CoinUtils"
    21232164                  echo "$as_me:$LINENO: result: yes" >&5
     
    21422183
    21432184
    2144 coin_subdirs=
     2185
     2186
    21452187echo "$as_me:$LINENO: checking whether directory Data/Netlib is available" >&5
    21462188echo $ECHO_N "checking whether directory Data/Netlib is available... $ECHO_C" >&6
    2147                 if test -r $srcdir/Data/Netlib/configure; then
     2189                coin_skip=no
     2190                if test x"$COIN_SKIP_PROJECTS" != x; then
     2191                  for dir in $COIN_SKIP_PROJECTS; do
     2192                    if test $dir = Data/Netlib; then
     2193                      coin_skip=yes
     2194                    fi
     2195                  done
     2196                fi
     2197                if test $coin_skip = yes; then
     2198                  echo "$as_me:$LINENO: result: skipping" >&5
     2199echo "${ECHO_T}skipping" >&6
     2200                elif test -r $srcdir/Data/Netlib/configure; then
    21482201                  coin_subdirs="$coin_subdirs Data/Netlib"
    21492202                  echo "$as_me:$LINENO: result: yes" >&5
     
    21682221
    21692222
    2170 coin_subdirs=
     2223
     2224
    21712225echo "$as_me:$LINENO: checking whether directory Data/Sample is available" >&5
    21722226echo $ECHO_N "checking whether directory Data/Sample is available... $ECHO_C" >&6
    2173                 if test -r $srcdir/Data/Sample/configure; then
     2227                coin_skip=no
     2228                if test x"$COIN_SKIP_PROJECTS" != x; then
     2229                  for dir in $COIN_SKIP_PROJECTS; do
     2230                    if test $dir = Data/Sample; then
     2231                      coin_skip=yes
     2232                    fi
     2233                  done
     2234                fi
     2235                if test $coin_skip = yes; then
     2236                  echo "$as_me:$LINENO: result: skipping" >&5
     2237echo "${ECHO_T}skipping" >&6
     2238                elif test -r $srcdir/Data/Sample/configure; then
    21742239                  coin_subdirs="$coin_subdirs Data/Sample"
    21752240                  echo "$as_me:$LINENO: result: yes" >&5
     
    21942259
    21952260
    2196 coin_subdirs=
     2261
     2262
    21972263echo "$as_me:$LINENO: checking whether directory Clp is available" >&5
    21982264echo $ECHO_N "checking whether directory Clp is available... $ECHO_C" >&6
    2199                 if test -r $srcdir/Clp/configure; then
     2265                coin_skip=no
     2266                if test x"$COIN_SKIP_PROJECTS" != x; then
     2267                  for dir in $COIN_SKIP_PROJECTS; do
     2268                    if test $dir = Clp; then
     2269                      coin_skip=yes
     2270                    fi
     2271                  done
     2272                fi
     2273                if test $coin_skip = yes; then
     2274                  echo "$as_me:$LINENO: result: skipping" >&5
     2275echo "${ECHO_T}skipping" >&6
     2276                elif test -r $srcdir/Clp/configure; then
    22002277                  coin_subdirs="$coin_subdirs Clp"
    22012278                  echo "$as_me:$LINENO: result: yes" >&5
     
    22312308
    22322309# Finally, we let configure write all the output...
     2310
     2311if test x"$coin_need_flibs" = xyes; then
     2312  ADDLIBS="$ADDLIBS $FLIBS"
     2313fi
    22332314
    22342315cat >confcache <<\_ACEOF
     
    29132994s,@BUILDTOOLSDIR@,$BUILDTOOLSDIR,;t t
    29142995s,@AUX_DIR@,$AUX_DIR,;t t
     2996s,@abs_source_dir@,$abs_source_dir,;t t
     2997s,@abs_lib_dir@,$abs_lib_dir,;t t
     2998s,@abs_include_dir@,$abs_include_dir,;t t
     2999s,@abs_bin_dir@,$abs_bin_dir,;t t
    29153000s,@HAVE_EXTERNALS_TRUE@,$HAVE_EXTERNALS_TRUE,;t t
    29163001s,@HAVE_EXTERNALS_FALSE@,$HAVE_EXTERNALS_FALSE,;t t
     3002s,@COIN_SKIP_PROJECTS@,$COIN_SKIP_PROJECTS,;t t
    29173003s,@subdirs@,$subdirs,;t t
    29183004s,@LIBOBJS@,$LIBOBJS,;t t
Note: See TracChangeset for help on using the changeset viewer.