Changeset 4142


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

AC_COIN_INITIALIZE without args; rerun autotools

Location:
ThirdParty/HSL/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/HSL/trunk/config.h.in

    r4023 r4142  
    11/* config.h.in.  Generated from configure.ac by autoheader.  */
     2
     3/* Define to 1 if the LAPACK package is available */
     4#undef COINHSL_HAS_LAPACK
    25
    36/* Define to 1 if MA27 is available. */
     
    2528#undef COINHSL_HAS_MC68
    2629
    27 /* Define to 1 if METIS is available */
     30/* Define to 1 if Metis is available. */
    2831#undef COINHSL_HAS_METIS
     32
     33/* Define to a macro mangling the given C identifier (in lower and upper
     34   case). */
     35#undef COINHSL_LAPACK_FUNC
     36
     37/* As COINHSL_LAPACK_FUNC, but for C identifiers containing underscores. */
     38#undef COINHSL_LAPACK_FUNC_
    2939
    3040/* Version number of project */
     
    3949/* Release version number of project. */
    4050#undef COINHSL_VERSION_RELEASE
    41 
    42 /* Define to 1 if the LAPACK package is available */
    43 #undef COIN_HAS_LAPACK
    44 
    45 /* Define to 1 if Metis is available. */
    46 #undef COIN_HAS_METIS
    47 
    48 /* Define to a macro mangling the given C identifier (in lower and upper
    49    case). */
    50 #undef COIN_LAPACK_FUNC
    51 
    52 /* As COIN_LAPACK_FUNC, but for C identifiers containing underscores. */
    53 #undef COIN_LAPACK_FUNC_
    5451
    5552/* Define to dummy `main' function (if any) required to link to the Fortran
  • ThirdParty/HSL/trunk/configure

    r4132 r4142  
    11#! /bin/sh
    22# Guess values for system-dependent variables and create Makefiles.
    3 # Generated by GNU Autoconf 2.69 for ThirdPartyHSL trunk.
     3# Generated by GNU Autoconf 2.69 for CoinHSL trunk.
    44#
    55# Report bugs to <https://github.com/coin-or-tools/ThirdParty-HSL/issues/new>.
     
    596596
    597597# Identity of this package.
    598 PACKAGE_NAME='ThirdPartyHSL'
    599 PACKAGE_TARNAME='thirdpartyhsl'
     598PACKAGE_NAME='CoinHSL'
     599PACKAGE_TARNAME='coinhsl'
    600600PACKAGE_VERSION='trunk'
    601 PACKAGE_STRING='ThirdPartyHSL trunk'
     601PACKAGE_STRING='CoinHSL trunk'
    602602PACKAGE_BUGREPORT='https://github.com/coin-or-tools/ThirdParty-HSL/issues/new'
    603603PACKAGE_URL='https://github.com/coin-or-tools/ThirdParty-HSL'
     
    13941394  # This message is too long to be a string in the A/UX 3.1 sh.
    13951395  cat <<_ACEOF
    1396 \`configure' configures ThirdPartyHSL trunk to adapt to many kinds of systems.
     1396\`configure' configures CoinHSL trunk to adapt to many kinds of systems.
    13971397
    13981398Usage: $0 [OPTION]... [VAR=VALUE]...
     
    14421442  --localedir=DIR         locale-dependent data [DATAROOTDIR/locale]
    14431443  --mandir=DIR            man documentation [DATAROOTDIR/man]
    1444   --docdir=DIR            documentation root [DATAROOTDIR/doc/thirdpartyhsl]
     1444  --docdir=DIR            documentation root [DATAROOTDIR/doc/coinhsl]
    14451445  --htmldir=DIR           html documentation [DOCDIR]
    14461446  --dvidir=DIR            dvi documentation [DOCDIR]
     
    14641464if test -n "$ac_init_help"; then
    14651465  case $ac_init_help in
    1466      short | recursive ) echo "Configuration of ThirdPartyHSL trunk:";;
     1466     short | recursive ) echo "Configuration of CoinHSL trunk:";;
    14671467   esac
    14681468  cat <<\_ACEOF
     
    15501550
    15511551Report bugs to <https://github.com/coin-or-tools/ThirdParty-HSL/issues/new>.
    1552 ThirdPartyHSL home page: <https://github.com/coin-or-tools/ThirdParty-HSL>.
     1552CoinHSL home page: <https://github.com/coin-or-tools/ThirdParty-HSL>.
    15531553_ACEOF
    15541554ac_status=$?
     
    16131613if $ac_init_version; then
    16141614  cat <<\_ACEOF
    1615 ThirdPartyHSL configure trunk
     1615CoinHSL configure trunk
    16161616generated by GNU Autoconf 2.69
    16171617
     
    20732073running configure, to aid debugging if configure makes a mistake.
    20742074
    2075 It was created by ThirdPartyHSL $as_me trunk, which was
     2075It was created by CoinHSL $as_me trunk, which was
    20762076generated by GNU Autoconf 2.69.  Invocation command line was
    20772077
     
    31013101
    31023102
    3103 
    3104 
    31053103# A useful makefile conditional that is always false
    31063104
     
    32093207
    32103208# Define the identity of the package.
    3211  PACKAGE='thirdpartyhsl'
     3209 PACKAGE='coinhsl'
    32123210 VERSION='trunk'
    32133211
     
    2132321321    coin_has_lapack=yes
    2132421322         lapack_pcfiles="lapack blas"
    21325     else as_fn_error $? "Could not find dsyev in Lapack from lapack.pc blas.pc." "$LINENO" 5
     21323    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
     21324$as_echo "$as_me: WARNING: lapack.pc and blas.pc present, but could not find dsyev when trying to link with it." >&2;}
    2132621325  fi
    2132721326
     
    2143521434  if test $coin_has_lapack = yes ; then
    2143621435
    21437 $as_echo "#define COIN_HAS_LAPACK 1" >>confdefs.h
     21436$as_echo "#define COINHSL_HAS_LAPACK 1" >>confdefs.h
    2143821437
    2143921438
     
    2144221441  case "${dsyev_namemangling}" in
    2144321442   "lower case, no underscore, no extra underscore")
    21444       $as_echo "#define COIN_LAPACK_FUNC(name,NAME) name" >>confdefs.h
    21445 
    21446       $as_echo "#define COIN_LAPACK_FUNC_(name,NAME) name" >>confdefs.h
     21443      $as_echo "#define COINHSL_LAPACK_FUNC(name,NAME) name" >>confdefs.h
     21444
     21445      $as_echo "#define COINHSL_LAPACK_FUNC_(name,NAME) name" >>confdefs.h
    2144721446 ;;
    2144821447   "lower case, no underscore, extra underscore")
    21449       $as_echo "#define COIN_LAPACK_FUNC(name,NAME) name" >>confdefs.h
    21450 
    21451       $as_echo "#define COIN_LAPACK_FUNC_(name,NAME) name ## _" >>confdefs.h
     21448      $as_echo "#define COINHSL_LAPACK_FUNC(name,NAME) name" >>confdefs.h
     21449
     21450      $as_echo "#define COINHSL_LAPACK_FUNC_(name,NAME) name ## _" >>confdefs.h
    2145221451 ;;
    2145321452   "lower case, underscore, no extra underscore")
    21454       $as_echo "#define COIN_LAPACK_FUNC(name,NAME) name ## _" >>confdefs.h
    21455 
    21456       $as_echo "#define COIN_LAPACK_FUNC_(name,NAME) name ## _" >>confdefs.h
     21453      $as_echo "#define COINHSL_LAPACK_FUNC(name,NAME) name ## _" >>confdefs.h
     21454
     21455      $as_echo "#define COINHSL_LAPACK_FUNC_(name,NAME) name ## _" >>confdefs.h
    2145721456 ;;
    2145821457   "lower case, underscore, extra underscore")
    21459       $as_echo "#define COIN_LAPACK_FUNC(name,NAME) name ## _" >>confdefs.h
    21460 
    21461       $as_echo "#define COIN_LAPACK_FUNC_(name,NAME) name ## __" >>confdefs.h
     21458      $as_echo "#define COINHSL_LAPACK_FUNC(name,NAME) name ## _" >>confdefs.h
     21459
     21460      $as_echo "#define COINHSL_LAPACK_FUNC_(name,NAME) name ## __" >>confdefs.h
    2146221461 ;;
    2146321462   "upper case, no underscore, no extra underscore")
    21464       $as_echo "#define COIN_LAPACK_FUNC(name,NAME) NAME" >>confdefs.h
    21465 
    21466       $as_echo "#define COIN_LAPACK_FUNC_(name,NAME) NAME" >>confdefs.h
     21463      $as_echo "#define COINHSL_LAPACK_FUNC(name,NAME) NAME" >>confdefs.h
     21464
     21465      $as_echo "#define COINHSL_LAPACK_FUNC_(name,NAME) NAME" >>confdefs.h
    2146721466 ;;
    2146821467   "upper case, no underscore, extra underscore")
    21469       $as_echo "#define COIN_LAPACK_FUNC(name,NAME) NAME" >>confdefs.h
    21470 
    21471       $as_echo "#define COIN_LAPACK_FUNC_(name,NAME) NAME ## _" >>confdefs.h
     21468      $as_echo "#define COINHSL_LAPACK_FUNC(name,NAME) NAME" >>confdefs.h
     21469
     21470      $as_echo "#define COINHSL_LAPACK_FUNC_(name,NAME) NAME ## _" >>confdefs.h
    2147221471 ;;
    2147321472   "upper case, underscore, no extra underscore")
    21474       $as_echo "#define COIN_LAPACK_FUNC(name,NAME) NAME ## _" >>confdefs.h
    21475 
    21476       $as_echo "#define COIN_LAPACK_FUNC_(name,NAME) NAME ## _" >>confdefs.h
     21473      $as_echo "#define COINHSL_LAPACK_FUNC(name,NAME) NAME ## _" >>confdefs.h
     21474
     21475      $as_echo "#define COINHSL_LAPACK_FUNC_(name,NAME) NAME ## _" >>confdefs.h
    2147721476 ;;
    2147821477   "upper case, underscore, extra underscore")
    21479       $as_echo "#define COIN_LAPACK_FUNC(name,NAME) NAME ## _" >>confdefs.h
    21480 
    21481       $as_echo "#define COIN_LAPACK_FUNC_(name,NAME) NAME ## __" >>confdefs.h
     21478      $as_echo "#define COINHSL_LAPACK_FUNC(name,NAME) NAME ## _" >>confdefs.h
     21479
     21480      $as_echo "#define COINHSL_LAPACK_FUNC_(name,NAME) NAME ## __" >>confdefs.h
    2148221481 ;;
    2148321482   *)
     
    2175221751  if test $coin_has_metis = yes ; then
    2175321752
    21754 $as_echo "#define COIN_HAS_METIS 1" >>confdefs.h
     21753$as_echo "#define COINHSL_HAS_METIS 1" >>confdefs.h
    2175521754
    2175621755    if test -n "$metis_pcfiles" ; then HSL_PCFILES="$metis_pcfiles $HSL_PCFILES" ; fi
     
    2176421763  fi
    2176521764
    21766   if test $coin_has_metis = yes ; then
    21767 
    21768 $as_echo "#define COINHSL_HAS_METIS 1" >>confdefs.h
    21769 
    21770   fi
    2177121765else
    2177221766  # do as if we had metis, so metis.f is not compiled
     
    2190721901_ACEOF
    2190821902
     21903
     21904      # add -DXYZ_BUILD to XYZ_CFLAGS
     21905      HSL_CFLAGS="${HSL_CFLAGS} -DHSL_BUILD"
    2190921906
    2191021907# Define BUILDTOOLS_DEBUG to enable debugging output
     
    2252722524# values after options handling.
    2252822525ac_log="
    22529 This file was extended by ThirdPartyHSL $as_me trunk, which was
     22526This file was extended by CoinHSL $as_me trunk, which was
    2253022527generated by GNU Autoconf 2.69.  Invocation command line was
    2253122528
     
    2258822585
    2258922586Report bugs to <https://github.com/coin-or-tools/ThirdParty-HSL/issues/new>.
    22590 ThirdPartyHSL home page: <https://github.com/coin-or-tools/ThirdParty-HSL>."
     22587CoinHSL home page: <https://github.com/coin-or-tools/ThirdParty-HSL>."
    2259122588
    2259222589_ACEOF
     
    2259422591ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
    2259522592ac_cs_version="\\
    22596 ThirdPartyHSL config.status trunk
     22593CoinHSL config.status trunk
    2259722594configured by $0, generated by GNU Autoconf 2.69,
    2259822595  with options \\"\$ac_cs_config\\"
  • ThirdParty/HSL/trunk/configure.ac

    r4046 r4142  
    1111AC_PREREQ(2.59)
    1212
    13 AC_INIT([ThirdPartyHSL],[trunk],[https://github.com/coin-or-tools/ThirdParty-HSL/issues/new],,[https://github.com/coin-or-tools/ThirdParty-HSL])
     13AC_INIT([CoinHSL],[trunk],[https://github.com/coin-or-tools/ThirdParty-HSL/issues/new],,[https://github.com/coin-or-tools/ThirdParty-HSL])
    1414
    1515AC_COPYRIGHT([
     
    2323AC_CONFIG_SRCDIR([coinhsl/common/deps.f])
    2424
    25 AC_COIN_INITIALIZE(COINHSL)
     25AC_COIN_INITIALIZE
    2626
    2727#############################################################################
     
    130130if test $coin_has_ma57$coin_has_hsl_ma77$coin_has_hsl_ma97$coin_has_hsl_mc68 != nononono ; then
    131131  AC_COIN_CHK_PKG(Metis,[HSL],[coinmetis],[build])
    132   if test $coin_has_metis = yes ; then
    133     AC_DEFINE(COINHSL_HAS_METIS, [1], Define to 1 if METIS is available)
    134   fi
    135132else
    136133  # do as if we had metis, so metis.f is not compiled
Note: See TracChangeset for help on using the changeset viewer.