Changeset 1698 for trunk/Clp


Ignore:
Timestamp:
Mar 6, 2011 2:49:26 PM (9 years ago)
Author:
stefan
Message:

make sure COIN_HAS_BLAS conditional is always defined; rerun autotools

Location:
trunk/Clp
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Clp/configure

    r1697 r1698  
    2331423314# CHOLMOD from UFL
    2331523315# CHOLMOD requires AMD, which can be given by AMD_LIBS
    23316 # CHOLMOD requires Blas and Lapack, which should be in COINUTILS_LIBS, if available
     23316# CHOLMOD requires Blas and Lapack?
    2331723317coin_save_LIBS="$LIBS"
    2331823318LIBS="$LIBS $AMD_LIBS"
     
    2948429484  CLPLIB_LIBS_INSTALLED="$use_wsmp $CLPLIB_LIBS_INSTALLED"
    2948529485  CLPLIB_PCLIBS="$use_wsmp $CLPLIB_PCLIBS"
     29486else
     29487  # to please configure
     29488
     29489
     29490if test 0 = 1; then
     29491  COIN_HAS_BLAS_TRUE=
     29492  COIN_HAS_BLAS_FALSE='#'
     29493else
     29494  COIN_HAS_BLAS_TRUE='#'
     29495  COIN_HAS_BLAS_FALSE=
     29496fi
     29497
    2948629498fi
    2948729499
     
    3039830410Usually this means the macro was only invoked conditionally." >&5
    3039930411echo "$as_me: error: conditional \"COIN_HAS_MUMPS\" was never defined.
     30412Usually this means the macro was only invoked conditionally." >&2;}
     30413   { (exit 1); exit 1; }; }
     30414fi
     30415if test -z "${COIN_HAS_BLAS_TRUE}" && test -z "${COIN_HAS_BLAS_FALSE}"; then
     30416  { { echo "$as_me:$LINENO: error: conditional \"COIN_HAS_BLAS\" was never defined.
     30417Usually this means the macro was only invoked conditionally." >&5
     30418echo "$as_me: error: conditional \"COIN_HAS_BLAS\" was never defined.
    3040030419Usually this means the macro was only invoked conditionally." >&2;}
    3040130420   { (exit 1); exit 1; }; }
  • trunk/Clp/configure.ac

    r1695 r1698  
    126126  CLPLIB_LIBS_INSTALLED="$use_wsmp $CLPLIB_LIBS_INSTALLED"
    127127  CLPLIB_PCLIBS="$use_wsmp $CLPLIB_PCLIBS"
     128else
     129  # to please configure
     130  AM_CONDITIONAL(COIN_HAS_BLAS, [test 0 = 1])
    128131fi
    129132AM_CONDITIONAL(COIN_HAS_WSMP, [test "$use_wsmp" != no])
Note: See TracChangeset for help on using the changeset viewer.