Changeset 3010


Ignore:
Timestamp:
Apr 21, 2020 10:46:05 AM (3 months ago)
Author:
stefan
Message:

fixup pc; rerun autotools

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/cbc.pc.in

    r2861 r3010  
    99URL: https://github.com/coin-or/Cbc
    1010Version: @PACKAGE_VERSION@
    11 Libs: -L${libdir} -lCbcSolver -lCbc
    12 Libs.private: @CBCLIB_LFLAGS_NOPC@
    1311Cflags: -I${includedir}
    14 Requires:
    15 Requires.private: @CBCLIB_PCFILES@
     12@COIN_STATIC_BUILD_FALSE@Libs: -L${libdir} -lCbcSolver -lCbc
     13@COIN_STATIC_BUILD_FALSE@Requires.private: @CBCLIB_PCFILES@
     14@COIN_STATIC_BUILD_TRUE@Libs: -L${libdir} -lOsiCbc @CBCLIB_LFLAGS_NOPC@
     15@COIN_STATIC_BUILD_TRUE@Requires: @CBCLIB_PCFILES@
  • trunk/configure

    r3005 r3010  
    745745PKG_CONFIG
    746746RPATH_FLAGS
     747COIN_STATIC_BUILD_FALSE
     748COIN_STATIC_BUILD_TRUE
    747749LT_LDFLAGS
    748750CXXCPP
     
    33783380
    33793381
    3380 
    33813382# Set the project's version numbers
    3382 
    33833383
    33843384  # break up package version number in major.minor.release
     
    34143414
    34153415# A useful makefile conditional that is always false
    3416 
    34173416   if false; then
    34183417  ALWAYS_FALSE_TRUE=
     
    34283427
    34293428
    3430 
    34313429# Get the build and host types
    34323430
    34333431
    34343432
    3435 
    34363433# libtool has some magic for host_os and build_os being mingw, but doesn't know about msys
    3437 
    34383434  if test $host_os = msys ; then
    34393435    host_os=mingw
     
    34493445# manual/html_node/Automake-Silent-Rules.html). Run before AM_INIT_AUTOMAKE,
    34503446# which will AC_REQUIRE it anyway.
    3451 
    34523447  # Check whether --enable-silent-rules was given.
    34533448if test "${enable_silent_rules+set}" = set; then :
     
    34973492# - place objects from sources in subdirs into corresponding subdirs
    34983493# - enable all automake warnings
    3499 
    35003494  if test "`cd $srcdir && pwd`" != "`pwd`"; then
    35013495  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
     
    36063600
    36073601# Disable automatic rebuild of configure/Makefile. Use run_autotools.
    3608 
    36093602
    36103603{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
     
    1695816951  LT_LDFLAGS="$LT_LDFLAGS -no-undefined"
    1695916952
     16953  # add automake conditional on whether we build shared or static, useful for .pc files
     16954   if test "$enable_shared" = no; then
     16955  COIN_STATIC_BUILD_TRUE=
     16956  COIN_STATIC_BUILD_FALSE='#'
     16957else
     16958  COIN_STATIC_BUILD_TRUE='#'
     16959  COIN_STATIC_BUILD_FALSE=
     16960fi
     16961
     16962
    1696016963
    1696116964# set RPATH_FLAGS to the compiler link flags required to hardcode location
     
    2213522138      CBCLIB_CFLAGS="${CBCLIB_CFLAGS} -DCBCLIB_BUILD"
    2213622139
    22137 # Define BUILDTOOLS_DEBUG to enable debugging output
    22138 
     22140      # Define BUILDTOOLS_DEBUG to enable debugging output
    2213922141      if test "$BUILDTOOLS_DEBUG" = 1 ; then
    2214022142        { $as_echo "$as_me:${as_lineno-$LINENO}: CBCLIB_LFLAGS_NOPC: \"${CBCLIB_LFLAGS_NOPC}\"" >&5
     
    2218522187      CBCSOLVERLIB_CFLAGS="${CBCSOLVERLIB_CFLAGS} -DCBCSOLVERLIB_BUILD"
    2218622188
    22187 # Define BUILDTOOLS_DEBUG to enable debugging output
    22188 
     22189      # Define BUILDTOOLS_DEBUG to enable debugging output
    2218922190      if test "$BUILDTOOLS_DEBUG" = 1 ; then
    2219022191        { $as_echo "$as_me:${as_lineno-$LINENO}: CBCSOLVERLIB_LFLAGS_NOPC: \"${CBCSOLVERLIB_LFLAGS_NOPC}\"" >&5
     
    2223522236      CBCGENERIC_CFLAGS="${CBCGENERIC_CFLAGS} -DCBCGENERIC_BUILD"
    2223622237
    22237 # Define BUILDTOOLS_DEBUG to enable debugging output
    22238 
     22238      # Define BUILDTOOLS_DEBUG to enable debugging output
    2223922239      if test "$BUILDTOOLS_DEBUG" = 1 ; then
    2224022240        { $as_echo "$as_me:${as_lineno-$LINENO}: CBCGENERIC_LFLAGS_NOPC: \"${CBCGENERIC_LFLAGS_NOPC}\"" >&5
     
    2228522285      OSICBCLIB_CFLAGS="${OSICBCLIB_CFLAGS} -DOSICBCLIB_BUILD"
    2228622286
    22287 # Define BUILDTOOLS_DEBUG to enable debugging output
    22288 
     22287      # Define BUILDTOOLS_DEBUG to enable debugging output
    2228922288      if test "$BUILDTOOLS_DEBUG" = 1 ; then
    2229022289        { $as_echo "$as_me:${as_lineno-$LINENO}: OSICBCLIB_LFLAGS_NOPC: \"${OSICBCLIB_LFLAGS_NOPC}\"" >&5
     
    2233522334      CBCUNITTEST_CFLAGS="${CBCUNITTEST_CFLAGS} -DCBCUNITTEST_BUILD"
    2233622335
    22337 # Define BUILDTOOLS_DEBUG to enable debugging output
    22338 
     22336      # Define BUILDTOOLS_DEBUG to enable debugging output
    2233922337      if test "$BUILDTOOLS_DEBUG" = 1 ; then
    2234022338        { $as_echo "$as_me:${as_lineno-$LINENO}: CBCUNITTEST_LFLAGS_NOPC: \"${CBCUNITTEST_LFLAGS_NOPC}\"" >&5
     
    2339023388if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
    2339123389  as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
     23390Usually this means the macro was only invoked conditionally." "$LINENO" 5
     23391fi
     23392if test -z "${COIN_STATIC_BUILD_TRUE}" && test -z "${COIN_STATIC_BUILD_FALSE}"; then
     23393  as_fn_error $? "conditional \"COIN_STATIC_BUILD\" was never defined.
    2339223394Usually this means the macro was only invoked conditionally." "$LINENO" 5
    2339323395fi
  • trunk/osi-cbc.pc.in

    r2909 r3010  
    99URL: https://github.com/coin-or/Cbc
    1010Version: @PACKAGE_VERSION@
    11 Libs: -L${libdir} -lOsiCbc
    12 Libs.private: @OSICBC_LFLAGS_NOPC@
    1311Cflags: -I${includedir}
    14 Requires:
    15 Requires.private: @OSICBC_PCFILES@ cbc
     12@COIN_STATIC_BUILD_FALSE@Libs: -L${libdir} -lOsiCbc
     13@COIN_STATIC_BUILD_FALSE@Requires.private: @OSICBC_PCFILES@
     14@COIN_STATIC_BUILD_TRUE@Libs: -L${libdir} -lOsiCbc @OSICBC_LFLAGS_NOPC@
     15@COIN_STATIC_BUILD_TRUE@Requires: @OSICBC_PCFILES@
Note: See TracChangeset for help on using the changeset viewer.