Changeset 1684


Ignore:
Timestamp:
Sep 13, 2010 3:38:18 AM (10 years ago)
Author:
stefan
Message:

change from COIN_HAS_MODULE to COIN_HAS_PACKAGE

Location:
ThirdParty/Mumps/trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • ThirdParty/Mumps/trunk/Makefile.in

    r1652 r1684  
    215215MUMPSOBJDIR = @MUMPSOBJDIR@
    216216MUMPSSRCDIR = @MUMPSSRCDIR@
     217MUMPS_LIBS = @MUMPS_LIBS@
     218MUMPS_PCLIBS = @MUMPS_PCLIBS@
     219MUMPS_PCREQUIRES = @MUMPS_PCREQUIRES@
    217220MUMPS_SVN_REV = @MUMPS_SVN_REV@
    218221MY_DEFS = @MY_DEFS@
    … …  
    231234PKG_CONFIG = @PKG_CONFIG@
    232235RANLIB = @RANLIB@
    233 REQUIREDPACKAGES = @REQUIREDPACKAGES@
    234236RPATH_FLAGS = @RPATH_FLAGS@
    235237SET_MAKE = @SET_MAKE@

  • ThirdParty/Mumps/trunk/coinmumps-uninstalled.pc.in

    r1620 r1684  
    55Description: Multifrontal Massively Parallel sparse direct Solver
    66Version: 4.9
    7 Libs: -L${libdir} -lcoinmumps @PCADDLIBS@
     7Libs: -L${libdir} -lcoinmumps @MUMPS_PCLIBS@
    88Cflags: -I@abs_source_dir@/MUMPS/libseq -I@abs_source_dir@/MUMPS/include
    9 Requires: @REQUIREDPACKAGES@
     9Requires: @MUMPS_PCREQUIRES@

  • ThirdParty/Mumps/trunk/coinmumps.pc.in

    r1620 r1684  
    77Description: Multifrontal Massively Parallel sparse direct Solver
    88Version: 4.9
    9 Libs: -L${libdir} -lcoinmumps @PCADDLIBS@
     9Libs: -L${libdir} -lcoinmumps @MUMPS_PCLIBS@
    1010Cflags: -I${includedir}
    11 Requires: @REQUIREDPACKAGES@
     11Requires: @MUMPS_PCREQUIRES@

  • ThirdParty/Mumps/trunk/configure

    r1673 r1684  
    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 ADDLIBS PCADDLIBS FADDLIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE have_svnversion MUMPS_SVN_REV build build_cpu build_vendor build_os CDEFS ADD_CFLAGS DBG_CFLAGS OPT_CFLAGS sol_cc_compiler CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT MPICC ADD_FFLAGS DBG_FFLAGS OPT_FFLAGS F77 FFLAGS ac_ct_F77 MPIF77 FLIBS CPP EGREP MY_DEFS 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 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 CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP LIBTOOL ac_c_preproc_warn_flag ac_cxx_preproc_warn_flag RPATH_FLAGS LT_LDFLAGS PKG_CONFIG ac_pt_PKG_CONFIG COIN_HAS_PKGCONFIG_TRUE COIN_HAS_PKGCONFIG_FALSE COIN_PKG_CONFIG_PATH COIN_PKG_CONFIG_PATH_UNINSTALLED BLAS_LIBS BLAS_CFLAGS BLAS_DATA REQUIREDPACKAGES COIN_HAS_BLAS_TRUE COIN_HAS_BLAS_FALSE METIS_LIBS METIS_CFLAGS METIS_DATA COIN_HAS_METIS_TRUE COIN_HAS_METIS_FALSE MUMPSDIR MUMPSOBJDIR MUMPSSRCDIR MY_FDEFS LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR LIBOBJS LTLIBOBJS'
     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 ADDLIBS PCADDLIBS FADDLIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE have_svnversion MUMPS_SVN_REV build build_cpu build_vendor build_os CDEFS ADD_CFLAGS DBG_CFLAGS OPT_CFLAGS sol_cc_compiler CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT MPICC ADD_FFLAGS DBG_FFLAGS OPT_FFLAGS F77 FFLAGS ac_ct_F77 MPIF77 FLIBS CPP EGREP MY_DEFS 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 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 CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP LIBTOOL ac_c_preproc_warn_flag ac_cxx_preproc_warn_flag RPATH_FLAGS LT_LDFLAGS PKG_CONFIG ac_pt_PKG_CONFIG COIN_HAS_PKGCONFIG_TRUE COIN_HAS_PKGCONFIG_FALSE COIN_PKG_CONFIG_PATH COIN_PKG_CONFIG_PATH_UNINSTALLED BLAS_LIBS BLAS_CFLAGS BLAS_DATA MUMPS_LIBS MUMPS_PCLIBS MUMPS_PCREQUIRES COIN_HAS_BLAS_TRUE COIN_HAS_BLAS_FALSE METIS_LIBS METIS_CFLAGS METIS_DATA COIN_HAS_METIS_TRUE COIN_HAS_METIS_FALSE MUMPSDIR MUMPSOBJDIR MUMPSSRCDIR MY_FDEFS LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR LIBOBJS LTLIBOBJS'
    476476ac_subst_files=''
    477477
    … …  
    11091109  --with-coin-instdir     prefix of installation directory for precompiled
    11101110                          COIN packages
    1111   --with-blas-lib linker flags for using module Blas
    1112   --with-blas-incdir directory with header files for using module Blas
    1113   --with-blas-datadir directory with data files for using module Blas
    1114   --with-metis-lib linker flags for using module Metis
    1115   --with-metis-incdir directory with header files for using module Metis
    1116   --with-metis-datadir directory with data files for using module Metis
     1111  --with-blas-lib linker flags for using package Blas
     1112  --with-blas-incdir directory with header files for using package Blas
     1113  --with-blas-datadir directory with data files for using package Blas
     1114  --with-metis-lib linker flags for using package Metis
     1115  --with-metis-incdir directory with header files for using package Metis
     1116  --with-metis-datadir directory with data files for using package Metis
    11171117
    11181118Some influential environment variables:
    … …  
    16521652fi
    16531653
    1654 # Set the project's SVN revision number
     1654# Set the project's SVN revision number. The complicated sed expression
     1655# (made worse by quadrigraphs) ensures that things like 4123:4168MS end up
     1656# as a single number.
    16551657# Extract the first word of "svnversion", so it can be a program name with args.
    16561658set dummy svnversion; ac_word=$2
    … …  
    16911693if test "x$have_svnversion" = xyes && test "xMumps" != x; then
    16921694
    1693   MUMPS_SVN_REV=`cd $srcdir/$coin_has_mumps ; svnversion`
     1695  svn_rev_tmp=`cd $srcdir/$coin_has_mumps ; svnversion`
     1696  MUMPS_SVN_REV=`echo $svn_rev_tmp | sed -n -e 's/^[0-9]*://' -e 's/\([0-9]\)[^0-9]*$/\1/p'`
    16941697  if test $MUMPS_SVN_REV != exported; then
    16951698
    16961699cat >>confdefs.h <<_ACEOF
    1697 #define MUMPS_SVN_REV "$MUMPS_SVN_REV"
     1700#define MUMPS_SVN_REV $MUMPS_SVN_REV
    16981701_ACEOF
    16991702
    … …  
    33743377
    33753378# Provide some information about the compiler.
    3376 echo "$as_me:3376:" \
     3379echo "$as_me:3379:" \
    33773380     "checking for Fortran 77 compiler version" >&5
    33783381ac_compiler=`set X $ac_compile; echo $2`
    … …  
    39423945ac_save_FFLAGS=$FFLAGS
    39433946FFLAGS="$FFLAGS $ac_verb"
    3944 (eval echo $as_me:3944: \"$ac_link\") >&5
     3947(eval echo $as_me:3947: \"$ac_link\") >&5
    39453948ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
    39463949echo "$ac_f77_v_output" >&5
    … …  
    40204023ac_save_FFLAGS=$FFLAGS
    40214024FFLAGS="$FFLAGS $ac_cv_prog_f77_v"
    4022 (eval echo $as_me:4022: \"$ac_link\") >&5
     4025(eval echo $as_me:4025: \"$ac_link\") >&5
    40234026ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
    40244027echo "$ac_f77_v_output" >&5
    … …  
    47714774
    47724775
    4773 # Tell FINALIZE to add FLIBS to ADDLIBS, so that they get into the .pc files
    4774 coin_need_flibs=yes
     4776# Add FLIBS to MUMPS_PCLIBS, so that they get into the .pc files
     4777MUMPS_PCLIBS="$FLIBS"
    47754778
    47764779# We need to translate the result from autoconf to what MUMPS wants
    … …  
    70797082*-*-irix6*)
    70807083  # Find out which ABI we are using.
    7081   echo '#line 7081 "configure"' > conftest.$ac_ext
     7084  echo '#line 7084 "configure"' > conftest.$ac_ext
    70827085  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    70837086  (eval $ac_compile) 2>&5
    … …  
    90759078   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    90769079   -e 's:$: $lt_compiler_flag:'`
    9077    (eval echo "\"\$as_me:9077: $lt_compile\"" >&5)
     9080   (eval echo "\"\$as_me:9080: $lt_compile\"" >&5)
    90789081   (eval "$lt_compile" 2>conftest.err)
    90799082   ac_status=$?
    90809083   cat conftest.err >&5
    9081    echo "$as_me:9081: \$? = $ac_status" >&5
     9084   echo "$as_me:9084: \$? = $ac_status" >&5
    90829085   if (exit $ac_status) && test -s "$ac_outfile"; then
    90839086     # The compiler can only warn and ignore the option if not recognized
    … …  
    93439346   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    93449347   -e 's:$: $lt_compiler_flag:'`
    9345    (eval echo "\"\$as_me:9345: $lt_compile\"" >&5)
     9348   (eval echo "\"\$as_me:9348: $lt_compile\"" >&5)
    93469349   (eval "$lt_compile" 2>conftest.err)
    93479350   ac_status=$?
    93489351   cat conftest.err >&5
    9349    echo "$as_me:9349: \$? = $ac_status" >&5
     9352   echo "$as_me:9352: \$? = $ac_status" >&5
    93509353   if (exit $ac_status) && test -s "$ac_outfile"; then
    93519354     # The compiler can only warn and ignore the option if not recognized
    … …  
    94479450   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    94489451   -e 's:$: $lt_compiler_flag:'`
    9449    (eval echo "\"\$as_me:9449: $lt_compile\"" >&5)
     9452   (eval echo "\"\$as_me:9452: $lt_compile\"" >&5)
    94509453   (eval "$lt_compile" 2>out/conftest.err)
    94519454   ac_status=$?
    94529455   cat out/conftest.err >&5
    9453    echo "$as_me:9453: \$? = $ac_status" >&5
     9456   echo "$as_me:9456: \$? = $ac_status" >&5
    94549457   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    94559458   then
    … …  
    1186411867  lt_status=$lt_dlunknown
    1186511868  cat > conftest.$ac_ext <<EOF
    11866 #line 11866 "configure"
     11869#line 11869 "configure"
    1186711870#include "confdefs.h"
    1186811871
    … …  
    1196411967  lt_status=$lt_dlunknown
    1196511968  cat > conftest.$ac_ext <<EOF
    11966 #line 11966 "configure"
     11969#line 11969 "configure"
    1196711970#include "confdefs.h"
    1196811971
    … …  
    1432414327   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1432514328   -e 's:$: $lt_compiler_flag:'`
    14326    (eval echo "\"\$as_me:14326: $lt_compile\"" >&5)
     14329   (eval echo "\"\$as_me:14329: $lt_compile\"" >&5)
    1432714330   (eval "$lt_compile" 2>conftest.err)
    1432814331   ac_status=$?
    1432914332   cat conftest.err >&5
    14330    echo "$as_me:14330: \$? = $ac_status" >&5
     14333   echo "$as_me:14333: \$? = $ac_status" >&5
    1433114334   if (exit $ac_status) && test -s "$ac_outfile"; then
    1433214335     # The compiler can only warn and ignore the option if not recognized
    … …  
    1442814431   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1442914432   -e 's:$: $lt_compiler_flag:'`
    14430    (eval echo "\"\$as_me:14430: $lt_compile\"" >&5)
     14433   (eval echo "\"\$as_me:14433: $lt_compile\"" >&5)
    1443114434   (eval "$lt_compile" 2>out/conftest.err)
    1443214435   ac_status=$?
    1443314436   cat out/conftest.err >&5
    14434    echo "$as_me:14434: \$? = $ac_status" >&5
     14437   echo "$as_me:14437: \$? = $ac_status" >&5
    1443514438   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1443614439   then
    … …  
    1599816001   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1599916002   -e 's:$: $lt_compiler_flag:'`
    16000    (eval echo "\"\$as_me:16000: $lt_compile\"" >&5)
     16003   (eval echo "\"\$as_me:16003: $lt_compile\"" >&5)
    1600116004   (eval "$lt_compile" 2>conftest.err)
    1600216005   ac_status=$?
    1600316006   cat conftest.err >&5
    16004    echo "$as_me:16004: \$? = $ac_status" >&5
     16007   echo "$as_me:16007: \$? = $ac_status" >&5
    1600516008   if (exit $ac_status) && test -s "$ac_outfile"; then
    1600616009     # The compiler can only warn and ignore the option if not recognized
    … …  
    1610216105   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1610316106   -e 's:$: $lt_compiler_flag:'`
    16104    (eval echo "\"\$as_me:16104: $lt_compile\"" >&5)
     16107   (eval echo "\"\$as_me:16107: $lt_compile\"" >&5)
    1610516108   (eval "$lt_compile" 2>out/conftest.err)
    1610616109   ac_status=$?
    1610716110   cat out/conftest.err >&5
    16108    echo "$as_me:16108: \$? = $ac_status" >&5
     16111   echo "$as_me:16111: \$? = $ac_status" >&5
    1610916112   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1611016113   then
    … …  
    1830918312   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1831018313   -e 's:$: $lt_compiler_flag:'`
    18311    (eval echo "\"\$as_me:18311: $lt_compile\"" >&5)
     18314   (eval echo "\"\$as_me:18314: $lt_compile\"" >&5)
    1831218315   (eval "$lt_compile" 2>conftest.err)
    1831318316   ac_status=$?
    1831418317   cat conftest.err >&5
    18315    echo "$as_me:18315: \$? = $ac_status" >&5
     18318   echo "$as_me:18318: \$? = $ac_status" >&5
    1831618319   if (exit $ac_status) && test -s "$ac_outfile"; then
    1831718320     # The compiler can only warn and ignore the option if not recognized
    … …  
    1857718580   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1857818581   -e 's:$: $lt_compiler_flag:'`
    18579    (eval echo "\"\$as_me:18579: $lt_compile\"" >&5)
     18582   (eval echo "\"\$as_me:18582: $lt_compile\"" >&5)
    1858018583   (eval "$lt_compile" 2>conftest.err)
    1858118584   ac_status=$?
    1858218585   cat conftest.err >&5
    18583    echo "$as_me:18583: \$? = $ac_status" >&5
     18586   echo "$as_me:18586: \$? = $ac_status" >&5
    1858418587   if (exit $ac_status) && test -s "$ac_outfile"; then
    1858518588     # The compiler can only warn and ignore the option if not recognized
    … …  
    1868118684   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1868218685   -e 's:$: $lt_compiler_flag:'`
    18683    (eval echo "\"\$as_me:18683: $lt_compile\"" >&5)
     18686   (eval echo "\"\$as_me:18686: $lt_compile\"" >&5)
    1868418687   (eval "$lt_compile" 2>out/conftest.err)
    1868518688   ac_status=$?
    1868618689   cat out/conftest.err >&5
    18687    echo "$as_me:18687: \$? = $ac_status" >&5
     18690   echo "$as_me:18690: \$? = $ac_status" >&5
    1868818691   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1868918692   then
    … …  
    2179421797fi;
    2179521798
    21796 #if user specified --with-blas-lib, then we should give COIN_HAS_MODULE preference
     21799#if user specified --with-blas-lib, then we should give COIN_HAS_PACKAGE preference
    2179721800
    2179821801# Check whether --with-blas-lib or --without-blas-lib was given.
    … …  
    2219822201      echo "$as_me:$LINENO: checking whether -lcomplib.sgimath has BLAS" >&5
    2219922202echo $ECHO_N "checking whether -lcomplib.sgimath has BLAS... $ECHO_C" >&6
    22200       SAVE_LIBS="$LIBS"
     22203      coin_save_LIBS="$LIBS"
    2220122204      LIBS="-lcomplib.sgimath $LIBS"
    2220222205      case $ac_ext in
    … …  
    2225622259echo "$as_me:$LINENO: result: no" >&5
    2225722260echo "${ECHO_T}no" >&6
    22258                          SAVE_LIBS="$LIBS"
    2225922261fi
    2226022262rm -f conftest.err conftest.$ac_objext \
    … …  
    2240422406                     echo "$as_me:$LINENO: result: no" >&5
    2240522407echo "${ECHO_T}no" >&6
    22406                          SAVE_LIBS="$LIBS"
    2240722408fi
    2240822409rm -f conftest.err conftest.$ac_objext \
    … …  
    2241122412        echo "$as_me:$LINENO: result: no" >&5
    2241222413echo "${ECHO_T}no" >&6
    22413                          SAVE_LIBS="$LIBS"
    2241422414      fi
    2241522415    fi
    … …  
    2255822558                     echo "$as_me:$LINENO: result: no" >&5
    2255922559echo "${ECHO_T}no" >&6
    22560                          SAVE_LIBS="$LIBS"
    2256122560fi
    2256222561rm -f conftest.err conftest.$ac_objext \
    … …  
    2256522564        echo "$as_me:$LINENO: result: no" >&5
    2256622565echo "${ECHO_T}no" >&6
    22567                          SAVE_LIBS="$LIBS"
    2256822566      fi
    2256922567    fi
    … …  
    2257122569esac
    2257222570
     22571      LIBS="$coin_save_LIBS"
    2257322572      ;;
    2257422573
    … …  
    2258022579# libraries to be linked for C++ and C. We can arrange that explicitly.
    2258122580    *-*-solaris*)
    22582       SAVE_LIBS="$LIBS"
    2258322581      echo "$as_me:$LINENO: checking for BLAS in libsunperf" >&5
    2258422582echo $ECHO_N "checking for BLAS in libsunperf... $ECHO_C" >&6
     22583      coin_save_LIBS="$LIBS"
    2258522584      LIBS="-lsunperf $FLIBS $LIBS"
    2258622585      case $ac_ext in
    … …  
    2264122640echo "$as_me:$LINENO: result: no" >&5
    2264222641echo "${ECHO_T}no" >&6
    22643                          LIBS="$SAVE_LIBS"
    2264422642fi
    2264522643rm -f conftest.err conftest.$ac_objext \
    … …  
    2279122789                     echo "$as_me:$LINENO: result: no" >&5
    2279222790echo "${ECHO_T}no" >&6
    22793                          LIBS="$SAVE_LIBS"
    2279422791fi
    2279522792rm -f conftest.err conftest.$ac_objext \
    … …  
    2279822795        echo "$as_me:$LINENO: result: no" >&5
    2279922796echo "${ECHO_T}no" >&6
    22800                          LIBS="$SAVE_LIBS"
    2280122797      fi
    2280222798    fi
    … …  
    2294722943                     echo "$as_me:$LINENO: result: no" >&5
    2294822944echo "${ECHO_T}no" >&6
    22949                          LIBS="$SAVE_LIBS"
    2295022945fi
    2295122946rm -f conftest.err conftest.$ac_objext \
    … …  
    2295422949        echo "$as_me:$LINENO: result: no" >&5
    2295522950echo "${ECHO_T}no" >&6
    22956                          LIBS="$SAVE_LIBS"
    2295722951      fi
    2295822952    fi
    … …  
    2296022954esac
    2296122955
     22956      LIBS="$coin_save_LIBS"
    2296222957      ;;
    2296322958    *-cygwin* | *-mingw*)
    … …  
    2296922964      case "$CC" in
    2297022965        cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    22971           SAVE_LIBS="$LIBS"
    2297222966          echo "$as_me:$LINENO: checking for BLAS in MKL" >&5
    2297322967echo $ECHO_N "checking for BLAS in MKL... $ECHO_C" >&6
     22968          coin_save_LIBS="$LIBS"
    2297422969          LIBS="mkl_intel_c.lib mkl_sequential.lib mkl_core.lib $LIBS"
    2297522970          case $ac_ext in
    … …  
    2302923024echo "$as_me:$LINENO: result: no" >&5
    2303023025echo "${ECHO_T}no" >&6
    23031                              LIBS="$SAVE_LIBS"
    2303223026fi
    2303323027rm -f conftest.err conftest.$ac_objext \
    … …  
    2317723171                     echo "$as_me:$LINENO: result: no" >&5
    2317823172echo "${ECHO_T}no" >&6
    23179                              LIBS="$SAVE_LIBS"
    2318023173fi
    2318123174rm -f conftest.err conftest.$ac_objext \
    … …  
    2318423177        echo "$as_me:$LINENO: result: no" >&5
    2318523178echo "${ECHO_T}no" >&6
    23186                              LIBS="$SAVE_LIBS"
    2318723179      fi
    2318823180    fi
    … …  
    2333123323                     echo "$as_me:$LINENO: result: no" >&5
    2333223324echo "${ECHO_T}no" >&6
    23333                              LIBS="$SAVE_LIBS"
    2333423325fi
    2333523326rm -f conftest.err conftest.$ac_objext \
    … …  
    2333823329        echo "$as_me:$LINENO: result: no" >&5
    2333923330echo "${ECHO_T}no" >&6
    23340                              LIBS="$SAVE_LIBS"
    2334123331      fi
    2334223332    fi
    … …  
    2334423334esac
    2334523335
     23336          LIBS="$coin_save_LIBS"
    2334623337          ;;
    2334723338      esac
    … …  
    2335023341
    2335123342  if test -z "$use_blas" && test $skip_lblas_check = no; then
    23352     SAVE_LIBS="$LIBS"
    2335323343    echo "$as_me:$LINENO: checking whether -lblas has BLAS" >&5
    2335423344echo $ECHO_N "checking whether -lblas has BLAS... $ECHO_C" >&6
     23345    coin_save_LIBS="$LIBS"
    2335523346    LIBS="-lblas $LIBS"
    2335623347    case $ac_ext in
    … …  
    2341023401echo "$as_me:$LINENO: result: no" >&5
    2341123402echo "${ECHO_T}no" >&6
    23412                        LIBS="$SAVE_LIBS"
    2341323403fi
    2341423404rm -f conftest.err conftest.$ac_objext \
    … …  
    2355823548                     echo "$as_me:$LINENO: result: no" >&5
    2355923549echo "${ECHO_T}no" >&6
    23560                        LIBS="$SAVE_LIBS"
    2356123550fi
    2356223551rm -f conftest.err conftest.$ac_objext \
    … …  
    2356523554        echo "$as_me:$LINENO: result: no" >&5
    2356623555echo "${ECHO_T}no" >&6
    23567                        LIBS="$SAVE_LIBS"
    2356823556      fi
    2356923557    fi
    … …  
    2371223700                     echo "$as_me:$LINENO: result: no" >&5
    2371323701echo "${ECHO_T}no" >&6
    23714                        LIBS="$SAVE_LIBS"
    2371523702fi
    2371623703rm -f conftest.err conftest.$ac_objext \
    … …  
    2371923706        echo "$as_me:$LINENO: result: no" >&5
    2372023707echo "${ECHO_T}no" >&6
    23721                        LIBS="$SAVE_LIBS"
    2372223708      fi
    2372323709    fi
    … …  
    2372523711esac
    2372623712
     23713    LIBS="$coin_save_LIBS"
    2372723714  fi
    23728   LIBS="$SAVE_LIBS"
    2372923715
    2373023716  # If we have no other ideas, consider building BLAS.
    … …  
    2373623722if test "x$use_blas" = xBUILD ; then
    2373723723
    23738 echo "$as_me:$LINENO: checking for COIN-OR module Blas" >&5
    23739 echo $ECHO_N "checking for COIN-OR module Blas... $ECHO_C" >&6
     23724echo "$as_me:$LINENO: checking for COIN-OR package Blas" >&5
     23725echo $ECHO_N "checking for COIN-OR package Blas... $ECHO_C" >&6
    2374023726
    2374123727coin_has_blas=notGiven
    2374223728
    23743 # check if user wants to skip module in any case
     23729# check if user wants to skip package in any case
    2374423730if test x"$COIN_SKIP_PROJECTS" != x; then
    2374523731  for dir in $COIN_SKIP_PROJECTS; do
    … …  
    2375823744
    2375923745
     23746
     23747
     23748
     23749
    2376023750#check if user provided LIBS, CFLAGS, or DATA for module
    2376123751if test $coin_has_blas != skipping; then
    … …  
    2376723757  coin_has_blas=yes
    2376823758       BLAS_LIBS="$withval"
    23769        PCADDLIBS="$withval $PCADDLIBS"
     23759
     23760         MUMPS_PCLIBS="$withval $MUMPS_PCLIBS"
     23761         MUMPS_LIBS="$withval $MUMPS_LIBS"
     23762
    2377023763
    2377123764fi;
    … …  
    2377723770  coin_has_blas=yes
    2377823771     BLAS_CFLAGS="-I`${CYGPATH_W} $withval`"
     23772     MUMPS_CFLAGS="$withval $MUMPS_CFLAGS"
     23773
     23774
    2377923775fi;
    2378023776
    … …  
    2381723813        echo "$as_me:$LINENO: result: yes: $BLAS_VERSIONS" >&5
    2381823814echo "${ECHO_T}yes: $BLAS_VERSIONS" >&6
    23819         REQUIREDPACKAGES="coinblas $REQUIREDPACKAGES"
     23815        MUMPS_PCREQUIRES="coinblas $MUMPS_PCREQUIRES"
     23816
    2382023817
    2382123818
    … …  
    2383923836    PKG_CONFIG_PATH="$coin_save_PKG_CONFIG_PATH"
    2384023837    export PKG_CONFIG_PATH
     23838
     23839    # augment X_CFLAGS and X_LIBS for each build target X in MUMPS
     23840
     23841      MUMPS_CFLAGS="$BLAS_CFLAGS $MUMPS_CFLAGS"
     23842      MUMPS_LIBS="$BLAS_LIBS $MUMPS_LIBS"
     23843
    2384123844  else
    2384223845    echo "$as_me:$LINENO: result: skipped check via pkg-config, redirect to fallback" >&5
    2384323846echo "${ECHO_T}skipped check via pkg-config, redirect to fallback" >&6
    2384423847
    23845 echo "$as_me:$LINENO: checking for COIN-OR module Blas (fallback)" >&5
    23846 echo $ECHO_N "checking for COIN-OR module Blas (fallback)... $ECHO_C" >&6
     23848echo "$as_me:$LINENO: checking for COIN-OR package Blas (fallback)" >&5
     23849echo $ECHO_N "checking for COIN-OR package Blas (fallback)... $ECHO_C" >&6
    2384723850
    2384823851coin_has_blas=notGiven
    … …  
    2385023853BLAS_CFLAGS=
    2385123854BLAS_DATA=
    23852 
    2385323855
    2385423856# initial list of dependencies is "coinblas", but we need to filter out version number specifications (= x, <= x, >= x)
    … …  
    2392623928  projtoprocess="$nextprojtoprocess"
    2392723929
     23930  # if there are no more projects to search for, finish up
    2392823931  if test "x$projtoprocess" = x ; then
    2392923932    coin_has_blas=yes
    … …  
    2393123934echo "${ECHO_T}yes, dependencies are$projprocessed" >&6
    2393223935
    23933     REQUIREDPACKAGES="coinblas $REQUIREDPACKAGES"
    23934 
    2393523936cat >>confdefs.h <<\_ACEOF
    2393623937#define COIN_HAS_BLAS 1
    … …  
    2393823939
    2393923940
     23941
     23942      MUMPS_PCREQUIRES="coinblas $MUMPS_PCREQUIRES"
     23943      MUMPS_CFLAGS="$BLAS_CFLAGS $MUMPS_CFLAGS"
     23944      MUMPS_LIBS="$BLAS_LIBS $MUMPS_LIBS"
     23945
     23946
    2394023947    if test 1 = 0 ; then  #change this test to enable a bit of debugging output
     23948      if test -n "$BLAS_CFLAGS" ; then
     23949        { echo "$as_me:$LINENO: Blas CFLAGS are $BLAS_CFLAGS" >&5
     23950echo "$as_me: Blas CFLAGS are $BLAS_CFLAGS" >&6;}
     23951      fi
     23952      if test -n "$BLAS_LIBS" ; then
     23953        { echo "$as_me:$LINENO: Blas LIBS   are $BLAS_LIBS" >&5
     23954echo "$as_me: Blas LIBS   are $BLAS_LIBS" >&6;}
     23955      fi
     23956      if test -n "$BLAS_DATA" ; then
     23957        { echo "$as_me:$LINENO: Blas DATA   is  $BLAS_DATA" >&5
     23958echo "$as_me: Blas DATA   is  $BLAS_DATA" >&6;}
     23959      fi
     23960
     23961        { echo "$as_me:$LINENO: MUMPS CFLAGS are $MUMPS_CFLAGS" >&5
     23962echo "$as_me: MUMPS CFLAGS are $MUMPS_CFLAGS" >&6;}
     23963        { echo "$as_me:$LINENO: MUMPS LIBS   are $MUMPS_LIBS" >&5
     23964echo "$as_me: MUMPS LIBS   are $MUMPS_LIBS" >&6;}
     23965
     23966    fi
     23967  fi
     23968done
     23969
     23970
     23971
     23972if test $coin_has_blas != notGiven &&
     23973                test $coin_has_blas != skipping; then
     23974  COIN_HAS_BLAS_TRUE=
     23975  COIN_HAS_BLAS_FALSE='#'
     23976else
     23977  COIN_HAS_BLAS_TRUE='#'
     23978  COIN_HAS_BLAS_FALSE=
     23979fi
     23980
     23981
     23982
     23983  fi
     23984
     23985else
     23986  echo "$as_me:$LINENO: result: $coin_has_blas" >&5
     23987echo "${ECHO_T}$coin_has_blas" >&6
     23988fi
     23989
     23990if test $coin_has_blas != skipping &&
     23991   test $coin_has_blas != notGiven ; then
     23992
     23993cat >>confdefs.h <<\_ACEOF
     23994#define COIN_HAS_BLAS 1
     23995_ACEOF
     23996
     23997
     23998  if test 1 = 0 ; then  #change this test to enable a bit of debugging output
    2394123999    if test -n "$BLAS_CFLAGS" ; then
    2394224000      { echo "$as_me:$LINENO: Blas CFLAGS are $BLAS_CFLAGS" >&5
    … …  
    2395124009echo "$as_me: Blas DATA   is  $BLAS_DATA" >&6;}
    2395224010    fi
     24011    if test -n "$BLAS_CFLAGS" ; then
     24012      { echo "$as_me:$LINENO: Blas CFLAGS are $BLAS_CFLAGS" >&5
     24013echo "$as_me: Blas CFLAGS are $BLAS_CFLAGS" >&6;}
    2395324014    fi
     24015
     24016      { echo "$as_me:$LINENO: MUMPS CFLAGS are $MUMPS_CFLAGS" >&5
     24017echo "$as_me: MUMPS CFLAGS are $MUMPS_CFLAGS" >&6;}
     24018      { echo "$as_me:$LINENO: MUMPS LIBS   are $MUMPS_LIBS" >&5
     24019echo "$as_me: MUMPS LIBS   are $MUMPS_LIBS" >&6;}
     24020
    2395424021  fi
    23955 done
    23956 
     24022fi
     24023
     24024# Define the Makefile conditional
    2395724025
    2395824026
    … …  
    2396824036
    2396924037
    23970   fi
    23971 
    23972 else
    23973   echo "$as_me:$LINENO: result: $coin_has_blas" >&5
    23974 echo "${ECHO_T}$coin_has_blas" >&6
    23975 fi
    23976 
    23977 if test $coin_has_blas != skipping &&
    23978    test $coin_has_blas != notGiven ; then
    23979   if test 0 = 1 ; then  #change this test to enable a bit of debugging output
    23980   if test -n "$BLAS_CFLAGS" ; then
    23981     { echo "$as_me:$LINENO: Blas CFLAGS are $BLAS_CFLAGS" >&5
    23982 echo "$as_me: Blas CFLAGS are $BLAS_CFLAGS" >&6;}
    23983   fi
    23984   if test -n "$BLAS_LIBS" ; then
    23985     { echo "$as_me:$LINENO: Blas LIBS   are $BLAS_LIBS" >&5
    23986 echo "$as_me: Blas LIBS   are $BLAS_LIBS" >&6;}
    23987   fi
    23988   if test -n "$BLAS_DATA" ; then
    23989     { echo "$as_me:$LINENO: Blas DATA   is  $BLAS_DATA" >&5
    23990 echo "$as_me: Blas DATA   is  $BLAS_DATA" >&6;}
    23991   fi
    23992   fi
     24038
     24039elif test "x$use_blas" != x && test "$use_blas" != no; then
     24040  coin_has_blas=yes
     24041
     24042
     24043if test 0 = 0; then
     24044  COIN_HAS_BLAS_TRUE=
     24045  COIN_HAS_BLAS_FALSE='#'
     24046else
     24047  COIN_HAS_BLAS_TRUE='#'
     24048  COIN_HAS_BLAS_FALSE=
     24049fi
     24050
    2399324051
    2399424052cat >>confdefs.h <<\_ACEOF
    … …  
    2399624054_ACEOF
    2399724055
    23998 fi
    23999 
    24000 # Define the Makefile conditional
    24001 
    24002 
    24003 if test $coin_has_blas != notGiven &&
    24004                 test $coin_has_blas != skipping; then
    24005   COIN_HAS_BLAS_TRUE=
    24006   COIN_HAS_BLAS_FALSE='#'
    24007 else
    24008   COIN_HAS_BLAS_TRUE='#'
    24009   COIN_HAS_BLAS_FALSE=
    24010 fi
    24011 
    24012 
    24013 
    24014 
    24015 elif test "x$use_blas" != x && test "$use_blas" != no; then
    24016   coin_has_blas=yes
    24017 
    24018 
    24019 if test 0 = 0; then
    24020   COIN_HAS_BLAS_TRUE=
    24021   COIN_HAS_BLAS_FALSE='#'
    24022 else
    24023   COIN_HAS_BLAS_TRUE='#'
    24024   COIN_HAS_BLAS_FALSE=
    24025 fi
    24026 
    24027 
    24028 cat >>confdefs.h <<\_ACEOF
    24029 #define COIN_HAS_BLAS 1
    24030 _ACEOF
    24031 
    2403224056  BLAS_LIBS="$use_blas"
    2403324057  BLAS_CFLAGS=
    … …  
    2403624060
    2403724061
    24038   PCADDLIBS="$use_blas $PCADDLIBS"
     24062
     24063    MUMPS_PCLIBS="$BLAS_LIBS $MUMPS_PCLIBS"
     24064    MUMPS_LIBS="$BLAS_LIBS $MUMPS_LIBS"
     24065
    2403924066
    2404024067else
    … …  
    2405424081
    2405524082
    24056 echo "$as_me:$LINENO: checking for COIN-OR module Metis" >&5
    24057 echo $ECHO_N "checking for COIN-OR module Metis... $ECHO_C" >&6
     24083
     24084
     24085
     24086
     24087
     24088echo "$as_me:$LINENO: checking for COIN-OR package Metis" >&5
     24089echo $ECHO_N "checking for COIN-OR package Metis... $ECHO_C" >&6
    2405824090
    2405924091coin_has_metis=notGiven
    2406024092
    24061 # check if user wants to skip module in any case
     24093# check if user wants to skip package in any case
    2406224094if test x"$COIN_SKIP_PROJECTS" != x; then
    2406324095  for dir in $COIN_SKIP_PROJECTS; do
    … …  
    2407624108
    2407724109
     24110
     24111
     24112
     24113
    2407824114#check if user provided LIBS, CFLAGS, or DATA for module
    2407924115if test $coin_has_metis != skipping; then
    … …  
    2408524121  coin_has_metis=yes
    2408624122       METIS_LIBS="$withval"
    24087        PCADDLIBS="$withval $PCADDLIBS"
     24123
     24124         MUMPS_PCLIBS="$withval $MUMPS_PCLIBS"
     24125         MUMPS_LIBS="$withval $MUMPS_LIBS"
     24126
    2408824127
    2408924128fi;
    … …  
    2409524134  coin_has_metis=yes
    2409624135     METIS_CFLAGS="-I`${CYGPATH_W} $withval`"
     24136     MUMPS_CFLAGS="$withval $MUMPS_CFLAGS"
     24137
     24138
    2409724139fi;
    2409824140
    … …  
    2413524177        echo "$as_me:$LINENO: result: yes: $METIS_VERSIONS" >&5
    2413624178echo "${ECHO_T}yes: $METIS_VERSIONS" >&6
    24137         REQUIREDPACKAGES="coinmetis >= 4.0 $REQUIREDPACKAGES"
     24179        MUMPS_PCREQUIRES="coinmetis >= 4.0 $MUMPS_PCREQUIRES"
     24180
    2413824181
    2413924182
    … …  
    2415724200    PKG_CONFIG_PATH="$coin_save_PKG_CONFIG_PATH"
    2415824201    export PKG_CONFIG_PATH
     24202
     24203    # augment X_CFLAGS and X_LIBS for each build target X in MUMPS
     24204
     24205      MUMPS_CFLAGS="$METIS_CFLAGS $MUMPS_CFLAGS"
     24206      MUMPS_LIBS="$METIS_LIBS $MUMPS_LIBS"
     24207
    2415924208  else
    2416024209    echo "$as_me:$LINENO: result: skipped check via pkg-config, redirect to fallback" >&5
    2416124210echo "${ECHO_T}skipped check via pkg-config, redirect to fallback" >&6
    2416224211
    24163 echo "$as_me:$LINENO: checking for COIN-OR module Metis (fallback)" >&5
    24164 echo $ECHO_N "checking for COIN-OR module Metis (fallback)... $ECHO_C" >&6
     24212echo "$as_me:$LINENO: checking for COIN-OR package Metis (fallback)" >&5
     24213echo $ECHO_N "checking for COIN-OR package Metis (fallback)... $ECHO_C" >&6
    2416524214
    2416624215coin_has_metis=notGiven
    … …  
    2416824217METIS_CFLAGS=
    2416924218METIS_DATA=
    24170 
    2417124219
    2417224220# initial list of dependencies is "coinmetis >= 4.0", but we need to filter out version number specifications (= x, <= x, >= x)
    … …  
    2424424292  projtoprocess="$nextprojtoprocess"
    2424524293
     24294  # if there are no more projects to search for, finish up
    2424624295  if test "x$projtoprocess" = x ; then
    2424724296    coin_has_metis=yes
    … …  
    2424924298echo "${ECHO_T}yes, dependencies are$projprocessed" >&6
    2425024299
    24251     REQUIREDPACKAGES="coinmetis >= 4.0 $REQUIREDPACKAGES"
    24252 
    2425324300cat >>confdefs.h <<\_ACEOF
    2425424301#define COIN_HAS_METIS 1
    … …  
    2425624303
    2425724304
     24305
     24306      MUMPS_PCREQUIRES="coinmetis >= 4.0 $MUMPS_PCREQUIRES"
     24307      MUMPS_CFLAGS="$METIS_CFLAGS $MUMPS_CFLAGS"
     24308      MUMPS_LIBS="$METIS_LIBS $MUMPS_LIBS"
     24309
     24310
    2425824311    if test 1 = 0 ; then  #change this test to enable a bit of debugging output
     24312      if test -n "$METIS_CFLAGS" ; then
     24313        { echo "$as_me:$LINENO: Metis CFLAGS are $METIS_CFLAGS" >&5
     24314echo "$as_me: Metis CFLAGS are $METIS_CFLAGS" >&6;}
     24315      fi
     24316      if test -n "$METIS_LIBS" ; then
     24317        { echo "$as_me:$LINENO: Metis LIBS   are $METIS_LIBS" >&5
     24318echo "$as_me: Metis LIBS   are $METIS_LIBS" >&6;}
     24319      fi
     24320      if test -n "$METIS_DATA" ; then
     24321        { echo "$as_me:$LINENO: Metis DATA   is  $METIS_DATA" >&5
     24322echo "$as_me: Metis DATA   is  $METIS_DATA" >&6;}
     24323      fi
     24324
     24325        { echo "$as_me:$LINENO: MUMPS CFLAGS are $MUMPS_CFLAGS" >&5
     24326echo "$as_me: MUMPS CFLAGS are $MUMPS_CFLAGS" >&6;}
     24327        { echo "$as_me:$LINENO: MUMPS LIBS   are $MUMPS_LIBS" >&5
     24328echo "$as_me: MUMPS LIBS   are $MUMPS_LIBS" >&6;}
     24329
     24330    fi
     24331  fi
     24332done
     24333
     24334
     24335
     24336if test $coin_has_metis != notGiven &&
     24337                test $coin_has_metis != skipping; then
     24338  COIN_HAS_METIS_TRUE=
     24339  COIN_HAS_METIS_FALSE='#'
     24340else
     24341  COIN_HAS_METIS_TRUE='#'
     24342  COIN_HAS_METIS_FALSE=
     24343fi
     24344
     24345
     24346
     24347  fi
     24348
     24349else
     24350  echo "$as_me:$LINENO: result: $coin_has_metis" >&5
     24351echo "${ECHO_T}$coin_has_metis" >&6
     24352fi
     24353
     24354if test $coin_has_metis != skipping &&
     24355   test $coin_has_metis != notGiven ; then
     24356
     24357cat >>confdefs.h <<\_ACEOF
     24358#define COIN_HAS_METIS 1
     24359_ACEOF
     24360
     24361
     24362  if test 1 = 0 ; then  #change this test to enable a bit of debugging output
    2425924363    if test -n "$METIS_CFLAGS" ; then
    2426024364      { echo "$as_me:$LINENO: Metis CFLAGS are $METIS_CFLAGS" >&5
    … …  
    2426924373echo "$as_me: Metis DATA   is  $METIS_DATA" >&6;}
    2427024374    fi
     24375    if test -n "$METIS_CFLAGS" ; then
     24376      { echo "$as_me:$LINENO: Metis CFLAGS are $METIS_CFLAGS" >&5
     24377echo "$as_me: Metis CFLAGS are $METIS_CFLAGS" >&6;}
    2427124378    fi
     24379
     24380      { echo "$as_me:$LINENO: MUMPS CFLAGS are $MUMPS_CFLAGS" >&5
     24381echo "$as_me: MUMPS CFLAGS are $MUMPS_CFLAGS" >&6;}
     24382      { echo "$as_me:$LINENO: MUMPS LIBS   are $MUMPS_LIBS" >&5
     24383echo "$as_me: MUMPS LIBS   are $MUMPS_LIBS" >&6;}
     24384
    2427224385  fi
    24273 done
    24274 
     24386fi
     24387
     24388# Define the Makefile conditional
    2427524389
    2427624390
    … …  
    2428624400
    2428724401
    24288   fi
    24289 
    24290 else
    24291   echo "$as_me:$LINENO: result: $coin_has_metis" >&5
    24292 echo "${ECHO_T}$coin_has_metis" >&6
    24293 fi
    24294 
    24295 if test $coin_has_metis != skipping &&
    24296    test $coin_has_metis != notGiven ; then
    24297   if test 0 = 1 ; then  #change this test to enable a bit of debugging output
    24298   if test -n "$METIS_CFLAGS" ; then
    24299     { echo "$as_me:$LINENO: Metis CFLAGS are $METIS_CFLAGS" >&5
    24300 echo "$as_me: Metis CFLAGS are $METIS_CFLAGS" >&6;}
    24301   fi
    24302   if test -n "$METIS_LIBS" ; then
    24303     { echo "$as_me:$LINENO: Metis LIBS   are $METIS_LIBS" >&5
    24304 echo "$as_me: Metis LIBS   are $METIS_LIBS" >&6;}
    24305   fi
    24306   if test -n "$METIS_DATA" ; then
    24307     { echo "$as_me:$LINENO: Metis DATA   is  $METIS_DATA" >&5
    24308 echo "$as_me: Metis DATA   is  $METIS_DATA" >&6;}
    24309   fi
    24310   fi
    24311 
    24312 cat >>confdefs.h <<\_ACEOF
    24313 #define COIN_HAS_METIS 1
    24314 _ACEOF
    24315 
    24316 fi
    24317 
    24318 # Define the Makefile conditional
    24319 
    24320 
    24321 if test $coin_has_metis != notGiven &&
    24322                 test $coin_has_metis != skipping; then
    24323   COIN_HAS_METIS_TRUE=
    24324   COIN_HAS_METIS_FALSE='#'
    24325 else
    24326   COIN_HAS_METIS_TRUE='#'
    24327   COIN_HAS_METIS_FALSE=
    24328 fi
    24329 
    24330 
    24331 
    2433224402
    2433324403if test "$coin_has_metis" = yes; then
    … …  
    2433624406fi
    2433724407
    24338 #Mumps needs pthreads
     24408# Mumps can make use of pthreads
    2433924409echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
    2434024410echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
    … …  
    2441024480echo "${ECHO_T}$ac_cv_lib_pthread_pthread_create" >&6
    2441124481if test $ac_cv_lib_pthread_pthread_create = yes; then
    24412   ADDLIBS="-lpthread $ADDLIBS"
     24482  MUMPS_PCLIBS="-lpthread $MUMPS_PCLIBS"
    2441324483fi
    2441424484
    … …  
    2542325493s,@BLAS_CFLAGS@,$BLAS_CFLAGS,;t t
    2542425494s,@BLAS_DATA@,$BLAS_DATA,;t t
    25425 s,@REQUIREDPACKAGES@,$REQUIREDPACKAGES,;t t
     25495s,@MUMPS_LIBS@,$MUMPS_LIBS,;t t
     25496s,@MUMPS_PCLIBS@,$MUMPS_PCLIBS,;t t
     25497s,@MUMPS_PCREQUIRES@,$MUMPS_PCREQUIRES,;t t
    2542625498s,@COIN_HAS_BLAS_TRUE@,$COIN_HAS_BLAS_TRUE,;t t
    2542725499s,@COIN_HAS_BLAS_FALSE@,$COIN_HAS_BLAS_FALSE,;t t

  • ThirdParty/Mumps/trunk/configure.ac

    r1657 r1684  
    5757AC_COIN_F77_WRAPPERS
    5858
    59 # Tell FINALIZE to add FLIBS to ADDLIBS, so that they get into the .pc files
    60 coin_need_flibs=yes
     59# Add FLIBS to MUMPS_PCLIBS, so that they get into the .pc files
     60MUMPS_PCLIBS="$FLIBS"
    6161
    6262# We need to translate the result from autoconf to what MUMPS wants
    … …  
    9696AC_COIN_INIT_AUTO_TOOLS
    9797
    98 AC_COIN_HAS_MODULE_BLAS
    99 AC_COIN_HAS_MODULE(Metis, [coinmetis >= 4.0])
     98AC_COIN_HAS_PACKAGE_BLAS(MUMPS)
     99AC_COIN_HAS_PACKAGE(Metis, [coinmetis >= 4.0], MUMPS)
    100100
    101101if test "$coin_has_metis" = yes; then
    … …  
    104104fi
    105105
    106 #Mumps needs pthreads
    107 AC_CHECK_LIB([pthread],[pthread_create],[ADDLIBS="-lpthread $ADDLIBS"])
     106# Mumps can make use of pthreads
     107AC_CHECK_LIB([pthread],[pthread_create],[MUMPS_PCLIBS="-lpthread $MUMPS_PCLIBS"])
    108108
    109109# Verify that we can compile Fortran 90 code
Note: See TracChangeset for help on using the changeset viewer.