Changeset 4178


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

fixup pc; rerun autotools

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

Legend:

Unmodified
Added
Removed
  • ThirdParty/Mumps/branches/mumps5/coinmumps.pc.in

    r4117 r4178  
    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/branches/mumps5/configure

    r4171 r4178  
    663663OPENMP_FCFLAGS
    664664FCLIBS
     665COIN_STATIC_BUILD_FALSE
     666COIN_STATIC_BUILD_TRUE
    665667LT_LDFLAGS
    666668CPP
     
    30373039
    30383040
    3039 
    30403041# Set the project's version numbers
    3041 
    30423042
    30433043  # break up package version number in major.minor.release
     
    30733073
    30743074# A useful makefile conditional that is always false
    3075 
    30763075   if false; then
    30773076  ALWAYS_FALSE_TRUE=
     
    30873086
    30883087
    3089 
    30903088# Get the build and host types
    30913089
    30923090
    30933091
    3094 
    30953092# libtool has some magic for host_os and build_os being mingw, but doesn't know about msys
    3096 
    30973093  if test $host_os = msys ; then
    30983094    host_os=mingw
     
    31083104# manual/html_node/Automake-Silent-Rules.html). Run before AM_INIT_AUTOMAKE,
    31093105# which will AC_REQUIRE it anyway.
    3110 
    31113106  # Check whether --enable-silent-rules was given.
    31123107if test "${enable_silent_rules+set}" = set; then :
     
    31563151# - place objects from sources in subdirs into corresponding subdirs
    31573152# - enable all automake warnings
    3158 
    31593153  if test "`cd $srcdir && pwd`" != "`pwd`"; then
    31603154  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
     
    32653259
    32663260# Disable automatic rebuild of configure/Makefile. Use run_autotools.
    3267 
    32683261
    32693262{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
     
    1623216225  LT_LDFLAGS="$LT_LDFLAGS -no-undefined"
    1623316226
     16227  # add automake conditional on whether we build shared or static, useful for .pc files
     16228   if test "$enable_shared" = no; then
     16229  COIN_STATIC_BUILD_TRUE=
     16230  COIN_STATIC_BUILD_FALSE='#'
     16231else
     16232  COIN_STATIC_BUILD_TRUE='#'
     16233  COIN_STATIC_BUILD_FALSE=
     16234fi
     16235
     16236
    1623416237
    1623516238# Add FLIBS to MUMPS_LFLAGS, so that they get into the .pc files section for static builds
     
    1748917492        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    1749017493/* end confdefs.h.  */
     17494
     17495/* Override any GCC internal prototype to avoid an error.
     17496   Use char because int might match the return type of a GCC
     17497   builtin and then its argument prototype would still apply.  */
    1749117498#ifdef __cplusplus
    17492              extern "C"
    17493              #endif
    17494              void $ac_name();
     17499extern "C"
     17500#endif
     17501char $ac_name ();
    1749517502#ifdef FC_DUMMY_MAIN
    1749617503#ifndef FC_DUMMY_MAIN_EQ_F77
     
    1750417511main ()
    1750517512{
    17506 $ac_name()
     17513return $ac_name ();
    1750717514  ;
    1750817515  return 0;
     
    1756817575        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    1756917576/* end confdefs.h.  */
     17577
     17578/* Override any GCC internal prototype to avoid an error.
     17579   Use char because int might match the return type of a GCC
     17580   builtin and then its argument prototype would still apply.  */
    1757017581#ifdef __cplusplus
    17571              extern "C"
    17572              #endif
    17573              void $ac_name();
     17582extern "C"
     17583#endif
     17584char $ac_name ();
    1757417585#ifdef FC_DUMMY_MAIN
    1757517586#ifndef FC_DUMMY_MAIN_EQ_F77
     
    1758317594main ()
    1758417595{
    17585 $ac_name()
     17596return $ac_name ();
    1758617597  ;
    1758717598  return 0;
     
    1764517656        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    1764617657/* end confdefs.h.  */
     17658
     17659/* Override any GCC internal prototype to avoid an error.
     17660   Use char because int might match the return type of a GCC
     17661   builtin and then its argument prototype would still apply.  */
    1764717662#ifdef __cplusplus
    17648              extern "C"
    17649              #endif
    17650              void $ac_name();
     17663extern "C"
     17664#endif
     17665char $ac_name ();
    1765117666#ifdef FC_DUMMY_MAIN
    1765217667#ifndef FC_DUMMY_MAIN_EQ_F77
     
    1766017675main ()
    1766117676{
    17662 $ac_name()
     17677return $ac_name ();
    1766317678  ;
    1766417679  return 0;
     
    1772917744        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    1773017745/* end confdefs.h.  */
     17746
     17747/* Override any GCC internal prototype to avoid an error.
     17748   Use char because int might match the return type of a GCC
     17749   builtin and then its argument prototype would still apply.  */
    1773117750#ifdef __cplusplus
    17732              extern "C"
    17733              #endif
    17734              void $ac_name();
     17751extern "C"
     17752#endif
     17753char $ac_name ();
    1773517754#ifdef FC_DUMMY_MAIN
    1773617755#ifndef FC_DUMMY_MAIN_EQ_F77
     
    1774417763main ()
    1774517764{
    17746 $ac_name()
     17765return $ac_name ();
    1774717766  ;
    1774817767  return 0;
     
    1782617845        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    1782717846/* end confdefs.h.  */
     17847
     17848/* Override any GCC internal prototype to avoid an error.
     17849   Use char because int might match the return type of a GCC
     17850   builtin and then its argument prototype would still apply.  */
    1782817851#ifdef __cplusplus
    17829              extern "C"
    17830              #endif
    17831              void $ac_name();
     17852extern "C"
     17853#endif
     17854char $ac_name ();
    1783217855#ifdef FC_DUMMY_MAIN
    1783317856#ifndef FC_DUMMY_MAIN_EQ_F77
     
    1784117864main ()
    1784217865{
    17843 $ac_name()
     17866return $ac_name ();
    1784417867  ;
    1784517868  return 0;
     
    1790217925        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    1790317926/* end confdefs.h.  */
     17927
     17928/* Override any GCC internal prototype to avoid an error.
     17929   Use char because int might match the return type of a GCC
     17930   builtin and then its argument prototype would still apply.  */
    1790417931#ifdef __cplusplus
    17905              extern "C"
    17906              #endif
    17907              void $ac_name();
     17932extern "C"
     17933#endif
     17934char $ac_name ();
    1790817935#ifdef FC_DUMMY_MAIN
    1790917936#ifndef FC_DUMMY_MAIN_EQ_F77
     
    1791717944main ()
    1791817945{
    17919 $ac_name()
     17946return $ac_name ();
    1792017947  ;
    1792117948  return 0;
     
    1797718004        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    1797818005/* end confdefs.h.  */
     18006
     18007/* Override any GCC internal prototype to avoid an error.
     18008   Use char because int might match the return type of a GCC
     18009   builtin and then its argument prototype would still apply.  */
    1797918010#ifdef __cplusplus
    17980              extern "C"
    17981              #endif
    17982              void $ac_name();
     18011extern "C"
     18012#endif
     18013char $ac_name ();
    1798318014#ifdef FC_DUMMY_MAIN
    1798418015#ifndef FC_DUMMY_MAIN_EQ_F77
     
    1799218023main ()
    1799318024{
    17994 $ac_name()
     18025return $ac_name ();
    1799518026  ;
    1799618027  return 0;
     
    1807418105        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    1807518106/* end confdefs.h.  */
     18107
     18108/* Override any GCC internal prototype to avoid an error.
     18109   Use char because int might match the return type of a GCC
     18110   builtin and then its argument prototype would still apply.  */
    1807618111#ifdef __cplusplus
    18077              extern "C"
    18078              #endif
    18079              void $ac_name();
     18112extern "C"
     18113#endif
     18114char $ac_name ();
    1808018115#ifdef FC_DUMMY_MAIN
    1808118116#ifndef FC_DUMMY_MAIN_EQ_F77
     
    1808918124main ()
    1809018125{
    18091 $ac_name()
     18126return $ac_name ();
    1809218127  ;
    1809318128  return 0;
     
    1816518200        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    1816618201/* end confdefs.h.  */
     18202
     18203/* Override any GCC internal prototype to avoid an error.
     18204   Use char because int might match the return type of a GCC
     18205   builtin and then its argument prototype would still apply.  */
    1816718206#ifdef __cplusplus
    18168              extern "C"
    18169              #endif
    18170              void $ac_name();
     18207extern "C"
     18208#endif
     18209char $ac_name ();
    1817118210#ifdef FC_DUMMY_MAIN
    1817218211#ifndef FC_DUMMY_MAIN_EQ_F77
     
    1818018219main ()
    1818118220{
    18182 $ac_name()
     18221return $ac_name ();
    1818318222  ;
    1818418223  return 0;
     
    1832418363        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    1832518364/* end confdefs.h.  */
     18365
     18366/* Override any GCC internal prototype to avoid an error.
     18367   Use char because int might match the return type of a GCC
     18368   builtin and then its argument prototype would still apply.  */
    1832618369#ifdef __cplusplus
    18327              extern "C"
    18328              #endif
    18329              void $ac_name();
     18370extern "C"
     18371#endif
     18372char $ac_name ();
    1833018373#ifdef FC_DUMMY_MAIN
    1833118374#ifndef FC_DUMMY_MAIN_EQ_F77
     
    1833918382main ()
    1834018383{
    18341 $ac_name()
     18384return $ac_name ();
    1834218385  ;
    1834318386  return 0;
     
    1902019063      MUMPS_CFLAGS="${MUMPS_CFLAGS} -DMUMPS_BUILD"
    1902119064
    19022 # Define BUILDTOOLS_DEBUG to enable debugging output
    19023 
     19065      # Define BUILDTOOLS_DEBUG to enable debugging output
    1902419066      if test "$BUILDTOOLS_DEBUG" = 1 ; then
    1902519067        { $as_echo "$as_me:${as_lineno-$LINENO}: MUMPS_LFLAGS_NOPC: \"${MUMPS_LFLAGS_NOPC}\"" >&5
     
    1920519247if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
    1920619248  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
     19249Usually this means the macro was only invoked conditionally." "$LINENO" 5
     19250fi
     19251if test -z "${COIN_STATIC_BUILD_TRUE}" && test -z "${COIN_STATIC_BUILD_FALSE}"; then
     19252  as_fn_error $? "conditional \"COIN_STATIC_BUILD\" was never defined.
    1920719253Usually this means the macro was only invoked conditionally." "$LINENO" 5
    1920819254fi
Note: See TracChangeset for help on using the changeset viewer.