Updated to recent upstream.
This commit is contained in:
Andrey Kiselev
parent
b11ec97f62
commit
88df59e89c
422
config/ltmain.sh
422
config/ltmain.sh
@ -1,6 +1,6 @@
|
||||
# Generated from ltmain.m4sh; do not edit by hand
|
||||
|
||||
# ltmain.sh (GNU libtool 1.2259 2006/02/03 20:43:24) 2.1a
|
||||
# ltmain.sh (GNU libtool 1.2305 2006/06/01 18:39:23) 2.1a
|
||||
# Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
|
||||
|
||||
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006
|
||||
@ -59,12 +59,12 @@
|
||||
# When reporting a bug, please describe a test case to reproduce it and
|
||||
# include the following information:
|
||||
#
|
||||
# host-triplet: sparc-sun-solaris2.9
|
||||
# host-triplet: $host
|
||||
# shell: $SHELL
|
||||
# compiler: $LTCC
|
||||
# compiler flags: $LTCFLAGS
|
||||
# linker: $LD (gnu? $with_gnu_ld)
|
||||
# $progname: (GNU libtool 1.2259 2006/02/03 20:43:24) 2.1a
|
||||
# $progname: (GNU libtool 1.2305 2006/06/01 18:39:23) 2.1a
|
||||
# automake: $automake_version
|
||||
# autoconf: $autoconf_version
|
||||
#
|
||||
@ -73,12 +73,8 @@
|
||||
PROGRAM=ltmain.sh
|
||||
PACKAGE=libtool
|
||||
VERSION=2.1a
|
||||
TIMESTAMP=" 1.2259 2006/02/03 20:43:24"
|
||||
package_revision=1.2259
|
||||
|
||||
## --------------------- ##
|
||||
## M4sh Initialization. ##
|
||||
## --------------------- ##
|
||||
TIMESTAMP=" 1.2305 2006/06/01 18:39:23"
|
||||
package_revision=1.2305
|
||||
|
||||
# Be Bourne compatible
|
||||
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
|
||||
@ -88,129 +84,40 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
|
||||
# is contrary to our usage. Disable this feature.
|
||||
alias -g '${1+"$@"}'='"$@"'
|
||||
setopt NO_GLOB_SUBST
|
||||
elif (set -o posix) >/dev/null 2>&1; then
|
||||
set -o posix
|
||||
else
|
||||
case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
|
||||
fi
|
||||
BIN_SH=xpg4; export BIN_SH # for Tru64
|
||||
DUALCASE=1; export DUALCASE # for MKS sh
|
||||
|
||||
|
||||
# PATH needs CR
|
||||
# Avoid depending upon Character Ranges.
|
||||
as_cr_letters='abcdefghijklmnopqrstuvwxyz'
|
||||
as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
|
||||
as_cr_Letters=$as_cr_letters$as_cr_LETTERS
|
||||
as_cr_digits='0123456789'
|
||||
as_cr_alnum=$as_cr_Letters$as_cr_digits
|
||||
|
||||
# The user is always right.
|
||||
if test "${PATH_SEPARATOR+set}" != set; then
|
||||
echo "#! /bin/sh" >conf$$.sh
|
||||
echo "exit 0" >>conf$$.sh
|
||||
chmod +x conf$$.sh
|
||||
if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
|
||||
PATH_SEPARATOR=';'
|
||||
else
|
||||
PATH_SEPARATOR=:
|
||||
fi
|
||||
rm -f conf$$.sh
|
||||
fi
|
||||
|
||||
# Support unset when possible.
|
||||
if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
|
||||
as_unset=unset
|
||||
else
|
||||
as_unset=false
|
||||
fi
|
||||
|
||||
|
||||
# Find who we are. Look in the path if we contain no path at all
|
||||
# relative or not.
|
||||
case $0 in
|
||||
*[\\/]* ) as_myself=$0 ;;
|
||||
*) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
for as_dir in $PATH
|
||||
# NLS nuisances: We save the old values to restore during execute mode.
|
||||
# Only set LANG and LC_ALL to C if already set.
|
||||
# These must not be set unconditionally because not all systems understand
|
||||
# e.g. LANG=C (notably SCO).
|
||||
for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
|
||||
do
|
||||
IFS=$as_save_IFS
|
||||
test -z "$as_dir" && as_dir=.
|
||||
test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
|
||||
eval "if test \"\${$lt_var+set}\" = set; then
|
||||
save_$lt_var=\$$lt_var
|
||||
$lt_var=C
|
||||
export $lt_var
|
||||
fi"
|
||||
done
|
||||
|
||||
;;
|
||||
esac
|
||||
# We did not find ourselves, most probably we were run as `sh COMMAND'
|
||||
# in which case we are not to be found in the path.
|
||||
if test "x$as_myself" = x; then
|
||||
as_myself=$0
|
||||
fi
|
||||
if test ! -f "$as_myself"; then
|
||||
{ echo "$as_me: error: cannot find myself; rerun with an absolute file name" >&2
|
||||
{ (exit 1); exit 1; }; }
|
||||
fi
|
||||
|
||||
# Work around bugs in pre-3.0 UWIN ksh.
|
||||
for as_var in ENV MAIL MAILPATH
|
||||
do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
|
||||
done
|
||||
PS1='$ '
|
||||
PS2='> '
|
||||
PS4='+ '
|
||||
|
||||
# NLS nuisances.
|
||||
for as_var in \
|
||||
LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
|
||||
LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
|
||||
LC_TELEPHONE LC_TIME
|
||||
do
|
||||
if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
|
||||
eval $as_var=C; export $as_var
|
||||
else
|
||||
($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
|
||||
fi
|
||||
done
|
||||
|
||||
# Required to use basename.
|
||||
if expr a : '\(a\)' >/dev/null 2>&1; then
|
||||
as_expr=expr
|
||||
else
|
||||
as_expr=false
|
||||
fi
|
||||
|
||||
if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
|
||||
as_basename=basename
|
||||
else
|
||||
as_basename=false
|
||||
fi
|
||||
|
||||
|
||||
# Name of the executable.
|
||||
as_me=`$as_basename "$0" ||
|
||||
$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
|
||||
X"$0" : 'X\(//\)$' \| \
|
||||
X"$0" : 'X\(/\)$' \| \
|
||||
. : '\(.\)' 2>/dev/null ||
|
||||
echo X/"$0" |
|
||||
sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
|
||||
/^X\/\(\/\/\)$/{ s//\1/; q; }
|
||||
/^X\/\(\/\).*/{ s//\1/; q; }
|
||||
s/.*/./; q'`
|
||||
|
||||
|
||||
$as_unset CDPATH
|
||||
$lt_unset CDPATH
|
||||
|
||||
|
||||
|
||||
: ${CP="cp -f"}
|
||||
: ${ECHO="echo"}
|
||||
: ${EGREP="/usr/local/bin/grep -E"}
|
||||
: ${FGREP="/usr/local/bin/grep -F"}
|
||||
: ${GREP="/usr/local/bin/grep"}
|
||||
: ${EGREP="/bin/grep -E"}
|
||||
: ${FGREP="/bin/grep -F"}
|
||||
: ${GREP="/bin/grep"}
|
||||
: ${LN_S="ln -s"}
|
||||
: ${MAKE="make"}
|
||||
: ${MKDIR="mkdir"}
|
||||
: ${MV="mv -f"}
|
||||
: ${RM="rm -f"}
|
||||
: ${SED="/usr/local/bin/sed"}
|
||||
: ${SED="/bin/sed"}
|
||||
: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
|
||||
: ${Xsed="$SED -e 1s/^X//"}
|
||||
|
||||
@ -280,19 +187,6 @@ double_quote_subst='s/\(["`\\]\)/\\\1/g'
|
||||
sed_double_backslash='s/^\(\(''\\\\''\\\\''\)*''\\\\''\)\$/\1\\$/;
|
||||
s/\([^\\]\(''\\\\''\\\\''\)*''\\\\''\)\$/\1\\$/g'
|
||||
|
||||
# test EBCDIC or ASCII
|
||||
case `echo X|tr X '\101'` in
|
||||
A) # ASCII based system
|
||||
# \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
|
||||
SP2NL='tr \040 \012'
|
||||
NL2SP='tr \015\012 \040\040'
|
||||
;;
|
||||
*) # EBCDIC based system
|
||||
SP2NL='tr \100 \n'
|
||||
NL2SP='tr \r\n \100\100'
|
||||
;;
|
||||
esac
|
||||
|
||||
# Standard options:
|
||||
opt_dry_run=false
|
||||
opt_help=false
|
||||
@ -557,6 +451,7 @@ func_help ()
|
||||
s/^# //
|
||||
s/^# *$//
|
||||
s*\$progname*'$progname'*
|
||||
s*\$host*'"$host"'*
|
||||
s*\$SHELL*'"$SHELL"'*
|
||||
s*\$LTCC*'"$LTCC"'*
|
||||
s*\$LTCFLAGS*'"$LTCFLAGS"'*
|
||||
@ -615,6 +510,8 @@ execute_dlfiles=
|
||||
preserve_args=
|
||||
lo2o="s/\\.lo\$/.${objext}/"
|
||||
o2lo="s/\\.${objext}\$/.lo/"
|
||||
extracted_archives=
|
||||
extracted_serial=0
|
||||
|
||||
opt_dry_run=false
|
||||
opt_duplicate_deps=false
|
||||
@ -830,9 +727,9 @@ The following components of LINK-COMMAND are treated specially:
|
||||
-dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols
|
||||
-export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
|
||||
-export-symbols SYMFILE
|
||||
try to export only the symbols listed in SYMFILE
|
||||
try to export only the symbols listed in SYMFILE
|
||||
-export-symbols-regex REGEX
|
||||
try to export only the symbols matching REGEX
|
||||
try to export only the symbols matching REGEX
|
||||
-LLIBDIR search LIBDIR for required installed libraries
|
||||
-lNAME OUTPUT-FILE requires the installed library libNAME
|
||||
-module build a library that can dlopened
|
||||
@ -848,9 +745,11 @@ The following components of LINK-COMMAND are treated specially:
|
||||
-R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries
|
||||
-shared only do dynamic linking of libtool libraries
|
||||
-shrext SUFFIX override the standard shared library file extension
|
||||
-static do not do any dynamic linking of libtool libraries
|
||||
-static do not do any dynamic linking of uninstalled libtool libraries
|
||||
-static-libtool-libs
|
||||
do not do any dynamic linking of libtool libraries
|
||||
-version-info CURRENT[:REVISION[:AGE]]
|
||||
specify library version info [each variable defaults to 0]
|
||||
specify library version info [each variable defaults to 0]
|
||||
-weak LIBNAME declare that the target provides the LIBNAME interface
|
||||
|
||||
All other options (arguments beginning with \`-') are ignored.
|
||||
@ -1557,7 +1456,17 @@ func_extract_archives ()
|
||||
esac
|
||||
func_basename "$my_xlib"
|
||||
my_xlib="$func_basename_result"
|
||||
my_xdir="$my_gentop/$my_xlib"
|
||||
my_xlib_u=$my_xlib
|
||||
while :; do
|
||||
case " $extracted_archives " in
|
||||
*" $my_xlib_u "*)
|
||||
extracted_serial=`expr $extracted_serial + 1`
|
||||
my_xlib_u=lt$extracted_serial-$my_xlib ;;
|
||||
*) break ;;
|
||||
esac
|
||||
done
|
||||
extracted_archives="$extracted_archives $my_xlib_u"
|
||||
my_xdir="$my_gentop/$my_xlib_u"
|
||||
|
||||
func_mkdir_p "$my_xdir"
|
||||
|
||||
@ -1611,6 +1520,44 @@ func_extract_archives ()
|
||||
}
|
||||
|
||||
|
||||
|
||||
# func_write_libtool_object output_name pic_name nonpic_name
|
||||
# Create a libtool object file (analogous to a ".la" file),
|
||||
# but don't create it if we're doing a dry run.
|
||||
func_write_libtool_object ()
|
||||
{
|
||||
write_libobj=${1}
|
||||
if test "$build_libtool_libs" = yes; then
|
||||
write_lobj=\'${2}\'
|
||||
else
|
||||
write_lobj=none
|
||||
fi
|
||||
|
||||
if test "$build_old_libs" = yes; then
|
||||
write_oldobj=\'${3}\'
|
||||
else
|
||||
write_oldobj=none
|
||||
fi
|
||||
|
||||
$opt_dry_run || {
|
||||
cat >${write_libobj}T <<EOF
|
||||
# $write_libobj - a libtool object file
|
||||
# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
|
||||
#
|
||||
# Please DO NOT delete this file!
|
||||
# It is necessary for linking the library.
|
||||
|
||||
# Name of the PIC object.
|
||||
pic_object=$write_lobj
|
||||
|
||||
# Name of the non-PIC object
|
||||
non_pic_object=$write_oldobj
|
||||
|
||||
EOF
|
||||
mv -f "${write_libobj}T" "${write_libobj}"
|
||||
}
|
||||
}
|
||||
|
||||
# func_mode_compile arg...
|
||||
func_mode_compile ()
|
||||
{
|
||||
@ -1860,18 +1807,6 @@ compiler."
|
||||
|
||||
$opt_dry_run || $RM "$libobj" "${libobj}T"
|
||||
|
||||
# Create a libtool object file (analogous to a ".la" file),
|
||||
# but don't create it if we're doing a dry run.
|
||||
$opt_dry_run || cat > ${libobj}T <<EOF
|
||||
# $libobj - a libtool object file
|
||||
# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
|
||||
#
|
||||
# Please DO NOT delete this file!
|
||||
# It is necessary for linking the library.
|
||||
|
||||
# Name of the PIC object.
|
||||
EOF
|
||||
|
||||
# Only build a PIC object if we are building libtool libraries.
|
||||
if test "$build_libtool_libs" = yes; then
|
||||
# Without this assignment, base_compile gets emptied.
|
||||
@ -1922,23 +1857,10 @@ compiler."
|
||||
'error=$?; $opt_dry_run || $RM $removelist; exit $error'
|
||||
fi
|
||||
|
||||
# Append the name of the PIC object to the libtool object file.
|
||||
$opt_dry_run || cat >> ${libobj}T <<EOF
|
||||
pic_object='$objdir/$objname'
|
||||
|
||||
EOF
|
||||
|
||||
# Allow error messages only from the first compilation.
|
||||
if test "$suppress_opt" = yes; then
|
||||
suppress_output=' >/dev/null 2>&1'
|
||||
fi
|
||||
else
|
||||
# No PIC object so indicate it doesn't exist in the libtool
|
||||
# object file.
|
||||
$opt_dry_run || cat >> ${libobj}T <<EOF
|
||||
pic_object=none
|
||||
|
||||
EOF
|
||||
fi
|
||||
|
||||
# Only build a position-dependent object if we build old libraries.
|
||||
@ -1984,26 +1906,10 @@ compiler."
|
||||
func_show_eval '$MV "$output_obj" "$obj"' \
|
||||
'error=$?; $opt_dry_run || $RM $removelist; exit $error'
|
||||
fi
|
||||
|
||||
# Append the name of the non-PIC object the libtool object file.
|
||||
# Only append if the libtool object file exists.
|
||||
$opt_dry_run || cat >> ${libobj}T <<EOF
|
||||
# Name of the non-PIC object.
|
||||
non_pic_object='$objname'
|
||||
|
||||
EOF
|
||||
else
|
||||
# Append the name of the non-PIC object the libtool object file.
|
||||
# Only append if the libtool object file exists.
|
||||
$opt_dry_run || cat >> ${libobj}T <<EOF
|
||||
# Name of the non-PIC object.
|
||||
non_pic_object=none
|
||||
|
||||
EOF
|
||||
fi
|
||||
|
||||
$opt_dry_run || {
|
||||
$MV "${libobj}T" "${libobj}"
|
||||
func_write_libtool_object "$libobj" "$objdir/$objname" "$objname"
|
||||
|
||||
# Unlock the critical section if it was locked
|
||||
if test "$need_locks" != no; then
|
||||
@ -2115,12 +2021,14 @@ func_mode_execute ()
|
||||
fi
|
||||
|
||||
# Restore saved environment variables
|
||||
if test "${save_LC_ALL+set}" = set; then
|
||||
LC_ALL="$save_LC_ALL"; export LC_ALL
|
||||
fi
|
||||
if test "${save_LANG+set}" = set; then
|
||||
LANG="$save_LANG"; export LANG
|
||||
fi
|
||||
for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
|
||||
do
|
||||
eval "if test \"\${save_$lt_var+set}\" = set; then
|
||||
$lt_var=\$save_$lt_var; export $lt_var
|
||||
else
|
||||
$lt_unset $lt_var
|
||||
fi"
|
||||
done
|
||||
|
||||
# Now prepare to actually exec the command.
|
||||
exec_cmd="\$cmd$args"
|
||||
@ -2668,10 +2576,10 @@ func_mode_link ()
|
||||
allow_undefined=yes
|
||||
;;
|
||||
esac
|
||||
libtool_args="$nonopt"
|
||||
libtool_args=$nonopt
|
||||
base_compile="$nonopt $@"
|
||||
compile_command="$nonopt"
|
||||
finalize_command="$nonopt"
|
||||
compile_command=$nonopt
|
||||
finalize_command=$nonopt
|
||||
|
||||
compile_rpath=
|
||||
finalize_rpath=
|
||||
@ -2729,24 +2637,33 @@ func_mode_link ()
|
||||
build_old_libs=no
|
||||
break
|
||||
;;
|
||||
-all-static | -static)
|
||||
if test "X$arg" = "X-all-static"; then
|
||||
-all-static | -static | -static-libtool-libs)
|
||||
case $arg in
|
||||
-all-static)
|
||||
if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
|
||||
func_warning "complete static linking is impossible in this configuration"
|
||||
fi
|
||||
if test -n "$link_static_flag"; then
|
||||
dlopen_self=$dlopen_self_static
|
||||
# See comment for -static flag below, for more details.
|
||||
compile_command="$compile_command $link_static_flag"
|
||||
finalize_command="$finalize_command $link_static_flag"
|
||||
func_append compile_command " $link_static_flag"
|
||||
func_append finalize_command " $link_static_flag"
|
||||
fi
|
||||
prefer_static_libs=yes
|
||||
else
|
||||
;;
|
||||
-static)
|
||||
if test -z "$pic_flag" && test -n "$link_static_flag"; then
|
||||
dlopen_self=$dlopen_self_static
|
||||
fi
|
||||
prefer_static_libs=built
|
||||
fi
|
||||
;;
|
||||
-static-libtool-libs)
|
||||
if test -z "$pic_flag" && test -n "$link_static_flag"; then
|
||||
dlopen_self=$dlopen_self_static
|
||||
fi
|
||||
prefer_static_libs=yes
|
||||
;;
|
||||
esac
|
||||
build_libtool_libs=no
|
||||
build_old_libs=yes
|
||||
break
|
||||
@ -2762,15 +2679,15 @@ func_mode_link ()
|
||||
arg="$1"
|
||||
shift
|
||||
func_quote_for_eval "$arg"
|
||||
qarg="$func_quote_for_eval_unquoted_result"
|
||||
libtool_args="$libtool_args $func_quote_for_eval_result"
|
||||
qarg=$func_quote_for_eval_unquoted_result
|
||||
func_append libtool_args " $func_quote_for_eval_result"
|
||||
|
||||
# If the previous option needs an argument, assign it.
|
||||
if test -n "$prev"; then
|
||||
case $prev in
|
||||
output)
|
||||
compile_command="$compile_command @OUTPUT@"
|
||||
finalize_command="$finalize_command @OUTPUT@"
|
||||
func_append compile_command " @OUTPUT@"
|
||||
func_append finalize_command " @OUTPUT@"
|
||||
;;
|
||||
esac
|
||||
|
||||
@ -2778,8 +2695,8 @@ func_mode_link ()
|
||||
dlfiles|dlprefiles)
|
||||
if test "$preload" = no; then
|
||||
# Add the symbol object into the linking commands.
|
||||
compile_command="$compile_command @SYMFILE@"
|
||||
finalize_command="$finalize_command @SYMFILE@"
|
||||
func_append compile_command " @SYMFILE@"
|
||||
func_append finalize_command " @SYMFILE@"
|
||||
preload=yes
|
||||
fi
|
||||
case $arg in
|
||||
@ -2897,7 +2814,7 @@ func_mode_link ()
|
||||
fi
|
||||
|
||||
# A PIC object.
|
||||
libobjs="$libobjs $pic_object"
|
||||
func_append libobjs " $pic_object"
|
||||
arg="$pic_object"
|
||||
fi
|
||||
|
||||
@ -2907,7 +2824,7 @@ func_mode_link ()
|
||||
non_pic_object="$xdir$non_pic_object"
|
||||
|
||||
# A standard non-PIC object
|
||||
non_pic_objects="$non_pic_objects $non_pic_object"
|
||||
func_append non_pic_objects " $non_pic_object"
|
||||
if test -z "$pic_object" || test "$pic_object" = none ; then
|
||||
arg="$non_pic_object"
|
||||
fi
|
||||
@ -2915,7 +2832,7 @@ func_mode_link ()
|
||||
# If the PIC object exists, use it instead.
|
||||
# $xdir was prepended to $pic_object above.
|
||||
non_pic_object="$pic_object"
|
||||
non_pic_objects="$non_pic_objects $non_pic_object"
|
||||
func_append non_pic_objects " $non_pic_object"
|
||||
fi
|
||||
else
|
||||
# Only an error if not doing a dry-run.
|
||||
@ -2926,8 +2843,8 @@ func_mode_link ()
|
||||
|
||||
pic_object=`$ECHO "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
|
||||
non_pic_object=`$ECHO "X${xdir}${arg}" | $Xsed -e "$lo2o"`
|
||||
libobjs="$libobjs $pic_object"
|
||||
non_pic_objects="$non_pic_objects $non_pic_object"
|
||||
func_append libobjs " $pic_object"
|
||||
func_append non_pic_objects " $non_pic_object"
|
||||
else
|
||||
func_fatal_error "\`$arg' is not a valid libtool object"
|
||||
fi
|
||||
@ -2986,23 +2903,23 @@ func_mode_link ()
|
||||
linker_flags="$linker_flags $qarg"
|
||||
compiler_flags="$compiler_flags $qarg"
|
||||
prev=
|
||||
compile_command="$compile_command $qarg"
|
||||
finalize_command="$finalize_command $qarg"
|
||||
func_append compile_command " $qarg"
|
||||
func_append finalize_command " $qarg"
|
||||
continue
|
||||
;;
|
||||
xcompiler)
|
||||
compiler_flags="$compiler_flags $qarg"
|
||||
prev=
|
||||
compile_command="$compile_command $qarg"
|
||||
finalize_command="$finalize_command $qarg"
|
||||
func_append compile_command " $qarg"
|
||||
func_append finalize_command " $qarg"
|
||||
continue
|
||||
;;
|
||||
xlinker)
|
||||
linker_flags="$linker_flags $qarg"
|
||||
compiler_flags="$compiler_flags $wl$qarg"
|
||||
prev=
|
||||
compile_command="$compile_command $wl$qarg"
|
||||
finalize_command="$finalize_command $wl$qarg"
|
||||
func_append compile_command " $wl$qarg"
|
||||
func_append finalize_command " $wl$qarg"
|
||||
continue
|
||||
;;
|
||||
*)
|
||||
@ -3073,8 +2990,8 @@ func_mode_link ()
|
||||
-L[A-Z][A-Z]*:*)
|
||||
case $with_gcc/$host in
|
||||
no/*-*-irix* | /*-*-irix*)
|
||||
compile_command="$compile_command $arg"
|
||||
finalize_command="$finalize_command $arg"
|
||||
func_append compile_command " $arg"
|
||||
func_append finalize_command " $arg"
|
||||
;;
|
||||
esac
|
||||
continue
|
||||
@ -3166,17 +3083,17 @@ func_mode_link ()
|
||||
# classes, name mangling, and exception handling.
|
||||
# Darwin uses the -arch flag to determine output architecture.
|
||||
-model|-arch|-isysroot)
|
||||
compile_command="$compile_command $arg"
|
||||
compiler_flags="$compiler_flags $arg"
|
||||
finalize_command="$finalize_command $arg"
|
||||
func_append compile_command " $arg"
|
||||
func_append finalize_command " $arg"
|
||||
prev=xcompiler
|
||||
continue
|
||||
;;
|
||||
|
||||
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
|
||||
compiler_flags="$compiler_flags $arg"
|
||||
compile_command="$compile_command $arg"
|
||||
finalize_command="$finalize_command $arg"
|
||||
func_append compile_command " $arg"
|
||||
func_append finalize_command " $arg"
|
||||
case "$new_inherited_linker_flags " in
|
||||
*" $arg "*) ;;
|
||||
* ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;;
|
||||
@ -3267,7 +3184,7 @@ func_mode_link ()
|
||||
continue
|
||||
;;
|
||||
|
||||
-static)
|
||||
-static | -static-libtool-libs)
|
||||
# The effects of -static are defined in a previous loop.
|
||||
# We used to do the same as -all-static on platforms that
|
||||
# didn't have a PIC flag, but the assumption that the effects
|
||||
@ -3357,8 +3274,8 @@ func_mode_link ()
|
||||
-t[45]*|-txscale*|@*)
|
||||
func_quote_for_eval "$arg"
|
||||
arg="$func_quote_for_eval_result"
|
||||
compile_command="$compile_command $arg"
|
||||
finalize_command="$finalize_command $arg"
|
||||
func_append compile_command " $arg"
|
||||
func_append finalize_command " $arg"
|
||||
compiler_flags="$compiler_flags $arg"
|
||||
continue
|
||||
;;
|
||||
@ -3419,7 +3336,7 @@ func_mode_link ()
|
||||
fi
|
||||
|
||||
# A PIC object.
|
||||
libobjs="$libobjs $pic_object"
|
||||
func_append libobjs " $pic_object"
|
||||
arg="$pic_object"
|
||||
fi
|
||||
|
||||
@ -3429,7 +3346,7 @@ func_mode_link ()
|
||||
non_pic_object="$xdir$non_pic_object"
|
||||
|
||||
# A standard non-PIC object
|
||||
non_pic_objects="$non_pic_objects $non_pic_object"
|
||||
func_append non_pic_objects " $non_pic_object"
|
||||
if test -z "$pic_object" || test "$pic_object" = none ; then
|
||||
arg="$non_pic_object"
|
||||
fi
|
||||
@ -3437,7 +3354,7 @@ func_mode_link ()
|
||||
# If the PIC object exists, use it instead.
|
||||
# $xdir was prepended to $pic_object above.
|
||||
non_pic_object="$pic_object"
|
||||
non_pic_objects="$non_pic_objects $non_pic_object"
|
||||
func_append non_pic_objects " $non_pic_object"
|
||||
fi
|
||||
else
|
||||
# Only an error if not doing a dry-run.
|
||||
@ -3448,8 +3365,8 @@ func_mode_link ()
|
||||
|
||||
pic_object=`$ECHO "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
|
||||
non_pic_object=`$ECHO "X${xdir}${arg}" | $Xsed -e "$lo2o"`
|
||||
libobjs="$libobjs $pic_object"
|
||||
non_pic_objects="$non_pic_objects $non_pic_object"
|
||||
func_append libobjs " $pic_object"
|
||||
func_append non_pic_objects " $non_pic_object"
|
||||
else
|
||||
func_fatal_error "\`$arg' is not a valid libtool object"
|
||||
fi
|
||||
@ -3491,8 +3408,8 @@ func_mode_link ()
|
||||
|
||||
# Now actually substitute the argument into the commands.
|
||||
if test -n "$arg"; then
|
||||
compile_command="$compile_command $arg"
|
||||
finalize_command="$finalize_command $arg"
|
||||
func_append compile_command " $arg"
|
||||
func_append finalize_command " $arg"
|
||||
fi
|
||||
done # argument parsing loop
|
||||
|
||||
@ -3501,8 +3418,8 @@ func_mode_link ()
|
||||
|
||||
if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
|
||||
eval arg=\"$export_dynamic_flag_spec\"
|
||||
compile_command="$compile_command $arg"
|
||||
finalize_command="$finalize_command $arg"
|
||||
func_append compile_command " $arg"
|
||||
func_append finalize_command " $arg"
|
||||
fi
|
||||
|
||||
oldlibs=
|
||||
@ -4296,7 +4213,8 @@ func_mode_link ()
|
||||
fi
|
||||
;;
|
||||
relink)
|
||||
if test "$hardcode_direct" = yes; then
|
||||
if test "$hardcode_direct" = yes &&
|
||||
test "$hardcode_direct_absolute" = no; then
|
||||
add="$dir/$linklib"
|
||||
elif test "$hardcode_minus_L" = yes; then
|
||||
add_dir="-L$dir"
|
||||
@ -4351,7 +4269,8 @@ func_mode_link ()
|
||||
add_dir=
|
||||
add=
|
||||
# Finalize command for both is simple: just hardcode it.
|
||||
if test "$hardcode_direct" = yes; then
|
||||
if test "$hardcode_direct" = yes &&
|
||||
test "$hardcode_direct_absolute" = no; then
|
||||
add="$libdir/$linklib"
|
||||
elif test "$hardcode_minus_L" = yes; then
|
||||
add_dir="-L$libdir"
|
||||
@ -4763,7 +4682,7 @@ func_mode_link ()
|
||||
# which has an extra 1 added just for fun
|
||||
#
|
||||
case $version_type in
|
||||
darwin|linux|osf|windows)
|
||||
darwin|linux|osf|windows|none)
|
||||
current=`expr $number_major + $number_minor`
|
||||
age="$number_minor"
|
||||
revision="$number_revision"
|
||||
@ -4988,11 +4907,11 @@ func_mode_link ()
|
||||
fi
|
||||
|
||||
# Eliminate all temporary directories.
|
||||
for path in $notinst_path; do
|
||||
lib_search_path=`$ECHO "X$lib_search_path " | $Xsed -e 's% $path % %g'`
|
||||
deplibs=`$ECHO "X$deplibs " | $Xsed -e 's% -L$path % %g'`
|
||||
dependency_libs=`$ECHO "X$dependency_libs " | $Xsed -e 's% -L$path % %g'`
|
||||
done
|
||||
#for path in $notinst_path; do
|
||||
# lib_search_path=`$ECHO "X$lib_search_path " | $Xsed -e "s% $path % %g"`
|
||||
# deplibs=`$ECHO "X$deplibs " | $Xsed -e "s% -L$path % %g"`
|
||||
# dependency_libs=`$ECHO "X$dependency_libs " | $Xsed -e "s% -L$path % %g"`
|
||||
#done
|
||||
|
||||
if test -n "$xrpath"; then
|
||||
# If the user specified any rpath flags, then add them.
|
||||
@ -5093,13 +5012,12 @@ func_mode_link ()
|
||||
int main() { return 0; }
|
||||
EOF
|
||||
$opt_dry_run || $RM conftest
|
||||
$LTCC $LTCFLAGS -o conftest conftest.c $deplibs
|
||||
if test "$?" -eq 0 ; then
|
||||
if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
|
||||
ldd_output=`ldd conftest`
|
||||
for i in $deplibs; do
|
||||
name=`expr $i : '-l\(.*\)'`
|
||||
# If $name is empty we are operating on a -L argument.
|
||||
if test "$name" != "" && test "$name" -ne "0"; then
|
||||
if test "$name" != "" && test "$name" != "0"; then
|
||||
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
|
||||
case " $predeps $postdeps " in
|
||||
*" $i "*)
|
||||
@ -5138,9 +5056,7 @@ EOF
|
||||
# If $name is empty we are operating on a -L argument.
|
||||
if test "$name" != "" && test "$name" != "0"; then
|
||||
$opt_dry_run || $RM conftest
|
||||
$LTCC $LTCFLAGS -o conftest conftest.c $i
|
||||
# Did it work?
|
||||
if test "$?" -eq 0 ; then
|
||||
if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
|
||||
ldd_output=`ldd conftest`
|
||||
if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
|
||||
case " $predeps $postdeps " in
|
||||
@ -5172,7 +5088,7 @@ EOF
|
||||
droppeddeps=yes
|
||||
$ECHO
|
||||
$ECHO "*** Warning! Library $i is needed by this library but I was not able to"
|
||||
$ECHO "*** make it link in! You will probably need to install it or some"
|
||||
$ECHO "*** make it link in! You will probably need to install it or some"
|
||||
$ECHO "*** library that it depends on before this library will be fully"
|
||||
$ECHO "*** functional. Installing it before continuing would be even better."
|
||||
fi
|
||||
@ -5909,12 +5825,14 @@ EOF
|
||||
reload_conv_objs=
|
||||
gentop=
|
||||
# reload_cmds runs $LD directly, so let us get rid of
|
||||
# -Wl from whole_archive_flag_spec
|
||||
# -Wl from whole_archive_flag_spec and hope we can get by with
|
||||
# turning comma into space..
|
||||
wl=
|
||||
|
||||
if test -n "$convenience"; then
|
||||
if test -n "$whole_archive_flag_spec"; then
|
||||
eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
|
||||
eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
|
||||
reload_conv_objs=$reload_objs\ `$ECHO "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
|
||||
else
|
||||
gentop="$output_objdir/${obj}x"
|
||||
generated="$generated $gentop"
|
||||
@ -6258,7 +6176,7 @@ EOF
|
||||
# Preserve any variables that may affect compiler behavior
|
||||
for var in $variables_saved_for_relink; do
|
||||
if eval test -z \"\${$var+set}\"; then
|
||||
relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
|
||||
relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
|
||||
elif eval var_value=\$$var; test -z "$var_value"; then
|
||||
relink_command="$var=; export $var; $relink_command"
|
||||
else
|
||||
@ -6676,6 +6594,20 @@ EOF
|
||||
Xsed='${SED} -e 1s/^X//'
|
||||
sed_quote_subst='$sed_quote_subst'
|
||||
|
||||
# Be Bourne compatible
|
||||
if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
|
||||
emulate sh
|
||||
NULLCMD=:
|
||||
# Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
|
||||
# is contrary to our usage. Disable this feature.
|
||||
alias -g '\${1+\"\$@\"}'='\"\$@\"'
|
||||
setopt NO_GLOB_SUBST
|
||||
else
|
||||
case \`(set -o) 2>/dev/null\` in *posix*) set -o posix;; esac
|
||||
fi
|
||||
BIN_SH=xpg4; export BIN_SH # for Tru64
|
||||
DUALCASE=1; export DUALCASE # for MKS sh
|
||||
|
||||
# The HP-UX ksh and POSIX shell print the target directory to stdout
|
||||
# if CDPATH is set.
|
||||
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
|
||||
@ -6819,7 +6751,7 @@ else
|
||||
;;
|
||||
esac
|
||||
$ECHO >> $output "\
|
||||
\$ECHO \"\$0: cannot exec \$program \${1+\"\$@\"}\"
|
||||
\$ECHO \"\$0: cannot exec \$program \$*\"
|
||||
exit 1
|
||||
fi
|
||||
else
|
||||
@ -6985,7 +6917,7 @@ fi\
|
||||
# Preserve any variables that may affect compiler behavior
|
||||
for var in $variables_saved_for_relink; do
|
||||
if eval test -z \"\${$var+set}\"; then
|
||||
relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
|
||||
relink_command="{ test -z \"\${$var+set}\" || $lt_unset $var || { $var=; export $var; }; }; $relink_command"
|
||||
elif eval var_value=\$$var; test -z "$var_value"; then
|
||||
relink_command="$var=; export $var; $relink_command"
|
||||
else
|
||||
|
||||
196
m4/libtool.m4
vendored
196
m4/libtool.m4
vendored
@ -37,7 +37,7 @@ m4_define([_LT_COPYING], [dnl
|
||||
# the same distribution terms that you use for the rest of that program.
|
||||
])
|
||||
|
||||
# serial 51 LT_INIT
|
||||
# serial 52 LT_INIT
|
||||
|
||||
|
||||
# LT_PREREQ(VERSION)
|
||||
@ -145,7 +145,7 @@ AC_REQUIRE([AC_EXEEXT])dnl
|
||||
_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl
|
||||
dnl
|
||||
m4_require([_LT_FILEUTILS_DEFAULTS])dnl
|
||||
m4_require([_LT_CHECK_XSI_SHELL])dnl
|
||||
m4_require([_LT_CHECK_SHELL_FEATURES])dnl
|
||||
m4_require([_LT_CMD_RELOAD])dnl
|
||||
m4_require([_LT_CHECK_MAGIC_METHOD])dnl
|
||||
m4_require([_LT_CMD_OLD_ARCHIVE])dnl
|
||||
@ -181,7 +181,6 @@ esac
|
||||
|
||||
# Sed substitution that helps us do robust quoting. It backslashifies
|
||||
# metacharacters that are still active within double-quoted strings.
|
||||
Xsed='sed -e 1s/^X//'
|
||||
sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
|
||||
|
||||
# Same as above, but do not quote variable references.
|
||||
@ -683,10 +682,6 @@ _LT_LIBTOOL_CONFIG_VARS
|
||||
_LT_LIBTOOL_TAG_VARS
|
||||
# ### END LIBTOOL CONFIG
|
||||
|
||||
# The HP-UX ksh and POSIX shell print the target directory to stdout
|
||||
# if CDPATH is set.
|
||||
(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
|
||||
|
||||
_LT_EOF
|
||||
|
||||
case $host_os in
|
||||
@ -1308,6 +1303,7 @@ dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], [])
|
||||
# Check whether the given linker option works
|
||||
AC_DEFUN([_LT_LINKER_OPTION],
|
||||
[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
|
||||
m4_require([_LT_DECL_SED])dnl
|
||||
AC_CACHE_CHECK([$1], [$2],
|
||||
[$2=no
|
||||
save_LDFLAGS="$LDFLAGS"
|
||||
@ -2157,7 +2153,7 @@ freebsd* | dragonfly*)
|
||||
shlibpath_overrides_runpath=no
|
||||
hardcode_into_libs=yes
|
||||
;;
|
||||
freebsd*) # from 4.6 on
|
||||
*) # from 4.6 on, and DragonFly
|
||||
shlibpath_overrides_runpath=yes
|
||||
hardcode_into_libs=yes
|
||||
;;
|
||||
@ -2291,7 +2287,7 @@ linux*)
|
||||
|
||||
# Append ld.so.conf contents to the search path
|
||||
if test -f /etc/ld.so.conf; then
|
||||
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
|
||||
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
|
||||
sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
|
||||
fi
|
||||
|
||||
@ -3116,6 +3112,7 @@ AC_REQUIRE([AC_PROG_CC])dnl
|
||||
AC_REQUIRE([AC_OBJEXT])dnl
|
||||
AC_REQUIRE([LT_PATH_NM])dnl
|
||||
AC_REQUIRE([LT_PATH_LD])dnl
|
||||
m4_require([_LT_DECL_SED])dnl
|
||||
m4_require([_LT_DECL_EGREP])dnl
|
||||
m4_require([_LT_TAG_COMPILER])dnl
|
||||
|
||||
@ -3367,12 +3364,14 @@ m4_if([$1], [CXX], [
|
||||
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
|
||||
fi
|
||||
;;
|
||||
beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
|
||||
beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
|
||||
# PIC is the default for these OSes.
|
||||
;;
|
||||
mingw* | os2* | pw32*)
|
||||
mingw* | cygwin* | os2* | pw32*)
|
||||
# This hack is so that the source file can tell whether it is being
|
||||
# built for inclusion in a dll (and should export symbols for example).
|
||||
# Although the cygwin gcc ignores -fPIC, still need this for old-style
|
||||
# (--disable-auto-import) libraries
|
||||
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
|
||||
;;
|
||||
darwin* | rhapsody*)
|
||||
@ -3525,6 +3524,14 @@ m4_if([$1], [CXX], [
|
||||
_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
|
||||
;;
|
||||
*)
|
||||
case `$CC -V 2>&1 | sed 5q` in
|
||||
*Sun\ C*)
|
||||
# Sun C++ 5.9
|
||||
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
|
||||
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
|
||||
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
@ -3652,13 +3659,15 @@ m4_if([$1], [CXX], [
|
||||
fi
|
||||
;;
|
||||
|
||||
beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
|
||||
beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
|
||||
# PIC is the default for these OSes.
|
||||
;;
|
||||
|
||||
mingw* | pw32* | os2*)
|
||||
mingw* | cygwin* | pw32* | os2*)
|
||||
# This hack is so that the source file can tell whether it is being
|
||||
# built for inclusion in a dll (and should export symbols for example).
|
||||
# Although the cygwin gcc ignores -fPIC, still need this for old-style
|
||||
# (--disable-auto-import) libraries
|
||||
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
|
||||
;;
|
||||
|
||||
@ -3732,7 +3741,7 @@ m4_if([$1], [CXX], [
|
||||
esac
|
||||
;;
|
||||
|
||||
mingw* | pw32* | os2*)
|
||||
mingw* | cygwin* | pw32* | os2*)
|
||||
# This hack is so that the source file can tell whether it is being
|
||||
# built for inclusion in a dll (and should export symbols for example).
|
||||
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
|
||||
@ -3779,6 +3788,22 @@ m4_if([$1], [CXX], [
|
||||
# All Alpha code is PIC.
|
||||
_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
|
||||
;;
|
||||
*)
|
||||
case `$CC -V 2>&1 | sed 5q` in
|
||||
*Sun\ C*)
|
||||
# Sun C 5.9
|
||||
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
|
||||
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
|
||||
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
|
||||
;;
|
||||
*Sun\ F*)
|
||||
# Sun Fortran 8.3 passes all unrecognized flags to the linker
|
||||
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
|
||||
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
|
||||
_LT_TAGVAR(lt_prog_compiler_wl, $1)=''
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
|
||||
@ -3907,6 +3932,7 @@ m4_defun([_LT_LINKER_SHLIBS],
|
||||
AC_REQUIRE([LT_PATH_NM])dnl
|
||||
m4_require([_LT_FILEUTILS_DEFAULTS])dnl
|
||||
m4_require([_LT_DECL_EGREP])dnl
|
||||
m4_require([_LT_DECL_SED])dnl
|
||||
m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
|
||||
m4_require([_LT_TAG_COMPILER])dnl
|
||||
AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
|
||||
@ -3943,6 +3969,7 @@ m4_if([$1], [CXX], [
|
||||
_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
|
||||
_LT_TAGVAR(hardcode_automatic, $1)=no
|
||||
_LT_TAGVAR(hardcode_direct, $1)=no
|
||||
_LT_TAGVAR(hardcode_direct_absolute, $1)=no
|
||||
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
|
||||
_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
|
||||
_LT_TAGVAR(hardcode_libdir_separator, $1)=
|
||||
@ -4126,11 +4153,22 @@ _LT_EOF
|
||||
ifc* | ifort*) # Intel Fortran compiler
|
||||
tmp_addflag=' -nofor_main' ;;
|
||||
esac
|
||||
|
||||
_LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
|
||||
case `$CC -V 2>&1 | sed 5q` in
|
||||
*Sun\ C*) # Sun C 5.9
|
||||
_LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive /dev/null'
|
||||
tmp_sharedflag='-G' ;;
|
||||
*Sun\ F*) # Sun Fortran 8.3
|
||||
tmp_sharedflag='-G' ;;
|
||||
*)
|
||||
tmp_sharedflag='-shared' ;;
|
||||
esac
|
||||
_LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
|
||||
|
||||
if test "x$supports_anon_versioning" = xyes; then
|
||||
_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~echo "local: *; };" >> $output_objdir/$libname.ver~$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
|
||||
_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
|
||||
cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
|
||||
echo "local: *; };" >> $output_objdir/$libname.ver~
|
||||
$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
|
||||
fi
|
||||
else
|
||||
_LT_TAGVAR(ld_shlibs, $1)=no
|
||||
@ -4281,6 +4319,7 @@ _LT_EOF
|
||||
|
||||
_LT_TAGVAR(archive_cmds, $1)=''
|
||||
_LT_TAGVAR(hardcode_direct, $1)=yes
|
||||
_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
|
||||
_LT_TAGVAR(hardcode_libdir_separator, $1)=':'
|
||||
_LT_TAGVAR(link_all_deplibs, $1)=yes
|
||||
_LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
|
||||
@ -4294,7 +4333,7 @@ _LT_EOF
|
||||
strings "$collect2name" | $GREP resolve_lib_name >/dev/null
|
||||
then
|
||||
# We have reworked collect2
|
||||
_LT_TAGVAR(hardcode_direct, $1)=yes
|
||||
:
|
||||
else
|
||||
# We have old collect2
|
||||
_LT_TAGVAR(hardcode_direct, $1)=unsupported
|
||||
@ -4526,6 +4565,7 @@ _LT_EOF
|
||||
_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
|
||||
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
|
||||
_LT_TAGVAR(hardcode_direct, $1)=yes
|
||||
_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
|
||||
_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
|
||||
# hardcode_minus_L: Not really in the search PATH,
|
||||
# but as the default location of the library.
|
||||
@ -4570,6 +4610,7 @@ _LT_EOF
|
||||
;;
|
||||
*)
|
||||
_LT_TAGVAR(hardcode_direct, $1)=yes
|
||||
_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
|
||||
_LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
|
||||
|
||||
# hardcode_minus_L: Not really in the search PATH,
|
||||
@ -4940,6 +4981,11 @@ _LT_TAGDECL([], [hardcode_libdir_separator], [1],
|
||||
_LT_TAGDECL([], [hardcode_direct], [0],
|
||||
[Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
|
||||
DIR into the resulting binary])
|
||||
_LT_TAGDECL([], [hardcode_direct_absolute], [0],
|
||||
[Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
|
||||
DIR into the resulting binary and the resulting library dependency is
|
||||
"absolute", i.e impossible to change by setting ${shlibpath_var} if the
|
||||
library is relocated])
|
||||
_LT_TAGDECL([], [hardcode_minus_L], [0],
|
||||
[Set to "yes" if using the -LDIR flag during linking hardcodes DIR
|
||||
into the resulting binary])
|
||||
@ -5099,6 +5145,7 @@ _LT_TAGVAR(always_export_symbols, $1)=no
|
||||
_LT_TAGVAR(archive_expsym_cmds, $1)=
|
||||
_LT_TAGVAR(export_dynamic_flag_spec, $1)=
|
||||
_LT_TAGVAR(hardcode_direct, $1)=no
|
||||
_LT_TAGVAR(hardcode_direct_absolute, $1)=no
|
||||
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
|
||||
_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
|
||||
_LT_TAGVAR(hardcode_libdir_separator, $1)=
|
||||
@ -5265,6 +5312,7 @@ if test "$_lt_caught_CXX_error" != yes; then
|
||||
|
||||
_LT_TAGVAR(archive_cmds, $1)=''
|
||||
_LT_TAGVAR(hardcode_direct, $1)=yes
|
||||
_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
|
||||
_LT_TAGVAR(hardcode_libdir_separator, $1)=':'
|
||||
_LT_TAGVAR(link_all_deplibs, $1)=yes
|
||||
_LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
|
||||
@ -5278,7 +5326,7 @@ if test "$_lt_caught_CXX_error" != yes; then
|
||||
strings "$collect2name" | $GREP resolve_lib_name >/dev/null
|
||||
then
|
||||
# We have reworked collect2
|
||||
_LT_TAGVAR(hardcode_direct, $1)=yes
|
||||
:
|
||||
else
|
||||
# We have old collect2
|
||||
_LT_TAGVAR(hardcode_direct, $1)=unsupported
|
||||
@ -5552,6 +5600,7 @@ if test "$_lt_caught_CXX_error" != yes; then
|
||||
;;
|
||||
*)
|
||||
_LT_TAGVAR(hardcode_direct, $1)=yes
|
||||
_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
|
||||
_LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
|
||||
# but as the default
|
||||
# location of the library.
|
||||
@ -5753,6 +5802,29 @@ if test "$_lt_caught_CXX_error" != yes; then
|
||||
# dependencies.
|
||||
output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
|
||||
;;
|
||||
*)
|
||||
case `$CC -V 2>&1 | sed 5q` in
|
||||
*Sun\ C*)
|
||||
# Sun C++ 5.9
|
||||
_LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
|
||||
_LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
|
||||
_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
|
||||
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
|
||||
_LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
|
||||
|
||||
# Not sure whether something based on
|
||||
# $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
|
||||
# would be better.
|
||||
output_verbose_link_cmd='echo'
|
||||
|
||||
# Archives containing C++ object files must be created using
|
||||
# "CC -xar", where "CC" is the Sun C++ compiler. This is
|
||||
# necessary to make sure instantiated templates are included
|
||||
# in the archive.
|
||||
_LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
|
||||
@ -6262,6 +6334,15 @@ interix3*)
|
||||
_LT_TAGVAR(postdeps,$1)=
|
||||
;;
|
||||
|
||||
linux*)
|
||||
case `$CC -V 2>&1 | sed 5q` in
|
||||
*Sun\ C*)
|
||||
# Sun C++ 5.9
|
||||
_LT_TAGVAR(postdeps,$1)='-lCstd -lCrun'
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
|
||||
solaris*)
|
||||
case $cc_basename in
|
||||
CC*)
|
||||
@ -6323,6 +6404,7 @@ _LT_TAGVAR(always_export_symbols, $1)=no
|
||||
_LT_TAGVAR(archive_expsym_cmds, $1)=
|
||||
_LT_TAGVAR(export_dynamic_flag_spec, $1)=
|
||||
_LT_TAGVAR(hardcode_direct, $1)=no
|
||||
_LT_TAGVAR(hardcode_direct_absolute, $1)=no
|
||||
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
|
||||
_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
|
||||
_LT_TAGVAR(hardcode_libdir_separator, $1)=
|
||||
@ -6456,6 +6538,7 @@ _LT_TAGVAR(always_export_symbols, $1)=no
|
||||
_LT_TAGVAR(archive_expsym_cmds, $1)=
|
||||
_LT_TAGVAR(export_dynamic_flag_spec, $1)=
|
||||
_LT_TAGVAR(hardcode_direct, $1)=no
|
||||
_LT_TAGVAR(hardcode_direct_absolute, $1)=no
|
||||
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
|
||||
_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
|
||||
_LT_TAGVAR(hardcode_libdir_separator, $1)=
|
||||
@ -6717,6 +6800,7 @@ AC_SUBST([GREP])
|
||||
m4_defun([_LT_DECL_SED],
|
||||
[AC_PROG_SED
|
||||
test -z "$SED" && SED=sed
|
||||
Xsed="$SED -e 1s/^X//"
|
||||
_LT_DECL([], [SED], [1], [A sed program that does not truncate output])
|
||||
_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"],
|
||||
[Sed that helps us avoid accidentally triggering echo(1) options like -n])
|
||||
@ -6730,7 +6814,7 @@ m4_ifndef([AC_PROG_SED], [
|
||||
# macro and use it instead. #
|
||||
############################################################
|
||||
|
||||
AC_DEFUN([AC_PROG_SED],
|
||||
m4_defun([AC_PROG_SED],
|
||||
[AC_MSG_CHECKING([for a sed that does not truncate output])
|
||||
AC_CACHE_VAL(lt_cv_path_SED,
|
||||
[# Loop through the user's path and test for sed and gsed.
|
||||
@ -6748,6 +6832,7 @@ do
|
||||
done
|
||||
done
|
||||
done
|
||||
IFS=$as_save_IFS
|
||||
lt_ac_max=0
|
||||
lt_ac_count=0
|
||||
# Add /usr/xpg4/bin/sed as it is typically found on Solaris
|
||||
@ -6785,11 +6870,17 @@ AC_MSG_RESULT([$SED])
|
||||
])#AC_PROG_SED
|
||||
])#m4_ifndef
|
||||
|
||||
# Old name:
|
||||
AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED])
|
||||
dnl aclocal-1.4 backwards compatibility:
|
||||
dnl AC_DEFUN([LT_AC_PROG_SED], [])
|
||||
|
||||
# _LT_CHECK_XSI_SHELL
|
||||
# -------------------
|
||||
# define func_basename as either Bourne or XSI compatible
|
||||
m4_defun([_LT_CHECK_XSI_SHELL],
|
||||
|
||||
# _LT_CHECK_SHELL_FEATURES
|
||||
# ------------------------
|
||||
# Find out whether the shell is Bourne or XSI compatible,
|
||||
# or has some other useful features.
|
||||
m4_defun([_LT_CHECK_SHELL_FEATURES],
|
||||
[AC_MSG_CHECKING([whether the shell understands some XSI constructs])
|
||||
# Try some XSI features
|
||||
xsi_shell=no
|
||||
@ -6799,7 +6890,37 @@ xsi_shell=no
|
||||
&& xsi_shell=yes
|
||||
AC_MSG_RESULT([$xsi_shell])
|
||||
_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell'])
|
||||
])# _LT_CHECK_XSI_SHELL
|
||||
|
||||
AC_MSG_CHECKING([whether the shell understands "+="])
|
||||
lt_shell_append=no
|
||||
( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \
|
||||
>/dev/null 2>&1 \
|
||||
&& lt_shell_append=yes
|
||||
AC_MSG_RESULT([$lt_shell_append])
|
||||
_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append'])
|
||||
|
||||
if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
|
||||
lt_unset=unset
|
||||
else
|
||||
lt_unset=false
|
||||
fi
|
||||
_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl
|
||||
|
||||
# test EBCDIC or ASCII
|
||||
case `echo X|tr X '\101'` in
|
||||
A) # ASCII based system
|
||||
# \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
|
||||
lt_SP2NL='tr \040 \012'
|
||||
lt_NL2SP='tr \015\012 \040\040'
|
||||
;;
|
||||
*) # EBCDIC based system
|
||||
lt_SP2NL='tr \100 \n'
|
||||
lt_NL2SP='tr \r\n \100\100'
|
||||
;;
|
||||
esac
|
||||
_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl
|
||||
_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
|
||||
])# _LT_CHECK_SHELL_FEATURES
|
||||
|
||||
|
||||
# _LT_PROG_XSI_SHELLFNS
|
||||
@ -6880,4 +7001,29 @@ func_stripname ()
|
||||
}
|
||||
_LT_EOF
|
||||
esac
|
||||
|
||||
case $lt_shell_append in
|
||||
yes)
|
||||
cat << \_LT_EOF >> "$cfgfile"
|
||||
|
||||
# func_append var value
|
||||
# Append VALUE to the end of shell variable VAR.
|
||||
func_append ()
|
||||
{
|
||||
eval "$[1]+=\$[2]"
|
||||
}
|
||||
_LT_EOF
|
||||
;;
|
||||
*)
|
||||
cat << \_LT_EOF >> "$cfgfile"
|
||||
|
||||
# func_append var value
|
||||
# Append VALUE to the end of shell variable VAR.
|
||||
func_append ()
|
||||
{
|
||||
eval "$[1]=\$$[1]\$[2]"
|
||||
}
|
||||
_LT_EOF
|
||||
;;
|
||||
esac
|
||||
])
|
||||
|
||||
6
m4/ltversion.m4
vendored
6
m4/ltversion.m4
vendored
@ -9,15 +9,15 @@
|
||||
|
||||
# Generated from ltversion.in; do not edit by hand
|
||||
|
||||
# serial 2248 ltversion.m4
|
||||
# serial 2305 ltversion.m4
|
||||
# This file is part of GNU Libtool
|
||||
|
||||
m4_define([LT_PACKAGE_VERSION], [2.1a])
|
||||
m4_define([LT_PACKAGE_REVISION], [1.2248])
|
||||
m4_define([LT_PACKAGE_REVISION], [1.2305])
|
||||
|
||||
AC_DEFUN([LTVERSION_VERSION],
|
||||
[macro_version='2.1a'
|
||||
macro_revision='1.2248'
|
||||
macro_revision='1.2305'
|
||||
_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
|
||||
_LT_DECL(, macro_revision, 0)
|
||||
])
|
||||
|
||||
Loading…
Reference in New Issue
Block a user