Changeset 2314


Ignore:
Timestamp:
Feb 23, 2018 7:33:51 PM (7 months ago)
Author:
lou
Message:

A final few files to get everything in sync.

Location:
branches/autotools-update/Clp
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/autotools-update/Clp

  • branches/autotools-update/Clp/clp.pc.in

    r2310 r2314  
    88URL: https://projects.coin-or.org/Clp
    99Version: @PACKAGE_VERSION@
    10 Libs: -L${libdir} -lClp @CLPLIB_PCLIBS@
     10Libs: -L${libdir} -lClpSolver -lClp @CLPLIB_PCLIBS@
    1111Cflags: -I${includedir}
    1212Requires: @CLPLIB_PCFILES@
  • branches/autotools-update/Clp/configure

    r2310 r2314  
    2098620986  fi
    2098720987
     20988# Possibilities are `yes', 'no', or `skipping'. Normalise to `yes' or `no'.
     20989
     20990  if test "$coin_has_coinutils" != yes ; then
     20991    coin_has_coinutils=no
     20992  fi
     20993
    2098820994# Create an automake conditional COIN_HAS_PRIM.
    2098920995
     
    2099721003
    2099821004
    20999 # If we've located the package, define preprocessor symbol COIN_HAS_PRIM
    21000 # and augment the necessary variables for the client packages. We need the
    21001 # final ':' (noop) below because it's possible that PRIM is data-only and the
    21002 # list of client packages is empty.
     21005# If we've located the package, define preprocessor symbol COIN_HAS_PRIM and
     21006# augment the necessary variables for the client packages. We need the final
     21007# ':' (noop) below because it's possible that the list of client packages
     21008# is empty.
    2100321009
    2100421010  if test $coin_has_coinutils = yes ; then
     
    2125521261  fi
    2125621262
     21263# Possibilities are `yes', 'no', or `skipping'. Normalise to `yes' or `no'.
     21264
     21265  if test "$coin_has_osi" != yes ; then
     21266    coin_has_osi=no
     21267  fi
     21268
    2125721269# Create an automake conditional COIN_HAS_PRIM.
    2125821270
     
    2126621278
    2126721279
    21268 # If we've located the package, define preprocessor symbol COIN_HAS_PRIM
    21269 # and augment the necessary variables for the client packages. We need the
    21270 # final ':' (noop) below because it's possible that PRIM is data-only and the
    21271 # list of client packages is empty.
     21280# If we've located the package, define preprocessor symbol COIN_HAS_PRIM and
     21281# augment the necessary variables for the client packages. We need the final
     21282# ':' (noop) below because it's possible that the list of client packages
     21283# is empty.
    2127221284
    2127321285  if test $coin_has_osi = yes ; then
     
    2151721529  fi
    2151821530
     21531# Possibilities are `yes', 'no', or `skipping'. Normalise to `yes' or `no'.
     21532
     21533  if test "$coin_has_ositests" != yes ; then
     21534    coin_has_ositests=no
     21535  fi
     21536
    2151921537# Create an automake conditional COIN_HAS_PRIM.
    2152021538
     
    2152821546
    2152921547
    21530 # If we've located the package, define preprocessor symbol COIN_HAS_PRIM
    21531 # and augment the necessary variables for the client packages. We need the
    21532 # final ':' (noop) below because it's possible that PRIM is data-only and the
    21533 # list of client packages is empty.
     21548# If we've located the package, define preprocessor symbol COIN_HAS_PRIM and
     21549# augment the necessary variables for the client packages. We need the final
     21550# ':' (noop) below because it's possible that the list of client packages
     21551# is empty.
    2153421552
    2153521553  if test $coin_has_ositests = yes ; then
     
    2175621774  fi
    2175721775
     21776# Possibilities are `yes', 'no', or `skipping'. Normalise to `yes' or `no'.
     21777
     21778  if test "$coin_has_sample" != yes ; then
     21779    coin_has_sample=no
     21780  fi
     21781
    2175821782# Create an automake conditional COIN_HAS_PRIM.
    2175921783
     
    2176721791
    2176821792
    21769 # If we've located the package, define preprocessor symbol COIN_HAS_PRIM
    21770 # and augment the necessary variables for the client packages. We need the
    21771 # final ':' (noop) below because it's possible that PRIM is data-only and the
    21772 # list of client packages is empty.
     21793# If we've located the package, define preprocessor symbol COIN_HAS_PRIM and
     21794# augment the necessary variables for the client packages. We need the final
     21795# ':' (noop) below because it's possible that the list of client packages
     21796# is empty.
    2177321797
    2177421798  if test $coin_has_sample = yes ; then
     
    2199222016  fi
    2199322017
     22018# Possibilities are `yes', 'no', or `skipping'. Normalise to `yes' or `no'.
     22019
     22020  if test "$coin_has_netlib" != yes ; then
     22021    coin_has_netlib=no
     22022  fi
     22023
    2199422024# Create an automake conditional COIN_HAS_PRIM.
    2199522025
     
    2200322033
    2200422034
    22005 # If we've located the package, define preprocessor symbol COIN_HAS_PRIM
    22006 # and augment the necessary variables for the client packages. We need the
    22007 # final ':' (noop) below because it's possible that PRIM is data-only and the
    22008 # list of client packages is empty.
     22035# If we've located the package, define preprocessor symbol COIN_HAS_PRIM and
     22036# augment the necessary variables for the client packages. We need the final
     22037# ':' (noop) below because it's possible that the list of client packages
     22038# is empty.
    2200922039
    2201022040  if test $coin_has_netlib = yes ; then
     
    2213622166  dflt_action=yes
    2213722167
    22138 # Initialize variables for the primary package.
     22168# Initialize variables for the primary library.
    2213922169
    2214022170  coin_has_amd=noInfo
     
    2224422274  esac
    2224522275
    22246 # The final value of coin_has_prim will be yes, no, or skipping. No means
    22247 # we looked (with pkgconfig) and didn't find anything. Skipping means the
    22248 # user said `don't use.' Yes means we have something, from the user or macro
    22249 # parameters or invented. Note that we haven't run a useability test!
     22276# The final value of coin_has_prim will be yes or skipping.  Skipping means
     22277# the user said `don't use.' Yes means we have something, from the user or
     22278# macro parameters or invented. Note that we haven't run a useability test!
    2225022279
    2225122280# Change the test to enable / disable debugging output
     
    2227422303  fi
    2227522304
     22305# Possibilities are `yes' or `skipping'. Normalise to `yes' or `no'.
     22306
     22307  if test "$coin_has_amd" != yes ; then
     22308    coin_has_amd=no
     22309  fi
     22310
    2227622311# Create an automake conditional COIN_HAS_PRIM.
    2227722312
     
    2237222407  dflt_action=yes
    2237322408
    22374 # Initialize variables for the primary package.
     22409# Initialize variables for the primary library.
    2237522410
    2237622411  coin_has_cholmod=noInfo
     
    2248022515  esac
    2248122516
    22482 # The final value of coin_has_prim will be yes, no, or skipping. No means
    22483 # we looked (with pkgconfig) and didn't find anything. Skipping means the
    22484 # user said `don't use.' Yes means we have something, from the user or macro
    22485 # parameters or invented. Note that we haven't run a useability test!
     22517# The final value of coin_has_prim will be yes or skipping.  Skipping means
     22518# the user said `don't use.' Yes means we have something, from the user or
     22519# macro parameters or invented. Note that we haven't run a useability test!
    2248622520
    2248722521# Change the test to enable / disable debugging output
     
    2250822542    { $as_echo "$as_me:${as_lineno-$LINENO}: result: $coin_has_cholmod due to COIN_SKIP_PROJECTS" >&5
    2250922543$as_echo "$coin_has_cholmod due to COIN_SKIP_PROJECTS" >&6; }
     22544  fi
     22545
     22546# Possibilities are `yes' or `skipping'. Normalise to `yes' or `no'.
     22547
     22548  if test "$coin_has_cholmod" != yes ; then
     22549    coin_has_cholmod=no
    2251022550  fi
    2251122551
     
    2277422814  fi
    2277522815
     22816# Possibilities are `yes', 'no', or `skipping'. Normalise to `yes' or `no'.
     22817
     22818  if test "$coin_has_glpk" != yes ; then
     22819    coin_has_glpk=no
     22820  fi
     22821
    2277622822# Create an automake conditional COIN_HAS_PRIM.
    2277722823
     
    2278522831
    2278622832
    22787 # If we've located the package, define preprocessor symbol COIN_HAS_PRIM
    22788 # and augment the necessary variables for the client packages. We need the
    22789 # final ':' (noop) below because it's possible that PRIM is data-only and the
    22790 # list of client packages is empty.
     22833# If we've located the package, define preprocessor symbol COIN_HAS_PRIM and
     22834# augment the necessary variables for the client packages. We need the final
     22835# ':' (noop) below because it's possible that the list of client packages
     22836# is empty.
    2279122837
    2279222838  if test $coin_has_glpk = yes ; then
     
    2305623102  fi
    2305723103
     23104# Possibilities are `yes', 'no', or `skipping'. Normalise to `yes' or `no'.
     23105
     23106  if test "$coin_has_mumps" != yes ; then
     23107    coin_has_mumps=no
     23108  fi
     23109
    2305823110# Create an automake conditional COIN_HAS_PRIM.
    2305923111
     
    2306723119
    2306823120
    23069 # If we've located the package, define preprocessor symbol COIN_HAS_PRIM
    23070 # and augment the necessary variables for the client packages. We need the
    23071 # final ':' (noop) below because it's possible that PRIM is data-only and the
    23072 # list of client packages is empty.
     23121# If we've located the package, define preprocessor symbol COIN_HAS_PRIM and
     23122# augment the necessary variables for the client packages. We need the final
     23123# ':' (noop) below because it's possible that the list of client packages
     23124# is empty.
    2307323125
    2307423126  if test $coin_has_mumps = yes ; then
     
    2309423146
    2309523147
    23096 # WSMP
     23148# WSMP (Watson Sparse Matrix Package from IBM T.J. Watson)
     23149
    2309723150
    2309823151  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for package WSMP" >&5
     
    2315423207  dflt_action=no
    2315523208
    23156 # Initialize variables for the primary package.
     23209# Initialize variables for the primary library.
    2315723210
    2315823211  coin_has_wsmp=noInfo
     
    2326823321  esac
    2326923322
    23270 # The final value of coin_has_prim will be yes, no, or skipping. No means
    23271 # we looked (with pkgconfig) and didn't find anything. Skipping means the
    23272 # user said `don't use.' Yes means we have something, from the user or macro
    23273 # parameters or invented. Note that we haven't run a useability test!
     23323# The final value of coin_has_prim will be yes or skipping.  Skipping means
     23324# the user said `don't use.' Yes means we have something, from the user or
     23325# macro parameters or invented. Note that we haven't run a useability test!
    2327423326
    2327523327# Change the test to enable / disable debugging output
     
    2329823350  fi
    2329923351
     23352# Possibilities are `yes' or `skipping'. Normalise to `yes' or `no'.
     23353
     23354  if test "$coin_has_wsmp" != yes ; then
     23355    coin_has_wsmp=no
     23356  fi
     23357
    2330023358# Create an automake conditional COIN_HAS_PRIM.
    2330123359
     
    2333423392
    2333523393
    23336 if test "$use_wsmp" != "no"; then
     23394if test "$use_wsmp" = yes ; then
    2333723395  # AC_COIN_CHK_PKG_BLAS(ClpLib)
    2333823396  use_wsmp=
     
    2357223630  :
    2357323631fi
    23574  if test "$use_wsmp" != no; then
     23632 if test "$use_wsmp" = yes; then
    2357523633  COIN_HAS_WSMP_TRUE=
    2357623634  COIN_HAS_WSMP_FALSE='#'
     
    2381223870  fi
    2381323871
     23872# Possibilities are `yes', 'no', or `skipping'. Normalise to `yes' or `no'.
     23873
     23874  if test "$coin_has_asl" != yes ; then
     23875    coin_has_asl=no
     23876  fi
     23877
    2381423878# Create an automake conditional COIN_HAS_PRIM.
    2381523879
     
    2382323887
    2382423888
    23825 # If we've located the package, define preprocessor symbol COIN_HAS_PRIM
    23826 # and augment the necessary variables for the client packages. We need the
    23827 # final ':' (noop) below because it's possible that PRIM is data-only and the
    23828 # list of client packages is empty.
     23889# If we've located the package, define preprocessor symbol COIN_HAS_PRIM and
     23890# augment the necessary variables for the client packages. We need the final
     23891# ':' (noop) below because it's possible that the list of client packages
     23892# is empty.
    2382923893
    2383023894  if test $coin_has_asl = yes ; then
  • branches/autotools-update/Clp/configure.ac

    r2310 r2314  
    117117AC_COIN_CHK_PKG(Mumps,[ClpLib],[coinmumps])
    118118
    119 # WSMP
     119# WSMP (Watson Sparse Matrix Package from IBM T.J. Watson)
     120
    120121AC_COIN_CHK_LIB(WSMP,[ClpLib],[],[],[],no)
    121122
    122 if test "$use_wsmp" != "no"; then
     123if test "$use_wsmp" = yes ; then
    123124  # AC_COIN_CHK_PKG_BLAS(ClpLib)
    124125  use_wsmp=
     
    137138  :
    138139fi
    139 AM_CONDITIONAL(COIN_HAS_WSMP, [test "$use_wsmp" != no])
     140AM_CONDITIONAL(COIN_HAS_WSMP, [test "$use_wsmp" = yes])
    140141
    141142#############################################################################
Note: See TracChangeset for help on using the changeset viewer.