Changeset 4117


Ignore:
Timestamp:
Jan 31, 2020 9:59:53 AM (2 months ago)
Author:
stefan
Message:

merge r4066,r4074,r4075 from trunk; rerun autotools

Location:
ThirdParty/Mumps/branches/mumps5
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/Mumps/branches/mumps5

  • ThirdParty/Mumps/branches/mumps5/Makefile.in

    r4011 r4117  
    351351AM_RECURSIVE_TARGETS = cscope
    352352ACLOCAL = @ACLOCAL@
     353ADD_CFLAGS = @ADD_CFLAGS@
     354ADD_FCFLAGS = @ADD_FCFLAGS@
    353355AMTAR = @AMTAR@
    354356AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
  • ThirdParty/Mumps/branches/mumps5/coinmumps.pc.in

    r4011 r4117  
    1 prefix=@prefix@
     1@COIN_RELOCATABLE_FALSE@prefix=@prefix@
     2@COIN_RELOCATABLE_TRUE@prefix=${pcfiledir}/../..
    23exec_prefix=@exec_prefix@
    34libdir=@libdir@
  • ThirdParty/Mumps/branches/mumps5/configure

    r4021 r4117  
    687687DLLTOOL
    688688AS
     689ADD_FCFLAGS
    689690ac_ct_FC
    690691FCFLAGS
    691692FC
     693ADD_CFLAGS
    692694am__fastdepCC_FALSE
    693695am__fastdepCC_TRUE
     
    705707LDFLAGS
    706708CFLAGS
     709COIN_RELOCATABLE_FALSE
     710COIN_RELOCATABLE_TRUE
    707711MAINT
    708712MAINTAINER_MODE_FALSE
     
    792796enable_silent_rules
    793797enable_maintainer_mode
     798enable_relocatable
    794799enable_dependency_tracking
    795800enable_static
     
    818823LIBS
    819824CPPFLAGS
     825ADD_CFLAGS
    820826FC
    821827FCFLAGS
     828ADD_FCFLAGS
    822829LT_SYS_LIBRARY_PATH
    823830CPP
     831LT_LDFLAGS
    824832PKG_CONFIG'
    825833
     
    14501458                          enable make rules and dependencies not useful (and
    14511459                          sometimes confusing) to the casual installer
     1460  --enable-relocatable    whether prefix in installed .pc files should be
     1461                          setup relative to pcfiledir
    14521462  --enable-dependency-tracking
    14531463                          do not reject slow dependency extractors
     
    15011511  CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
    15021512              you have headers in a nonstandard directory <include dir>
     1513  ADD_CFLAGS  Additional C compiler options (if not overwriting CFLAGS)
    15031514  FC          Fortran compiler command
    15041515  FCFLAGS     Fortran compiler flags
     1516  ADD_FCFLAGS Additional Fortran compiler options (if not overwriting FCFLAGS)
    15051517  LT_SYS_LIBRARY_PATH
    15061518              User-defined run-time library search path.
    15071519  CPP         C preprocessor
     1520  LT_LDFLAGS  Flags passed to libtool when building libraries or executables
     1521              that are installed
    15081522  PKG_CONFIG  path to pkg-config utility
    15091523
     
    25412555  if test "$enable_debug" = yes ; then
    25422556    if test "$enable_msvc" = yes ; then
    2543       : ${FFLAGS:="-nologo -fpp -Z7 -MDd"}
    2544       : ${FCFLAGS:="-nologo -fpp -Z7 -MDd"}
    2545       : ${CFLAGS:="-nologo -Z7 -MDd"}
    2546       : ${CXXFLAGS:="-nologo -EHs -Z7 -MDd"}
     2557      : ${FFLAGS:="-nologo -fpp -Z7 -MDd $ADD_FFLAGS"}
     2558      : ${FCFLAGS:="-nologo -fpp -Z7 -MDd $ADD_FCFLAGS"}
     2559      : ${CFLAGS:="-nologo -Z7 -MDd $ADD_CFLAGS"}
     2560      : ${CXXFLAGS:="-nologo -EHs -Z7 -MDd $ADD_CXXFLAGS"}
    25472561      : ${AR:="lib"}
    25482562      : ${AR_FLAGS:="-nologo -out:"}
    25492563    else
    2550       : ${FFLAGS:="-g"}
    2551       : ${FCFLAGS:="-g"}
    2552       : ${CFLAGS:="-g"}
    2553       : ${CXXFLAGS:="-g"}
     2564      : ${FFLAGS:="-g $ADD_FFLAGS"}
     2565      : ${FCFLAGS:="-g $ADD_FCFLAGS"}
     2566      : ${CFLAGS:="-g $ADD_CFLAGS"}
     2567      : ${CXXFLAGS:="-g $ADD_CXXFLAGS"}
    25542568    fi
    25552569  else
    25562570    if test "$enable_msvc" = yes ; then
    2557       : ${FFLAGS:="-nologo -fpp -O2 -MD"}
    2558       : ${FCFLAGS:="-nologo -fpp -O2 -MD"}
    2559       : ${CFLAGS:="-nologo -DNDEBUG -O2 -MD"}
    2560       : ${CXXFLAGS:="-nologo -EHs -DNDEBUG -O2 -MD"}
     2571      : ${FFLAGS:="-nologo -fpp -O2 -MD $ADD_FFLAGS"}
     2572      : ${FCFLAGS:="-nologo -fpp -O2 -MD $ADD_FCFLAGS"}
     2573      : ${CFLAGS:="-nologo -DNDEBUG -O2 -MD $ADD_CFLAGS"}
     2574      : ${CXXFLAGS:="-nologo -EHs -DNDEBUG -O2 -MD $ADD_CXXFLAGS"}
    25612575      : ${AR:="lib"}
    25622576      : ${AR_FLAGS:="-nologo -out:"}
    25632577    else
    2564       : ${FFLAGS:="-O2"}
    2565       : ${FCFLAGS:="-O2"}
    2566       : ${CFLAGS:="-O2 -DNDEBUG"}
    2567       : ${CXXFLAGS:="-O2 -DNDEBUG"}
     2578      : ${FFLAGS:="-O2 $ADD_FFLAGS"}
     2579      : ${FCFLAGS:="-O2 $ADD_FCFLAGS"}
     2580      : ${CFLAGS:="-O2 -DNDEBUG $ADD_CFLAGS"}
     2581      : ${CXXFLAGS:="-O2 -DNDEBUG $ADD_CXXFLAGS"}
    25682582    fi
    25692583  fi
     
    33053319  exec_prefix=$save_exec_prefix
    33063320
     3321# add a configure flag to indicate whether .pc files should be made relocatable
     3322# off by default, as it creates libtool warnings
     3323  # Check whether --enable-relocatable was given.
     3324if test "${enable_relocatable+set}" = set; then :
     3325  enableval=$enable_relocatable; coin_enable_relocatable=$enableval
     3326else
     3327  coin_enable_relocatable=no
     3328fi
     3329
     3330   if test $coin_enable_relocatable = yes; then
     3331  COIN_RELOCATABLE_TRUE=
     3332  COIN_RELOCATABLE_FALSE='#'
     3333else
     3334  COIN_RELOCATABLE_TRUE='#'
     3335  COIN_RELOCATABLE_FALSE=
     3336fi
     3337
     3338
    33073339
    33083340#############################################################################
     
    33823414
    33833415  # If enable-msvc, then test for Intel (on Windows) and MS C compiler
    3384   # explicitly and add compile-wrapper before AC_PROG_CC, because
    3385   # the compile-wrapper work around issues when having the wrong link.exe
    3386   # in the PATH first, which would upset tests in AC_PROG_CC.
    3387   # Further, if CC unset and not set by user, then stop with error.
     3416  # explicitly and add the compile wrapper before AC_PROG_CC. The compile
     3417  # wrapper works around issues related to finding MS link.exe. (Unix link.exe
     3418  # occurs first in PATH, which causes compile and link checks to fail.) For
     3419  # the same reason, set LD to use the compile wrapper. If CC remains unset
     3420  # (neither icl or cl was found, and CC was not set by the user), stop with
     3421  # an error.
     3422
    33883423  if test $enable_msvc = yes ; then
    33893424    for ac_prog in icl cl
     
    34313466    if test -n "$CC" ; then
    34323467      CC="$am_aux_dir/compile $CC"
     3468      ac_cv_prog_CC="$CC"
     3469      LD="$CC"
    34333470    else
    34343471      as_fn_error $? "Neither MS nor Intel C compiler found in PATH and CC is unset." "$LINENO" 5
     
    34363473  fi
    34373474
    3438   # look for some C compiler and check whether it works
    3439   # if user has set CC or we found icl/cl above, this shouldn't overwrite CC
    3440   # other than CXX of F77, this macro also takes care of adding the compile-wrapper
     3475  # Look for some C compiler and check that it works. If the user has set CC
     3476  # or we found icl/cl above, this shouldn't overwrite CC. Unlike the macros
     3477  # that establish C++ or Fortran compilers, PROG_CC also takes care of adding
     3478  # the compile wrapper if needed.
     3479
    34413480  ac_ext=c
    34423481ac_cpp='$CPP $CPPFLAGS'
     
    42244263
    42254264
     4265  # Declare precious variable for additional compiler flags
     4266
     4267
    42264268
    42274269# Get the name of the Fortran compiler and appropriate compiler options
     
    45624604    fi
    45634605  fi
     4606
     4607  # Declare precious variable for additional compiler flags
     4608
    45644609
    45654610
     
    1599216037#    regarding those that are properly marked for dll-export in the source.
    1599316038#
    15994 # Patch libtool also to circumbent some issues when using MinGW (Msys+GCC).
     16039# Patch libtool also to circumvent some issues when using MinGW (Msys+GCC).
    1599516040# 1. Relax check which libraries can be used when linking a DLL.
    1599616041#    libtool's func_mode_link() would reject linking MinGW system libraries,
     
    1601516060  esac
    1601616061
    16017   # Set up LT_LDFLAGS.
     16062  # Set up LT_LDFLAGS, user can initialize and we augment below
    1601816063
    1601916064
     
    1680316848
    1680416849# Mumps can use OpenMP
    16805 # but if single threaded, then it (5.2.1) seems to become slower, so disable by default
     16850# but if single threaded, then it (5.2.1) seems to become slower within Ipopt, so disable by default
    1680616851if test -z "$enable_openmp" ; then
    1680716852  enable_openmp=no
     
    1814118186  fi
    1814218187
     18188if test $coin_has_lapack != yes; then
     18189  as_fn_error $? "Required package LAPACK not found." "$LINENO" 5
     18190fi
    1814318191
    1814418192# if the BLAS library includes the GEMMT level-3 BLAS extension, it is strongly recommend to use it
     
    1870018748if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
    1870118749  as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
     18750Usually this means the macro was only invoked conditionally." "$LINENO" 5
     18751fi
     18752if test -z "${COIN_RELOCATABLE_TRUE}" && test -z "${COIN_RELOCATABLE_FALSE}"; then
     18753  as_fn_error $? "conditional \"COIN_RELOCATABLE\" was never defined.
    1870218754Usually this means the macro was only invoked conditionally." "$LINENO" 5
    1870318755fi
  • ThirdParty/Mumps/branches/mumps5/configure.ac

    r4021 r4117  
    8888
    8989AC_COIN_CHK_LAPACK(MUMPS)
     90if test $coin_has_lapack != yes; then
     91  AC_MSG_ERROR([Required package LAPACK not found.])
     92fi
    9093
    9194# if the BLAS library includes the GEMMT level-3 BLAS extension, it is strongly recommend to use it
Note: See TracChangeset for help on using the changeset viewer.