Changeset 4144


Ignore:
Timestamp:
Mar 24, 2020 12:27:04 PM (8 days ago)
Author:
stefan
Message:

AC_COIN_INITIALIZE without args; rerun autotools

Location:
ThirdParty/Mumps/trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/Mumps/trunk/Makefile.in

    r4138 r4144  
    439439AM_CFLAGS = $(MY_DEFS) $(MUMPS_CFLAGS)
    440440
    441 # automake thinks that the .F files are F77, not FC, and requires F77 to be set
     441# automake thinks that the .F files are F77, not F95, and requires F77 to be set
    442442# set it to FC, and same for FFLAGS
    443443F77 = $(FC)
  • ThirdParty/Mumps/trunk/config.h.in

    r4025 r4144  
    11/* config.h.in.  Generated from configure.ac by autoheader.  */
    2 
    3 /* Define to 1 if the LAPACK package is available */
    4 #undef COIN_HAS_LAPACK
    5 
    6 /* Define to 1 if Metis is available. */
    7 #undef COIN_HAS_METIS
    8 
    9 /* Define to a macro mangling the given C identifier (in lower and upper
    10    case). */
    11 #undef COIN_LAPACK_FUNC
    12 
    13 /* As COIN_LAPACK_FUNC, but for C identifiers containing underscores. */
    14 #undef COIN_LAPACK_FUNC_
    152
    163/* Define to dummy `main' function (if any) required to link to the Fortran
     
    7057#undef MUMPS_EXPORT
    7158
    72 /* Version number of project */
    73 #undef MUMPS_VERSION
    74 
    75 /* Major version number of project. */
    76 #undef MUMPS_VERSION_MAJOR
    77 
    78 /* Minor version number of project. */
    79 #undef MUMPS_VERSION_MINOR
    80 
    81 /* Release version number of project. */
    82 #undef MUMPS_VERSION_RELEASE
    83 
    8459/* Define to the address where bug reports for this package should be sent. */
    8560#undef PACKAGE_BUGREPORT
     
    10277/* Define to 1 if you have the ANSI C header files. */
    10378#undef STDC_HEADERS
     79
     80/* Define to 1 if the LAPACK package is available */
     81#undef THIRDPARTYMUMPS_HAS_LAPACK
     82
     83/* Define to 1 if Metis is available. */
     84#undef THIRDPARTYMUMPS_HAS_METIS
     85
     86/* Define to a macro mangling the given C identifier (in lower and upper
     87   case). */
     88#undef THIRDPARTYMUMPS_LAPACK_FUNC
     89
     90/* As THIRDPARTYMUMPS_LAPACK_FUNC, but for C identifiers containing
     91   underscores. */
     92#undef THIRDPARTYMUMPS_LAPACK_FUNC_
     93
     94/* Version number of project */
     95#undef THIRDPARTYMUMPS_VERSION
     96
     97/* Major version number of project. */
     98#undef THIRDPARTYMUMPS_VERSION_MAJOR
     99
     100/* Minor version number of project. */
     101#undef THIRDPARTYMUMPS_VERSION_MINOR
     102
     103/* Release version number of project. */
     104#undef THIRDPARTYMUMPS_VERSION_RELEASE
  • ThirdParty/Mumps/trunk/configure

    r4138 r4144  
    30473047
    30483048cat >>confdefs.h <<_ACEOF
    3049 #define MUMPS_VERSION "trunk"
     3049#define THIRDPARTYMUMPS_VERSION "trunk"
    30503050_ACEOF
    30513051
    30523052
    30533053cat >>confdefs.h <<_ACEOF
    3054 #define MUMPS_VERSION_MAJOR 9999
     3054#define THIRDPARTYMUMPS_VERSION_MAJOR 9999
    30553055_ACEOF
    30563056
    30573057
    30583058cat >>confdefs.h <<_ACEOF
    3059 #define MUMPS_VERSION_MINOR 9999
     3059#define THIRDPARTYMUMPS_VERSION_MINOR 9999
    30603060_ACEOF
    30613061
    30623062
    30633063cat >>confdefs.h <<_ACEOF
    3064 #define MUMPS_VERSION_RELEASE 9999
     3064#define THIRDPARTYMUMPS_VERSION_RELEASE 9999
    30653065_ACEOF
    3066 
    3067 
    30683066
    30693067
     
    1802918027    coin_has_lapack=yes
    1803018028         lapack_pcfiles="lapack blas"
    18031     else as_fn_error $? "Could not find dsyev in Lapack from lapack.pc blas.pc." "$LINENO" 5
     18029    else { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: lapack.pc and blas.pc present, but could not find dsyev when trying to link with it." >&5
     18030$as_echo "$as_me: WARNING: lapack.pc and blas.pc present, but could not find dsyev when trying to link with it." >&2;}
    1803218031  fi
    1803318032
     
    1814118140  if test $coin_has_lapack = yes ; then
    1814218141
    18143 $as_echo "#define COIN_HAS_LAPACK 1" >>confdefs.h
     18142$as_echo "#define THIRDPARTYMUMPS_HAS_LAPACK 1" >>confdefs.h
    1814418143
    1814518144
     
    1814818147  case "${dsyev_namemangling}" in
    1814918148   "lower case, no underscore, no extra underscore")
    18150       $as_echo "#define COIN_LAPACK_FUNC(name,NAME) name" >>confdefs.h
    18151 
    18152       $as_echo "#define COIN_LAPACK_FUNC_(name,NAME) name" >>confdefs.h
     18149      $as_echo "#define THIRDPARTYMUMPS_LAPACK_FUNC(name,NAME) name" >>confdefs.h
     18150
     18151      $as_echo "#define THIRDPARTYMUMPS_LAPACK_FUNC_(name,NAME) name" >>confdefs.h
    1815318152 ;;
    1815418153   "lower case, no underscore, extra underscore")
    18155       $as_echo "#define COIN_LAPACK_FUNC(name,NAME) name" >>confdefs.h
    18156 
    18157       $as_echo "#define COIN_LAPACK_FUNC_(name,NAME) name ## _" >>confdefs.h
     18154      $as_echo "#define THIRDPARTYMUMPS_LAPACK_FUNC(name,NAME) name" >>confdefs.h
     18155
     18156      $as_echo "#define THIRDPARTYMUMPS_LAPACK_FUNC_(name,NAME) name ## _" >>confdefs.h
    1815818157 ;;
    1815918158   "lower case, underscore, no extra underscore")
    18160       $as_echo "#define COIN_LAPACK_FUNC(name,NAME) name ## _" >>confdefs.h
    18161 
    18162       $as_echo "#define COIN_LAPACK_FUNC_(name,NAME) name ## _" >>confdefs.h
     18159      $as_echo "#define THIRDPARTYMUMPS_LAPACK_FUNC(name,NAME) name ## _" >>confdefs.h
     18160
     18161      $as_echo "#define THIRDPARTYMUMPS_LAPACK_FUNC_(name,NAME) name ## _" >>confdefs.h
    1816318162 ;;
    1816418163   "lower case, underscore, extra underscore")
    18165       $as_echo "#define COIN_LAPACK_FUNC(name,NAME) name ## _" >>confdefs.h
    18166 
    18167       $as_echo "#define COIN_LAPACK_FUNC_(name,NAME) name ## __" >>confdefs.h
     18164      $as_echo "#define THIRDPARTYMUMPS_LAPACK_FUNC(name,NAME) name ## _" >>confdefs.h
     18165
     18166      $as_echo "#define THIRDPARTYMUMPS_LAPACK_FUNC_(name,NAME) name ## __" >>confdefs.h
    1816818167 ;;
    1816918168   "upper case, no underscore, no extra underscore")
    18170       $as_echo "#define COIN_LAPACK_FUNC(name,NAME) NAME" >>confdefs.h
    18171 
    18172       $as_echo "#define COIN_LAPACK_FUNC_(name,NAME) NAME" >>confdefs.h
     18169      $as_echo "#define THIRDPARTYMUMPS_LAPACK_FUNC(name,NAME) NAME" >>confdefs.h
     18170
     18171      $as_echo "#define THIRDPARTYMUMPS_LAPACK_FUNC_(name,NAME) NAME" >>confdefs.h
    1817318172 ;;
    1817418173   "upper case, no underscore, extra underscore")
    18175       $as_echo "#define COIN_LAPACK_FUNC(name,NAME) NAME" >>confdefs.h
    18176 
    18177       $as_echo "#define COIN_LAPACK_FUNC_(name,NAME) NAME ## _" >>confdefs.h
     18174      $as_echo "#define THIRDPARTYMUMPS_LAPACK_FUNC(name,NAME) NAME" >>confdefs.h
     18175
     18176      $as_echo "#define THIRDPARTYMUMPS_LAPACK_FUNC_(name,NAME) NAME ## _" >>confdefs.h
    1817818177 ;;
    1817918178   "upper case, underscore, no extra underscore")
    18180       $as_echo "#define COIN_LAPACK_FUNC(name,NAME) NAME ## _" >>confdefs.h
    18181 
    18182       $as_echo "#define COIN_LAPACK_FUNC_(name,NAME) NAME ## _" >>confdefs.h
     18179      $as_echo "#define THIRDPARTYMUMPS_LAPACK_FUNC(name,NAME) NAME ## _" >>confdefs.h
     18180
     18181      $as_echo "#define THIRDPARTYMUMPS_LAPACK_FUNC_(name,NAME) NAME ## _" >>confdefs.h
    1818318182 ;;
    1818418183   "upper case, underscore, extra underscore")
    18185       $as_echo "#define COIN_LAPACK_FUNC(name,NAME) NAME ## _" >>confdefs.h
    18186 
    18187       $as_echo "#define COIN_LAPACK_FUNC_(name,NAME) NAME ## __" >>confdefs.h
     18184      $as_echo "#define THIRDPARTYMUMPS_LAPACK_FUNC(name,NAME) NAME ## _" >>confdefs.h
     18185
     18186      $as_echo "#define THIRDPARTYMUMPS_LAPACK_FUNC_(name,NAME) NAME ## __" >>confdefs.h
    1818818187 ;;
    1818918188   *)
     
    1844518444  if test $coin_has_metis = yes ; then
    1844618445
    18447 $as_echo "#define COIN_HAS_METIS 1" >>confdefs.h
     18446$as_echo "#define THIRDPARTYMUMPS_HAS_METIS 1" >>confdefs.h
    1844818447
    1844918448    if test -n "$metis_pcfiles" ; then MUMPS_PCFILES="$metis_pcfiles $MUMPS_PCFILES" ; fi
     
    1850918508_ACEOF
    1851018509
     18510
     18511      # add -DXYZ_BUILD to XYZ_CFLAGS
     18512      MUMPS_CFLAGS="${MUMPS_CFLAGS} -DMUMPS_BUILD"
    1851118513
    1851218514# Define BUILDTOOLS_DEBUG to enable debugging output
  • ThirdParty/Mumps/trunk/configure.ac

    r4075 r4144  
    2323AC_CONFIG_SRCDIR(MUMPS/src/dmumps_part1.F)
    2424
    25 AC_COIN_INITIALIZE(Mumps)
     25AC_COIN_INITIALIZE
    2626
    2727#############################################################################
Note: See TracChangeset for help on using the changeset viewer.