Changeset 4176


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

fixup pc; rerun autotools

Location:
ThirdParty/ASL/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/ASL/trunk/coinasl.pc.in

    r4068 r4176  
    99URL: https://github.com/coin-or-tools/ThirdParty-ASL
    1010Version: @PACKAGE_VERSION@
    11 Libs: -L${libdir} -lcoinasl
    12 Libs.private: @ASL_LFLAGS_NOPC@
    1311Cflags: -I${includedir}
     12@COIN_STATIC_BUILD_FALSE@Libs: -L${libdir} -lcoinasl
     13@COIN_STATIC_BUILD_TRUE@Libs: -L${libdir} -lcoinasl @ASL_LFLAGS_NOPC@
  • ThirdParty/ASL/trunk/configure

    r4149 r4176  
    649649CC_IS_CL_TRUE
    650650ASL_LFLAGS
     651COIN_STATIC_BUILD_FALSE
     652COIN_STATIC_BUILD_TRUE
    651653LT_LDFLAGS
    652654CPP
     
    28652867
    28662868
    2867 
    28682869# Set the project's version numbers
    2869 
    28702870
    28712871  # break up package version number in major.minor.release
     
    29012901
    29022902# A useful makefile conditional that is always false
    2903 
    29042903   if false; then
    29052904  ALWAYS_FALSE_TRUE=
     
    29152914
    29162915
    2917 
    29182916# Get the build and host types
    29192917
    29202918
    29212919
    2922 
    29232920# libtool has some magic for host_os and build_os being mingw, but doesn't know about msys
    2924 
    29252921  if test $host_os = msys ; then
    29262922    host_os=mingw
     
    29362932# manual/html_node/Automake-Silent-Rules.html). Run before AM_INIT_AUTOMAKE,
    29372933# which will AC_REQUIRE it anyway.
    2938 
    29392934  # Check whether --enable-silent-rules was given.
    29402935if test "${enable_silent_rules+set}" = set; then :
     
    29842979# - place objects from sources in subdirs into corresponding subdirs
    29852980# - enable all automake warnings
    2986 
    29872981  if test "`cd $srcdir && pwd`" != "`pwd`"; then
    29882982  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
     
    30933087
    30943088# Disable automatic rebuild of configure/Makefile. Use run_autotools.
    3095 
    30963089
    30973090{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
     
    1230412297  LT_LDFLAGS="$LT_LDFLAGS -no-undefined"
    1230512298
     12299  # add automake conditional on whether we build shared or static, useful for .pc files
     12300   if test "$enable_shared" = no; then
     12301  COIN_STATIC_BUILD_TRUE=
     12302  COIN_STATIC_BUILD_FALSE='#'
     12303else
     12304  COIN_STATIC_BUILD_TRUE='#'
     12305  COIN_STATIC_BUILD_FALSE=
     12306fi
     12307
     12308
    1230612309
    1230712310# Determine additional pre-compiler flags using various feature checks
     
    1256212565      ASL_CFLAGS="${ASL_CFLAGS} -DASL_BUILD"
    1256312566
    12564 # Define BUILDTOOLS_DEBUG to enable debugging output
    12565 
     12567      # Define BUILDTOOLS_DEBUG to enable debugging output
    1256612568      if test "$BUILDTOOLS_DEBUG" = 1 ; then
    1256712569        { $as_echo "$as_me:${as_lineno-$LINENO}: ASL_LFLAGS_NOPC: \"${ASL_LFLAGS_NOPC}\"" >&5
     
    1275812760if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
    1275912761  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
     12762Usually this means the macro was only invoked conditionally." "$LINENO" 5
     12763fi
     12764if test -z "${COIN_STATIC_BUILD_TRUE}" && test -z "${COIN_STATIC_BUILD_FALSE}"; then
     12765  as_fn_error $? "conditional \"COIN_STATIC_BUILD\" was never defined.
    1276012766Usually this means the macro was only invoked conditionally." "$LINENO" 5
    1276112767fi
Note: See TracChangeset for help on using the changeset viewer.