mirror of
git://git.savannah.gnu.org/libtool.git
synced 2025-02-17 15:10:02 +08:00
syntax-check: fix violations and implement sc_useless_braces_in_variable_derefs.
Until now, libtool sources have used braced variable names seemingly at random! Almost always the braces are just noise, so remove all the unnecessary ones. * cfg.mk (sc_useless_braces_in_variable_derefs): New syntax check rule to ensure we only reintroduce braced variable dereferences if they are followed by a valid variable name character. build-aux/general.m4sh, build-aux/git-hooks/commit-msg, build-aux/ltmain.m4sh, build-aux/options-parser, configure.ac, libltdl/configure.ac, m4/libtool.m4, m4/ltdl.m4, m4/ltoptions.m4, tests/defs.m4sh, tests/demo-nopic.test, tests/depdemo/configure.ac, tests/flags.at, tests/link.test, tests/objectlist.test, tests/quote.test, tests/static.at: Remove spurious braces. Signed-off-by: Gary V. Vaughan <gary@gnu.org>
This commit is contained in:
Gary V. Vaughan
parent
4757bf0637
commit
8fad6be03e
@ -78,11 +78,11 @@ basename='s,^.*/,,'
|
||||
# otherwise set result to NONDIR_REPLACEMENT.
|
||||
func_dirname ()
|
||||
{
|
||||
func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
|
||||
if test "X$func_dirname_result" = "X${1}"; then
|
||||
func_dirname_result=${3}
|
||||
func_dirname_result=`$ECHO "$1" | $SED "$dirname"`
|
||||
if test "X$func_dirname_result" = "X$1"; then
|
||||
func_dirname_result=$3
|
||||
else
|
||||
func_dirname_result=$func_dirname_result${2}
|
||||
func_dirname_result=$func_dirname_result$2
|
||||
fi
|
||||
} # func_dirname may be replaced by extended shell implementation
|
||||
|
||||
@ -90,7 +90,7 @@ func_dirname ()
|
||||
# func_basename file
|
||||
func_basename ()
|
||||
{
|
||||
func_basename_result=`$ECHO "${1}" | $SED "$basename"`
|
||||
func_basename_result=`$ECHO "$1" | $SED "$basename"`
|
||||
} # func_basename may be replaced by extended shell implementation
|
||||
|
||||
|
||||
@ -109,13 +109,13 @@ func_basename ()
|
||||
func_dirname_and_basename ()
|
||||
{
|
||||
# Extract subdirectory from the argument.
|
||||
func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
|
||||
if test "X$func_dirname_result" = "X${1}"; then
|
||||
func_dirname_result=${3}
|
||||
func_dirname_result=`$ECHO "$1" | $SED -e "$dirname"`
|
||||
if test "X$func_dirname_result" = "X$1"; then
|
||||
func_dirname_result=$3
|
||||
else
|
||||
func_dirname_result=$func_dirname_result${2}
|
||||
func_dirname_result=$func_dirname_result$2
|
||||
fi
|
||||
func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
|
||||
func_basename_result=`$ECHO "$1" | $SED -e "$basename"`
|
||||
} # func_dirname_and_basename may be replaced by extended shell implementation
|
||||
|
||||
|
||||
@ -127,9 +127,9 @@ func_dirname_and_basename ()
|
||||
# func_strip_suffix prefix name
|
||||
func_stripname ()
|
||||
{
|
||||
case ${2} in
|
||||
.*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
|
||||
*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
|
||||
case $2 in
|
||||
.*) func_stripname_result=`$ECHO "$3" | $SED "s%^$1%%; s%\\\\$2\$%%"`;;
|
||||
*) func_stripname_result=`$ECHO "$3" | $SED "s%^$1%%; s%$2\$%%"`;;
|
||||
esac
|
||||
} # func_stripname may be replaced by extended shell implementation
|
||||
|
||||
@ -251,7 +251,7 @@ func_relative_path ()
|
||||
;;
|
||||
*)
|
||||
func_dirname $func_relative_path_tlibdir
|
||||
func_relative_path_tlibdir=${func_dirname_result}
|
||||
func_relative_path_tlibdir=$func_dirname_result
|
||||
if test "x$func_relative_path_tlibdir" = x ; then
|
||||
# Have to descend all the way to the root!
|
||||
func_relative_path_result=../$func_relative_path_result
|
||||
@ -268,7 +268,7 @@ func_relative_path ()
|
||||
func_relative_path_result=$func_stripname_result
|
||||
func_stripname '/' '/' "$func_relative_path_tcancelled"
|
||||
if test "x$func_stripname_result" != x ; then
|
||||
func_relative_path_result=${func_relative_path_result}/${func_stripname_result}
|
||||
func_relative_path_result=$func_relative_path_result/$func_stripname_result
|
||||
fi
|
||||
|
||||
# Normalisation. If bindir is libdir, return `.' else relative path.
|
||||
@ -471,15 +471,15 @@ func_mktempdir ()
|
||||
|
||||
if test "$opt_dry_run" = ":"; then
|
||||
# Return a directory name, but don't create it in dry-run mode
|
||||
my_tmpdir=${my_template}-$$
|
||||
my_tmpdir=$my_template-$$
|
||||
else
|
||||
|
||||
# If mktemp works, use that first and foremost
|
||||
my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`
|
||||
my_tmpdir=`mktemp -d "$my_template-XXXXXXXX" 2>/dev/null`
|
||||
|
||||
if test ! -d "$my_tmpdir"; then
|
||||
# Failing that, at least try and use $RANDOM to avoid a race
|
||||
my_tmpdir=${my_template}-${RANDOM-0}$$
|
||||
my_tmpdir=$my_template-${RANDOM-0}$$
|
||||
|
||||
save_mktempdir_umask=`umask`
|
||||
umask 0077
|
||||
|
||||
@ -87,12 +87,12 @@ fn_check_msg ()
|
||||
}
|
||||
|
||||
# Make sure Copyright-paperwork-exempt line is valid.
|
||||
if grep "${CPR_re}[Nn]" "$log_file" >/dev/null 2>&1; then
|
||||
if grep "$CPR_re[Nn]" "$log_file" >/dev/null 2>&1; then
|
||||
$ECHO "\
|
||||
\`Copyright-paperwork-exempt: No' is redundant, please remove."
|
||||
return_status=1
|
||||
else
|
||||
not_yes=`grep "${CPR_re}" "$log_file" 2>/dev/null \
|
||||
not_yes=`grep "$CPR_re" "$log_file" 2>/dev/null \
|
||||
|grep -v "${CPR_re}Yes\$"`
|
||||
|
||||
test -n "$not_yes" && {
|
||||
|
||||
@ -138,8 +138,8 @@ magic_exe='%%%MAGIC EXE variable%%%'
|
||||
# Global variables.
|
||||
nonopt=
|
||||
preserve_args=
|
||||
lo2o=s/\\.lo\$/.${objext}/
|
||||
o2lo=s/\\.${objext}\$/.lo/
|
||||
lo2o=s/\\.lo\$/.$objext/
|
||||
o2lo=s/\\.$objext\$/.lo/
|
||||
extracted_archives=
|
||||
extracted_serial=0
|
||||
|
||||
@ -152,7 +152,7 @@ exec_cmd=
|
||||
# Append VALUE to the end of shell variable VAR.
|
||||
func_append ()
|
||||
{
|
||||
eval "${1}=\$${1}\${2}"
|
||||
eval "$1=\$$1\$2"
|
||||
} # func_append may be replaced by extended shell implementation
|
||||
|
||||
# func_append_quoted var value
|
||||
@ -160,15 +160,15 @@ func_append ()
|
||||
# by a space.
|
||||
func_append_quoted ()
|
||||
{
|
||||
func_quote_for_eval "${2}"
|
||||
eval "${1}=\$${1}\\ \$func_quote_for_eval_result"
|
||||
func_quote_for_eval "$2"
|
||||
eval "$1=\$$1\\ \$func_quote_for_eval_result"
|
||||
} # func_append_quoted may be replaced by extended shell implementation
|
||||
|
||||
|
||||
# func_arith arithmetic-term...
|
||||
func_arith ()
|
||||
{
|
||||
func_arith_result=`expr "${@}"`
|
||||
func_arith_result=`expr "$@"`
|
||||
} # func_arith may be replaced by extended shell implementation
|
||||
|
||||
|
||||
@ -176,21 +176,21 @@ func_arith ()
|
||||
# STRING may not start with a hyphen.
|
||||
func_len ()
|
||||
{
|
||||
func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len`
|
||||
func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
|
||||
} # func_len may be replaced by extended shell implementation
|
||||
|
||||
|
||||
# func_lo2o object
|
||||
func_lo2o ()
|
||||
{
|
||||
func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
|
||||
func_lo2o_result=`$ECHO "$1" | $SED "$lo2o"`
|
||||
} # func_lo2o may be replaced by extended shell implementation
|
||||
|
||||
|
||||
# func_xform libobj-or-source
|
||||
func_xform ()
|
||||
{
|
||||
func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
|
||||
func_xform_result=`$ECHO "$1" | $SED 's/\.[^.]*$/.lo/'`
|
||||
} # func_xform may be replaced by extended shell implementation
|
||||
|
||||
|
||||
@ -608,7 +608,7 @@ func_infer_tag ()
|
||||
for z in $available_tags; do
|
||||
if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
|
||||
# Evaluate the configuration.
|
||||
eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
|
||||
eval "`$SED -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
|
||||
CC_quoted=
|
||||
for arg in $CC; do
|
||||
# Double-quote args containing other shell metacharacters.
|
||||
@ -649,15 +649,15 @@ func_infer_tag ()
|
||||
# but don't create it if we're doing a dry run.
|
||||
func_write_libtool_object ()
|
||||
{
|
||||
write_libobj=${1}
|
||||
write_libobj=$1
|
||||
if test "$build_libtool_libs" = yes; then
|
||||
write_lobj=\'${2}\'
|
||||
write_lobj=\'$2\'
|
||||
else
|
||||
write_lobj=none
|
||||
fi
|
||||
|
||||
if test "$build_old_libs" = yes; then
|
||||
write_oldobj=\'${3}\'
|
||||
write_oldobj=\'$3\'
|
||||
else
|
||||
write_oldobj=none
|
||||
fi
|
||||
@ -677,7 +677,7 @@ pic_object=$write_lobj
|
||||
non_pic_object=$write_oldobj
|
||||
|
||||
EOF
|
||||
$MV "${write_libobj}T" "${write_libobj}"
|
||||
$MV "${write_libobj}T" "$write_libobj"
|
||||
}
|
||||
}
|
||||
|
||||
@ -707,7 +707,7 @@ func_convert_core_file_wine_to_w32 ()
|
||||
# *an error message* to stdout. So we must check for both error code of
|
||||
# zero AND non-empty stdout, which explains the odd construction:
|
||||
func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null`
|
||||
if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then
|
||||
if test "$?" -eq 0 && test -n "$func_convert_core_file_wine_to_w32_tmp"; then
|
||||
func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" |
|
||||
$SED -e "$lt_sed_naive_backslashify"`
|
||||
else
|
||||
@ -1038,7 +1038,7 @@ func_init_to_host_path_cmd ()
|
||||
|
||||
if test -z "$to_host_path_cmd"; then
|
||||
func_stripname 'func_convert_file_' '' "$to_host_file_cmd"
|
||||
to_host_path_cmd=func_convert_path_${func_stripname_result}
|
||||
to_host_path_cmd=func_convert_path_$func_stripname_result
|
||||
fi
|
||||
}
|
||||
|
||||
@ -1346,7 +1346,7 @@ func_mode_compile ()
|
||||
func_dirname_and_basename "$obj" "/" ""
|
||||
objname=$func_basename_result
|
||||
xdir=$func_dirname_result
|
||||
lobj=${xdir}$objdir/$objname
|
||||
lobj=$xdir$objdir/$objname
|
||||
|
||||
test -z "$base_compile" && \
|
||||
func_fatal_help "you must specify a compilation command"
|
||||
@ -1372,7 +1372,7 @@ func_mode_compile ()
|
||||
# Calculate the filename of the output object if compiler does
|
||||
# not support -o with -c
|
||||
if test "$compiler_c_o" = no; then
|
||||
output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext}
|
||||
output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.$objext
|
||||
lockfile=$output_obj.lock
|
||||
else
|
||||
output_obj=
|
||||
@ -1691,7 +1691,7 @@ required, except when creating a convenience library.
|
||||
If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
|
||||
using \`ar' and \`ranlib', or on Windows using \`lib'.
|
||||
|
||||
If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
|
||||
If OUTPUT-FILE ends in \`.lo' or \`.$objext', then a reloadable object file
|
||||
is created, otherwise an executable program is created."
|
||||
;;
|
||||
|
||||
@ -1926,7 +1926,7 @@ func_mode_finish ()
|
||||
else
|
||||
tmpdir=`func_mktempdir`
|
||||
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
|
||||
mv -f $tmpdir/tmp-la $lib
|
||||
done
|
||||
@ -2496,7 +2496,7 @@ func_generate_dlsyms ()
|
||||
"") ;;
|
||||
*.c)
|
||||
# Discover the nlist of each of the dlfiles.
|
||||
nlist=$output_objdir/${my_outputname}.nm
|
||||
nlist=$output_objdir/$my_outputname.nm
|
||||
|
||||
func_show_eval "$RM $nlist ${nlist}S ${nlist}T"
|
||||
|
||||
@ -2562,7 +2562,7 @@ extern \"C\" {
|
||||
export_symbols=$output_objdir/$outputname.exp
|
||||
$opt_dry_run || {
|
||||
$RM $export_symbols
|
||||
eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
|
||||
eval "$SED -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
|
||||
case $host in
|
||||
*cygwin* | *mingw* | *cegcc* )
|
||||
eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
|
||||
@ -2572,7 +2572,7 @@ extern \"C\" {
|
||||
}
|
||||
else
|
||||
$opt_dry_run || {
|
||||
eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
|
||||
eval "$SED -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
|
||||
eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
|
||||
eval '$MV "$nlist"T "$nlist"'
|
||||
case $host in
|
||||
@ -3035,12 +3035,12 @@ func_extract_archives ()
|
||||
darwin_arch=
|
||||
func_verbose "$darwin_base_archive has multiple architectures $darwin_arches"
|
||||
for darwin_arch in $darwin_arches ; do
|
||||
func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
|
||||
$LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
|
||||
cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
|
||||
func_extract_an_archive "`pwd`" "${darwin_base_archive}"
|
||||
func_mkdir_p "unfat-$$/$darwin_base_archive-$darwin_arch"
|
||||
$LIPO -thin $darwin_arch -output "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive" "$darwin_archive"
|
||||
cd "unfat-$$/$darwin_base_archive-$darwin_arch"
|
||||
func_extract_an_archive "`pwd`" "$darwin_base_archive"
|
||||
cd "$darwin_curdir"
|
||||
$RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
|
||||
$RM "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive"
|
||||
done # $darwin_arches
|
||||
## Okay now we've a bunch of thin objects, gotta fatten them up :)
|
||||
darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u`
|
||||
@ -3183,7 +3183,7 @@ func_parse_lt_options ()
|
||||
|
||||
# Print the debug banner immediately:
|
||||
if test -n \"\$lt_option_debug\"; then
|
||||
echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE) $VERSION\" 1>&2
|
||||
echo \"$outputname:$output:\$LINENO: libtool wrapper (GNU $PACKAGE) $VERSION\" 1>&2
|
||||
fi
|
||||
}
|
||||
|
||||
@ -3194,7 +3194,7 @@ func_lt_dump_args ()
|
||||
lt_dump_args_N=1;
|
||||
for lt_arg
|
||||
do
|
||||
\$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\"
|
||||
\$ECHO \"$outputname:$output:\$LINENO: newargv[\$lt_dump_args_N]: \$lt_arg\"
|
||||
lt_dump_args_N=\`expr \$lt_dump_args_N + 1\`
|
||||
done
|
||||
}
|
||||
@ -3208,7 +3208,7 @@ func_exec_program_core ()
|
||||
*-*-mingw | *-*-os2* | *-cegcc*)
|
||||
$ECHO "\
|
||||
if test -n \"\$lt_option_debug\"; then
|
||||
\$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2
|
||||
\$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir\\\\\$program\" 1>&2
|
||||
func_lt_dump_args \${1+\"\$@\"} 1>&2
|
||||
fi
|
||||
exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
|
||||
@ -3218,7 +3218,7 @@ func_exec_program_core ()
|
||||
*)
|
||||
$ECHO "\
|
||||
if test -n \"\$lt_option_debug\"; then
|
||||
\$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2
|
||||
\$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir/\$program\" 1>&2
|
||||
func_lt_dump_args \${1+\"\$@\"} 1>&2
|
||||
fi
|
||||
exec \"\$progdir/\$program\" \${1+\"\$@\"}
|
||||
@ -3299,7 +3299,7 @@ func_exec_program ()
|
||||
progdir=\"\$thisdir/$objdir\"
|
||||
|
||||
if test ! -f \"\$progdir/\$program\" ||
|
||||
{ file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
|
||||
{ file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | $SED 1q\`; \\
|
||||
test \"X\$file\" != \"X\$progdir/\$program\"; }; then
|
||||
|
||||
file=\"\$\$-\$program\"
|
||||
@ -4415,7 +4415,7 @@ func_mode_link ()
|
||||
vinfo=
|
||||
vinfo_number=no
|
||||
weak_libs=
|
||||
single_module=${wl}-single_module
|
||||
single_module=$wl-single_module
|
||||
func_infer_tag $base_compile
|
||||
|
||||
# We need to know -static, to get the right output filenames.
|
||||
@ -4922,7 +4922,7 @@ func_mode_link ()
|
||||
;;
|
||||
|
||||
-multi_module)
|
||||
single_module=${wl}-multi_module
|
||||
single_module=$wl-multi_module
|
||||
continue
|
||||
;;
|
||||
|
||||
@ -5268,7 +5268,7 @@ func_mode_link ()
|
||||
|
||||
if test -n "$shlibpath_var"; then
|
||||
# get the directories listed in $shlibpath_var
|
||||
eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\`
|
||||
eval shlib_search_path=\`\$ECHO \"\$$shlibpath_var\" \| \$SED \'s/:/ /g\'\`
|
||||
else
|
||||
shlib_search_path=
|
||||
fi
|
||||
@ -5445,7 +5445,7 @@ func_mode_link ()
|
||||
for searchdir in $searchdirs; do
|
||||
for search_ext in .la $std_shrext .so .a; do
|
||||
# Search the libtool library
|
||||
lib=$searchdir/lib${name}${search_ext}
|
||||
lib=$searchdir/lib$name$search_ext
|
||||
if test -f "$lib"; then
|
||||
if test "$search_ext" = ".la"; then
|
||||
found=yes
|
||||
@ -6309,19 +6309,19 @@ func_mode_link ()
|
||||
case $host in
|
||||
*-*-darwin*)
|
||||
depdepl=
|
||||
eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
|
||||
eval deplibrary_names=`$SED -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
|
||||
if test -n "$deplibrary_names" ; then
|
||||
for tmp in $deplibrary_names ; do
|
||||
depdepl=$tmp
|
||||
done
|
||||
if test -f "$absdir/$objdir/$depdepl" ; then
|
||||
depdepl=$absdir/$objdir/$depdepl
|
||||
darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
|
||||
darwin_install_name=`$OTOOL -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
|
||||
if test -z "$darwin_install_name"; then
|
||||
darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
|
||||
darwin_install_name=`$OTOOL64 -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
|
||||
fi
|
||||
func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
|
||||
func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}"
|
||||
func_append compiler_flags " $wl-dylib_file $wl$darwin_install_name:$depdepl"
|
||||
func_append linker_flags " -dylib_file $darwin_install_name:$depdepl"
|
||||
path=
|
||||
fi
|
||||
fi
|
||||
@ -6331,7 +6331,7 @@ func_mode_link ()
|
||||
;;
|
||||
esac
|
||||
else
|
||||
eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
|
||||
eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
|
||||
test -z "$libdir" && \
|
||||
func_fatal_error "\`$deplib' is not a valid libtool archive"
|
||||
test "$absdir" != "$libdir" && \
|
||||
@ -6658,7 +6658,7 @@ func_mode_link ()
|
||||
# Darwin ld doesn't like 0 for these options...
|
||||
func_arith $current + 1
|
||||
minor_current=$func_arith_result
|
||||
xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
|
||||
xlcverstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision"
|
||||
verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
|
||||
;;
|
||||
|
||||
@ -6720,11 +6720,11 @@ func_mode_link ()
|
||||
iface=$func_arith_result
|
||||
func_arith $loop - 1
|
||||
loop=$func_arith_result
|
||||
verstring=$verstring:${iface}.0
|
||||
verstring=$verstring:$iface.0
|
||||
done
|
||||
|
||||
# Make executables depend on our current version.
|
||||
func_append verstring ":${current}.0"
|
||||
func_append verstring ":$current.0"
|
||||
;;
|
||||
|
||||
qnx)
|
||||
@ -6804,7 +6804,7 @@ func_mode_link ()
|
||||
case $p in
|
||||
*.$objext | *.gcno)
|
||||
;;
|
||||
$output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
|
||||
$output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/$libname$release.*)
|
||||
if test "X$precious_files_regex" != "X"; then
|
||||
if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
|
||||
then
|
||||
@ -6825,7 +6825,7 @@ func_mode_link ()
|
||||
func_append oldlibs " $output_objdir/$libname.$libext"
|
||||
|
||||
# Transform .lo files to .o files.
|
||||
oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP`
|
||||
oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; $lo2o" | $NL2SP`
|
||||
fi
|
||||
|
||||
# Eliminate all temporary directories.
|
||||
@ -7072,7 +7072,7 @@ EOF
|
||||
# but so what?
|
||||
potlib=$potent_lib
|
||||
while test -h "$potlib" 2>/dev/null; do
|
||||
potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
|
||||
potliblink=`ls -ld $potlib | $SED 's/.* -> //'`
|
||||
case $potliblink in
|
||||
[\\/]* | [A-Za-z]:[\\/]*) potlib=$potliblink;;
|
||||
*) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";;
|
||||
@ -7289,7 +7289,7 @@ EOF
|
||||
|
||||
# Test again, we may have decided not to build it any more
|
||||
if test "$build_libtool_libs" = yes; then
|
||||
# Remove ${wl} instances when linking with ld.
|
||||
# Remove $wl instances when linking with ld.
|
||||
# FIXME: should test the right _cmds variable.
|
||||
case $archive_cmds in
|
||||
*\$LD\ *) wl= ;;
|
||||
@ -7440,7 +7440,7 @@ EOF
|
||||
output_la=$func_basename_result
|
||||
save_libobjs=$libobjs
|
||||
save_output=$output
|
||||
output=${output_objdir}/${output_la}.nm
|
||||
output=$output_objdir/$output_la.nm
|
||||
func_to_tool_file "$output"
|
||||
libobjs=$nm_file_list_spec$func_to_tool_file_result
|
||||
func_append delfiles " $output"
|
||||
@ -7587,7 +7587,7 @@ EOF
|
||||
k=1
|
||||
|
||||
if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then
|
||||
output=${output_objdir}/${output_la}.lnkscript
|
||||
output=$output_objdir/$output_la.lnkscript
|
||||
func_verbose "creating GNU ld script: $output"
|
||||
echo 'INPUT (' > $output
|
||||
for obj in $save_libobjs
|
||||
@ -7600,7 +7600,7 @@ EOF
|
||||
func_to_tool_file "$output"
|
||||
output=$func_to_tool_file_result
|
||||
elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
|
||||
output=${output_objdir}/${output_la}.lnk
|
||||
output=$output_objdir/$output_la.lnk
|
||||
func_verbose "creating linker input file list: $output"
|
||||
: > $output
|
||||
set x $save_libobjs
|
||||
@ -7621,7 +7621,7 @@ EOF
|
||||
else
|
||||
if test -n "$save_libobjs"; then
|
||||
func_verbose "creating reloadable object files..."
|
||||
output=$output_objdir/$output_la-${k}.$objext
|
||||
output=$output_objdir/$output_la-$k.$objext
|
||||
eval test_cmds=\"$reload_cmds\"
|
||||
func_len " $test_cmds"
|
||||
len0=$func_len_result
|
||||
@ -7649,10 +7649,10 @@ EOF
|
||||
reload_objs="$objlist $last_robj"
|
||||
eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"
|
||||
fi
|
||||
last_robj=$output_objdir/$output_la-${k}.$objext
|
||||
last_robj=$output_objdir/$output_la-$k.$objext
|
||||
func_arith $k + 1
|
||||
k=$func_arith_result
|
||||
output=$output_objdir/$output_la-${k}.$objext
|
||||
output=$output_objdir/$output_la-$k.$objext
|
||||
objlist=" $obj"
|
||||
func_len " $last_robj"
|
||||
func_arith $len0 + $func_len_result
|
||||
@ -7664,9 +7664,9 @@ EOF
|
||||
# files will link in the last one created.
|
||||
test -z "$concat_cmds" || concat_cmds=$concat_cmds~
|
||||
reload_objs="$objlist $last_robj"
|
||||
eval concat_cmds=\"\${concat_cmds}$reload_cmds\"
|
||||
eval concat_cmds=\"\$concat_cmds$reload_cmds\"
|
||||
if test -n "$last_robj"; then
|
||||
eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
|
||||
eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
|
||||
fi
|
||||
func_append delfiles " $output"
|
||||
|
||||
@ -7902,7 +7902,7 @@ EOF
|
||||
test "$build_libtool_libs" != yes && libobjs=$non_pic_objects
|
||||
|
||||
# Create the old-style object.
|
||||
reload_objs=$objs$old_deplibs' '`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`' '$reload_conv_objs
|
||||
reload_objs=$objs$old_deplibs' '`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; /\.lib$/d; $lo2o" | $NL2SP`' '$reload_conv_objs
|
||||
|
||||
output=$obj
|
||||
func_execute_cmds "$reload_cmds" 'exit $?'
|
||||
@ -7974,8 +7974,8 @@ EOF
|
||||
if test "$tagname" = CXX ; then
|
||||
case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
|
||||
10.[0123])
|
||||
func_append compile_command " ${wl}-bind_at_load"
|
||||
func_append finalize_command " ${wl}-bind_at_load"
|
||||
func_append compile_command " $wl-bind_at_load"
|
||||
func_append finalize_command " $wl-bind_at_load"
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
@ -8058,7 +8058,7 @@ EOF
|
||||
fi
|
||||
case $host in
|
||||
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
|
||||
testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'`
|
||||
testbindir=`$ECHO "$libdir" | $SED -e 's*/lib$*/bin*'`
|
||||
case :$dllsearchpath: in
|
||||
*":$libdir:"*) ;;
|
||||
::) dllsearchpath=$libdir;;
|
||||
@ -8162,8 +8162,8 @@ EOF
|
||||
fi
|
||||
|
||||
# Delete the generated files.
|
||||
if test -f "$output_objdir/${outputname}S.${objext}"; then
|
||||
func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
|
||||
if test -f "$output_objdir/${outputname}S.$objext"; then
|
||||
func_show_eval '$RM "$output_objdir/${outputname}S.$objext"'
|
||||
fi
|
||||
|
||||
exit $exit_status
|
||||
@ -8473,7 +8473,7 @@ EOF
|
||||
RANLIB=$save_RANLIB
|
||||
fi
|
||||
test -z "$concat_cmds" || concat_cmds=$concat_cmds~
|
||||
eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
|
||||
eval concat_cmds=\"\$concat_cmds$old_archive_cmds\"
|
||||
objlist=
|
||||
len=$len0
|
||||
fi
|
||||
@ -8534,7 +8534,7 @@ EOF
|
||||
func_basename "$deplib"
|
||||
name=$func_basename_result
|
||||
func_resolve_sysroot "$deplib"
|
||||
eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
|
||||
eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
|
||||
test -z "$libdir" && \
|
||||
func_fatal_error "\`$deplib' is not a valid libtool archive"
|
||||
func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
|
||||
@ -8560,7 +8560,7 @@ EOF
|
||||
*.la)
|
||||
func_basename "$lib"
|
||||
name=$func_basename_result
|
||||
eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
|
||||
eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
|
||||
test -z "$libdir" && \
|
||||
func_fatal_error "\`$lib' is not a valid libtool archive"
|
||||
func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"
|
||||
@ -8579,7 +8579,7 @@ EOF
|
||||
# the library:
|
||||
func_basename "$lib"
|
||||
name=$func_basename_result
|
||||
eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
|
||||
eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
|
||||
test -z "$libdir" && \
|
||||
func_fatal_error "\`$lib' is not a valid libtool archive"
|
||||
func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"
|
||||
@ -8839,12 +8839,12 @@ func_mode_uninstall ()
|
||||
|
||||
# note $name still contains .exe if it was in $file originally
|
||||
# as does the version of $file that was added into $rmfiles
|
||||
func_append rmfiles " $odir/$name $odir/${name}S.${objext}"
|
||||
func_append rmfiles " $odir/$name $odir/${name}S.$objext"
|
||||
if test "$fast_install" = yes && test -n "$relink_command"; then
|
||||
func_append rmfiles " $odir/lt-$name"
|
||||
fi
|
||||
if test "X$noexename" != "X$name" ; then
|
||||
func_append rmfiles " $odir/lt-${noexename}.c"
|
||||
func_append rmfiles " $odir/lt-$noexename.c"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
@ -8853,7 +8853,7 @@ func_mode_uninstall ()
|
||||
func_show_eval "$RM $rmfiles" 'exit_status=1'
|
||||
done
|
||||
|
||||
# Try to remove the ${objdir}s in the directories where we deleted files
|
||||
# Try to remove the $objdir's in the directories where we deleted files
|
||||
for dir in $rmdirs; do
|
||||
if test -d "$dir"; then
|
||||
func_show_eval "rmdir $dir >/dev/null 2>&1"
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#! /bin/sh
|
||||
|
||||
# Set a version string for this script.
|
||||
scriptversion=2011-11-16.05; # UTC
|
||||
scriptversion=2011-11-20.12; # UTC
|
||||
|
||||
# A pluggable option parser for Bourne shell.
|
||||
# Written by Gary V. Vaughan, 2010
|
||||
@ -555,13 +555,13 @@ func_error ()
|
||||
$require_term_colors
|
||||
|
||||
_G_message=$*
|
||||
_G_prefix="$progname: ${tc_standout}${tc_red}error${tc_reset}: "
|
||||
_G_prefix="$progname: $tc_standout${tc_red}error$tc_reset: "
|
||||
|
||||
save_IFS=$IFS
|
||||
IFS=$nl
|
||||
for _G_line in $_G_message; do
|
||||
IFS=$save_IFS
|
||||
echo "$_G_prefix${tc_bold}$_G_line${tc_reset}" 1>&2
|
||||
echo "$_G_prefix$tc_bold$_G_line$tc_reset" 1>&2
|
||||
_G_prefix="$progname: "
|
||||
done
|
||||
IFS=$save_IFS
|
||||
|
||||
6
cfg.mk
6
cfg.mk
@ -190,6 +190,12 @@ define _sc_search_regexp_or_exclude
|
||||
fi || :;
|
||||
endef
|
||||
|
||||
exclude_file_name_regexp--sc_useless_braces_in_variable_derefs = /cvsu$$
|
||||
sc_useless_braces_in_variable_derefs:
|
||||
@prohibit='\$${[0-9A-Za-z_]+}[^0-9A-Za-z_]' \
|
||||
halt='found spurious braces around variable dereference' \
|
||||
$(_sc_search_regexp)
|
||||
|
||||
sc_useless_quotes_in_assignment:
|
||||
@prohibit='^[ ]*[A-Za-z_][A-Za-z0-9_]*="[^ !#&()*;<>?@~^{|}]*"$$' \
|
||||
halt='found spurious quotes around assignment value' \
|
||||
|
||||
@ -109,8 +109,8 @@ AC_SUBST([CONFIG_STATUS_DEPENDENCIES], ['$(srcdir)/.version'])
|
||||
## Libtool specific configuration. ##
|
||||
## ------------------------------- ##
|
||||
|
||||
AC_SUBST([aclocaldir], ["\${datadir}/aclocal"])
|
||||
AC_SUBST([pkgdatadir], ["\${datadir}/$PACKAGE"])
|
||||
AC_SUBST([aclocaldir], ["\$(datadir)/aclocal"])
|
||||
AC_SUBST([pkgdatadir], ["\$(datadir)/$PACKAGE"])
|
||||
|
||||
AC_ARG_ENABLE(ltdl-install,
|
||||
[AS_HELP_STRING([--disable-ltdl-install], [do not install libltdl])])
|
||||
@ -132,7 +132,7 @@ AC_SUBST([CONF_SUBDIRS])
|
||||
|
||||
DIST_MAKEFILE_LIST=
|
||||
for dir in $CONF_SUBDIRS; do
|
||||
DIST_MAKEFILE_LIST="${DIST_MAKEFILE_LIST}$dir/Makefile "
|
||||
DIST_MAKEFILE_LIST="$DIST_MAKEFILE_LIST$dir/Makefile "
|
||||
done
|
||||
AC_SUBST([DIST_MAKEFILE_LIST])
|
||||
|
||||
|
||||
@ -58,7 +58,7 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
|
||||
## ------------------------------- ##
|
||||
## Libtool specific configuration. ##
|
||||
## ------------------------------- ##
|
||||
pkgdatadir='${datadir}'"/${PACKAGE}"
|
||||
pkgdatadir='$datadir'"/$PACKAGE"
|
||||
|
||||
|
||||
## ----------------------- ##
|
||||
|
||||
662
m4/libtool.m4
vendored
662
m4/libtool.m4
vendored
File diff suppressed because it is too large
Load Diff
28
m4/ltdl.m4
28
m4/ltdl.m4
@ -41,16 +41,16 @@ m4_define([_LTDL_DIR], [])
|
||||
|
||||
# _LT_BUILD_PREFIX
|
||||
# ----------------
|
||||
# If Autoconf is new enough, expand to `${top_build_prefix}', otherwise
|
||||
# to `${top_builddir}/'.
|
||||
# If Autoconf is new enough, expand to `$(top_build_prefix)', otherwise
|
||||
# to `$(top_builddir)/'.
|
||||
m4_define([_LT_BUILD_PREFIX],
|
||||
[m4_ifdef([AC_AUTOCONF_VERSION],
|
||||
[m4_if(m4_version_compare(m4_defn([AC_AUTOCONF_VERSION]), [2.62]),
|
||||
[-1], [m4_ifdef([_AC_HAVE_TOP_BUILD_PREFIX],
|
||||
[${top_build_prefix}],
|
||||
[${top_builddir}/])],
|
||||
[${top_build_prefix}])],
|
||||
[${top_builddir}/])[]dnl
|
||||
[$(top_build_prefix)],
|
||||
[$(top_builddir)/])],
|
||||
[$(top_build_prefix)])],
|
||||
[$(top_builddir)/])[]dnl
|
||||
])
|
||||
|
||||
|
||||
@ -60,8 +60,8 @@ m4_define([_LT_BUILD_PREFIX],
|
||||
# LTDLINCL to the include flags for the libltdl header and adds
|
||||
# --enable-ltdl-convenience to the configure arguments. Note that
|
||||
# AC_CONFIG_SUBDIRS is not called here. LIBLTDL will be prefixed with
|
||||
# '${top_build_prefix}' if available, otherwise with '${top_builddir}/',
|
||||
# and LTDLINCL will be prefixed with '${top_srcdir}/' (note the single
|
||||
# '$(top_build_prefix)' if available, otherwise with '$(top_builddir)/',
|
||||
# and LTDLINCL will be prefixed with '$(top_srcdir)/' (note the single
|
||||
# quotes!). If your package is not flat and you're not using automake,
|
||||
# define top_build_prefix, top_builddir, and top_srcdir appropriately
|
||||
# in your Makefiles.
|
||||
@ -97,7 +97,7 @@ m4_defun([_LTDL_CONVENIENCE],
|
||||
esac
|
||||
LIBLTDL='_LT_BUILD_PREFIX'"${lt_ltdl_dir+$lt_ltdl_dir/}libltdlc.la"
|
||||
LTDLDEPS=$LIBLTDL
|
||||
LTDLINCL='-I${top_srcdir}'"${lt_ltdl_dir+/$lt_ltdl_dir}"
|
||||
LTDLINCL='-I$(top_srcdir)'"${lt_ltdl_dir+/$lt_ltdl_dir}"
|
||||
|
||||
AC_SUBST([LIBLTDL])
|
||||
AC_SUBST([LTDLDEPS])
|
||||
@ -115,9 +115,9 @@ AC_SUBST([INCLTDL])
|
||||
# and LTDLINCL to the include flags for the libltdl header and adds
|
||||
# --enable-ltdl-install to the configure arguments. Note that
|
||||
# AC_CONFIG_SUBDIRS is not called from here. If an installed libltdl
|
||||
# is not found, LIBLTDL will be prefixed with '${top_build_prefix}' if
|
||||
# available, otherwise with '${top_builddir}/', and LTDLINCL will be
|
||||
# prefixed with '${top_srcdir}/' (note the single quotes!). If your
|
||||
# is not found, LIBLTDL will be prefixed with '$(top_build_prefix)' if
|
||||
# available, otherwise with '$(top_builddir)/', and LTDLINCL will be
|
||||
# prefixed with '$(top_srcdir)/' (note the single quotes!). If your
|
||||
# package is not flat and you're not using automake, define top_build_prefix,
|
||||
# top_builddir, and top_srcdir appropriately in your Makefiles.
|
||||
# In the future, this macro may have to be called after LT_INIT.
|
||||
@ -174,7 +174,7 @@ case $enable_ltdl_install in
|
||||
ac_configure_args="$ac_configure_args --enable-ltdl-install"
|
||||
LIBLTDL='_LT_BUILD_PREFIX'"${lt_ltdl_dir+$lt_ltdl_dir/}libltdl.la"
|
||||
LTDLDEPS=$LIBLTDL
|
||||
LTDLINCL='-I${top_srcdir}'"${lt_ltdl_dir+/$lt_ltdl_dir}"
|
||||
LTDLINCL='-I$(top_srcdir)'"${lt_ltdl_dir+/$lt_ltdl_dir}"
|
||||
;;
|
||||
esac
|
||||
|
||||
@ -427,7 +427,7 @@ m4_define([_LT_ENABLE_INSTALL],
|
||||
[AC_ARG_ENABLE([ltdl-install],
|
||||
[AS_HELP_STRING([--enable-ltdl-install], [install libltdl])])
|
||||
|
||||
case ,${enable_ltdl_install},${enable_ltdl_convenience} in
|
||||
case ,$enable_ltdl_install,$enable_ltdl_convenience in
|
||||
*yes*) ;;
|
||||
*) enable_ltdl_convenience=yes ;;
|
||||
esac
|
||||
|
||||
8
m4/ltoptions.m4
vendored
8
m4/ltoptions.m4
vendored
@ -172,7 +172,7 @@ AC_ARG_ENABLE([shared],
|
||||
*)
|
||||
enable_shared=no
|
||||
# Look at the argument we got. We use all the common list separators.
|
||||
lt_save_ifs=$IFS; IFS=${IFS}$PATH_SEPARATOR,
|
||||
lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
|
||||
for pkg in $enableval; do
|
||||
IFS=$lt_save_ifs
|
||||
if test "X$pkg" = "X$p"; then
|
||||
@ -226,7 +226,7 @@ AC_ARG_ENABLE([static],
|
||||
*)
|
||||
enable_static=no
|
||||
# Look at the argument we got. We use all the common list separators.
|
||||
lt_save_ifs=$IFS; IFS=${IFS}$PATH_SEPARATOR,
|
||||
lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
|
||||
for pkg in $enableval; do
|
||||
IFS=$lt_save_ifs
|
||||
if test "X$pkg" = "X$p"; then
|
||||
@ -280,7 +280,7 @@ AC_ARG_ENABLE([fast-install],
|
||||
*)
|
||||
enable_fast_install=no
|
||||
# Look at the argument we got. We use all the common list separators.
|
||||
lt_save_ifs=$IFS; IFS=${IFS}$PATH_SEPARATOR,
|
||||
lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
|
||||
for pkg in $enableval; do
|
||||
IFS=$lt_save_ifs
|
||||
if test "X$pkg" = "X$p"; then
|
||||
@ -334,7 +334,7 @@ m4_define([_LT_WITH_PIC],
|
||||
*)
|
||||
pic_mode=default
|
||||
# Look at the argument we got. We use all the common list separators.
|
||||
lt_save_ifs=$IFS; IFS=${IFS}$PATH_SEPARATOR,
|
||||
lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
|
||||
for lt_pkg in $withval; do
|
||||
IFS=$lt_save_ifs
|
||||
if test "X$lt_pkg" = "X$lt_p"; then
|
||||
|
||||
@ -172,7 +172,7 @@ func_require ()
|
||||
|
||||
for my_file in $my_files; do
|
||||
test -f "$my_file" \
|
||||
|| func_skip "You must run ${my_prereq}.test before running $0"
|
||||
|| func_skip "You must run $my_prereq.test before running $0"
|
||||
done
|
||||
}
|
||||
|
||||
@ -195,7 +195,7 @@ func_configure_nofail ()
|
||||
|
||||
func_msg "Configuring in $my_dir"
|
||||
|
||||
test -f "$my_testdir/configure" || ${AUTORECONF} --force --install $my_testdir
|
||||
test -f "$my_testdir/configure" || $AUTORECONF --force --install $my_testdir
|
||||
if test -f "$my_testdir/configure"; then
|
||||
|
||||
eval func_msg $SHELL "$my_testdir/configure" $my_args
|
||||
|
||||
@ -36,10 +36,10 @@ esac
|
||||
|
||||
if test "$build" = "$host" && test -d "/etc/selinux"; then
|
||||
_selinux=`getenforce 2>/dev/null || echo "Disabled"`
|
||||
case ${_selinux} in
|
||||
case $_selinux in
|
||||
*Enforcing)
|
||||
_sebool_allow_execmod=`getsebool allow_execmod 2>/dev/null`
|
||||
case ${_sebool_allow_execmod} in
|
||||
case $_sebool_allow_execmod in
|
||||
*off)
|
||||
func_skip "SELinux policy disallows"
|
||||
;;
|
||||
|
||||
@ -52,7 +52,7 @@ AC_SUBST([LIBTOOL_DEPS])
|
||||
## ------------------------------- ##
|
||||
## depdemo specific configuration. ##
|
||||
## ------------------------------- ##
|
||||
STATIC="\`${CONFIG_SHELL} ./libtool --features | ${SED} -n -e '/enable static/s/^.*\$\$/-static/p'\`"
|
||||
STATIC="\`$CONFIG_SHELL ./libtool --features |$SED -n -e '/enable static/s/^.*\$\$/-static/p'\`"
|
||||
AC_SUBST([STATIC])
|
||||
|
||||
## ------------------------------ ##
|
||||
|
||||
@ -70,7 +70,7 @@ eval "`$LIBTOOL --tag=lt_tag --config | $EGREP '^(wl|archive_cmds)='`"
|
||||
AT_CHECK([$LIBTOOL --tag=lt_tag --mode=compile $compile -c $source],
|
||||
[], [ignore], [ignore])
|
||||
|
||||
# Linker flags are prefixed with ${wl} iff they are passed to the
|
||||
# Linker flags are prefixed with $wl iff they are passed to the
|
||||
# compiler driver, instead of directly to the linker.
|
||||
case $archive_cmds in
|
||||
*\$LD*\$linker_flags*) maybe_wl= compiler_flags_in_liblink=false ;;
|
||||
|
||||
@ -30,7 +30,7 @@ linkresult=`$LIBTOOL -n --mode=link $CC -o gettext ../lib/libnlsut.a`
|
||||
test $? -eq 0 || exit $EXIT_FAILURE
|
||||
|
||||
echo "$linkresult"
|
||||
echo "$linkresult" | ${EGREP} "../lib/libnlsut.a" >/dev/null 2>&1 || {
|
||||
echo "$linkresult" | $EGREP ../lib/libnlsut.a >/dev/null 2>&1 || {
|
||||
func_fail "$progname: ../lib/libnlsut.a was not used as expected in linking"
|
||||
}
|
||||
|
||||
|
||||
@ -30,7 +30,7 @@
|
||||
linkresult=`$LIBTOOL -n --mode=link $CC -objectlist nonexistant 2>&1`
|
||||
test $? -eq 0 && exit $EXIT_FAILURE
|
||||
|
||||
echo "$linkresult" | ${EGREP} "nonexistant" >/dev/null 2>&1 && {
|
||||
echo "$linkresult" | $EGREP "nonexistant" >/dev/null 2>&1 && {
|
||||
func_msg "$progname: error message contains -objectlist argument as expected"
|
||||
} || exit $EXIT_FAILURE
|
||||
|
||||
@ -40,7 +40,7 @@ objlist="object list with spaces"
|
||||
linkresult=`$LIBTOOL -n --mode=link $CC -o a.out -objectlist "$objlist" 2>&1`
|
||||
rm -f "$objlist"
|
||||
|
||||
echo "$linkresult" | ${EGREP} "spaces" >/dev/null 2>&1 && {
|
||||
echo "$linkresult" | $EGREP "spaces" >/dev/null 2>&1 && {
|
||||
func_msg "$progname: -objectlist with spaces in filename not recognized."
|
||||
exit $EXIT_FAILURE
|
||||
}
|
||||
|
||||
@ -75,14 +75,14 @@ for mode in compile link install; do
|
||||
|
||||
# Trivial.
|
||||
echo "= trying: no quoting"
|
||||
result=`$LIBTOOL -n --mode=$mode $preargs ${preflag}"${flag}test" $postargs` || status=$EXIT_FAILURE
|
||||
result=`$LIBTOOL -n --mode=$mode $preargs $preflag"$flag:test" $postargs` || status=$EXIT_FAILURE
|
||||
# We used to have the contents of $match in the case statement,
|
||||
# without an intermediate variable, but it would fail on at least
|
||||
# Solaris' and HP-UX's /bin/sh. Ugh!
|
||||
# We must not attempt to match $preargs in the output, because libtool
|
||||
# may modify them. For example, on Cygwin, ``libtool --mode=link gcc -o
|
||||
# foo foo.o'' becomes ``gcc -o foo.exe foo.o''.
|
||||
match="${match_preflag}${flag}test "
|
||||
match="$match_preflag$flag:test "
|
||||
case $result in
|
||||
*"$match"*)
|
||||
$ECHO "= passed: $result"
|
||||
@ -96,9 +96,9 @@ for mode in compile link install; do
|
||||
# Metacharacters that should be backslashified.
|
||||
for mchar in \\ \" \` \$; do
|
||||
$ECHO "= trying: \\$mchar quoting"
|
||||
result=`$LIBTOOL -n --mode=$mode $preargs ${preflag}"${flag}${mchar}test${mchar}" $postargs` || status=$EXIT_FAILURE
|
||||
match="${match_preflag}${flag}\\${mchar}test\\${mchar} "
|
||||
alt_match="${match_preflag}\"${flag}\\${mchar}test\\${mchar}\" "
|
||||
result=`$LIBTOOL -n --mode=$mode $preargs $preflag"$flag$mchar:test$mchar" $postargs` || status=$EXIT_FAILURE
|
||||
match="$match_preflag$flag\\$mchar:test\\$mchar "
|
||||
alt_match="$match_preflag\"$flag\\$mchar:test\\$mchar\" "
|
||||
case $result in
|
||||
*"$match"*)
|
||||
$ECHO "= passed: $result"
|
||||
@ -118,8 +118,8 @@ for mode in compile link install; do
|
||||
"'" " " " "; do
|
||||
|
||||
$ECHO "= trying: \"$mchar\" quoting"
|
||||
result=`$LIBTOOL -n --mode=$mode $preargs ${preflag}"${flag}${mchar}test${mchar}" $postargs` || status=$EXIT_FAILURE
|
||||
match="${match_preflag}\"${flag}${mchar}test${mchar}\" "
|
||||
result=`$LIBTOOL -n --mode=$mode $preargs $preflag"$flag$mchar:test$mchar" $postargs` || status=$EXIT_FAILURE
|
||||
match="$match_preflag\"$flag$mchar:test$mchar\" "
|
||||
case $result in
|
||||
*"$match"*)
|
||||
$ECHO "= passed: $result"
|
||||
|
||||
@ -134,7 +134,7 @@ func_fix_path ()
|
||||
save_PATH=$PATH
|
||||
sep=
|
||||
test -z "$PATH" || sep=:
|
||||
PATH=${2}/bin:${3}/bin:${1}/bin$sep$PATH
|
||||
PATH=$2/bin:$3/bin:$1/bin$sep$PATH
|
||||
fi
|
||||
|
||||
}
|
||||
@ -149,21 +149,21 @@ func_restore_path ()
|
||||
# func_move_libs srcdir_to_move prefix_to_move other_prefix other_prefix
|
||||
func_move_libs ()
|
||||
{
|
||||
LT_AT_MVDIR(["${1}"], ["${1}-moved"])
|
||||
LT_AT_MVDIR(["${2}"], ["${2}-moved"])
|
||||
LT_AT_MVDIR(["$srcdir_broken"], ["${1}"])
|
||||
LT_AT_MVDIR(["$prefix_broken"], ["${2}"])
|
||||
func_fix_path ${2} ${3} ${4}
|
||||
LT_AT_MVDIR(["$1"], ["$1-moved"])
|
||||
LT_AT_MVDIR(["$2"], ["$2-moved"])
|
||||
LT_AT_MVDIR(["$srcdir_broken"], ["$1"])
|
||||
LT_AT_MVDIR(["$prefix_broken"], ["$2"])
|
||||
func_fix_path "$2" "$3" "$4"
|
||||
}
|
||||
|
||||
# func_restore_libs srcdir_to_restore prefix_to_restore
|
||||
func_restore_libs ()
|
||||
{
|
||||
func_restore_path
|
||||
LT_AT_MVDIR(["${2}"], ["$prefix_broken"])
|
||||
LT_AT_MVDIR(["${1}"], ["$srcdir_broken"])
|
||||
LT_AT_MVDIR(["${2}-moved"], ["${2}"])
|
||||
LT_AT_MVDIR(["${1}-moved"], ["${1}"])
|
||||
LT_AT_MVDIR(["$2"], ["$prefix_broken"])
|
||||
LT_AT_MVDIR(["$1"], ["$srcdir_broken"])
|
||||
LT_AT_MVDIR(["$2-moved"], ["$2"])
|
||||
LT_AT_MVDIR(["$1-moved"], ["$1"])
|
||||
}
|
||||
|
||||
# make sure the program can be run.
|
||||
@ -178,7 +178,7 @@ func_test_exec ()
|
||||
LT_AT_EXEC_CHECK([./m$st])
|
||||
# For some per-deplib flag combinations there may be no installed program,
|
||||
# because liba2 is not yet installed.
|
||||
if test -f "$bindir/m${st}$EXEEXT"; then
|
||||
if test -f "$bindir/m$st$EXEEXT"; then
|
||||
LT_AT_EXEC_CHECK([$bindir/m$st])
|
||||
fi
|
||||
done
|
||||
@ -198,7 +198,7 @@ func_test_exec_fail ()
|
||||
LT_AT_EXEC_CHECK([./m$st], [1], [], [ignore], [|| (exit 1)])
|
||||
# For some per-deplib flag combinations there may be no installed program,
|
||||
# because liba2 is not yet installed.
|
||||
if test -f "$bindir/m${st}$EXEEXT"; then
|
||||
if test -f "$bindir/m$st$EXEEXT"; then
|
||||
LT_AT_EXEC_CHECK([$bindir/m$st], [1], [], [ignore], [|| (exit 1)])
|
||||
fi
|
||||
done
|
||||
@ -260,7 +260,7 @@ for withdep in no yes; do
|
||||
|
||||
# global static flags.
|
||||
for st in -static -static-libtool-libs $can_link_all_static; do
|
||||
AT_CHECK([$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS $st -o m${st}$EXEEXT m.$OBJEXT \
|
||||
AT_CHECK([$LIBTOOL --mode=link $CC $CFLAGS $LDFLAGS $st -o m$st$EXEEXT m.$OBJEXT \
|
||||
-L$libdir1 -la1 a2/liba2.la -L$libdir3 -R$libdir3 -la3],
|
||||
[0], [ignore], [ignore])
|
||||
done
|
||||
@ -309,7 +309,7 @@ for withdep in no yes; do
|
||||
# We can't install any program that links dynamically against liba2.
|
||||
for st in -static -static-libtool-libs $can_link_all_static `$per_deplib && echo 2 12 23 123 123a`; do
|
||||
echo "# m$st"
|
||||
AT_CHECK([$LIBTOOL --mode=install cp m${st}$EXEEXT $bindir/m${st}$EXEEXT], [0], [ignore], [stderr])
|
||||
AT_CHECK([$LIBTOOL --mode=install cp m$st$EXEEXT $bindir/m$st$EXEEXT], [0], [ignore], [stderr])
|
||||
if $have_static; then
|
||||
AT_CHECK([$EGREP 'relinking|has not been installed' stderr], [1], [], [])
|
||||
fi
|
||||
|
||||
Loading…
Reference in New Issue
Block a user