Changeset 2347


Ignore:
Timestamp:
Oct 15, 2018 6:50:01 PM (6 months ago)
Author:
stefan
Message:

add a CLP_HAS_MUMPS define and export it in config_clp.h, too

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

Legend:

Unmodified
Added
Removed
  • branches/autotools-update/Clp/configure

    r2341 r2347  
    1318713187  hardcode_into_libs=yes
    1318813188
    13189   # Add ABI-specific directories to the system library path.
    13190   sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
    13191 
    1319213189  # Ideally, we could use ldconfig to report *all* directores which are
    1319313190  # searched for libraries, however this is still not possible.  Aside from not
     
    1319813195  if test -f /etc/ld.so.conf; then
    1319913196    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[       ]*hwcap[        ]/d;s/[:,      ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
    13200     sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
     13197    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
    1320113198  fi
    1320213199
     
    1721617213  hardcode_into_libs=yes
    1721717214
    17218   # Add ABI-specific directories to the system library path.
    17219   sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
    17220 
    1722117215  # Ideally, we could use ldconfig to report *all* directores which are
    1722217216  # searched for libraries, however this is still not possible.  Aside from not
     
    1722717221  if test -f /etc/ld.so.conf; then
    1722817222    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[       ]*hwcap[        ]/d;s/[:,      ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
    17229     sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
     17223    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
    1723017224  fi
    1723117225
     
    2016920163  hardcode_into_libs=yes
    2017020164
    20171   # Add ABI-specific directories to the system library path.
    20172   sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
    20173 
    2017420165  # Ideally, we could use ldconfig to report *all* directores which are
    2017520166  # searched for libraries, however this is still not possible.  Aside from not
     
    2018020171  if test -f /etc/ld.so.conf; then
    2018120172    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[       ]*hwcap[        ]/d;s/[:,      ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
    20182     sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
     20173    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
    2018320174  fi
    2018420175
     
    2320123192  fi
    2320223193
     23194if test $coin_has_mumps = yes ; then
     23195
     23196$as_echo "#define CLP_HAS_MUMPS 1" >>confdefs.h
     23197
     23198fi
    2320323199
    2320423200# WSMP (Watson Sparse Matrix Package from IBM T.J. Watson)
  • branches/autotools-update/Clp/configure.ac

    r2341 r2347  
    126126# MUMPS
    127127AC_COIN_CHK_PKG(Mumps,[ClpLib],[coinmumps])
     128if test $coin_has_mumps = yes ; then
     129  AC_DEFINE(CLP_HAS_MUMPS, [1], [Define to 1 if MUMPS package is available])
     130fi
    128131
    129132# WSMP (Watson Sparse Matrix Package from IBM T.J. Watson)
Note: See TracChangeset for help on using the changeset viewer.