Changeset 3951 for ThirdParty


Ignore:
Timestamp:
Jun 24, 2019 4:29:23 PM (2 months ago)
Author:
lou
Message:

Merge trunk revisions 3853:3950 into autotools-update. Propagate changes for
automake 1.15.1 -> 1.16.1.

Location:
ThirdParty/Glpk/branches/autotools-update
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/Glpk/branches/autotools-update

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • ThirdParty/Glpk/branches/autotools-update/Makefile.in

    r3887 r3951  
    1 # Makefile.in generated by automake 1.15.1 from Makefile.am.
     1# Makefile.in generated by automake 1.16.1 from Makefile.am.
    22# @configure_input@
    33
    4 # Copyright (C) 1994-2017 Free Software Foundation, Inc.
     4# Copyright (C) 1994-2018 Free Software Foundation, Inc.
    55
    66# This Makefile.in is free software; the Free Software Foundation
     
    384384            $(SHELL) ./config.status;; \
    385385          *) \
    386             echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
    387             cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
     386            echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \
     387            cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \
    388388        esac;
    389389$(srcdir)/BuildTools/Makemain.inc $(am__empty):
  • ThirdParty/Glpk/branches/autotools-update/compile

    r3680 r3951  
    1 #! /bin/sh
     1#!/usr/bin/sh
    22# Wrapper for compilers which do not understand '-c -o'.
    33
  • ThirdParty/Glpk/branches/autotools-update/config.guess

    r3886 r3951  
    1 #! /bin/sh
     1#!/usr/bin/sh
    22# Attempt to guess a canonical system name.
    33#   Copyright 1992-2016 Free Software Foundation, Inc.
  • ThirdParty/Glpk/branches/autotools-update/config.sub

    r3886 r3951  
    1 #! /bin/sh
     1#!/usr/bin/sh
    22# Configuration validation subroutine script.
    33#   Copyright 1992-2016 Free Software Foundation, Inc.
  • ThirdParty/Glpk/branches/autotools-update/configure

    r3887 r3951  
    603603
    604604ac_unique_file="glpk/src/glpk.h"
    605 ac_default_prefix=`pwd`
    606605# Factoring default headers for most tests.
    607606ac_includes_default="\
     
    678677AMDEP_FALSE
    679678AMDEP_TRUE
    680 am__quote
    681679am__include
    682680DEPDIR
     
    767765PACKAGE_NAME
    768766PATH_SEPARATOR
    769 SHELL'
     767SHELL
     768am__quote'
    770769ac_subst_files=''
    771770ac_user_opts='
     
    23022301
    23032302
    2304 am__api_version='1.15'
     2303am__api_version='1.16'
    23052304
    23062305# Find a good install program.  We prefer a C program (faster),
     
    28442843
    28452844
    2846 # Where should everything be installed by default?  The COIN default is to
    2847 # install directly into subdirectories of the directory where configure is
    2848 # run. The default would be to install under /usr/local.
    2849 
    2850 
    2851 
    28522845# Change the default compiler flags. This needs to run before
    28532846# AC_CANONICAL_BUILD.
     
    29652958# For better backward compatibility.  To be removed once Automake 1.9.x
    29662959# dies out for good.  For more background, see:
    2967 # <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
    2968 # <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
     2960# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
     2961# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
    29692962mkdir_p='$(MKDIR_P)'
    29702963
     
    30173010
    30183011You can download and install GNU coreutils to get an 'rm' implementation
    3019 that behaves properly: <http://www.gnu.org/software/coreutils/>.
     3012that behaves properly: <https://www.gnu.org/software/coreutils/>.
    30203013
    30213014If you want to complete the configuration process using your problematic
     
    30713064ac_config_commands="$ac_config_commands depfiles"
    30723065
    3073 
    3074 am_make=${MAKE-make}
    3075 cat > confinc << 'END'
     3066{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5
     3067$as_echo_n "checking whether ${MAKE-make} supports the include directive... " >&6; }
     3068cat > confinc.mk << 'END'
    30763069am__doit:
    3077         @echo this is the am__doit target
     3070        @echo this is the am__doit target >confinc.out
    30783071.PHONY: am__doit
    30793072END
    3080 # If we don't find an include directive, just comment out the code.
    3081 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
    3082 $as_echo_n "checking for style of include used by $am_make... " >&6; }
    30833073am__include="#"
    30843074am__quote=
    3085 _am_result=none
    3086 # First try GNU make style include.
    3087 echo "include confinc" > confmf
    3088 # Ignore all kinds of additional output from 'make'.
    3089 case `$am_make -s -f confmf 2> /dev/null` in #(
    3090 *the\ am__doit\ target*)
    3091   am__include=include
    3092   am__quote=
    3093   _am_result=GNU
    3094   ;;
     3075# BSD make does it like this.
     3076echo '.include "confinc.mk" # ignored' > confmf.BSD
     3077# Other make implementations (GNU, Solaris 10, AIX) do it like this.
     3078echo 'include confinc.mk # ignored' > confmf.GNU
     3079_am_result=no
     3080for s in GNU BSD; do
     3081  { echo "$as_me:$LINENO: ${MAKE-make} -f confmf.$s && cat confinc.out" >&5
     3082   (${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5
     3083   ac_status=$?
     3084   echo "$as_me:$LINENO: \$? = $ac_status" >&5
     3085   (exit $ac_status); }
     3086  case $?:`cat confinc.out 2>/dev/null` in #(
     3087  '0:this is the am__doit target') :
     3088    case $s in #(
     3089  BSD) :
     3090    am__include='.include' am__quote='"' ;; #(
     3091  *) :
     3092    am__include='include' am__quote='' ;;
     3093esac ;; #(
     3094  *) :
     3095     ;;
    30953096esac
    3096 # Now try BSD make style include.
    3097 if test "$am__include" = "#"; then
    3098    echo '.include "confinc"' > confmf
    3099    case `$am_make -s -f confmf 2> /dev/null` in #(
    3100    *the\ am__doit\ target*)
    3101      am__include=.include
    3102      am__quote="\""
    3103      _am_result=BSD
    3104      ;;
    3105    esac
    3106 fi
    3107 
    3108 
    3109 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
    3110 $as_echo "$_am_result" >&6; }
    3111 rm -f confinc confmf
     3097  if test "$am__include" != "#"; then
     3098    _am_result="yes ($s style)"
     3099    break
     3100  fi
     3101done
     3102rm -f confinc.* confmf.*
     3103{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5
     3104$as_echo "${_am_result}" >&6; }
    31123105
    31133106# Check whether --enable-dependency-tracking was given.
     
    1301013003# INIT-COMMANDS
    1301113004#
    13012 AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
     13005AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"
    1301313006
    1301413007
     
    1391013903  # are listed without --file.  Let's play safe and only enable the eval
    1391113904  # if we detect the quoting.
    13912   case $CONFIG_FILES in
    13913   *\'*) eval set x "$CONFIG_FILES" ;;
    13914   *)   set x $CONFIG_FILES ;;
    13915   esac
     13905  # TODO: see whether this extra hack can be removed once we start
     13906  # requiring Autoconf 2.70 or later.
     13907  case $CONFIG_FILES in #(
     13908  *\'*) :
     13909    eval set x "$CONFIG_FILES" ;; #(
     13910  *) :
     13911    set x $CONFIG_FILES ;; #(
     13912  *) :
     13913     ;;
     13914esac
    1391613915  shift
    13917   for mf
     13916  # Used to flag and report bootstrapping failures.
     13917  am_rc=0
     13918  for am_mf
    1391813919  do
    1391913920    # Strip MF so we end up with the name of the file.
    13920     mf=`echo "$mf" | sed -e 's/:.*$//'`
    13921     # Check whether this is an Automake generated Makefile or not.
    13922     # We used to match only the files named 'Makefile.in', but
    13923     # some people rename them; so instead we look at the file content.
    13924     # Grep'ing the first line is not enough: some people post-process
    13925     # each Makefile.in and add a new line on top of each file to say so.
    13926     # Grep'ing the whole file is not good either: AIX grep has a line
     13921    am_mf=`$as_echo "$am_mf" | sed -e 's/:.*$//'`
     13922    # Check whether this is an Automake generated Makefile which includes
     13923    # dependency-tracking related rules and includes.
     13924    # Grep'ing the whole file directly is not great: AIX grep has a line
    1392713925    # limit of 2048, but all sed's we know have understand at least 4000.
    13928     if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
    13929       dirpart=`$as_dirname -- "$mf" ||
    13930 $as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
    13931          X"$mf" : 'X\(//\)[^/]' \| \
    13932          X"$mf" : 'X\(//\)$' \| \
    13933          X"$mf" : 'X\(/\)' \| . 2>/dev/null ||
    13934 $as_echo X"$mf" |
     13926    sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \
     13927      || continue
     13928    am_dirpart=`$as_dirname -- "$am_mf" ||
     13929$as_expr X"$am_mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
     13930         X"$am_mf" : 'X\(//\)[^/]' \| \
     13931         X"$am_mf" : 'X\(//\)$' \| \
     13932         X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
     13933$as_echo X"$am_mf" |
    1393513934    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
    1393613935            s//\1/
     
    1395013949          }
    1395113950          s/.*/./; q'`
    13952     else
    13953       continue
    13954     fi
    13955     # Extract the definition of DEPDIR, am__include, and am__quote
    13956     # from the Makefile without running 'make'.
    13957     DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
    13958     test -z "$DEPDIR" && continue
    13959     am__include=`sed -n 's/^am__include = //p' < "$mf"`
    13960     test -z "$am__include" && continue
    13961     am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
    13962     # Find all dependency output files, they are included files with
    13963     # $(DEPDIR) in their names.  We invoke sed twice because it is the
    13964     # simplest approach to changing $(DEPDIR) to its actual value in the
    13965     # expansion.
    13966     for file in `sed -n "
    13967       s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
    13968          sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
    13969       # Make sure the directory exists.
    13970       test -f "$dirpart/$file" && continue
    13971       fdir=`$as_dirname -- "$file" ||
    13972 $as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
    13973          X"$file" : 'X\(//\)[^/]' \| \
    13974          X"$file" : 'X\(//\)$' \| \
    13975          X"$file" : 'X\(/\)' \| . 2>/dev/null ||
    13976 $as_echo X"$file" |
    13977     sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
     13951    am_filepart=`$as_basename -- "$am_mf" ||
     13952$as_expr X/"$am_mf" : '.*/\([^/][^/]*\)/*$' \| \
     13953         X"$am_mf" : 'X\(//\)$' \| \
     13954         X"$am_mf" : 'X\(/\)' \| . 2>/dev/null ||
     13955$as_echo X/"$am_mf" |
     13956    sed '/^.*\/\([^/][^/]*\)\/*$/{
    1397813957            s//\1/
    1397913958            q
    1398013959          }
    13981           /^X\(\/\/\)[^/].*/{
     13960          /^X\/\(\/\/\)$/{
    1398213961            s//\1/
    1398313962            q
    1398413963          }
    13985           /^X\(\/\/\)$/{
    13986             s//\1/
    13987             q
    13988           }
    13989           /^X\(\/\).*/{
     13964          /^X\/\(\/\).*/{
    1399013965            s//\1/
    1399113966            q
    1399213967          }
    1399313968          s/.*/./; q'`
    13994       as_dir=$dirpart/$fdir; as_fn_mkdir_p
    13995       # echo "creating $dirpart/$file"
    13996       echo '# dummy' > "$dirpart/$file"
    13997     done
     13969    { echo "$as_me:$LINENO: cd "$am_dirpart" \
     13970      && sed -e '/# am--include-marker/d' "$am_filepart" \
     13971        | $MAKE -f - am--depfiles" >&5
     13972   (cd "$am_dirpart" \
     13973      && sed -e '/# am--include-marker/d' "$am_filepart" \
     13974        | $MAKE -f - am--depfiles) >&5 2>&5
     13975   ac_status=$?
     13976   echo "$as_me:$LINENO: \$? = $ac_status" >&5
     13977   (exit $ac_status); } || am_rc=$?
    1399813978  done
     13979  if test $am_rc -ne 0; then
     13980    { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
     13981$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
     13982as_fn_error $? "Something went wrong bootstrapping makefile fragments
     13983    for automatic dependency tracking.  Try re-running configure with the
     13984    '--disable-dependency-tracking' option to at least be able to build
     13985    the package (albeit without support for automatic dependency tracking).
     13986See \`config.log' for more details" "$LINENO" 5; }
     13987  fi
     13988  { am_dirpart=; unset am_dirpart;}
     13989  { am_filepart=; unset am_filepart;}
     13990  { am_mf=; unset am_mf;}
     13991  { am_rc=; unset am_rc;}
     13992  rm -f conftest-deps.mk
    1399913993}
    1400013994 ;;
  • ThirdParty/Glpk/branches/autotools-update/depcomp

    r3623 r3951  
    1 #! /bin/sh
     1#!/usr/bin/sh
    22# depcomp - compile a program generating dependencies as side-effects
    33
  • ThirdParty/Glpk/branches/autotools-update/install-sh

    r3623 r3951  
    1 #!/bin/sh
     1#!/usr/bin/sh
    22# install - install a program, script, or datafile
    33
  • ThirdParty/Glpk/branches/autotools-update/ltmain.sh

    r3886 r3951  
    21252125func_fatal_configuration ()
    21262126{
    2127     func__fatal_error ${1+"$@"} \
     2127    func_fatal_error ${1+"$@"} \
    21282128      "See the $PACKAGE documentation for more information." \
    21292129      "Fatal configuration error."
  • ThirdParty/Glpk/branches/autotools-update/missing

    r3623 r3951  
    1 #! /bin/sh
     1#!/usr/bin/sh
    22# Common wrapper for a few potentially missing GNU programs.
    33
Note: See TracChangeset for help on using the changeset viewer.