Changeset 4177


Ignore:
Timestamp:
Apr 21, 2020 8:39:24 AM (13 months ago)
Author:
stefan
Message:

fixup pc; rerun autotools

Location:
ThirdParty/Mumps/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/Mumps/trunk/coinmumps.pc.in

    r4074 r4177  
    99URL: https://github.com/coin-or-tools/ThirdParty-MUMPS
    1010Version: @PACKAGE_VERSION@
    11 Libs: -L${libdir} -lcoinmumps
    12 Libs.private: @MUMPS_LFLAGS_NOPC@
    1311Cflags: -I${includedir}
    14 Requires.private: @MUMPS_PCFILES@
     12@COIN_STATIC_BUILD_FALSE@Libs: -L${libdir} -lcoinmumps
     13@COIN_STATIC_BUILD_FALSE@Requires.private: @MUMPS_PCFILES@
     14@COIN_STATIC_BUILD_TRUE@Libs: -L${libdir} -lcoinmumps @MUMPS_LFLAGS_NOPC@
     15@COIN_STATIC_BUILD_TRUE@Requires: @MUMPS_PCFILES@
  • ThirdParty/Mumps/trunk/configure

    r4170 r4177  
    664664MY_DEFS
    665665FCLIBS
     666COIN_STATIC_BUILD_FALSE
     667COIN_STATIC_BUILD_TRUE
    666668LT_LDFLAGS
    667669CPP
     
    30363038
    30373039
    3038 
    30393040# Set the project's version numbers
    3040 
    30413041
    30423042  # break up package version number in major.minor.release
     
    30723072
    30733073# A useful makefile conditional that is always false
    3074 
    30753074   if false; then
    30763075  ALWAYS_FALSE_TRUE=
     
    30863085
    30873086
    3088 
    30893087# Get the build and host types
    30903088
    30913089
    30923090
    3093 
    30943091# libtool has some magic for host_os and build_os being mingw, but doesn't know about msys
    3095 
    30963092  if test $host_os = msys ; then
    30973093    host_os=mingw
     
    31073103# manual/html_node/Automake-Silent-Rules.html). Run before AM_INIT_AUTOMAKE,
    31083104# which will AC_REQUIRE it anyway.
    3109 
    31103105  # Check whether --enable-silent-rules was given.
    31113106if test "${enable_silent_rules+set}" = set; then :
     
    31553150# - place objects from sources in subdirs into corresponding subdirs
    31563151# - enable all automake warnings
    3157 
    31583152  if test "`cd $srcdir && pwd`" != "`pwd`"; then
    31593153  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
     
    32643258
    32653259# Disable automatic rebuild of configure/Makefile. Use run_autotools.
    3266 
    32673260
    32683261{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
     
    1623116224  LT_LDFLAGS="$LT_LDFLAGS -no-undefined"
    1623216225
     16226  # add automake conditional on whether we build shared or static, useful for .pc files
     16227   if test "$enable_shared" = no; then
     16228  COIN_STATIC_BUILD_TRUE=
     16229  COIN_STATIC_BUILD_FALSE='#'
     16230else
     16231  COIN_STATIC_BUILD_TRUE='#'
     16232  COIN_STATIC_BUILD_FALSE=
     16233fi
     16234
     16235
    1623316236
    1623416237# Add FLIBS to MUMPS_LFLAGS, so that they get into the .pc files section for static builds
     
    1740317406        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    1740417407/* end confdefs.h.  */
     17408
     17409/* Override any GCC internal prototype to avoid an error.
     17410   Use char because int might match the return type of a GCC
     17411   builtin and then its argument prototype would still apply.  */
    1740517412#ifdef __cplusplus
    17406              extern "C"
    17407              #endif
    17408              void $ac_name();
     17413extern "C"
     17414#endif
     17415char $ac_name ();
    1740917416#ifdef FC_DUMMY_MAIN
    1741017417#ifndef FC_DUMMY_MAIN_EQ_F77
     
    1741817425main ()
    1741917426{
    17420 $ac_name()
     17427return $ac_name ();
    1742117428  ;
    1742217429  return 0;
     
    1748217489        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    1748317490/* end confdefs.h.  */
     17491
     17492/* Override any GCC internal prototype to avoid an error.
     17493   Use char because int might match the return type of a GCC
     17494   builtin and then its argument prototype would still apply.  */
    1748417495#ifdef __cplusplus
    17485              extern "C"
    17486              #endif
    17487              void $ac_name();
     17496extern "C"
     17497#endif
     17498char $ac_name ();
    1748817499#ifdef FC_DUMMY_MAIN
    1748917500#ifndef FC_DUMMY_MAIN_EQ_F77
     
    1749717508main ()
    1749817509{
    17499 $ac_name()
     17510return $ac_name ();
    1750017511  ;
    1750117512  return 0;
     
    1755917570        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    1756017571/* end confdefs.h.  */
     17572
     17573/* Override any GCC internal prototype to avoid an error.
     17574   Use char because int might match the return type of a GCC
     17575   builtin and then its argument prototype would still apply.  */
    1756117576#ifdef __cplusplus
    17562              extern "C"
    17563              #endif
    17564              void $ac_name();
     17577extern "C"
     17578#endif
     17579char $ac_name ();
    1756517580#ifdef FC_DUMMY_MAIN
    1756617581#ifndef FC_DUMMY_MAIN_EQ_F77
     
    1757417589main ()
    1757517590{
    17576 $ac_name()
     17591return $ac_name ();
    1757717592  ;
    1757817593  return 0;
     
    1764317658        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    1764417659/* end confdefs.h.  */
     17660
     17661/* Override any GCC internal prototype to avoid an error.
     17662   Use char because int might match the return type of a GCC
     17663   builtin and then its argument prototype would still apply.  */
    1764517664#ifdef __cplusplus
    17646              extern "C"
    17647              #endif
    17648              void $ac_name();
     17665extern "C"
     17666#endif
     17667char $ac_name ();
    1764917668#ifdef FC_DUMMY_MAIN
    1765017669#ifndef FC_DUMMY_MAIN_EQ_F77
     
    1765817677main ()
    1765917678{
    17660 $ac_name()
     17679return $ac_name ();
    1766117680  ;
    1766217681  return 0;
     
    1774017759        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    1774117760/* end confdefs.h.  */
     17761
     17762/* Override any GCC internal prototype to avoid an error.
     17763   Use char because int might match the return type of a GCC
     17764   builtin and then its argument prototype would still apply.  */
    1774217765#ifdef __cplusplus
    17743              extern "C"
    17744              #endif
    17745              void $ac_name();
     17766extern "C"
     17767#endif
     17768char $ac_name ();
    1774617769#ifdef FC_DUMMY_MAIN
    1774717770#ifndef FC_DUMMY_MAIN_EQ_F77
     
    1775517778main ()
    1775617779{
    17757 $ac_name()
     17780return $ac_name ();
    1775817781  ;
    1775917782  return 0;
     
    1781617839        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    1781717840/* end confdefs.h.  */
     17841
     17842/* Override any GCC internal prototype to avoid an error.
     17843   Use char because int might match the return type of a GCC
     17844   builtin and then its argument prototype would still apply.  */
    1781817845#ifdef __cplusplus
    17819              extern "C"
    17820              #endif
    17821              void $ac_name();
     17846extern "C"
     17847#endif
     17848char $ac_name ();
    1782217849#ifdef FC_DUMMY_MAIN
    1782317850#ifndef FC_DUMMY_MAIN_EQ_F77
     
    1783117858main ()
    1783217859{
    17833 $ac_name()
     17860return $ac_name ();
    1783417861  ;
    1783517862  return 0;
     
    1789117918        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    1789217919/* end confdefs.h.  */
     17920
     17921/* Override any GCC internal prototype to avoid an error.
     17922   Use char because int might match the return type of a GCC
     17923   builtin and then its argument prototype would still apply.  */
    1789317924#ifdef __cplusplus
    17894              extern "C"
    17895              #endif
    17896              void $ac_name();
     17925extern "C"
     17926#endif
     17927char $ac_name ();
    1789717928#ifdef FC_DUMMY_MAIN
    1789817929#ifndef FC_DUMMY_MAIN_EQ_F77
     
    1790617937main ()
    1790717938{
    17908 $ac_name()
     17939return $ac_name ();
    1790917940  ;
    1791017941  return 0;
     
    1798818019        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    1798918020/* end confdefs.h.  */
     18021
     18022/* Override any GCC internal prototype to avoid an error.
     18023   Use char because int might match the return type of a GCC
     18024   builtin and then its argument prototype would still apply.  */
    1799018025#ifdef __cplusplus
    17991              extern "C"
    17992              #endif
    17993              void $ac_name();
     18026extern "C"
     18027#endif
     18028char $ac_name ();
    1799418029#ifdef FC_DUMMY_MAIN
    1799518030#ifndef FC_DUMMY_MAIN_EQ_F77
     
    1800318038main ()
    1800418039{
    18005 $ac_name()
     18040return $ac_name ();
    1800618041  ;
    1800718042  return 0;
     
    1807918114        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    1808018115/* end confdefs.h.  */
     18116
     18117/* Override any GCC internal prototype to avoid an error.
     18118   Use char because int might match the return type of a GCC
     18119   builtin and then its argument prototype would still apply.  */
    1808118120#ifdef __cplusplus
    18082              extern "C"
    18083              #endif
    18084              void $ac_name();
     18121extern "C"
     18122#endif
     18123char $ac_name ();
    1808518124#ifdef FC_DUMMY_MAIN
    1808618125#ifndef FC_DUMMY_MAIN_EQ_F77
     
    1809418133main ()
    1809518134{
    18096 $ac_name()
     18135return $ac_name ();
    1809718136  ;
    1809818137  return 0;
     
    1873618775      MUMPS_CFLAGS="${MUMPS_CFLAGS} -DMUMPS_BUILD"
    1873718776
    18738 # Define BUILDTOOLS_DEBUG to enable debugging output
    18739 
     18777      # Define BUILDTOOLS_DEBUG to enable debugging output
    1874018778      if test "$BUILDTOOLS_DEBUG" = 1 ; then
    1874118779        { $as_echo "$as_me:${as_lineno-$LINENO}: MUMPS_LFLAGS_NOPC: \"${MUMPS_LFLAGS_NOPC}\"" >&5
     
    1892118959if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
    1892218960  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
     18961Usually this means the macro was only invoked conditionally." "$LINENO" 5
     18962fi
     18963if test -z "${COIN_STATIC_BUILD_TRUE}" && test -z "${COIN_STATIC_BUILD_FALSE}"; then
     18964  as_fn_error $? "conditional \"COIN_STATIC_BUILD\" was never defined.
    1892318965Usually this means the macro was only invoked conditionally." "$LINENO" 5
    1892418966fi
Note: See TracChangeset for help on using the changeset viewer.