ViewVC Help

View File | Revision Log | Show Annotations | View Changeset | Root Listing

root/svn/hopm/trunk/aclocal.m4

Comparing hopm/trunk/aclocal.m4 (file contents):
Revision 5859 by michael, Wed Jan 28 14:14:14 2015 UTC vs.
Revision 5860 by michael, Mon Apr 27 21:48:51 2015 UTC

#	Line 754 | Line 754 | _LT_COPYING
754		_LT_LIBTOOL_TAGS
755
756		# Configured defaults for sys_lib_dlsearch_path munging.
757	<	: \${LT_SYS_LIBRARY_PATH="$LT_SYS_LIBRARY_PATH"}
757	>	: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"}
758
759		# ### BEGIN LIBTOOL CONFIG
760		_LT_LIBTOOL_CONFIG_VARS
#	Line 765 | Line 765 | _LT_EOF
765
766		cat <<'_LT_EOF' >> "$cfgfile"
767
768	+	# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE
769	+
770		_LT_PREPARE_MUNGE_PATH_LIST
771		_LT_PREPARE_CC_BASENAME
772
773	+	# ### END FUNCTIONS SHARED WITH CONFIGURE
774	+
775		_LT_EOF
776
777		case $host_os in
#	Line 2267 | Line 2271 | func_munge_path_list ()
2271		x)
2272		;;
2273		*:)
2274	<	eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'` \$@S|@1\"
2274	>	eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'` \@S|@@S|@1\"
2275		;;
2276		x:*)
2277		eval @S|@1=\"\@S|@@S|@1 `$ECHO @S|@2 | $SED 's/:/ /g'`\"
#	Line 3111 | Line 3115 | if test set = "${lt_cv_sys_lib_dlsearch_
3115		sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
3116		fi
3117
3118	<	# lt_cv_sys_lib... is unaugmented for libtool script decls...
3119	<	lt_cv_sys_lib_dlsearch_path_spec=$sys_lib_dlsearch_path_spec
3118	>	# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
3119	>	configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
3120
3121	<	# ..but sys_lib_... needs LT_SYS_LIBRARY_PATH munging for
3118	<	# LT_SYS_DLSEARCH_PATH macro in ltdl.m4 to work with the correct paths:
3121	>	# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
3122		func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
3123
3124	+	# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
3125	+	configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
3126	+
3127		_LT_DECL([], [variables_saved_for_relink], [1],
3128		[Variables whose values should be saved in libtool wrapper scripts and
3129		restored at link time])
#	Line 3150 | Line 3156 | _LT_DECL([], [hardcode_into_libs], [0],
3156		[Whether we should hardcode library paths into libraries])
3157		_LT_DECL([], [sys_lib_search_path_spec], [2],
3158		[Compile-time system search path for libraries])
3159	<	_LT_DECL([sys_lib_dlsearch_path_spec], [lt_cv_sys_lib_dlsearch_path_spec], [2],
3160	<	[Run-time system search path for libraries])
3159	>	_LT_DECL([sys_lib_dlsearch_path_spec], [configure_time_dlsearch_path], [2],
3160	>	[Detected run-time system search path for libraries])
3161	>	_LT_DECL([], [configure_time_lt_sys_library_path], [2],
3162	>	[Explicit LT_SYS_LIBRARY_PATH set during ./configure time])
3163		])# _LT_SYS_DYNAMIC_LINKER
3164
3165
#	Line 8928 | Line 8936 | m4_define([lt_dict_filter],
8936
8937		# @configure_input@
8938
8939	<	# serial 4171 ltversion.m4
8939	>	# serial 4179 ltversion.m4
8940		# This file is part of GNU Libtool
8941
8942	<	m4_define([LT_PACKAGE_VERSION], [2.4.5])
8943	<	m4_define([LT_PACKAGE_REVISION], [2.4.5])
8942	>	m4_define([LT_PACKAGE_VERSION], [2.4.6])
8943	>	m4_define([LT_PACKAGE_REVISION], [2.4.6])
8944
8945		AC_DEFUN([LTVERSION_VERSION],
8946	<	[macro_version='2.4.5'
8947	<	macro_revision='2.4.5'
8946	>	[macro_version='2.4.6'
8947	>	macro_revision='2.4.6'
8948		_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
8949		_LT_DECL(, macro_revision, 0)
8950		])

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines (old)
>	Changed lines (new)