Update to libtool 2.4.3 + HP-UX patches
This commit is contained in:
128
configure
vendored
128
configure
vendored
@@ -6380,8 +6380,8 @@ esac
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
macro_version='2.4.2.418'
|
macro_version='2.4.2.458.26-92994'
|
||||||
macro_revision='2.4.2.418'
|
macro_revision='2.4.3'
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -6900,8 +6900,13 @@ else
|
|||||||
# Adding the 'sed 1q' prevents false positives on HP-UX, which says:
|
# Adding the 'sed 1q' prevents false positives on HP-UX, which says:
|
||||||
# nm: unknown option "B" ignored
|
# nm: unknown option "B" ignored
|
||||||
# Tru64's nm complains that /dev/null is an invalid object file
|
# Tru64's nm complains that /dev/null is an invalid object file
|
||||||
case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
|
# MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty
|
||||||
*/dev/null* | *'Invalid file or object type'*)
|
case $build_os in
|
||||||
|
mingw*) lt_bad_file=conftest.nm/nofile ;;
|
||||||
|
*) lt_bad_file=/dev/null ;;
|
||||||
|
esac
|
||||||
|
case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in
|
||||||
|
*$lt_bad_file* | *'Invalid file or object type'*)
|
||||||
lt_cv_path_NM="$tmp_nm -B"
|
lt_cv_path_NM="$tmp_nm -B"
|
||||||
break 2
|
break 2
|
||||||
;;
|
;;
|
||||||
@@ -8701,6 +8706,71 @@ $as_echo "${lt_sysroot:-no}" >&6; }
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a working dd" >&5
|
||||||
|
$as_echo_n "checking for a working dd... " >&6; }
|
||||||
|
if ${ac_cv_path_lt_DD+:} false; then :
|
||||||
|
$as_echo_n "(cached) " >&6
|
||||||
|
else
|
||||||
|
printf 0123456789abcdef0123456789abcdef >conftest.i
|
||||||
|
cat conftest.i conftest.i >conftest2.i
|
||||||
|
: ${lt_DD:=$DD}
|
||||||
|
if test -z "$lt_DD"; then
|
||||||
|
ac_path_lt_DD_found=false
|
||||||
|
# Loop through the user's path and test for each of PROGNAME-LIST
|
||||||
|
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||||
|
for as_dir in $PATH
|
||||||
|
do
|
||||||
|
IFS=$as_save_IFS
|
||||||
|
test -z "$as_dir" && as_dir=.
|
||||||
|
for ac_prog in dd; do
|
||||||
|
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||||
|
ac_path_lt_DD="$as_dir/$ac_prog$ac_exec_ext"
|
||||||
|
as_fn_executable_p "$ac_path_lt_DD" || continue
|
||||||
|
if "$ac_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
|
||||||
|
cmp -s conftest.i conftest.out \
|
||||||
|
&& ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=:
|
||||||
|
fi
|
||||||
|
$ac_path_lt_DD_found && break 3
|
||||||
|
done
|
||||||
|
done
|
||||||
|
done
|
||||||
|
IFS=$as_save_IFS
|
||||||
|
if test -z "$ac_cv_path_lt_DD"; then
|
||||||
|
:
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
ac_cv_path_lt_DD=$lt_DD
|
||||||
|
fi
|
||||||
|
|
||||||
|
rm -f conftest.i conftest2.i conftest.out
|
||||||
|
fi
|
||||||
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_lt_DD" >&5
|
||||||
|
$as_echo "$ac_cv_path_lt_DD" >&6; }
|
||||||
|
|
||||||
|
|
||||||
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to truncate binary pipes" >&5
|
||||||
|
$as_echo_n "checking how to truncate binary pipes... " >&6; }
|
||||||
|
if ${lt_cv_truncate_bin+:} false; then :
|
||||||
|
$as_echo_n "(cached) " >&6
|
||||||
|
else
|
||||||
|
printf 0123456789abcdef0123456789abcdef >conftest.i
|
||||||
|
cat conftest.i conftest.i >conftest2.i
|
||||||
|
lt_cv_truncate_bin=
|
||||||
|
if "$ac_cv_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
|
||||||
|
cmp -s conftest.i conftest.out \
|
||||||
|
&& lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1"
|
||||||
|
fi
|
||||||
|
rm -f conftest.i conftest2.i conftest.out
|
||||||
|
test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"
|
||||||
|
fi
|
||||||
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_truncate_bin" >&5
|
||||||
|
$as_echo "$lt_cv_truncate_bin" >&6; }
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# Check whether --enable-libtool-lock was given.
|
# Check whether --enable-libtool-lock was given.
|
||||||
if test "${enable_libtool_lock+set}" = set; then :
|
if test "${enable_libtool_lock+set}" = set; then :
|
||||||
enableval=$enable_libtool_lock;
|
enableval=$enable_libtool_lock;
|
||||||
@@ -9685,7 +9755,7 @@ $as_echo "$lt_cv_ld_force_load" >&6; }
|
|||||||
case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
|
case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
|
||||||
10.0,*86*-darwin8*|10.0,*-darwin[91]*)
|
10.0,*86*-darwin8*|10.0,*-darwin[91]*)
|
||||||
_lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
|
_lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
|
||||||
10.[012]*)
|
10.[012][,.]*)
|
||||||
_lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
|
_lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
|
||||||
10.*)
|
10.*)
|
||||||
_lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
|
_lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
|
||||||
@@ -24007,6 +24077,7 @@ lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_
|
|||||||
lt_cv_nm_interface='`$ECHO "$lt_cv_nm_interface" | $SED "$delay_single_quote_subst"`'
|
lt_cv_nm_interface='`$ECHO "$lt_cv_nm_interface" | $SED "$delay_single_quote_subst"`'
|
||||||
nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
|
nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
|
||||||
lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
|
lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
|
||||||
|
lt_cv_truncate_bin='`$ECHO "$lt_cv_truncate_bin" | $SED "$delay_single_quote_subst"`'
|
||||||
objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
|
objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
|
||||||
MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
|
MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
|
||||||
lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
|
lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
|
||||||
@@ -24129,6 +24200,7 @@ lt_cv_sys_global_symbol_to_c_name_address \
|
|||||||
lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
|
lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
|
||||||
lt_cv_nm_interface \
|
lt_cv_nm_interface \
|
||||||
nm_file_list_spec \
|
nm_file_list_spec \
|
||||||
|
lt_cv_truncate_bin \
|
||||||
lt_prog_compiler_no_builtin_flag \
|
lt_prog_compiler_no_builtin_flag \
|
||||||
lt_prog_compiler_pic \
|
lt_prog_compiler_pic \
|
||||||
lt_prog_compiler_wl \
|
lt_prog_compiler_wl \
|
||||||
@@ -24812,39 +24884,34 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
|
|||||||
|
|
||||||
cat <<_LT_EOF >> "$cfgfile"
|
cat <<_LT_EOF >> "$cfgfile"
|
||||||
#! $SHELL
|
#! $SHELL
|
||||||
|
|
||||||
# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
|
|
||||||
# Generated automatically by $as_me ($PACKAGE) $VERSION
|
# Generated automatically by $as_me ($PACKAGE) $VERSION
|
||||||
# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
|
# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
|
||||||
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
|
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
|
||||||
|
|
||||||
|
# Provide generalized library-building support services.
|
||||||
|
# Written by Gordon Matzigkeit, 1996
|
||||||
|
|
||||||
|
# Copyright (C) 2014 Free Software Foundation, Inc.
|
||||||
|
# This is free software; see the source for copying conditions. There is NO
|
||||||
|
# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||||
|
|
||||||
|
# GNU Libtool is free software; you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
# the Free Software Foundation; either version 2 of of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
#
|
#
|
||||||
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
|
# As a special exception to the GNU General Public License, if you
|
||||||
# 2006, 2007, 2008, 2009, 2010, 2011 Free Software
|
# distribute this file as part of a program or library that is built
|
||||||
# Foundation, Inc.
|
# using GNU Libtool, you may include this file under the same
|
||||||
# Written by Gordon Matzigkeit, 1996
|
# distribution terms that you use for the rest of that program.
|
||||||
#
|
#
|
||||||
# This file is part of GNU Libtool.
|
# GNU Libtool is distributed in the hope that it will be useful, but
|
||||||
#
|
# WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
# GNU Libtool is free software; you can redistribute it and/or
|
|
||||||
# modify it under the terms of the GNU General Public License as
|
|
||||||
# published by the Free Software Foundation; either version 2 of
|
|
||||||
# the License, or (at your option) any later version.
|
|
||||||
#
|
|
||||||
# As a special exception to the GNU General Public License,
|
|
||||||
# if you distribute this file as part of a program or library that
|
|
||||||
# is built using GNU Libtool, you may include this file under the
|
|
||||||
# same distribution terms that you use for the rest of that program.
|
|
||||||
#
|
|
||||||
# GNU Libtool is distributed in the hope that it will be useful,
|
|
||||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
# GNU General Public License for more details.
|
# GNU General Public License for more details.
|
||||||
#
|
#
|
||||||
# You should have received a copy of the GNU General Public License
|
# You should have received a copy of the GNU General Public License
|
||||||
# along with GNU Libtool; see the file COPYING. If not, a copy
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
|
|
||||||
# obtained by writing to the Free Software Foundation, Inc.,
|
|
||||||
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
||||||
|
|
||||||
|
|
||||||
# The names of the tagged configurations supported by this script.
|
# The names of the tagged configurations supported by this script.
|
||||||
@@ -25003,6 +25070,9 @@ nm_file_list_spec=$lt_nm_file_list_spec
|
|||||||
# The root where to search for dependent libraries,and where our libraries should be installed.
|
# The root where to search for dependent libraries,and where our libraries should be installed.
|
||||||
lt_sysroot=$lt_sysroot
|
lt_sysroot=$lt_sysroot
|
||||||
|
|
||||||
|
# Command to truncate a binary pipe.
|
||||||
|
lt_truncate_bin=$lt_lt_cv_truncate_bin
|
||||||
|
|
||||||
# The name of the directory that contains temporary libtool files.
|
# The name of the directory that contains temporary libtool files.
|
||||||
objdir=$objdir
|
objdir=$objdir
|
||||||
|
|
||||||
|
354
ltmain.sh
354
ltmain.sh
@@ -1,10 +1,12 @@
|
|||||||
#! /bin/sh
|
#! /bin/sh
|
||||||
|
## DO NOT EDIT - This file generated from ./build-aux/ltmain.in
|
||||||
|
## by inline-source v2014-01-03.01
|
||||||
|
|
||||||
# libtool (GNU libtool) 2.4.2.418
|
# libtool (GNU libtool) 2.4.3
|
||||||
# Provide generalized library-building support services.
|
# Provide generalized library-building support services.
|
||||||
# Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
|
# Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
|
||||||
|
|
||||||
# Copyright (C) 1996-2013 Free Software Foundation, Inc.
|
# Copyright (C) 1996-2014 Free Software Foundation, Inc.
|
||||||
# This is free software; see the source for copying conditions. There is NO
|
# This is free software; see the source for copying conditions. There is NO
|
||||||
# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||||
|
|
||||||
@@ -29,8 +31,8 @@
|
|||||||
|
|
||||||
PROGRAM=libtool
|
PROGRAM=libtool
|
||||||
PACKAGE=libtool
|
PACKAGE=libtool
|
||||||
VERSION=2.4.2.418
|
VERSION=2.4.3
|
||||||
package_revision=2.4.2.418
|
package_revision=2.4.3
|
||||||
|
|
||||||
|
|
||||||
## ------ ##
|
## ------ ##
|
||||||
@@ -62,12 +64,12 @@ package_revision=2.4.2.418
|
|||||||
# libraries, which are installed to $pkgauxdir.
|
# libraries, which are installed to $pkgauxdir.
|
||||||
|
|
||||||
# Set a version string for this script.
|
# Set a version string for this script.
|
||||||
scriptversion=2013-08-23.20; # UTC
|
scriptversion=2014-01-03.01; # UTC
|
||||||
|
|
||||||
# General shell script boiler plate, and helper functions.
|
# General shell script boiler plate, and helper functions.
|
||||||
# Written by Gary V. Vaughan, 2004
|
# Written by Gary V. Vaughan, 2004
|
||||||
|
|
||||||
# Copyright (C) 2004-2013 Free Software Foundation, Inc.
|
# Copyright (C) 2004-2014 Free Software Foundation, Inc.
|
||||||
# This is free software; see the source for copying conditions. There is NO
|
# This is free software; see the source for copying conditions. There is NO
|
||||||
# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||||
|
|
||||||
@@ -147,47 +149,157 @@ nl='
|
|||||||
'
|
'
|
||||||
IFS="$sp $nl"
|
IFS="$sp $nl"
|
||||||
|
|
||||||
# There are still modern systems that have problems with 'echo' mis-
|
# There are apparently some retarded systems that use ';' as a PATH separator!
|
||||||
# handling backslashes, among others, so make sure $bs_echo is set to a
|
if test "${PATH_SEPARATOR+set}" != set; then
|
||||||
# command that correctly interprets backslashes.
|
PATH_SEPARATOR=:
|
||||||
# (this code from Autoconf 2.68)
|
(PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
|
||||||
|
(PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
|
||||||
# Printing a long string crashes Solaris 7 /usr/bin/printf.
|
PATH_SEPARATOR=';'
|
||||||
bs_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
|
}
|
||||||
bs_echo=$bs_echo$bs_echo$bs_echo$bs_echo$bs_echo
|
|
||||||
bs_echo=$bs_echo$bs_echo$bs_echo$bs_echo$bs_echo$bs_echo
|
|
||||||
# Prefer a ksh shell builtin over an external printf program on Solaris,
|
|
||||||
# but without wasting forks for bash or zsh.
|
|
||||||
if test -z "$BASH_VERSION$ZSH_VERSION" \
|
|
||||||
&& (test "X`print -r -- $bs_echo`" = "X$bs_echo") 2>/dev/null; then
|
|
||||||
bs_echo='print -r --'
|
|
||||||
bs_echo_n='print -rn --'
|
|
||||||
elif (test "X`printf %s $bs_echo`" = "X$bs_echo") 2>/dev/null; then
|
|
||||||
bs_echo='printf %s\n'
|
|
||||||
bs_echo_n='printf %s'
|
|
||||||
else
|
|
||||||
if test "X`(/usr/ucb/echo -n -n $bs_echo) 2>/dev/null`" = "X-n $bs_echo"; then
|
|
||||||
bs_echo_body='eval /usr/ucb/echo -n "$1$nl"'
|
|
||||||
bs_echo_n='/usr/ucb/echo -n'
|
|
||||||
else
|
|
||||||
bs_echo_body='eval expr "X$1" : "X\\(.*\\)"'
|
|
||||||
bs_echo_n_body='eval
|
|
||||||
arg=$1;
|
|
||||||
case $arg in #(
|
|
||||||
*"$nl"*)
|
|
||||||
expr "X$arg" : "X\\(.*\\)$nl";
|
|
||||||
arg=`expr "X$arg" : ".*$nl\\(.*\\)"`;;
|
|
||||||
esac;
|
|
||||||
expr "X$arg" : "X\\(.*\\)" | tr -d "$nl"
|
|
||||||
'
|
|
||||||
export bs_echo_n_body
|
|
||||||
bs_echo_n='sh -c $bs_echo_n_body bs_echo'
|
|
||||||
fi
|
|
||||||
export bs_echo_body
|
|
||||||
bs_echo='sh -c $bs_echo_body bs_echo'
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
## ------------------------- ##
|
||||||
|
## Locate command utilities. ##
|
||||||
|
## ------------------------- ##
|
||||||
|
|
||||||
|
|
||||||
|
# func_executable_p FILE
|
||||||
|
# ----------------------
|
||||||
|
# Check that FILE is an executable regular file.
|
||||||
|
func_executable_p ()
|
||||||
|
{
|
||||||
|
test -f "$1" && test -x "$1"
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
# func_path_progs PROGS_LIST CHECK_FUNC [PATH]
|
||||||
|
# --------------------------------------------
|
||||||
|
# Search for either a program that responds to --version with output
|
||||||
|
# containing "GNU", or else returned by CHECK_FUNC otherwise, by
|
||||||
|
# trying all the directories in PATH with each of the elements of
|
||||||
|
# PROGS_LIST.
|
||||||
|
#
|
||||||
|
# CHECK_FUNC should accept the path to a candidate program, and
|
||||||
|
# set $func_check_prog_result if it truncates its output less than
|
||||||
|
# $_G_path_prog_max characters.
|
||||||
|
func_path_progs ()
|
||||||
|
{
|
||||||
|
_G_progs_list=$1
|
||||||
|
_G_check_func=$2
|
||||||
|
_G_PATH=${3-"$PATH"}
|
||||||
|
|
||||||
|
_G_path_prog_max=0
|
||||||
|
_G_path_prog_found=false
|
||||||
|
_G_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||||
|
for _G_dir in $_G_PATH; do
|
||||||
|
IFS=$_G_save_IFS
|
||||||
|
test -z "$_G_dir" && _G_dir=.
|
||||||
|
for _G_prog_name in $_G_progs_list; do
|
||||||
|
for _exeext in '' .EXE; do
|
||||||
|
_G_path_prog=$_G_dir/$_G_prog_name$_exeext
|
||||||
|
func_executable_p "$_G_path_prog" || continue
|
||||||
|
case `"$_G_path_prog" --version 2>&1` in
|
||||||
|
*GNU*) func_path_progs_result=$_G_path_prog _G_path_prog_found=: ;;
|
||||||
|
*) $_G_check_func $_G_path_prog
|
||||||
|
func_path_progs_result=$func_check_prog_result
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
$_G_path_prog_found && break 3
|
||||||
|
done
|
||||||
|
done
|
||||||
|
done
|
||||||
|
IFS=$_G_save_IFS
|
||||||
|
test -z "$func_path_progs_result" && {
|
||||||
|
echo "no acceptable sed could be found in \$PATH" >&2
|
||||||
|
exit 1
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
# We want to be able to use the functions in this file before configure
|
||||||
|
# has figured out where the best binaries are kept, which means we have
|
||||||
|
# to search for them ourselves - except when the results are already set
|
||||||
|
# where we skip the searches.
|
||||||
|
|
||||||
|
# Unless the user overrides by setting SED, search the path for either GNU
|
||||||
|
# sed, or the sed that truncates its output the least.
|
||||||
|
test -z "$SED" && {
|
||||||
|
_G_sed_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
|
||||||
|
for _G_i in 1 2 3 4 5 6 7; do
|
||||||
|
_G_sed_script=$_G_sed_script$nl$_G_sed_script
|
||||||
|
done
|
||||||
|
echo "$_G_sed_script" 2>/dev/null | sed 99q >conftest.sed
|
||||||
|
_G_sed_script=
|
||||||
|
|
||||||
|
func_check_prog_sed ()
|
||||||
|
{
|
||||||
|
_G_path_prog=$1
|
||||||
|
|
||||||
|
_G_count=0
|
||||||
|
printf 0123456789 >conftest.in
|
||||||
|
while :
|
||||||
|
do
|
||||||
|
cat conftest.in conftest.in >conftest.tmp
|
||||||
|
mv conftest.tmp conftest.in
|
||||||
|
cp conftest.in conftest.nl
|
||||||
|
echo '' >> conftest.nl
|
||||||
|
"$_G_path_prog" -f conftest.sed <conftest.nl >conftest.out 2>/dev/null || break
|
||||||
|
diff conftest.out conftest.nl >/dev/null 2>&1 || break
|
||||||
|
_G_count=`expr $_G_count + 1`
|
||||||
|
if test "$_G_count" -gt "$_G_path_prog_max"; then
|
||||||
|
# Best one so far, save it but keep looking for a better one
|
||||||
|
func_check_prog_result=$_G_path_prog
|
||||||
|
_G_path_prog_max=$_G_count
|
||||||
|
fi
|
||||||
|
# 10*(2^10) chars as input seems more than enough
|
||||||
|
test 10 -lt "$_G_count" && break
|
||||||
|
done
|
||||||
|
rm -f conftest.in conftest.tmp conftest.nl conftest.out
|
||||||
|
}
|
||||||
|
|
||||||
|
func_path_progs "sed gsed" func_check_prog_sed $PATH:/usr/xpg4/bin
|
||||||
|
rm -f conftest.sed
|
||||||
|
SED=$func_path_progs_result
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
# Unless the user overrides by setting GREP, search the path for either GNU
|
||||||
|
# grep, or the grep that truncates its output the least.
|
||||||
|
test -z "$GREP" && {
|
||||||
|
func_check_prog_grep ()
|
||||||
|
{
|
||||||
|
_G_path_prog=$1
|
||||||
|
|
||||||
|
_G_count=0
|
||||||
|
_G_path_prog_max=0
|
||||||
|
printf 0123456789 >conftest.in
|
||||||
|
while :
|
||||||
|
do
|
||||||
|
cat conftest.in conftest.in >conftest.tmp
|
||||||
|
mv conftest.tmp conftest.in
|
||||||
|
cp conftest.in conftest.nl
|
||||||
|
echo 'GREP' >> conftest.nl
|
||||||
|
"$_G_path_prog" -e 'GREP$' -e '-(cannot match)-' <conftest.nl >conftest.out 2>/dev/null || break
|
||||||
|
diff conftest.out conftest.nl >/dev/null 2>&1 || break
|
||||||
|
_G_count=`expr $_G_count + 1`
|
||||||
|
if test "$_G_count" -gt "$_G_path_prog_max"; then
|
||||||
|
# Best one so far, save it but keep looking for a better one
|
||||||
|
func_check_prog_result=$_G_path_prog
|
||||||
|
_G_path_prog_max=$_G_count
|
||||||
|
fi
|
||||||
|
# 10*(2^10) chars as input seems more than enough
|
||||||
|
test 10 -lt "$_G_count" && break
|
||||||
|
done
|
||||||
|
rm -f conftest.in conftest.tmp conftest.nl conftest.out
|
||||||
|
}
|
||||||
|
|
||||||
|
func_path_progs "grep ggrep" func_check_prog_grep $PATH:/usr/xpg4/bin
|
||||||
|
GREP=$func_path_progs_result
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
## ------------------------------- ##
|
## ------------------------------- ##
|
||||||
## User overridable command paths. ##
|
## User overridable command paths. ##
|
||||||
## ------------------------------- ##
|
## ------------------------------- ##
|
||||||
@@ -198,16 +310,14 @@ fi
|
|||||||
# in the command search PATH.
|
# in the command search PATH.
|
||||||
|
|
||||||
: ${CP="cp -f"}
|
: ${CP="cp -f"}
|
||||||
: ${ECHO="$bs_echo"}
|
: ${ECHO="printf %s\n"}
|
||||||
: ${EGREP="grep -E"}
|
: ${EGREP="$GREP -E"}
|
||||||
: ${FGREP="grep -F"}
|
: ${FGREP="$GREP -F"}
|
||||||
: ${GREP="grep"}
|
|
||||||
: ${LN_S="ln -s"}
|
: ${LN_S="ln -s"}
|
||||||
: ${MAKE="make"}
|
: ${MAKE="make"}
|
||||||
: ${MKDIR="mkdir"}
|
: ${MKDIR="mkdir"}
|
||||||
: ${MV="mv -f"}
|
: ${MV="mv -f"}
|
||||||
: ${RM="rm -f"}
|
: ${RM="rm -f"}
|
||||||
: ${SED="sed"}
|
|
||||||
: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
|
: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
|
||||||
|
|
||||||
|
|
||||||
@@ -298,13 +408,13 @@ exit_status=$EXIT_SUCCESS
|
|||||||
progpath=$0
|
progpath=$0
|
||||||
|
|
||||||
# The name of this program.
|
# The name of this program.
|
||||||
progname=`$bs_echo "$progpath" |$SED "$sed_basename"`
|
progname=`$ECHO "$progpath" |$SED "$sed_basename"`
|
||||||
|
|
||||||
# Make sure we have an absolute progpath for reexecution:
|
# Make sure we have an absolute progpath for reexecution:
|
||||||
case $progpath in
|
case $progpath in
|
||||||
[\\/]*|[A-Za-z]:\\*) ;;
|
[\\/]*|[A-Za-z]:\\*) ;;
|
||||||
*[\\/]*)
|
*[\\/]*)
|
||||||
progdir=`$bs_echo "$progpath" |$SED "$sed_dirname"`
|
progdir=`$ECHO "$progpath" |$SED "$sed_dirname"`
|
||||||
progdir=`cd "$progdir" && pwd`
|
progdir=`cd "$progdir" && pwd`
|
||||||
progpath=$progdir/$progname
|
progpath=$progdir/$progname
|
||||||
;;
|
;;
|
||||||
@@ -498,7 +608,7 @@ func_append_uniq ()
|
|||||||
{
|
{
|
||||||
$debug_cmd
|
$debug_cmd
|
||||||
|
|
||||||
eval _G_current_value='`$bs_echo $'$1'`'
|
eval _G_current_value='`$ECHO $'$1'`'
|
||||||
_G_delim=`expr "$2" : '\(.\)'`
|
_G_delim=`expr "$2" : '\(.\)'`
|
||||||
|
|
||||||
case $_G_delim$_G_current_value$_G_delim in
|
case $_G_delim$_G_current_value$_G_delim in
|
||||||
@@ -611,7 +721,7 @@ func_echo ()
|
|||||||
IFS=$nl
|
IFS=$nl
|
||||||
for _G_line in $_G_message; do
|
for _G_line in $_G_message; do
|
||||||
IFS=$func_echo_IFS
|
IFS=$func_echo_IFS
|
||||||
$bs_echo "$progname: $_G_line"
|
$ECHO "$progname: $_G_line"
|
||||||
done
|
done
|
||||||
IFS=$func_echo_IFS
|
IFS=$func_echo_IFS
|
||||||
}
|
}
|
||||||
@@ -645,17 +755,17 @@ func_echo_infix_1 ()
|
|||||||
for _G_tc in "$tc_reset" "$tc_bold" "$tc_standout" "$tc_red" "$tc_green" "$tc_blue" "$tc_cyan"
|
for _G_tc in "$tc_reset" "$tc_bold" "$tc_standout" "$tc_red" "$tc_green" "$tc_blue" "$tc_cyan"
|
||||||
do
|
do
|
||||||
test -n "$_G_tc" && {
|
test -n "$_G_tc" && {
|
||||||
_G_esc_tc=`$bs_echo "$_G_tc" | sed "$sed_make_literal_regex"`
|
_G_esc_tc=`$ECHO "$_G_tc" | $SED "$sed_make_literal_regex"`
|
||||||
_G_indent=`$bs_echo "$_G_indent" | sed "s|$_G_esc_tc||g"`
|
_G_indent=`$ECHO "$_G_indent" | $SED "s|$_G_esc_tc||g"`
|
||||||
}
|
}
|
||||||
done
|
done
|
||||||
_G_indent="$progname: "`echo "$_G_indent" | sed 's|.| |g'`" " ## exclude from sc_prohibit_nested_quotes
|
_G_indent="$progname: "`echo "$_G_indent" | $SED 's|.| |g'`" " ## exclude from sc_prohibit_nested_quotes
|
||||||
|
|
||||||
func_echo_infix_1_IFS=$IFS
|
func_echo_infix_1_IFS=$IFS
|
||||||
IFS=$nl
|
IFS=$nl
|
||||||
for _G_line in $_G_message; do
|
for _G_line in $_G_message; do
|
||||||
IFS=$func_echo_infix_1_IFS
|
IFS=$func_echo_infix_1_IFS
|
||||||
$bs_echo "$_G_prefix$tc_bold$_G_line$tc_reset" >&2
|
$ECHO "$_G_prefix$tc_bold$_G_line$tc_reset" >&2
|
||||||
_G_prefix=$_G_indent
|
_G_prefix=$_G_indent
|
||||||
done
|
done
|
||||||
IFS=$func_echo_infix_1_IFS
|
IFS=$func_echo_infix_1_IFS
|
||||||
@@ -1232,56 +1342,40 @@ func_sort_ver ()
|
|||||||
{
|
{
|
||||||
$debug_cmd
|
$debug_cmd
|
||||||
|
|
||||||
ver1=$1
|
printf '%s\n%s\n' "$1" "$2" \
|
||||||
ver2=$2
|
| sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n -k 5,5n -k 6,6n -k 7,7n -k 8,8n -k 9,9n
|
||||||
|
}
|
||||||
|
|
||||||
# Split on '.' and compare each component.
|
# func_lt_ver PREV CURR
|
||||||
i=1
|
# ---------------------
|
||||||
while :; do
|
# Return true if PREV and CURR are in the correct order according to
|
||||||
p1=`echo "$ver1" |cut -d. -f$i`
|
# func_sort_ver, otherwise false. Use it like this:
|
||||||
p2=`echo "$ver2" |cut -d. -f$i`
|
#
|
||||||
if test ! "$p1"; then
|
# func_lt_ver "$prev_ver" "$proposed_ver" || func_fatal_error "..."
|
||||||
echo "$1 $2"
|
func_lt_ver ()
|
||||||
break
|
{
|
||||||
elif test ! "$p2"; then
|
$debug_cmd
|
||||||
echo "$2 $1"
|
|
||||||
break
|
test "x$1" = x`func_sort_ver "$1" "$2" | $SED 1q`
|
||||||
elif test ! "$p1" = "$p2"; then
|
|
||||||
if test "$p1" -gt "$p2" 2>/dev/null; then # numeric comparison
|
|
||||||
echo "$2 $1"
|
|
||||||
elif test "$p2" -gt "$p1" 2>/dev/null; then # numeric comparison
|
|
||||||
echo "$1 $2"
|
|
||||||
else # numeric, then lexicographic comparison
|
|
||||||
lp=`printf "$p1\n$p2\n" |sort -n |tail -n1`
|
|
||||||
if test "$lp" = "$p2"; then
|
|
||||||
echo "$1 $2"
|
|
||||||
else
|
|
||||||
echo "$2 $1"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
i=`expr $i + 1`
|
|
||||||
done
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
# Local variables:
|
# Local variables:
|
||||||
# mode: shell-script
|
# mode: shell-script
|
||||||
# sh-indentation: 2
|
# sh-indentation: 2
|
||||||
# eval: (add-hook 'write-file-hooks 'time-stamp)
|
# eval: (add-hook 'before-save-hook 'time-stamp)
|
||||||
# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC"
|
# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC"
|
||||||
# time-stamp-time-zone: "UTC"
|
# time-stamp-time-zone: "UTC"
|
||||||
# End:
|
# End:
|
||||||
#! /bin/sh
|
#! /bin/sh
|
||||||
|
|
||||||
# Set a version string for this script.
|
# Set a version string for this script.
|
||||||
scriptversion=2012-10-21.11; # UTC
|
scriptversion=2014-01-07.03; # UTC
|
||||||
|
|
||||||
# A portable, pluggable option parser for Bourne shell.
|
# A portable, pluggable option parser for Bourne shell.
|
||||||
# Written by Gary V. Vaughan, 2010
|
# Written by Gary V. Vaughan, 2010
|
||||||
|
|
||||||
# Copyright (C) 2010-2013 Free Software Foundation, Inc.
|
# Copyright (C) 2010-2014 Free Software Foundation, Inc.
|
||||||
# This is free software; see the source for copying conditions. There is NO
|
# This is free software; see the source for copying conditions. There is NO
|
||||||
# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||||
|
|
||||||
@@ -1421,7 +1515,7 @@ func_remove_hook ()
|
|||||||
{
|
{
|
||||||
$debug_cmd
|
$debug_cmd
|
||||||
|
|
||||||
eval ${1}_hooks='`$bs_echo "\$'$1'_hooks" |$SED "s| '$2'||"`'
|
eval ${1}_hooks='`$ECHO "\$'$1'_hooks" |$SED "s| '$2'||"`'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -1698,9 +1792,9 @@ func_validate_options ()
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
## ------------------##
|
## ----------------- ##
|
||||||
## Helper functions. ##
|
## Helper functions. ##
|
||||||
## ------------------##
|
## ----------------- ##
|
||||||
|
|
||||||
# This section contains the helper functions used by the rest of the
|
# This section contains the helper functions used by the rest of the
|
||||||
# hookable option parser framework in ascii-betical order.
|
# hookable option parser framework in ascii-betical order.
|
||||||
@@ -1714,8 +1808,8 @@ func_fatal_help ()
|
|||||||
{
|
{
|
||||||
$debug_cmd
|
$debug_cmd
|
||||||
|
|
||||||
eval \$bs_echo \""Usage: $usage"\"
|
eval \$ECHO \""Usage: $usage"\"
|
||||||
eval \$bs_echo \""$fatal_help"\"
|
eval \$ECHO \""$fatal_help"\"
|
||||||
func_error ${1+"$@"}
|
func_error ${1+"$@"}
|
||||||
exit $EXIT_FAILURE
|
exit $EXIT_FAILURE
|
||||||
}
|
}
|
||||||
@@ -1729,7 +1823,7 @@ func_help ()
|
|||||||
$debug_cmd
|
$debug_cmd
|
||||||
|
|
||||||
func_usage_message
|
func_usage_message
|
||||||
$bs_echo "$long_help_message"
|
$ECHO "$long_help_message"
|
||||||
exit 0
|
exit 0
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1816,7 +1910,7 @@ func_usage ()
|
|||||||
$debug_cmd
|
$debug_cmd
|
||||||
|
|
||||||
func_usage_message
|
func_usage_message
|
||||||
$bs_echo "Run '$progname --help |${PAGER-more}' for full usage"
|
$ECHO "Run '$progname --help |${PAGER-more}' for full usage"
|
||||||
exit 0
|
exit 0
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1828,7 +1922,7 @@ func_usage_message ()
|
|||||||
{
|
{
|
||||||
$debug_cmd
|
$debug_cmd
|
||||||
|
|
||||||
eval \$bs_echo \""Usage: $usage"\"
|
eval \$ECHO \""Usage: $usage"\"
|
||||||
echo
|
echo
|
||||||
$SED -n 's|^# ||
|
$SED -n 's|^# ||
|
||||||
/^Written by/{
|
/^Written by/{
|
||||||
@@ -1837,7 +1931,7 @@ func_usage_message ()
|
|||||||
h
|
h
|
||||||
/^Written by/q' < "$progpath"
|
/^Written by/q' < "$progpath"
|
||||||
echo
|
echo
|
||||||
eval \$bs_echo \""$usage_message"\"
|
eval \$ECHO \""$usage_message"\"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -1849,7 +1943,7 @@ func_version ()
|
|||||||
$debug_cmd
|
$debug_cmd
|
||||||
|
|
||||||
printf '%s\n' "$progname $scriptversion"
|
printf '%s\n' "$progname $scriptversion"
|
||||||
$SED -n '/^##/q
|
$SED -n '
|
||||||
/(C)/!b go
|
/(C)/!b go
|
||||||
:more
|
:more
|
||||||
/\./!{
|
/\./!{
|
||||||
@@ -1877,13 +1971,13 @@ func_version ()
|
|||||||
# Local variables:
|
# Local variables:
|
||||||
# mode: shell-script
|
# mode: shell-script
|
||||||
# sh-indentation: 2
|
# sh-indentation: 2
|
||||||
# eval: (add-hook 'write-file-hooks 'time-stamp)
|
# eval: (add-hook 'before-save-hook 'time-stamp)
|
||||||
# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC"
|
# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC"
|
||||||
# time-stamp-time-zone: "UTC"
|
# time-stamp-time-zone: "UTC"
|
||||||
# End:
|
# End:
|
||||||
|
|
||||||
# Set a version string.
|
# Set a version string.
|
||||||
scriptversion='(GNU libtool) 2.4.2.418'
|
scriptversion='(GNU libtool) 2.4.3'
|
||||||
|
|
||||||
|
|
||||||
# func_echo ARG...
|
# func_echo ARG...
|
||||||
@@ -1900,7 +1994,7 @@ func_echo ()
|
|||||||
IFS=$nl
|
IFS=$nl
|
||||||
for _G_line in $_G_message; do
|
for _G_line in $_G_message; do
|
||||||
IFS=$func_echo_IFS
|
IFS=$func_echo_IFS
|
||||||
$bs_echo "$progname${opt_mode+: $opt_mode}: $_G_line"
|
$ECHO "$progname${opt_mode+: $opt_mode}: $_G_line"
|
||||||
done
|
done
|
||||||
IFS=$func_echo_IFS
|
IFS=$func_echo_IFS
|
||||||
}
|
}
|
||||||
@@ -1969,7 +2063,7 @@ include the following information:
|
|||||||
compiler: $LTCC
|
compiler: $LTCC
|
||||||
compiler flags: $LTCFLAGS
|
compiler flags: $LTCFLAGS
|
||||||
linker: $LD (gnu? $with_gnu_ld)
|
linker: $LD (gnu? $with_gnu_ld)
|
||||||
version: $progname (GNU libtool) 2.4.2.418
|
version: $progname (GNU libtool) 2.4.3
|
||||||
automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q`
|
automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q`
|
||||||
autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q`
|
autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q`
|
||||||
|
|
||||||
@@ -2315,7 +2409,9 @@ libtool_validate_options ()
|
|||||||
test : = "$debug_cmd" || func_append preserve_args " --debug"
|
test : = "$debug_cmd" || func_append preserve_args " --debug"
|
||||||
|
|
||||||
case $host in
|
case $host in
|
||||||
*cygwin* | *mingw* | *pw32* | *cegcc*)
|
# Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452
|
||||||
|
# see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788
|
||||||
|
*cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2*)
|
||||||
# don't eliminate duplications in $postdeps and $predeps
|
# don't eliminate duplications in $postdeps and $predeps
|
||||||
opt_duplicate_compiler_generated_deps=:
|
opt_duplicate_compiler_generated_deps=:
|
||||||
;;
|
;;
|
||||||
@@ -2386,6 +2482,14 @@ $1
|
|||||||
_LTECHO_EOF'
|
_LTECHO_EOF'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# func_generated_by_libtool
|
||||||
|
# True iff stdin has been generated by Libtool. This function is only
|
||||||
|
# a basic sanity check; it will hardly flush out determined imposters.
|
||||||
|
func_generated_by_libtool_p ()
|
||||||
|
{
|
||||||
|
$GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
|
||||||
|
}
|
||||||
|
|
||||||
# func_lalib_p file
|
# func_lalib_p file
|
||||||
# True iff FILE is a libtool '.la' library or '.lo' object file.
|
# True iff FILE is a libtool '.la' library or '.lo' object file.
|
||||||
# This function is only a basic sanity check; it will hardly flush out
|
# This function is only a basic sanity check; it will hardly flush out
|
||||||
@@ -2393,8 +2497,7 @@ _LTECHO_EOF'
|
|||||||
func_lalib_p ()
|
func_lalib_p ()
|
||||||
{
|
{
|
||||||
test -f "$1" &&
|
test -f "$1" &&
|
||||||
$SED -e 4q "$1" 2>/dev/null \
|
$SED -e 4q "$1" 2>/dev/null | func_generated_by_libtool_p
|
||||||
| $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
|
|
||||||
}
|
}
|
||||||
|
|
||||||
# func_lalib_unsafe_p file
|
# func_lalib_unsafe_p file
|
||||||
@@ -2426,7 +2529,8 @@ func_lalib_unsafe_p ()
|
|||||||
# determined imposters.
|
# determined imposters.
|
||||||
func_ltwrapper_script_p ()
|
func_ltwrapper_script_p ()
|
||||||
{
|
{
|
||||||
func_lalib_p "$1"
|
test -f "$1" &&
|
||||||
|
$lt_truncate_bin < "$1" 2>/dev/null | func_generated_by_libtool_p
|
||||||
}
|
}
|
||||||
|
|
||||||
# func_ltwrapper_executable_p file
|
# func_ltwrapper_executable_p file
|
||||||
@@ -3696,7 +3800,7 @@ if $opt_help; then
|
|||||||
for opt_mode in compile link execute install finish uninstall clean; do
|
for opt_mode in compile link execute install finish uninstall clean; do
|
||||||
func_mode_help
|
func_mode_help
|
||||||
done
|
done
|
||||||
} | sed -n '1p; 2,$s/^Usage:/ or: /p'
|
} | $SED -n '1p; 2,$s/^Usage:/ or: /p'
|
||||||
{
|
{
|
||||||
func_help noexit
|
func_help noexit
|
||||||
for opt_mode in compile link execute install finish uninstall clean; do
|
for opt_mode in compile link execute install finish uninstall clean; do
|
||||||
@@ -3704,7 +3808,7 @@ if $opt_help; then
|
|||||||
func_mode_help
|
func_mode_help
|
||||||
done
|
done
|
||||||
} |
|
} |
|
||||||
sed '1d
|
$SED '1d
|
||||||
/^When reporting/,/^Report/{
|
/^When reporting/,/^Report/{
|
||||||
H
|
H
|
||||||
d
|
d
|
||||||
@@ -3894,7 +3998,7 @@ func_mode_finish ()
|
|||||||
else
|
else
|
||||||
tmpdir=`func_mktempdir`
|
tmpdir=`func_mktempdir`
|
||||||
for lib in $libs; do
|
for lib in $libs; do
|
||||||
sed -e "$sysroot_cmd s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
|
$SED -e "$sysroot_cmd s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
|
||||||
> $tmpdir/tmp-la
|
> $tmpdir/tmp-la
|
||||||
mv -f $tmpdir/tmp-la $lib
|
mv -f $tmpdir/tmp-la $lib
|
||||||
done
|
done
|
||||||
@@ -4449,7 +4553,7 @@ func_generate_dlsyms ()
|
|||||||
my_outputname=$1
|
my_outputname=$1
|
||||||
my_originator=$2
|
my_originator=$2
|
||||||
my_pic_p=${3-false}
|
my_pic_p=${3-false}
|
||||||
my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'`
|
my_prefix=`$ECHO "$my_originator" | $SED 's%[^a-zA-Z0-9]%_%g'`
|
||||||
my_dlsyms=
|
my_dlsyms=
|
||||||
|
|
||||||
if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then
|
if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then
|
||||||
@@ -5322,7 +5426,7 @@ func_exec_program ()
|
|||||||
if test -n \"\$relink_command\"; then
|
if test -n \"\$relink_command\"; then
|
||||||
if relink_command_output=\`eval \$relink_command 2>&1\`; then :
|
if relink_command_output=\`eval \$relink_command 2>&1\`; then :
|
||||||
else
|
else
|
||||||
$ECHO \"\$relink_command_output\" >&2
|
\$ECHO \"\$relink_command_output\" >&2
|
||||||
$RM \"\$progdir/\$file\"
|
$RM \"\$progdir/\$file\"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
@@ -5554,7 +5658,12 @@ void lt_dump_script (FILE *f);
|
|||||||
EOF
|
EOF
|
||||||
|
|
||||||
cat <<EOF
|
cat <<EOF
|
||||||
volatile const char * MAGIC_EXE = "$magic_exe";
|
#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 5)
|
||||||
|
# define externally_visible volatile
|
||||||
|
#else
|
||||||
|
# define externally_visible __attribute__((externally_visible)) volatile
|
||||||
|
#endif
|
||||||
|
externally_visible const char * MAGIC_EXE = "$magic_exe";
|
||||||
const char * LIB_PATH_VARNAME = "$shlibpath_var";
|
const char * LIB_PATH_VARNAME = "$shlibpath_var";
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
@@ -7116,6 +7225,7 @@ func_mode_link ()
|
|||||||
# -m*, -t[45]*, -txscale* architecture-specific flags for GCC
|
# -m*, -t[45]*, -txscale* architecture-specific flags for GCC
|
||||||
# -F/path path to uninstalled frameworks, gcc on darwin
|
# -F/path path to uninstalled frameworks, gcc on darwin
|
||||||
# -p, -pg, --coverage, -fprofile-* profiling flags for GCC
|
# -p, -pg, --coverage, -fprofile-* profiling flags for GCC
|
||||||
|
# -fstack-protector* stack protector flags for GCC
|
||||||
# @file GCC response files
|
# @file GCC response files
|
||||||
# -tp=* Portland pgcc target processor selection
|
# -tp=* Portland pgcc target processor selection
|
||||||
# --sysroot=* for sysroot support
|
# --sysroot=* for sysroot support
|
||||||
@@ -7123,7 +7233,7 @@ func_mode_link ()
|
|||||||
# -stdlib=* select c++ std lib with clang
|
# -stdlib=* select c++ std lib with clang
|
||||||
-64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
|
-64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
|
||||||
-t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
|
-t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
|
||||||
-O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-stdlib=*)
|
-O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*)
|
||||||
func_quote_for_eval "$arg"
|
func_quote_for_eval "$arg"
|
||||||
arg=$func_quote_for_eval_result
|
arg=$func_quote_for_eval_result
|
||||||
func_append compile_command " $arg"
|
func_append compile_command " $arg"
|
||||||
@@ -9926,15 +10036,17 @@ EOF
|
|||||||
# the extraction.
|
# the extraction.
|
||||||
reload_conv_objs=
|
reload_conv_objs=
|
||||||
gentop=
|
gentop=
|
||||||
# reload_cmds runs $LD directly, so let us get rid of
|
# if reload_cmds runs $LD directly, get rid of -Wl from
|
||||||
# -Wl from whole_archive_flag_spec and hope we can get by with
|
# whole_archive_flag_spec and hope we can get by with turning comma
|
||||||
# turning comma into space..
|
# into space.
|
||||||
wl=
|
case $reload_cmds in
|
||||||
|
*\$LD[\ \$]*) wl= ;;
|
||||||
|
esac
|
||||||
if test -n "$convenience"; then
|
if test -n "$convenience"; then
|
||||||
if test -n "$whole_archive_flag_spec"; then
|
if test -n "$whole_archive_flag_spec"; then
|
||||||
eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
|
eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
|
||||||
reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
|
test -n "$wl" || tmp_whole_archive_flags=`$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
|
||||||
|
reload_conv_objs=$reload_objs\ $tmp_whole_archive_flags
|
||||||
else
|
else
|
||||||
gentop=$output_objdir/${obj}x
|
gentop=$output_objdir/${obj}x
|
||||||
func_append generated " $gentop"
|
func_append generated " $gentop"
|
||||||
|
96
m4/libtool.m4
vendored
96
m4/libtool.m4
vendored
@@ -1,6 +1,6 @@
|
|||||||
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
|
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
|
||||||
#
|
#
|
||||||
# Copyright (C) 1996-2001, 2003-2013 Free Software Foundation, Inc.
|
# Copyright (C) 1996-2001, 2003-2014 Free Software Foundation, Inc.
|
||||||
# Written by Gordon Matzigkeit, 1996
|
# Written by Gordon Matzigkeit, 1996
|
||||||
#
|
#
|
||||||
# This file is free software; the Free Software Foundation gives
|
# This file is free software; the Free Software Foundation gives
|
||||||
@@ -8,33 +8,27 @@
|
|||||||
# modifications, as long as this notice is preserved.
|
# modifications, as long as this notice is preserved.
|
||||||
|
|
||||||
m4_define([_LT_COPYING], [dnl
|
m4_define([_LT_COPYING], [dnl
|
||||||
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
|
# Copyright (C) 2014 Free Software Foundation, Inc.
|
||||||
# 2006, 2007, 2008, 2009, 2010, 2011 Free Software
|
# This is free software; see the source for copying conditions. There is NO
|
||||||
# Foundation, Inc.
|
# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||||
# Written by Gordon Matzigkeit, 1996
|
|
||||||
|
# GNU Libtool is free software; you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
# the Free Software Foundation; either version 2 of of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
#
|
#
|
||||||
# This file is part of GNU Libtool.
|
# As a special exception to the GNU General Public License, if you
|
||||||
|
# distribute this file as part of a program or library that is built
|
||||||
|
# using GNU Libtool, you may include this file under the same
|
||||||
|
# distribution terms that you use for the rest of that program.
|
||||||
#
|
#
|
||||||
# GNU Libtool is free software; you can redistribute it and/or
|
# GNU Libtool is distributed in the hope that it will be useful, but
|
||||||
# modify it under the terms of the GNU General Public License as
|
# WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
# published by the Free Software Foundation; either version 2 of
|
|
||||||
# the License, or (at your option) any later version.
|
|
||||||
#
|
|
||||||
# As a special exception to the GNU General Public License,
|
|
||||||
# if you distribute this file as part of a program or library that
|
|
||||||
# is built using GNU Libtool, you may include this file under the
|
|
||||||
# same distribution terms that you use for the rest of that program.
|
|
||||||
#
|
|
||||||
# GNU Libtool is distributed in the hope that it will be useful,
|
|
||||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
# GNU General Public License for more details.
|
# GNU General Public License for more details.
|
||||||
#
|
#
|
||||||
# You should have received a copy of the GNU General Public License
|
# You should have received a copy of the GNU General Public License
|
||||||
# along with GNU Libtool; see the file COPYING. If not, a copy
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
|
|
||||||
# obtained by writing to the Free Software Foundation, Inc.,
|
|
||||||
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
||||||
])
|
])
|
||||||
|
|
||||||
# serial 58 LT_INIT
|
# serial 58 LT_INIT
|
||||||
@@ -65,7 +59,7 @@ esac
|
|||||||
# LT_INIT([OPTIONS])
|
# LT_INIT([OPTIONS])
|
||||||
# ------------------
|
# ------------------
|
||||||
AC_DEFUN([LT_INIT],
|
AC_DEFUN([LT_INIT],
|
||||||
[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
|
[AC_PREREQ([2.62])dnl We use AC_PATH_PROGS_FEATURE_CHECK
|
||||||
AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
|
AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
|
||||||
AC_BEFORE([$0], [LT_LANG])dnl
|
AC_BEFORE([$0], [LT_LANG])dnl
|
||||||
AC_BEFORE([$0], [LT_OUTPUT])dnl
|
AC_BEFORE([$0], [LT_OUTPUT])dnl
|
||||||
@@ -175,6 +169,7 @@ m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
|
|||||||
m4_require([_LT_CMD_OLD_ARCHIVE])dnl
|
m4_require([_LT_CMD_OLD_ARCHIVE])dnl
|
||||||
m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
|
m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
|
||||||
m4_require([_LT_WITH_SYSROOT])dnl
|
m4_require([_LT_WITH_SYSROOT])dnl
|
||||||
|
m4_require([_LT_CMD_TRUNCATE])dnl
|
||||||
|
|
||||||
_LT_CONFIG_LIBTOOL_INIT([
|
_LT_CONFIG_LIBTOOL_INIT([
|
||||||
# See if we are running on zsh, and set the options that allow our
|
# See if we are running on zsh, and set the options that allow our
|
||||||
@@ -715,12 +710,13 @@ _LT_CONFIG_SAVE_COMMANDS([
|
|||||||
|
|
||||||
cat <<_LT_EOF >> "$cfgfile"
|
cat <<_LT_EOF >> "$cfgfile"
|
||||||
#! $SHELL
|
#! $SHELL
|
||||||
|
|
||||||
# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
|
|
||||||
# Generated automatically by $as_me ($PACKAGE) $VERSION
|
# Generated automatically by $as_me ($PACKAGE) $VERSION
|
||||||
# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
|
# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
|
||||||
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
|
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
|
||||||
#
|
|
||||||
|
# Provide generalized library-building support services.
|
||||||
|
# Written by Gordon Matzigkeit, 1996
|
||||||
|
|
||||||
_LT_COPYING
|
_LT_COPYING
|
||||||
_LT_LIBTOOL_TAGS
|
_LT_LIBTOOL_TAGS
|
||||||
|
|
||||||
@@ -1047,7 +1043,7 @@ _LT_EOF
|
|||||||
case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
|
case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
|
||||||
10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
|
10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
|
||||||
_lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
|
_lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
|
||||||
10.[[012]]*)
|
10.[[012]][[,.]]*)
|
||||||
_lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
|
_lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
|
||||||
10.*)
|
10.*)
|
||||||
_lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
|
_lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
|
||||||
@@ -3222,6 +3218,43 @@ _LT_TAGDECL([], [reload_cmds], [2])dnl
|
|||||||
])# _LT_CMD_RELOAD
|
])# _LT_CMD_RELOAD
|
||||||
|
|
||||||
|
|
||||||
|
# _LT_PATH_DD
|
||||||
|
# -----------
|
||||||
|
# find a working dd
|
||||||
|
m4_defun([_LT_PATH_DD],
|
||||||
|
[AC_CACHE_CHECK([for a working dd], [ac_cv_path_lt_DD],
|
||||||
|
[printf 0123456789abcdef0123456789abcdef >conftest.i
|
||||||
|
cat conftest.i conftest.i >conftest2.i
|
||||||
|
: ${lt_DD:=$DD}
|
||||||
|
AC_PATH_PROGS_FEATURE_CHECK([lt_DD], [dd],
|
||||||
|
[if "$ac_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
|
||||||
|
cmp -s conftest.i conftest.out \
|
||||||
|
&& ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=:
|
||||||
|
fi])
|
||||||
|
rm -f conftest.i conftest2.i conftest.out])
|
||||||
|
])# _LT_PATH_DD
|
||||||
|
|
||||||
|
|
||||||
|
# _LT_CMD_TRUNCATE
|
||||||
|
# ----------------
|
||||||
|
# find command to truncate a binary pipe
|
||||||
|
m4_defun([_LT_CMD_TRUNCATE],
|
||||||
|
[m4_require([_LT_PATH_DD])
|
||||||
|
AC_CACHE_CHECK([how to truncate binary pipes], [lt_cv_truncate_bin],
|
||||||
|
[printf 0123456789abcdef0123456789abcdef >conftest.i
|
||||||
|
cat conftest.i conftest.i >conftest2.i
|
||||||
|
lt_cv_truncate_bin=
|
||||||
|
if "$ac_cv_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
|
||||||
|
cmp -s conftest.i conftest.out \
|
||||||
|
&& lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1"
|
||||||
|
fi
|
||||||
|
rm -f conftest.i conftest2.i conftest.out
|
||||||
|
test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"])
|
||||||
|
_LT_DECL([lt_truncate_bin], [lt_cv_truncate_bin], [1],
|
||||||
|
[Command to truncate a binary pipe])
|
||||||
|
])# _LT_CMD_TRUNCATE
|
||||||
|
|
||||||
|
|
||||||
# _LT_CHECK_MAGIC_METHOD
|
# _LT_CHECK_MAGIC_METHOD
|
||||||
# ----------------------
|
# ----------------------
|
||||||
# how to check for library dependencies
|
# how to check for library dependencies
|
||||||
@@ -3477,8 +3510,13 @@ else
|
|||||||
# Adding the 'sed 1q' prevents false positives on HP-UX, which says:
|
# Adding the 'sed 1q' prevents false positives on HP-UX, which says:
|
||||||
# nm: unknown option "B" ignored
|
# nm: unknown option "B" ignored
|
||||||
# Tru64's nm complains that /dev/null is an invalid object file
|
# Tru64's nm complains that /dev/null is an invalid object file
|
||||||
case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
|
# MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty
|
||||||
*/dev/null* | *'Invalid file or object type'*)
|
case $build_os in
|
||||||
|
mingw*) lt_bad_file=conftest.nm/nofile ;;
|
||||||
|
*) lt_bad_file=/dev/null ;;
|
||||||
|
esac
|
||||||
|
case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in
|
||||||
|
*$lt_bad_file* | *'Invalid file or object type'*)
|
||||||
lt_cv_path_NM="$tmp_nm -B"
|
lt_cv_path_NM="$tmp_nm -B"
|
||||||
break 2
|
break 2
|
||||||
;;
|
;;
|
||||||
|
2
m4/ltoptions.m4
vendored
2
m4/ltoptions.m4
vendored
@@ -1,6 +1,6 @@
|
|||||||
# Helper functions for option handling. -*- Autoconf -*-
|
# Helper functions for option handling. -*- Autoconf -*-
|
||||||
#
|
#
|
||||||
# Copyright (C) 2004-2005, 2007-2009, 2011-2013 Free Software
|
# Copyright (C) 2004-2005, 2007-2009, 2011-2014 Free Software
|
||||||
# Foundation, Inc.
|
# Foundation, Inc.
|
||||||
# Written by Gary V. Vaughan, 2004
|
# Written by Gary V. Vaughan, 2004
|
||||||
#
|
#
|
||||||
|
2
m4/ltsugar.m4
vendored
2
m4/ltsugar.m4
vendored
@@ -1,6 +1,6 @@
|
|||||||
# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*-
|
# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*-
|
||||||
#
|
#
|
||||||
# Copyright (C) 2004-2005, 2007-2008, 2011-2013 Free Software
|
# Copyright (C) 2004-2005, 2007-2008, 2011-2014 Free Software
|
||||||
# Foundation, Inc.
|
# Foundation, Inc.
|
||||||
# Written by Gary V. Vaughan, 2004
|
# Written by Gary V. Vaughan, 2004
|
||||||
#
|
#
|
||||||
|
12
m4/ltversion.m4
vendored
12
m4/ltversion.m4
vendored
@@ -1,6 +1,6 @@
|
|||||||
# ltversion.m4 -- version numbers -*- Autoconf -*-
|
# ltversion.m4 -- version numbers -*- Autoconf -*-
|
||||||
#
|
#
|
||||||
# Copyright (C) 2004, 2011-2013 Free Software Foundation, Inc.
|
# Copyright (C) 2004, 2011-2014 Free Software Foundation, Inc.
|
||||||
# Written by Scott James Remnant, 2004
|
# Written by Scott James Remnant, 2004
|
||||||
#
|
#
|
||||||
# This file is free software; the Free Software Foundation gives
|
# This file is free software; the Free Software Foundation gives
|
||||||
@@ -9,15 +9,15 @@
|
|||||||
|
|
||||||
# @configure_input@
|
# @configure_input@
|
||||||
|
|
||||||
# serial 4038 ltversion.m4
|
# serial 4105 ltversion.m4
|
||||||
# This file is part of GNU Libtool
|
# This file is part of GNU Libtool
|
||||||
|
|
||||||
m4_define([LT_PACKAGE_VERSION], [2.4.2.418])
|
m4_define([LT_PACKAGE_VERSION], [2.4.2.458.26-92994])
|
||||||
m4_define([LT_PACKAGE_REVISION], [2.4.2.418])
|
m4_define([LT_PACKAGE_REVISION], [2.4.3])
|
||||||
|
|
||||||
AC_DEFUN([LTVERSION_VERSION],
|
AC_DEFUN([LTVERSION_VERSION],
|
||||||
[macro_version='2.4.2.418'
|
[macro_version='2.4.2.458.26-92994'
|
||||||
macro_revision='2.4.2.418'
|
macro_revision='2.4.3'
|
||||||
_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
|
_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
|
||||||
_LT_DECL(, macro_revision, 0)
|
_LT_DECL(, macro_revision, 0)
|
||||||
])
|
])
|
||||||
|
2
m4/lt~obsolete.m4
vendored
2
m4/lt~obsolete.m4
vendored
@@ -1,6 +1,6 @@
|
|||||||
# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*-
|
# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*-
|
||||||
#
|
#
|
||||||
# Copyright (C) 2004-2005, 2007, 2009, 2011-2013 Free Software
|
# Copyright (C) 2004-2005, 2007, 2009, 2011-2014 Free Software
|
||||||
# Foundation, Inc.
|
# Foundation, Inc.
|
||||||
# Written by Scott James Remnant, 2004.
|
# Written by Scott James Remnant, 2004.
|
||||||
#
|
#
|
||||||
|
Reference in New Issue
Block a user