Changeset 4180 for ThirdParty/Glpk/trunk

Timestamp:

Apr 21, 2020 11:00:20 AM (12 months ago)

Author:

stefan

Message:

rerun autotools

Location:

ThirdParty/Glpk/trunk

Files:

• configure (modified) (6 diffs)
• glpk_config_files/configure (modified) (9 diffs)

ThirdParty/Glpk/trunk/configure

@@ -2403 +2403 @@
 
 
-
 # Set the project's version numbers
-
 
   # break up package version number in major.minor.release
@@ -2439 +2437 @@
 
 # A useful makefile conditional that is always false
-
    if false; then
   ALWAYS_FALSE_TRUE=
@@ -2453 +2450 @@
 
 
-
 # Get the build and host types
 
 
 
-
 # libtool has some magic for host_os and build_os being mingw, but doesn't know about msys
-
   if test $host_os = msys ; then
     host_os=mingw
@@ -2474 +2468 @@
 # manual/html_node/Automake-Silent-Rules.html). Run before AM_INIT_AUTOMAKE,
 # which will AC_REQUIRE it anyway.
-
   # Check whether --enable-silent-rules was given.
 if test "${enable_silent_rules+set}" = set; then :
@@ -2522 +2515 @@
 # - place objects from sources in subdirs into corresponding subdirs
 # - enable all automake warnings
-
   if test "`cd $srcdir && pwd`" != "`pwd`"; then
   # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
@@ -2631 +2623 @@
 
 # Disable automatic rebuild of configure/Makefile. Use run_autotools.
-
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5

ThirdParty/Glpk/trunk/glpk_config_files/configure

@@ -638 +638 @@
 LIBOBJS
 NOUNDEFINED
+COIN_STATIC_BUILD_FALSE
+COIN_STATIC_BUILD_TRUE
 LT_LDFLAGS
 CPP
@@ -2893 +2895 @@
 
 
-
 # Set the project's version numbers
-
 
   # break up package version number in major.minor.release
@@ -2928 +2928 @@
 
 
-
-
 # A useful makefile conditional that is always false
-
    if false; then
   ALWAYS_FALSE_TRUE=
@@ -2945 +2942 @@
 
 
-
 # Get the build and host types
 
 
 
-
 # libtool has some magic for host_os and build_os being mingw, but doesn't know about msys
-
   if test $host_os = msys ; then
     host_os=mingw
@@ -2966 +2960 @@
 # manual/html_node/Automake-Silent-Rules.html). Run before AM_INIT_AUTOMAKE,
 # which will AC_REQUIRE it anyway.
-
   # Check whether --enable-silent-rules was given.
 if test "${enable_silent_rules+set}" = set; then :
@@ -3014 +3007 @@
 # - place objects from sources in subdirs into corresponding subdirs
 # - enable all automake warnings
-
   if test "`cd $srcdir && pwd`" != "`pwd`"; then
   # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
@@ -3123 +3115 @@
 
 # Disable automatic rebuild of configure/Makefile. Use run_autotools.
-
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
@@ -12629 +12620 @@
   # Use the libtool library info, if defined, otherwise use the project version info,
   # if a full major.minor.release number was available
-
+  LT_LDFLAGS="$LT_LDFLAGS -version-info glpk"
+    { $as_echo "$as_me:${as_lineno-$LINENO}: libtool version info: -version-info glpk" >&5
+$as_echo "$as_me: libtool version info: -version-info glpk" >&6;}
 
   # shared libraries should have no undefined symbols
   # for Windows DLLs, it is mandatory to add this
   LT_LDFLAGS="$LT_LDFLAGS -no-undefined"
+
+  # add automake conditional on whether we build shared or static, useful for .pc files
+   if test "$enable_shared" = no; then
+  COIN_STATIC_BUILD_TRUE=
+  COIN_STATIC_BUILD_FALSE='#'
+else
+  COIN_STATIC_BUILD_TRUE='#'
+  COIN_STATIC_BUILD_FALSE=
+fi
+
 
 
@@ -13076 +13079 @@
 if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
   as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
+if test -z "${COIN_STATIC_BUILD_TRUE}" && test -z "${COIN_STATIC_BUILD_FALSE}"; then
+  as_fn_error $? "conditional \"COIN_STATIC_BUILD\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi