mirror of
https://github.com/HDFGroup/hdf5.git
synced 2025-04-12 17:31:09 +08:00
[svn-r5252] Purpose:
Update
Description:
Updated ltmain.sh with the newest version from the 1.4.2 libtool. The
one I updated with earlier still had a few bugs in it, for some
reason. I got rid of the RPM version on my machine and used the
compiled source instead.
Platforms tested:
Linux
This commit is contained in:
Bill Wendling
parent
033c659312
commit
34fd49d1e4
165
bin/ltmain.sh
165
bin/ltmain.sh
@ -56,7 +56,7 @@ modename="$progname"
|
||||
PROGRAM=ltmain.sh
|
||||
PACKAGE=libtool
|
||||
VERSION=1.4.2
|
||||
TIMESTAMP=" (1.922.2.54 2001/09/11 03:33:37)"
|
||||
TIMESTAMP=" (1.922.2.53 2001/09/11 03:18:52)"
|
||||
|
||||
default_mode=
|
||||
help="Try \`$progname --help' for more information."
|
||||
@ -467,7 +467,7 @@ if test -z "$show_help"; then
|
||||
pic_mode=default
|
||||
;;
|
||||
esac
|
||||
if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
|
||||
if test $pic_mode = no && test "$deplibs_check_method" != pass_all; then
|
||||
# non-PIC code in shared libraries is not supported
|
||||
pic_mode=default
|
||||
fi
|
||||
@ -1303,11 +1303,11 @@ compiler."
|
||||
output_objdir="$output_objdir/$objdir"
|
||||
fi
|
||||
# Create the object directory.
|
||||
if test ! -d "$output_objdir"; then
|
||||
if test ! -d $output_objdir; then
|
||||
$show "$mkdir $output_objdir"
|
||||
$run $mkdir $output_objdir
|
||||
status=$?
|
||||
if test "$status" -ne 0 && test ! -d "$output_objdir"; then
|
||||
if test $status -ne 0 && test ! -d $output_objdir; then
|
||||
exit $status
|
||||
fi
|
||||
fi
|
||||
@ -1366,7 +1366,7 @@ compiler."
|
||||
;;
|
||||
esac
|
||||
for pass in $passes; do
|
||||
if test "$linkmode" = prog; then
|
||||
if test $linkmode = prog; then
|
||||
# Determine which files to process
|
||||
case $pass in
|
||||
dlopen)
|
||||
@ -1383,11 +1383,11 @@ compiler."
|
||||
found=no
|
||||
case $deplib in
|
||||
-l*)
|
||||
if test "$linkmode" = oldlib && test "$linkmode" = obj; then
|
||||
if test $linkmode = oldlib && test $linkmode = obj; then
|
||||
$echo "$modename: warning: \`-l' is ignored for archives/objects: $deplib" 1>&2
|
||||
continue
|
||||
fi
|
||||
if test "$pass" = conv; then
|
||||
if test $pass = conv; then
|
||||
deplibs="$deplib $deplibs"
|
||||
continue
|
||||
fi
|
||||
@ -1407,7 +1407,7 @@ compiler."
|
||||
finalize_deplibs="$deplib $finalize_deplibs"
|
||||
else
|
||||
deplibs="$deplib $deplibs"
|
||||
test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
|
||||
test $linkmode = lib && newdependency_libs="$deplib $newdependency_libs"
|
||||
fi
|
||||
continue
|
||||
fi
|
||||
@ -1416,16 +1416,16 @@ compiler."
|
||||
case $linkmode in
|
||||
lib)
|
||||
deplibs="$deplib $deplibs"
|
||||
test "$pass" = conv && continue
|
||||
test $pass = conv && continue
|
||||
newdependency_libs="$deplib $newdependency_libs"
|
||||
newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
|
||||
;;
|
||||
prog)
|
||||
if test "$pass" = conv; then
|
||||
if test $pass = conv; then
|
||||
deplibs="$deplib $deplibs"
|
||||
continue
|
||||
fi
|
||||
if test "$pass" = scan; then
|
||||
if test $pass = scan; then
|
||||
deplibs="$deplib $deplibs"
|
||||
newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
|
||||
else
|
||||
@ -1440,7 +1440,7 @@ compiler."
|
||||
continue
|
||||
;; # -L
|
||||
-R*)
|
||||
if test "$pass" = link; then
|
||||
if test $pass = link; then
|
||||
dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
|
||||
# Make sure the xrpath contains only unique directories.
|
||||
case "$xrpath " in
|
||||
@ -1453,7 +1453,7 @@ compiler."
|
||||
;;
|
||||
*.la) lib="$deplib" ;;
|
||||
*.$libext)
|
||||
if test "$pass" = conv; then
|
||||
if test $pass = conv; then
|
||||
deplibs="$deplib $deplibs"
|
||||
continue
|
||||
fi
|
||||
@ -1474,7 +1474,7 @@ compiler."
|
||||
continue
|
||||
;;
|
||||
prog)
|
||||
if test "$pass" != link; then
|
||||
if test $pass != link; then
|
||||
deplibs="$deplib $deplibs"
|
||||
else
|
||||
compile_deplibs="$deplib $compile_deplibs"
|
||||
@ -1485,7 +1485,7 @@ compiler."
|
||||
esac # linkmode
|
||||
;; # *.$libext
|
||||
*.lo | *.$objext)
|
||||
if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
|
||||
if test $pass = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
|
||||
# If there is no dlopen support or we're linking statically,
|
||||
# we need to preload.
|
||||
newdlprefiles="$newdlprefiles $deplib"
|
||||
@ -1501,7 +1501,7 @@ compiler."
|
||||
continue
|
||||
;;
|
||||
esac # case $deplib
|
||||
if test "$found" = yes || test -f "$lib"; then :
|
||||
if test $found = yes || test -f "$lib"; then :
|
||||
else
|
||||
$echo "$modename: cannot find the library \`$lib'" 1>&2
|
||||
exit 1
|
||||
@ -1535,13 +1535,13 @@ compiler."
|
||||
|
||||
if test "$linkmode,$pass" = "lib,link" ||
|
||||
test "$linkmode,$pass" = "prog,scan" ||
|
||||
{ test "$linkmode" = oldlib && test "$linkmode" = obj; }; then
|
||||
{ test $linkmode = oldlib && test $linkmode = obj; }; then
|
||||
# Add dl[pre]opened files of deplib
|
||||
test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
|
||||
test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
|
||||
fi
|
||||
|
||||
if test "$pass" = conv; then
|
||||
if test $pass = conv; then
|
||||
# Only check for convenience libraries
|
||||
deplibs="$lib $deplibs"
|
||||
if test -z "$libdir"; then
|
||||
@ -1560,7 +1560,7 @@ compiler."
|
||||
esac
|
||||
tmp_libs="$tmp_libs $deplib"
|
||||
done
|
||||
elif test "$linkmode" != prog && test "$linkmode" != lib; then
|
||||
elif test $linkmode != prog && test $linkmode != lib; then
|
||||
$echo "$modename: \`$lib' is not a convenience library" 1>&2
|
||||
exit 1
|
||||
fi
|
||||
@ -1578,7 +1578,7 @@ compiler."
|
||||
fi
|
||||
|
||||
# This library was specified with -dlopen.
|
||||
if test "$pass" = dlopen; then
|
||||
if test $pass = dlopen; then
|
||||
if test -z "$libdir"; then
|
||||
$echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
|
||||
exit 1
|
||||
@ -1627,7 +1627,7 @@ compiler."
|
||||
name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
|
||||
|
||||
# This library was specified with -dlpreopen.
|
||||
if test "$pass" = dlpreopen; then
|
||||
if test $pass = dlpreopen; then
|
||||
if test -z "$libdir"; then
|
||||
$echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
|
||||
exit 1
|
||||
@ -1646,7 +1646,7 @@ compiler."
|
||||
|
||||
if test -z "$libdir"; then
|
||||
# Link the convenience library
|
||||
if test "$linkmode" = lib; then
|
||||
if test $linkmode = lib; then
|
||||
deplibs="$dir/$old_library $deplibs"
|
||||
elif test "$linkmode,$pass" = "prog,link"; then
|
||||
compile_deplibs="$dir/$old_library $compile_deplibs"
|
||||
@ -1657,7 +1657,7 @@ compiler."
|
||||
continue
|
||||
fi
|
||||
|
||||
if test "$linkmode" = prog && test "$pass" != link; then
|
||||
if test $linkmode = prog && test $pass != link; then
|
||||
newlib_search_path="$newlib_search_path $ladir"
|
||||
deplibs="$lib $deplibs"
|
||||
|
||||
@ -1673,7 +1673,7 @@ compiler."
|
||||
-L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test
|
||||
esac
|
||||
# Need to link against all dependency_libs?
|
||||
if test "$linkalldeplibs" = yes; then
|
||||
if test $linkalldeplibs = yes; then
|
||||
deplibs="$deplib $deplibs"
|
||||
else
|
||||
# Need to hardcode shared library paths
|
||||
@ -1694,7 +1694,7 @@ compiler."
|
||||
# Link against this shared library
|
||||
|
||||
if test "$linkmode,$pass" = "prog,link" ||
|
||||
{ test "$linkmode" = lib && test "$hardcode_into_libs" = yes; }; then
|
||||
{ test $linkmode = lib && test $hardcode_into_libs = yes; }; then
|
||||
# Hardcode the library path.
|
||||
# Skip directories that are in the system default run-time
|
||||
# search path.
|
||||
@ -1716,7 +1716,7 @@ compiler."
|
||||
esac
|
||||
;;
|
||||
esac
|
||||
if test "$linkmode" = prog; then
|
||||
if test $linkmode = prog; then
|
||||
# We need to hardcode the library path
|
||||
if test -n "$shlibpath_var"; then
|
||||
# Make sure the rpath contains only unique directories.
|
||||
@ -1798,9 +1798,9 @@ compiler."
|
||||
# make sure the library variables are pointing to the new library
|
||||
dir=$output_objdir
|
||||
linklib=$newlib
|
||||
fi # test -n "$old_archive_from_expsyms_cmds"
|
||||
fi # test -n $old_archive_from_expsyms_cmds
|
||||
|
||||
if test "$linkmode" = prog || test "$mode" != relink; then
|
||||
if test $linkmode = prog || test "$mode" != relink; then
|
||||
add_shlibpath=
|
||||
add_dir=
|
||||
add=
|
||||
@ -1849,7 +1849,7 @@ compiler."
|
||||
*) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
|
||||
esac
|
||||
fi
|
||||
if test "$linkmode" = prog; then
|
||||
if test $linkmode = prog; then
|
||||
test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
|
||||
test -n "$add" && compile_deplibs="$add $compile_deplibs"
|
||||
else
|
||||
@ -1866,7 +1866,7 @@ compiler."
|
||||
fi
|
||||
fi
|
||||
|
||||
if test "$linkmode" = prog || test "$mode" = relink; then
|
||||
if test $linkmode = prog || test "$mode" = relink; then
|
||||
add_shlibpath=
|
||||
add_dir=
|
||||
add=
|
||||
@ -1888,7 +1888,7 @@ compiler."
|
||||
add="-l$name"
|
||||
fi
|
||||
|
||||
if test "$linkmode" = prog; then
|
||||
if test $linkmode = prog; then
|
||||
test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
|
||||
test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
|
||||
else
|
||||
@ -1896,7 +1896,7 @@ compiler."
|
||||
test -n "$add" && deplibs="$add $deplibs"
|
||||
fi
|
||||
fi
|
||||
elif test "$linkmode" = prog; then
|
||||
elif test $linkmode = prog; then
|
||||
if test "$alldeplibs" = yes &&
|
||||
{ test "$deplibs_check_method" = pass_all ||
|
||||
{ test "$build_libtool_libs" = yes &&
|
||||
@ -1955,10 +1955,10 @@ compiler."
|
||||
fi
|
||||
fi # link shared/static library?
|
||||
|
||||
if test "$linkmode" = lib; then
|
||||
if test $linkmode = lib; then
|
||||
if test -n "$dependency_libs" &&
|
||||
{ test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes ||
|
||||
test "$link_static" = yes; }; then
|
||||
{ test $hardcode_into_libs != yes || test $build_old_libs = yes ||
|
||||
test $link_static = yes; }; then
|
||||
# Extract -R from dependency_libs
|
||||
temp_deplibs=
|
||||
for libdir in $dependency_libs; do
|
||||
@ -1987,7 +1987,7 @@ compiler."
|
||||
tmp_libs="$tmp_libs $deplib"
|
||||
done
|
||||
|
||||
if test "$link_all_deplibs" != no; then
|
||||
if test $link_all_deplibs != no; then
|
||||
# Add the search paths of all dependency libraries
|
||||
for deplib in $dependency_libs; do
|
||||
case $deplib in
|
||||
@ -2030,15 +2030,15 @@ compiler."
|
||||
fi # link_all_deplibs != no
|
||||
fi # linkmode = lib
|
||||
done # for deplib in $libs
|
||||
if test "$pass" = dlpreopen; then
|
||||
if test $pass = dlpreopen; then
|
||||
# Link the dlpreopened libraries before other libraries
|
||||
for deplib in $save_deplibs; do
|
||||
deplibs="$deplib $deplibs"
|
||||
done
|
||||
fi
|
||||
if test "$pass" != dlopen; then
|
||||
test "$pass" != scan && dependency_libs="$newdependency_libs"
|
||||
if test "$pass" != conv; then
|
||||
if test $pass != dlopen; then
|
||||
test $pass != scan && dependency_libs="$newdependency_libs"
|
||||
if test $pass != conv; then
|
||||
# Make sure lib_search_path contains only unique directories.
|
||||
lib_search_path=
|
||||
for dir in $newlib_search_path; do
|
||||
@ -2096,7 +2096,7 @@ compiler."
|
||||
deplibs=
|
||||
fi
|
||||
done # for pass
|
||||
if test "$linkmode" = prog; then
|
||||
if test $linkmode = prog; then
|
||||
dlfiles="$newdlfiles"
|
||||
dlprefiles="$newdlprefiles"
|
||||
fi
|
||||
@ -2173,7 +2173,7 @@ compiler."
|
||||
fi
|
||||
|
||||
set dummy $rpath
|
||||
if test "$#" -gt 2; then
|
||||
if test $# -gt 2; then
|
||||
$echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2
|
||||
fi
|
||||
install_libdir="$2"
|
||||
@ -2214,7 +2214,7 @@ compiler."
|
||||
|
||||
# Check that each of the things are valid numbers.
|
||||
case $current in
|
||||
[0-9]*) ;;
|
||||
0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
|
||||
*)
|
||||
$echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
|
||||
$echo "$modename: \`$vinfo' is not valid version information" 1>&2
|
||||
@ -2223,7 +2223,7 @@ compiler."
|
||||
esac
|
||||
|
||||
case $revision in
|
||||
[0-9]*) ;;
|
||||
0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
|
||||
*)
|
||||
$echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
|
||||
$echo "$modename: \`$vinfo' is not valid version information" 1>&2
|
||||
@ -2232,7 +2232,7 @@ compiler."
|
||||
esac
|
||||
|
||||
case $age in
|
||||
[0-9]*) ;;
|
||||
0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
|
||||
*)
|
||||
$echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
|
||||
$echo "$modename: \`$vinfo' is not valid version information" 1>&2
|
||||
@ -2240,7 +2240,7 @@ compiler."
|
||||
;;
|
||||
esac
|
||||
|
||||
if test "$age" -gt "$current"; then
|
||||
if test $age -gt $current; then
|
||||
$echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
|
||||
$echo "$modename: \`$vinfo' is not valid version information" 1>&2
|
||||
exit 1
|
||||
@ -2279,7 +2279,7 @@ compiler."
|
||||
|
||||
# Add in all the interfaces that we are compatible with.
|
||||
loop=$revision
|
||||
while test "$loop" -ne 0; do
|
||||
while test $loop != 0; do
|
||||
iface=`expr $revision - $loop`
|
||||
loop=`expr $loop - 1`
|
||||
verstring="sgi$major.$iface:$verstring"
|
||||
@ -2302,7 +2302,7 @@ compiler."
|
||||
|
||||
# Add in all the interfaces that we are compatible with.
|
||||
loop=$age
|
||||
while test "$loop" -ne 0; do
|
||||
while test $loop != 0; do
|
||||
iface=`expr $current - $loop`
|
||||
loop=`expr $loop - 1`
|
||||
verstring="$verstring:${iface}.0"
|
||||
@ -2403,7 +2403,7 @@ compiler."
|
||||
*) finalize_rpath="$finalize_rpath $libdir" ;;
|
||||
esac
|
||||
done
|
||||
if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
|
||||
if test $hardcode_into_libs != yes || test $build_old_libs = yes; then
|
||||
dependency_libs="$temp_xrpath $dependency_libs"
|
||||
fi
|
||||
fi
|
||||
@ -2446,7 +2446,7 @@ compiler."
|
||||
;;
|
||||
*)
|
||||
# Add libc to deplibs on all other systems if necessary.
|
||||
if test "$build_libtool_need_lc" = "yes"; then
|
||||
if test $build_libtool_need_lc = "yes"; then
|
||||
deplibs="$deplibs -lc"
|
||||
fi
|
||||
;;
|
||||
@ -2487,7 +2487,7 @@ compiler."
|
||||
EOF
|
||||
$rm conftest
|
||||
$CC -o conftest conftest.c $deplibs
|
||||
if test "$?" -eq 0 ; then
|
||||
if test $? -eq 0 ; then
|
||||
ldd_output=`ldd conftest`
|
||||
for i in $deplibs; do
|
||||
name="`expr $i : '-l\(.*\)'`"
|
||||
@ -2521,7 +2521,7 @@ EOF
|
||||
$rm conftest
|
||||
$CC -o conftest conftest.c $i
|
||||
# Did it work?
|
||||
if test "$?" -eq 0 ; then
|
||||
if test $? -eq 0 ; then
|
||||
ldd_output=`ldd conftest`
|
||||
libname=`eval \\$echo \"$libname_spec\"`
|
||||
deplib_matches=`eval \\$echo \"$library_names_spec\"`
|
||||
@ -2692,7 +2692,7 @@ EOF
|
||||
echo "*** automatically added whenever a program is linked with this library"
|
||||
echo "*** or is declared to -dlopen it."
|
||||
|
||||
if test "$allow_undefined" = no; then
|
||||
if test $allow_undefined = no; then
|
||||
echo
|
||||
echo "*** Since this library must not contain undefined symbols,"
|
||||
echo "*** because either the platform does not support them or"
|
||||
@ -2719,7 +2719,7 @@ EOF
|
||||
|
||||
# Test again, we may have decided not to build it any more
|
||||
if test "$build_libtool_libs" = yes; then
|
||||
if test "$hardcode_into_libs" = yes; then
|
||||
if test $hardcode_into_libs = yes; then
|
||||
# Hardcode the library paths
|
||||
hardcode_libdirs=
|
||||
dep_rpath=
|
||||
@ -2850,7 +2850,7 @@ EOF
|
||||
$show "mkdir $gentop"
|
||||
$run mkdir "$gentop"
|
||||
status=$?
|
||||
if test "$status" -ne 0 && test ! -d "$gentop"; then
|
||||
if test $status -ne 0 && test ! -d "$gentop"; then
|
||||
exit $status
|
||||
fi
|
||||
generated="$generated $gentop"
|
||||
@ -2869,7 +2869,7 @@ EOF
|
||||
$show "mkdir $xdir"
|
||||
$run mkdir "$xdir"
|
||||
status=$?
|
||||
if test "$status" -ne 0 && test ! -d "$xdir"; then
|
||||
if test $status -ne 0 && test ! -d "$xdir"; then
|
||||
exit $status
|
||||
fi
|
||||
$show "(cd $xdir && $AR x $xabs)"
|
||||
@ -2989,7 +2989,7 @@ EOF
|
||||
$show "mkdir $gentop"
|
||||
$run mkdir "$gentop"
|
||||
status=$?
|
||||
if test "$status" -ne 0 && test ! -d "$gentop"; then
|
||||
if test $status -ne 0 && test ! -d "$gentop"; then
|
||||
exit $status
|
||||
fi
|
||||
generated="$generated $gentop"
|
||||
@ -3008,7 +3008,7 @@ EOF
|
||||
$show "mkdir $xdir"
|
||||
$run mkdir "$xdir"
|
||||
status=$?
|
||||
if test "$status" -ne 0 && test ! -d "$xdir"; then
|
||||
if test $status -ne 0 && test ! -d "$xdir"; then
|
||||
exit $status
|
||||
fi
|
||||
$show "(cd $xdir && $AR x $xabs)"
|
||||
@ -3230,6 +3230,7 @@ EOF
|
||||
finalize_rpath="$rpath";
|
||||
;;
|
||||
esac
|
||||
##finalize_rpath="$rpath"
|
||||
#
|
||||
# End HACK
|
||||
#
|
||||
@ -3425,7 +3426,7 @@ static const void *lt_preloaded_setup() {
|
||||
finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
|
||||
fi
|
||||
|
||||
if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
|
||||
if test $need_relink = no || test "$build_libtool_libs" != yes; then
|
||||
# Replace the output file specification.
|
||||
compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
|
||||
link_command="$compile_command$compile_rpath"
|
||||
@ -3550,7 +3551,7 @@ static const void *lt_preloaded_setup() {
|
||||
relink_command="$var=\"$var_value\"; export $var; $relink_command"
|
||||
fi
|
||||
done
|
||||
relink_command="(cd `pwd`; $relink_command)"
|
||||
relink_command="cd `pwd`; $relink_command"
|
||||
relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
|
||||
fi
|
||||
|
||||
@ -3704,9 +3705,9 @@ else
|
||||
# Add our own library path to $shlibpath_var
|
||||
###################################################################
|
||||
# HACK: This hack has been in HDF5's ltmain.sh file from since I
|
||||
# started messing with the Makefile/configure system. I'm loathe to
|
||||
# remove it because it seems to work for us.
|
||||
#
|
||||
# started messing with the Makefile/configure system. I'm loathe to
|
||||
# remove it because it seems to work for us.
|
||||
#
|
||||
##$shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
|
||||
$shlibpath_var=\"$finalize_shlibpath$temp_rpath\$$shlibpath_var\"
|
||||
#
|
||||
@ -3803,7 +3804,7 @@ fi\
|
||||
$show "mkdir $gentop"
|
||||
$run mkdir "$gentop"
|
||||
status=$?
|
||||
if test "$status" -ne 0 && test ! -d "$gentop"; then
|
||||
if test $status -ne 0 && test ! -d "$gentop"; then
|
||||
exit $status
|
||||
fi
|
||||
generated="$generated $gentop"
|
||||
@ -3823,7 +3824,7 @@ fi\
|
||||
$show "mkdir $xdir"
|
||||
$run mkdir "$xdir"
|
||||
status=$?
|
||||
if test "$status" -ne 0 && test ! -d "$xdir"; then
|
||||
if test $status -ne 0 && test ! -d "$xdir"; then
|
||||
exit $status
|
||||
fi
|
||||
$show "(cd $xdir && $AR x $xabs)"
|
||||
@ -3890,7 +3891,7 @@ fi\
|
||||
fi
|
||||
done
|
||||
# Quote the link command for shipping.
|
||||
relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args)"
|
||||
relink_command="cd `pwd`; $SHELL $0 --mode=relink $libtool_args"
|
||||
relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
|
||||
|
||||
# Only create the output if not a dry run.
|
||||
@ -3980,7 +3981,7 @@ dlpreopen='$dlprefiles'
|
||||
|
||||
# Directory that this library needs to be installed in:
|
||||
libdir='$install_libdir'"
|
||||
if test "$installed" = no && test "$need_relink" = yes; then
|
||||
if test "$installed" = no && test $need_relink = yes; then
|
||||
$echo >> $output "\
|
||||
relink_command=\"$relink_command\""
|
||||
fi
|
||||
@ -4116,7 +4117,7 @@ relink_command=\"$relink_command\""
|
||||
|
||||
# Not a directory, so check to see that there is only one file specified.
|
||||
set dummy $files
|
||||
if test "$#" -gt 2; then
|
||||
if test $# -gt 2; then
|
||||
$echo "$modename: \`$dest' is not a directory" 1>&2
|
||||
$echo "$help" 1>&2
|
||||
exit 1
|
||||
@ -4218,7 +4219,7 @@ relink_command=\"$relink_command\""
|
||||
$run eval "$striplib $destdir/$realname" || exit $?
|
||||
fi
|
||||
|
||||
if test "$#" -gt 0; then
|
||||
if test $# -gt 0; then
|
||||
# Delete the old symlinks, and create new ones.
|
||||
for linkname
|
||||
do
|
||||
@ -4351,13 +4352,7 @@ relink_command=\"$relink_command\""
|
||||
if test "$finalize" = yes && test -z "$run"; then
|
||||
tmpdir="/tmp"
|
||||
test -n "$TMPDIR" && tmpdir="$TMPDIR"
|
||||
tmpdir=`mktemp -d $tmpdir/libtool-XXXXXX 2> /dev/null`
|
||||
if test $? = 0 ; then :
|
||||
else
|
||||
tmpdir="/tmp"
|
||||
test -n "$TMPDIR" && tmpdir="$TMPDIR"
|
||||
tmpdir="$tmpdir/libtool-$$"
|
||||
fi
|
||||
tmpdir="$tmpdir/libtool-$$"
|
||||
if $mkdir -p "$tmpdir" && chmod 700 "$tmpdir"; then :
|
||||
else
|
||||
$echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
|
||||
@ -4482,7 +4477,7 @@ relink_command=\"$relink_command\""
|
||||
fi
|
||||
|
||||
# Exit here if they wanted silent mode.
|
||||
test "$show" = : && exit 0
|
||||
test "$show" = ":" && exit 0
|
||||
|
||||
echo "----------------------------------------------------------------------"
|
||||
echo "Libraries have been installed in:"
|
||||
@ -4648,7 +4643,7 @@ relink_command=\"$relink_command\""
|
||||
fi
|
||||
|
||||
# Now prepare to actually exec the command.
|
||||
exec_cmd="\$cmd$args"
|
||||
exec_cmd='"$cmd"$args'
|
||||
else
|
||||
# Display what would be done.
|
||||
if test -n "$shlibpath_var"; then
|
||||
@ -4698,10 +4693,10 @@ relink_command=\"$relink_command\""
|
||||
objdir="$dir/$objdir"
|
||||
fi
|
||||
name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
|
||||
test "$mode" = uninstall && objdir="$dir"
|
||||
test $mode = uninstall && objdir="$dir"
|
||||
|
||||
# Remember objdir for removal later, being careful to avoid duplicates
|
||||
if test "$mode" = clean; then
|
||||
if test $mode = clean; then
|
||||
case " $rmdirs " in
|
||||
*" $objdir "*) ;;
|
||||
*) rmdirs="$rmdirs $objdir" ;;
|
||||
@ -4733,9 +4728,9 @@ relink_command=\"$relink_command\""
|
||||
rmfiles="$rmfiles $objdir/$n"
|
||||
done
|
||||
test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
|
||||
test "$mode" = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
|
||||
test $mode = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
|
||||
|
||||
if test "$mode" = uninstall; then
|
||||
if test $mode = uninstall; then
|
||||
if test -n "$library_names"; then
|
||||
# Do each command in the postuninstall commands.
|
||||
eval cmds=\"$postuninstall_cmds\"
|
||||
@ -4744,7 +4739,7 @@ relink_command=\"$relink_command\""
|
||||
IFS="$save_ifs"
|
||||
$show "$cmd"
|
||||
$run eval "$cmd"
|
||||
if test "$?" -ne 0 && test "$rmforce" != yes; then
|
||||
if test $? != 0 && test "$rmforce" != yes; then
|
||||
exit_status=1
|
||||
fi
|
||||
done
|
||||
@ -4759,7 +4754,7 @@ relink_command=\"$relink_command\""
|
||||
IFS="$save_ifs"
|
||||
$show "$cmd"
|
||||
$run eval "$cmd"
|
||||
if test "$?" -ne 0 && test "$rmforce" != yes; then
|
||||
if test $? != 0 && test "$rmforce" != yes; then
|
||||
exit_status=1
|
||||
fi
|
||||
done
|
||||
@ -4779,7 +4774,7 @@ relink_command=\"$relink_command\""
|
||||
|
||||
*)
|
||||
# Do a test to see if this is a libtool program.
|
||||
if test "$mode" = clean &&
|
||||
if test $mode = clean &&
|
||||
(sed -e '4q' $file | egrep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
|
||||
relink_command=
|
||||
. $dir/$file
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user