Changeset 1571


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

fixup pc; rerun autotools

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/cgl.pc.in

    r1539 r1571  
    99URL: https://github.com/coin-or/Clp
    1010Version: @PACKAGE_VERSION@
    11 Libs: -L${libdir} -lCgl
    12 Libs.private: @CGLLIB_LFLAGS_NOPC@
    1311Cflags: -I${includedir}
    14 Requires:
    15 Requires.private: @CGLLIB_PCFILES@
     12@COIN_STATIC_BUILD_FALSE@Libs: -L${libdir} -lCgl
     13@COIN_STATIC_BUILD_FALSE@Requires.private: @CGLLIB_PCFILES@
     14@COIN_STATIC_BUILD_TRUE@Libs: -L${libdir} -lCgl @CGLLIB_LFLAGS_NOPC@
     15@COIN_STATIC_BUILD_TRUE@Requires: @CGLLIB_PCFILES@
  • trunk/configure

    r1562 r1571  
    696696CGL_SUBDIRS
    697697RPATH_FLAGS
     698COIN_STATIC_BUILD_FALSE
     699COIN_STATIC_BUILD_TRUE
    698700LT_LDFLAGS
    699701CXXCPP
     
    32373239
    32383240
    3239 
    32403241# Set the project's version numbers
    3241 
    32423242
    32433243  # break up package version number in major.minor.release
     
    32733273
    32743274# A useful makefile conditional that is always false
    3275 
    32763275   if false; then
    32773276  ALWAYS_FALSE_TRUE=
     
    32873286
    32883287
    3289 
    32903288# Get the build and host types
    32913289
    32923290
    32933291
    3294 
    32953292# libtool has some magic for host_os and build_os being mingw, but doesn't know about msys
    3296 
    32973293  if test $host_os = msys ; then
    32983294    host_os=mingw
     
    33083304# manual/html_node/Automake-Silent-Rules.html). Run before AM_INIT_AUTOMAKE,
    33093305# which will AC_REQUIRE it anyway.
    3310 
    33113306  # Check whether --enable-silent-rules was given.
    33123307if test "${enable_silent_rules+set}" = set; then :
     
    33563351# - place objects from sources in subdirs into corresponding subdirs
    33573352# - enable all automake warnings
    3358 
    33593353  if test "`cd $srcdir && pwd`" != "`pwd`"; then
    33603354  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
     
    34653459
    34663460# Disable automatic rebuild of configure/Makefile. Use run_autotools.
    3467 
    34683461
    34693462{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
     
    1682616819  LT_LDFLAGS="$LT_LDFLAGS -no-undefined"
    1682716820
     16821  # add automake conditional on whether we build shared or static, useful for .pc files
     16822   if test "$enable_shared" = no; then
     16823  COIN_STATIC_BUILD_TRUE=
     16824  COIN_STATIC_BUILD_FALSE='#'
     16825else
     16826  COIN_STATIC_BUILD_TRUE='#'
     16827  COIN_STATIC_BUILD_FALSE=
     16828fi
     16829
     16830
    1682816831
    1682916832# set RPATH_FLAGS to the compiler link flags required to hardcode location
     
    1795417957      CGLLIB_CFLAGS="${CGLLIB_CFLAGS} -DCGLLIB_BUILD"
    1795517958
    17956 # Define BUILDTOOLS_DEBUG to enable debugging output
    17957 
     17959      # Define BUILDTOOLS_DEBUG to enable debugging output
    1795817960      if test "$BUILDTOOLS_DEBUG" = 1 ; then
    1795917961        { $as_echo "$as_me:${as_lineno-$LINENO}: CGLLIB_LFLAGS_NOPC: \"${CGLLIB_LFLAGS_NOPC}\"" >&5
     
    2005120053      CGLUNITTEST_CFLAGS="${CGLUNITTEST_CFLAGS} -DCGLUNITTEST_BUILD"
    2005220054
    20053 # Define BUILDTOOLS_DEBUG to enable debugging output
    20054 
     20055      # Define BUILDTOOLS_DEBUG to enable debugging output
    2005520056      if test "$BUILDTOOLS_DEBUG" = 1 ; then
    2005620057        { $as_echo "$as_me:${as_lineno-$LINENO}: CGLUNITTEST_LFLAGS_NOPC: \"${CGLUNITTEST_LFLAGS_NOPC}\"" >&5
     
    2065720658if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
    2065820659  as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
     20660Usually this means the macro was only invoked conditionally." "$LINENO" 5
     20661fi
     20662if test -z "${COIN_STATIC_BUILD_TRUE}" && test -z "${COIN_STATIC_BUILD_FALSE}"; then
     20663  as_fn_error $? "conditional \"COIN_STATIC_BUILD\" was never defined.
    2065920664Usually this means the macro was only invoked conditionally." "$LINENO" 5
    2066020665fi
Note: See TracChangeset for help on using the changeset viewer.