ltmain.sh		ltmain.sh
	skipping to change at line 73		skipping to change at line 73
	# Try `$progname --help --mode=MODE' for a more detailed description of MOD E.		# Try `$progname --help --mode=MODE' for a more detailed description of MOD E.
	#		#
	# When reporting a bug, please describe a test case to reproduce it and		# When reporting a bug, please describe a test case to reproduce it and
	# include the following information:		# include the following information:
	#		#
	# host-triplet: $host		# host-triplet: $host
	# shell: $SHELL		# shell: $SHELL
	# compiler: $LTCC		# compiler: $LTCC
	# compiler flags: $LTCFLAGS		# compiler flags: $LTCFLAGS
	# linker: $LD (gnu? $with_gnu_ld)		# linker: $LD (gnu? $with_gnu_ld)
	# $progname: (GNU libtool) 2.4.2		# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.3
	# automake: $automake_version		# automake: $automake_version
	# autoconf: $autoconf_version		# autoconf: $autoconf_version
	#		#
	# Report bugs to <bug-libtool@gnu.org>.		# Report bugs to <bug-libtool@gnu.org>.
	# GNU libtool home page: <http://www.gnu.org/software/libtool/>.		# GNU libtool home page: <http://www.gnu.org/software/libtool/>.
	# General help using GNU software: <http://www.gnu.org/gethelp/>.		# General help using GNU software: <http://www.gnu.org/gethelp/>.
	PROGRAM=libtool		PROGRAM=libtool
	PACKAGE=libtool		PACKAGE=libtool
	VERSION=2.4.2		VERSION="2.4.2 Debian-2.4.2-1.3"
	TIMESTAMP=""		TIMESTAMP=""
	package_revision=1.3337		package_revision=1.3337
	# Be Bourne compatible		# Be Bourne compatible
	if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then		if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
	emulate sh		emulate sh
	NULLCMD=:		NULLCMD=:
	# Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which		# Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
	# is contrary to our usage. Disable this feature.		# is contrary to our usage. Disable this feature.
	alias -g '${1+"$@"}'='"$@"'		alias -g '${1+"$@"}'='"$@"'
	skipping to change at line 6052		skipping to change at line 6052
	if test "$linkmode,$pass" = "lib,link" ||		if test "$linkmode,$pass" = "lib,link" ||
	test "$linkmode,$pass" = "prog,scan"; then		test "$linkmode,$pass" = "prog,scan"; then
	libs="$deplibs"		libs="$deplibs"
	deplibs=		deplibs=
	fi		fi
	if test "$linkmode" = prog; then		if test "$linkmode" = prog; then
	case $pass in		case $pass in
	dlopen) libs="$dlfiles" ;;		dlopen) libs="$dlfiles" ;;
	dlpreopen) libs="$dlprefiles" ;;		dlpreopen) libs="$dlprefiles" ;;
	link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;		link)
			libs="$deplibs %DEPLIBS%"
			test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
			;;
	esac		esac
	fi		fi
	if test "$linkmode,$pass" = "lib,dlpreopen"; then		if test "$linkmode,$pass" = "lib,dlpreopen"; then
	# Collect and forward deplibs of preopened libtool libs		# Collect and forward deplibs of preopened libtool libs
	for lib in $dlprefiles; do		for lib in $dlprefiles; do
	# Ignore non-libtool-libs		# Ignore non-libtool-libs
	dependency_libs=		dependency_libs=
	func_resolve_sysroot "$lib"		func_resolve_sysroot "$lib"
	case $lib in		case $lib in
	*.la) func_source "$func_resolve_sysroot_result" ;;		*.la) func_source "$func_resolve_sysroot_result" ;;
	skipping to change at line 6371		skipping to change at line 6374
	if test "$pass" = conv; then		if test "$pass" = conv; then
	# Only check for convenience libraries		# Only check for convenience libraries
	deplibs="$lib $deplibs"		deplibs="$lib $deplibs"
	if test -z "$libdir"; then		if test -z "$libdir"; then
	if test -z "$old_library"; then		if test -z "$old_library"; then
	func_fatal_error "cannot find name of link library for \`$lib' "		func_fatal_error "cannot find name of link library for \`$lib' "
	fi		fi
	# It is a libtool convenience library, so add in its objects.		# It is a libtool convenience library, so add in its objects.
	func_append convenience " $ladir/$objdir/$old_library"		func_append convenience " $ladir/$objdir/$old_library"
	func_append old_convenience " $ladir/$objdir/$old_library"		func_append old_convenience " $ladir/$objdir/$old_library"
			tmp_libs=
			for deplib in $dependency_libs; do
			deplibs="$deplib $deplibs"
			if $opt_preserve_dup_deps ; then
			case "$tmp_libs " in
			*" $deplib "*) func_append specialdeplibs " $deplib" ;;
			esac
			fi
			func_append tmp_libs " $deplib"
			done
	elif test "$linkmode" != prog && test "$linkmode" != lib; then		elif test "$linkmode" != prog && test "$linkmode" != lib; then
	func_fatal_error "\`$lib' is not a convenience library"		func_fatal_error "\`$lib' is not a convenience library"
	fi		fi
	tmp_libs=
	for deplib in $dependency_libs; do
	deplibs="$deplib $deplibs"
	if $opt_preserve_dup_deps ; then
	case "$tmp_libs " in
	*" $deplib "*) func_append specialdeplibs " $deplib" ;;
	esac
	fi
	func_append tmp_libs " $deplib"
	done
	continue		continue
	fi # $pass = conv		fi # $pass = conv
	# Get the name of the library we link against.		# Get the name of the library we link against.
	linklib=		linklib=
	if test -n "$old_library" &&		if test -n "$old_library" &&
	{ test "$prefer_static_libs" = yes ||		{ test "$prefer_static_libs" = yes ||
	test "$prefer_static_libs,$installed" = "built,no"; }; then		test "$prefer_static_libs,$installed" = "built,no"; }; then
	linklib=$old_library		linklib=$old_library
	else		else
	skipping to change at line 7274		skipping to change at line 7277
	revision="$number_minor"		revision="$number_minor"
	age="0"		age="0"
	;;		;;
	irix|nonstopux)		irix|nonstopux)
	func_arith $number_major + $number_minor		func_arith $number_major + $number_minor
	current=$func_arith_result		current=$func_arith_result
	age="$number_minor"		age="$number_minor"
	revision="$number_minor"		revision="$number_minor"
	lt_irix_increment=no		lt_irix_increment=no
	;;		;;
			*)
			func_fatal_configuration "$modename: unknown library version typ
			e \`$version_type'"
			;;
	esac		esac
	;;		;;
	no)		no)
	current="$1"		current="$1"
	revision="$2"		revision="$2"
	age="$3"		age="$3"
	;;		;;
	esac		esac
	# Check that each of the things are valid numbers.		# Check that each of the things are valid numbers.
End of changes. 6 change blocks.
	13 lines changed or deleted		20 lines changed or added
This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/