Changeset 4180 for ThirdParty/Glpk/trunk


Ignore:
Timestamp:
Apr 21, 2020 11:00:20 AM (12 months ago)
Author:
stefan
Message:

rerun autotools

Location:
ThirdParty/Glpk/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/Glpk/trunk/configure

    r4141 r4180  
    24032403
    24042404
    2405 
    24062405# Set the project's version numbers
    2407 
    24082406
    24092407  # break up package version number in major.minor.release
     
    24392437
    24402438# A useful makefile conditional that is always false
    2441 
    24422439   if false; then
    24432440  ALWAYS_FALSE_TRUE=
     
    24532450
    24542451
    2455 
    24562452# Get the build and host types
    24572453
    24582454
    24592455
    2460 
    24612456# libtool has some magic for host_os and build_os being mingw, but doesn't know about msys
    2462 
    24632457  if test $host_os = msys ; then
    24642458    host_os=mingw
     
    24742468# manual/html_node/Automake-Silent-Rules.html). Run before AM_INIT_AUTOMAKE,
    24752469# which will AC_REQUIRE it anyway.
    2476 
    24772470  # Check whether --enable-silent-rules was given.
    24782471if test "${enable_silent_rules+set}" = set; then :
     
    25222515# - place objects from sources in subdirs into corresponding subdirs
    25232516# - enable all automake warnings
    2524 
    25252517  if test "`cd $srcdir && pwd`" != "`pwd`"; then
    25262518  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
     
    26312623
    26322624# Disable automatic rebuild of configure/Makefile. Use run_autotools.
    2633 
    26342625
    26352626{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
  • ThirdParty/Glpk/trunk/glpk_config_files/configure

    r4133 r4180  
    638638LIBOBJS
    639639NOUNDEFINED
     640COIN_STATIC_BUILD_FALSE
     641COIN_STATIC_BUILD_TRUE
    640642LT_LDFLAGS
    641643CPP
     
    28932895
    28942896
    2895 
    28962897# Set the project's version numbers
    2897 
    28982898
    28992899  # break up package version number in major.minor.release
     
    29282928
    29292929
    2930 
    2931 
    29322930# A useful makefile conditional that is always false
    2933 
    29342931   if false; then
    29352932  ALWAYS_FALSE_TRUE=
     
    29452942
    29462943
    2947 
    29482944# Get the build and host types
    29492945
    29502946
    29512947
    2952 
    29532948# libtool has some magic for host_os and build_os being mingw, but doesn't know about msys
    2954 
    29552949  if test $host_os = msys ; then
    29562950    host_os=mingw
     
    29662960# manual/html_node/Automake-Silent-Rules.html). Run before AM_INIT_AUTOMAKE,
    29672961# which will AC_REQUIRE it anyway.
    2968 
    29692962  # Check whether --enable-silent-rules was given.
    29702963if test "${enable_silent_rules+set}" = set; then :
     
    30143007# - place objects from sources in subdirs into corresponding subdirs
    30153008# - enable all automake warnings
    3016 
    30173009  if test "`cd $srcdir && pwd`" != "`pwd`"; then
    30183010  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
     
    31233115
    31243116# Disable automatic rebuild of configure/Makefile. Use run_autotools.
    3125 
    31263117
    31273118{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
     
    1262912620  # Use the libtool library info, if defined, otherwise use the project version info,
    1263012621  # if a full major.minor.release number was available
    12631 
     12622  LT_LDFLAGS="$LT_LDFLAGS -version-info glpk"
     12623    { $as_echo "$as_me:${as_lineno-$LINENO}: libtool version info: -version-info glpk" >&5
     12624$as_echo "$as_me: libtool version info: -version-info glpk" >&6;}
    1263212625
    1263312626  # shared libraries should have no undefined symbols
    1263412627  # for Windows DLLs, it is mandatory to add this
    1263512628  LT_LDFLAGS="$LT_LDFLAGS -no-undefined"
     12629
     12630  # add automake conditional on whether we build shared or static, useful for .pc files
     12631   if test "$enable_shared" = no; then
     12632  COIN_STATIC_BUILD_TRUE=
     12633  COIN_STATIC_BUILD_FALSE='#'
     12634else
     12635  COIN_STATIC_BUILD_TRUE='#'
     12636  COIN_STATIC_BUILD_FALSE=
     12637fi
     12638
    1263612639
    1263712640
     
    1307613079if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
    1307713080  as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
     13081Usually this means the macro was only invoked conditionally." "$LINENO" 5
     13082fi
     13083if test -z "${COIN_STATIC_BUILD_TRUE}" && test -z "${COIN_STATIC_BUILD_FALSE}"; then
     13084  as_fn_error $? "conditional \"COIN_STATIC_BUILD\" was never defined.
    1307813085Usually this means the macro was only invoked conditionally." "$LINENO" 5
    1307913086fi
Note: See TracChangeset for help on using the changeset viewer.