Merge branch 'lukeh/moonshot' of github.com:heimdal/heimdal into lukeh/moonshot

Conflicts:
	lib/gssapi/version-script.map
This commit is contained in:
Luke Howard
2011-03-21 23:55:54 +11:00
8 changed files with 1897 additions and 1886 deletions

View File

@@ -86,6 +86,7 @@ EXPORTS
gss_set_name_attribute gss_set_name_attribute
gss_set_sec_context_option gss_set_sec_context_option
gss_sign gss_sign
gss_store_cred
gss_test_oid_set_member gss_test_oid_set_member
gss_unseal gss_unseal
gss_unwrap gss_unwrap

1084
lib/libedit/aclocal.m4 vendored

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -7,35 +7,34 @@
'0', '0',
1, 1,
[ [
'/Users/lha/prefix/share/autoconf' '/usr/local/share/autoconf'
], ],
[ [
'/Users/lha/prefix/share/autoconf/autoconf/autoconf.m4f', '/usr/local/share/autoconf/autoconf/autoconf.m4f',
'/Users/lha/prefix/share/aclocal/argz.m4', '/usr/local/share/aclocal/argz.m4',
'/Users/lha/prefix/share/aclocal/libtool.m4', '/usr/local/share/aclocal/libtool.m4',
'/Users/lha/prefix/share/aclocal/ltdl.m4', '/usr/local/share/aclocal/ltdl.m4',
'/Users/lha/prefix/share/aclocal/ltoptions.m4', '/usr/local/share/aclocal/ltoptions.m4',
'/Users/lha/prefix/share/aclocal/ltsugar.m4', '/usr/local/share/aclocal/ltsugar.m4',
'/Users/lha/prefix/share/aclocal/ltversion.m4', '/usr/local/share/aclocal/ltversion.m4',
'/Users/lha/prefix/share/aclocal/lt~obsolete.m4', '/usr/local/share/aclocal/lt~obsolete.m4',
'/Users/lha/prefix/share/aclocal-1.11/amversion.m4', '/usr/local/share/aclocal-1.10/amversion.m4',
'/Users/lha/prefix/share/aclocal-1.11/auxdir.m4', '/usr/local/share/aclocal-1.10/auxdir.m4',
'/Users/lha/prefix/share/aclocal-1.11/cond.m4', '/usr/local/share/aclocal-1.10/cond.m4',
'/Users/lha/prefix/share/aclocal-1.11/depend.m4', '/usr/local/share/aclocal-1.10/depend.m4',
'/Users/lha/prefix/share/aclocal-1.11/depout.m4', '/usr/local/share/aclocal-1.10/depout.m4',
'/Users/lha/prefix/share/aclocal-1.11/init.m4', '/usr/local/share/aclocal-1.10/init.m4',
'/Users/lha/prefix/share/aclocal-1.11/install-sh.m4', '/usr/local/share/aclocal-1.10/install-sh.m4',
'/Users/lha/prefix/share/aclocal-1.11/lead-dot.m4', '/usr/local/share/aclocal-1.10/lead-dot.m4',
'/Users/lha/prefix/share/aclocal-1.11/make.m4', '/usr/local/share/aclocal-1.10/make.m4',
'/Users/lha/prefix/share/aclocal-1.11/missing.m4', '/usr/local/share/aclocal-1.10/missing.m4',
'/Users/lha/prefix/share/aclocal-1.11/mkdirp.m4', '/usr/local/share/aclocal-1.10/mkdirp.m4',
'/Users/lha/prefix/share/aclocal-1.11/options.m4', '/usr/local/share/aclocal-1.10/options.m4',
'/Users/lha/prefix/share/aclocal-1.11/runlog.m4', '/usr/local/share/aclocal-1.10/runlog.m4',
'/Users/lha/prefix/share/aclocal-1.11/sanity.m4', '/usr/local/share/aclocal-1.10/sanity.m4',
'/Users/lha/prefix/share/aclocal-1.11/silent.m4', '/usr/local/share/aclocal-1.10/strip.m4',
'/Users/lha/prefix/share/aclocal-1.11/strip.m4', '/usr/local/share/aclocal-1.10/substnot.m4',
'/Users/lha/prefix/share/aclocal-1.11/substnot.m4', '/usr/local/share/aclocal-1.10/tar.m4',
'/Users/lha/prefix/share/aclocal-1.11/tar.m4',
'acinclude.m4', 'acinclude.m4',
'configure.ac' 'configure.ac'
], ],
@@ -48,7 +47,6 @@
'_LT_AC_LANG_CXX_CONFIG' => 1, '_LT_AC_LANG_CXX_CONFIG' => 1,
'AM_PROG_MKDIR_P' => 1, 'AM_PROG_MKDIR_P' => 1,
'AM_AUTOMAKE_VERSION' => 1, 'AM_AUTOMAKE_VERSION' => 1,
'AM_SUBST_NOTMAKE' => 1,
'AM_MISSING_PROG' => 1, 'AM_MISSING_PROG' => 1,
'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1, 'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1,
'_LT_AC_LANG_C_CONFIG' => 1, '_LT_AC_LANG_C_CONFIG' => 1,
@@ -56,8 +54,8 @@
'_m4_warn' => 1, '_m4_warn' => 1,
'AC_LIBTOOL_OBJDIR' => 1, 'AC_LIBTOOL_OBJDIR' => 1,
'gl_FUNC_ARGZ' => 1, 'gl_FUNC_ARGZ' => 1,
'LTOBSOLETE_VERSION' => 1,
'AM_SANITY_CHECK' => 1, 'AM_SANITY_CHECK' => 1,
'LTOBSOLETE_VERSION' => 1,
'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1, 'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1,
'AC_LIBTOOL_PROG_COMPILER_PIC' => 1, 'AC_LIBTOOL_PROG_COMPILER_PIC' => 1,
'LT_LIB_M' => 1, 'LT_LIB_M' => 1,
@@ -71,10 +69,10 @@
'_LT_WITH_SYSROOT' => 1, '_LT_WITH_SYSROOT' => 1,
'LT_SYS_DLOPEN_DEPLIBS' => 1, 'LT_SYS_DLOPEN_DEPLIBS' => 1,
'LT_FUNC_DLSYM_USCORE' => 1, 'LT_FUNC_DLSYM_USCORE' => 1,
'AC_LIBTOOL_CONFIG' => 1,
'_LT_AC_LANG_F77' => 1, '_LT_AC_LANG_F77' => 1,
'_AM_SUBST_NOTMAKE' => 1, 'AC_LIBTOOL_CONFIG' => 1,
'AC_LTDL_DLLIB' => 1, 'AC_LTDL_DLLIB' => 1,
'_AM_SUBST_NOTMAKE' => 1,
'_AM_AUTOCONF_VERSION' => 1, '_AM_AUTOCONF_VERSION' => 1,
'AM_DISABLE_SHARED' => 1, 'AM_DISABLE_SHARED' => 1,
'_LT_PROG_ECHO_BACKSLASH' => 1, '_LT_PROG_ECHO_BACKSLASH' => 1,
@@ -109,7 +107,6 @@
'AC_LTDL_OBJDIR' => 1, 'AC_LTDL_OBJDIR' => 1,
'_LT_PATH_TOOL_PREFIX' => 1, '_LT_PATH_TOOL_PREFIX' => 1,
'AC_LIBTOOL_RC' => 1, 'AC_LIBTOOL_RC' => 1,
'AM_SILENT_RULES' => 1,
'AC_DISABLE_FAST_INSTALL' => 1, 'AC_DISABLE_FAST_INSTALL' => 1,
'_LT_AC_PROG_ECHO_BACKSLASH' => 1, '_LT_AC_PROG_ECHO_BACKSLASH' => 1,
'_LT_AC_SYS_LIBPATH_AIX' => 1, '_LT_AC_SYS_LIBPATH_AIX' => 1,
@@ -223,280 +220,6 @@
bless( [ bless( [
'1', '1',
1, 1,
[
'/Users/lha/prefix/share/autoconf'
],
[
'/Users/lha/prefix/share/autoconf/autoconf/autoconf.m4f',
'aclocal.m4',
'configure.ac'
],
{
'_LT_AC_TAGCONFIG' => 1,
'AM_PROG_F77_C_O' => 1,
'm4_pattern_forbid' => 1,
'AC_INIT' => 1,
'_AM_COND_IF' => 1,
'AC_CANONICAL_TARGET' => 1,
'AC_SUBST' => 1,
'AC_CONFIG_LIBOBJ_DIR' => 1,
'AC_FC_SRCEXT' => 1,
'AC_CANONICAL_HOST' => 1,
'AC_PROG_LIBTOOL' => 1,
'AM_INIT_AUTOMAKE' => 1,
'AC_CONFIG_SUBDIRS' => 1,
'AM_AUTOMAKE_VERSION' => 1,
'LT_CONFIG_LTDL_DIR' => 1,
'AC_REQUIRE_AUX_FILE' => 1,
'AC_CONFIG_LINKS' => 1,
'm4_sinclude' => 1,
'LT_SUPPORTED_TAG' => 1,
'AM_MAINTAINER_MODE' => 1,
'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
'_m4_warn' => 1,
'AM_PROG_CXX_C_O' => 1,
'_AM_COND_ENDIF' => 1,
'AM_ENABLE_MULTILIB' => 1,
'AM_SILENT_RULES' => 1,
'AC_CONFIG_FILES' => 1,
'LT_INIT' => 1,
'include' => 1,
'AM_GNU_GETTEXT' => 1,
'AC_LIBSOURCE' => 1,
'AM_PROG_FC_C_O' => 1,
'AC_CANONICAL_BUILD' => 1,
'AC_FC_FREEFORM' => 1,
'AH_OUTPUT' => 1,
'_AM_SUBST_NOTMAKE' => 1,
'AC_CONFIG_AUX_DIR' => 1,
'sinclude' => 1,
'm4_pattern_allow' => 1,
'AM_PROG_CC_C_O' => 1,
'AC_CANONICAL_SYSTEM' => 1,
'AM_CONDITIONAL' => 1,
'AC_CONFIG_HEADERS' => 1,
'AC_DEFINE_TRACE_LITERAL' => 1,
'm4_include' => 1,
'_AM_COND_ELSE' => 1,
'AC_SUBST_TRACE' => 1
}
], 'Autom4te::Request' ),
bless( [
'2',
1,
[
'/usr/local/share/autoconf'
],
[
'/usr/local/share/autoconf/autoconf/autoconf.m4f',
'/usr/local/share/aclocal/argz.m4',
'/usr/local/share/aclocal/libtool.m4',
'/usr/local/share/aclocal/ltdl.m4',
'/usr/local/share/aclocal/ltoptions.m4',
'/usr/local/share/aclocal/ltsugar.m4',
'/usr/local/share/aclocal/ltversion.m4',
'/usr/local/share/aclocal/lt~obsolete.m4',
'/usr/local/share/aclocal-1.10/amversion.m4',
'/usr/local/share/aclocal-1.10/auxdir.m4',
'/usr/local/share/aclocal-1.10/cond.m4',
'/usr/local/share/aclocal-1.10/depend.m4',
'/usr/local/share/aclocal-1.10/depout.m4',
'/usr/local/share/aclocal-1.10/init.m4',
'/usr/local/share/aclocal-1.10/install-sh.m4',
'/usr/local/share/aclocal-1.10/lead-dot.m4',
'/usr/local/share/aclocal-1.10/make.m4',
'/usr/local/share/aclocal-1.10/missing.m4',
'/usr/local/share/aclocal-1.10/mkdirp.m4',
'/usr/local/share/aclocal-1.10/options.m4',
'/usr/local/share/aclocal-1.10/runlog.m4',
'/usr/local/share/aclocal-1.10/sanity.m4',
'/usr/local/share/aclocal-1.10/strip.m4',
'/usr/local/share/aclocal-1.10/substnot.m4',
'/usr/local/share/aclocal-1.10/tar.m4',
'acinclude.m4',
'configure.ac'
],
{
'AM_ENABLE_STATIC' => 1,
'AC_LIBTOOL_LANG_RC_CONFIG' => 1,
'_LT_AC_SHELL_INIT' => 1,
'AC_DEFUN' => 1,
'AC_PROG_LIBTOOL' => 1,
'_LT_AC_LANG_CXX_CONFIG' => 1,
'AM_PROG_MKDIR_P' => 1,
'AM_AUTOMAKE_VERSION' => 1,
'AM_MISSING_PROG' => 1,
'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1,
'_LT_AC_LANG_C_CONFIG' => 1,
'AM_PROG_INSTALL_STRIP' => 1,
'_m4_warn' => 1,
'AC_LIBTOOL_OBJDIR' => 1,
'gl_FUNC_ARGZ' => 1,
'AM_SANITY_CHECK' => 1,
'LTOBSOLETE_VERSION' => 1,
'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1,
'AC_LIBTOOL_PROG_COMPILER_PIC' => 1,
'LT_LIB_M' => 1,
'_LT_AC_CHECK_DLFCN' => 1,
'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1,
'LTSUGAR_VERSION' => 1,
'_LT_PROG_LTMAIN' => 1,
'LT_SYS_SYMBOL_USCORE' => 1,
'_AM_PROG_TAR' => 1,
'AC_LIBTOOL_GCJ' => 1,
'LT_SYS_DLOPEN_DEPLIBS' => 1,
'LT_FUNC_DLSYM_USCORE' => 1,
'_LT_AC_LANG_F77' => 1,
'AC_LIBTOOL_CONFIG' => 1,
'_AM_SUBST_NOTMAKE' => 1,
'AC_LTDL_DLLIB' => 1,
'_AM_AUTOCONF_VERSION' => 1,
'AM_DISABLE_SHARED' => 1,
'_LT_PROG_ECHO_BACKSLASH' => 1,
'_LTDL_SETUP' => 1,
'_LT_AC_LANG_CXX' => 1,
'AM_PROG_LIBTOOL' => 1,
'AC_LIB_LTDL' => 1,
'_LT_AC_FILE_LTDLL_C' => 1,
'AM_PROG_LD' => 1,
'EL_GETPW_R_POSIX' => 1,
'AU_DEFUN' => 1,
'AC_PROG_NM' => 1,
'AC_LIBTOOL_DLOPEN' => 1,
'AC_PROG_LD' => 1,
'AC_PROG_LD_GNU' => 1,
'AC_ENABLE_FAST_INSTALL' => 1,
'AC_LIBTOOL_FC' => 1,
'LTDL_CONVENIENCE' => 1,
'_AM_SET_OPTION' => 1,
'AC_LTDL_PREOPEN' => 1,
'_LT_LINKER_BOILERPLATE' => 1,
'_LT_PREPARE_SED_QUOTE_VARS' => 1,
'AC_LIBTOOL_LANG_CXX_CONFIG' => 1,
'AC_LIBTOOL_PROG_CC_C_O' => 1,
'gl_PREREQ_ARGZ' => 1,
'LT_SUPPORTED_TAG' => 1,
'AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
'LT_PROG_RC' => 1,
'LT_SYS_MODULE_EXT' => 1,
'AC_DEFUN_ONCE' => 1,
'_LT_AC_LANG_GCJ' => 1,
'AC_LTDL_OBJDIR' => 1,
'_LT_PATH_TOOL_PREFIX' => 1,
'AC_LIBTOOL_RC' => 1,
'AC_DISABLE_FAST_INSTALL' => 1,
'_LT_AC_PROG_ECHO_BACKSLASH' => 1,
'_LT_AC_SYS_LIBPATH_AIX' => 1,
'_LT_AC_TRY_DLOPEN_SELF' => 1,
'include' => 1,
'LT_AC_PROG_SED' => 1,
'AM_ENABLE_SHARED' => 1,
'LTDL_INSTALLABLE' => 1,
'_LT_AC_LANG_GCJ_CONFIG' => 1,
'AC_ENABLE_SHARED' => 1,
'AC_ENABLE_STATIC' => 1,
'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1,
'_LT_REQUIRED_DARWIN_CHECKS' => 1,
'_LT_AC_TAGVAR' => 1,
'EL_MANTYPE' => 1,
'AC_LIBTOOL_LANG_F77_CONFIG' => 1,
'AM_CONDITIONAL' => 1,
'LT_LIB_DLLOAD' => 1,
'LTDL_INIT' => 1,
'_LT_PROG_F77' => 1,
'_LT_PROG_CXX' => 1,
'LTVERSION_VERSION' => 1,
'AM_PROG_INSTALL_SH' => 1,
'm4_include' => 1,
'AC_PROG_EGREP' => 1,
'_AC_AM_CONFIG_HEADER_HOOK' => 1,
'AC_PATH_MAGIC' => 1,
'AC_LTDL_SYSSEARCHPATH' => 1,
'AM_MAKE_INCLUDE' => 1,
'LT_CMD_MAX_LEN' => 1,
'_LT_AC_TAGCONFIG' => 1,
'm4_pattern_forbid' => 1,
'_LT_LINKER_OPTION' => 1,
'AC_LIBTOOL_COMPILER_OPTION' => 1,
'AC_DISABLE_SHARED' => 1,
'_LT_COMPILER_BOILERPLATE' => 1,
'AC_LIBTOOL_WIN32_DLL' => 1,
'AC_LIBTOOL_SETUP' => 1,
'AC_PROG_LD_RELOAD_FLAG' => 1,
'AC_LTDL_DLSYM_USCORE' => 1,
'AM_MISSING_HAS_RUN' => 1,
'LT_LANG' => 1,
'LT_SYS_DLSEARCH_PATH' => 1,
'LT_CONFIG_LTDL_DIR' => 1,
'AC_LIBTOOL_DLOPEN_SELF' => 1,
'LT_OUTPUT' => 1,
'AC_LIBTOOL_PROG_LD_SHLIBS' => 1,
'AC_WITH_LTDL' => 1,
'AC_LIBTOOL_LINKER_OPTION' => 1,
'LT_AC_PROG_RC' => 1,
'AC_LIBTOOL_CXX' => 1,
'LT_INIT' => 1,
'LT_AC_PROG_GCJ' => 1,
'LT_SYS_DLOPEN_SELF' => 1,
'_LT_AC_PROG_CXXCPP' => 1,
'AM_DEP_TRACK' => 1,
'AM_DISABLE_STATIC' => 1,
'_AC_PROG_LIBTOOL' => 1,
'_AM_IF_OPTION' => 1,
'EL_ENABLE_WIDEC' => 1,
'AC_PATH_TOOL_PREFIX' => 1,
'AC_LIBTOOL_F77' => 1,
'm4_pattern_allow' => 1,
'AM_SET_LEADING_DOT' => 1,
'LT_AC_PROG_EGREP' => 1,
'_LT_PROG_FC' => 1,
'_AM_DEPENDENCIES' => 1,
'AC_LIBTOOL_LANG_C_CONFIG' => 1,
'LTOPTIONS_VERSION' => 1,
'_LT_AC_SYS_COMPILER' => 1,
'AM_PROG_NM' => 1,
'EL_GETPW_R_DRAFT' => 1,
'AC_LIBLTDL_CONVENIENCE' => 1,
'AC_DEPLIBS_CHECK_METHOD' => 1,
'AM_SET_CURRENT_AUTOMAKE_VERSION' => 1,
'AC_LIBLTDL_INSTALLABLE' => 1,
'AC_LTDL_ENABLE_INSTALL' => 1,
'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1,
'LT_PROG_GCJ' => 1,
'AM_INIT_AUTOMAKE' => 1,
'AC_DISABLE_STATIC' => 1,
'LT_PATH_NM' => 1,
'AC_LTDL_SHLIBEXT' => 1,
'_LT_AC_LOCK' => 1,
'_LT_AC_LANG_RC_CONFIG' => 1,
'LT_SYS_MODULE_PATH' => 1,
'AC_LIBTOOL_POSTDEP_PREDEP' => 1,
'LT_WITH_LTDL' => 1,
'AC_LTDL_SHLIBPATH' => 1,
'AM_AUX_DIR_EXPAND' => 1,
'_LT_AC_LANG_F77_CONFIG' => 1,
'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1,
'_AM_SET_OPTIONS' => 1,
'_LT_COMPILER_OPTION' => 1,
'_AM_OUTPUT_DEPENDENCY_COMMANDS' => 1,
'AM_RUN_LOG' => 1,
'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1,
'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1,
'AC_LIBTOOL_PICMODE' => 1,
'LT_PATH_LD' => 1,
'AC_CHECK_LIBM' => 1,
'AC_LIBTOOL_SYS_LIB_STRIP' => 1,
'_AM_MANGLE_OPTION' => 1,
'AC_LTDL_SYMBOL_USCORE' => 1,
'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1,
'AM_SET_DEPDIR' => 1,
'_LT_CC_BASENAME' => 1,
'_LT_LIBOBJ' => 1
}
], 'Autom4te::Request' ),
bless( [
'3',
1,
[ [
'/usr/local/share/autoconf' '/usr/local/share/autoconf'
], ],

File diff suppressed because it is too large Load Diff

View File

@@ -1,4 +1,4 @@
m4trace:aclocal.m4:9406: -1- m4_include([acinclude.m4]) m4trace:aclocal.m4:9331: -1- m4_include([acinclude.m4])
m4trace:configure.ac:13: -1- AC_INIT([libedit], [EL_RELEASE], [], [libedit-EL_TIMESTAMP]) m4trace:configure.ac:13: -1- AC_INIT([libedit], [EL_RELEASE], [], [libedit-EL_TIMESTAMP])
m4trace:configure.ac:13: -1- m4_pattern_forbid([^_?A[CHUM]_]) m4trace:configure.ac:13: -1- m4_pattern_forbid([^_?A[CHUM]_])
m4trace:configure.ac:13: -1- m4_pattern_forbid([_AC_]) m4trace:configure.ac:13: -1- m4_pattern_forbid([_AC_])
@@ -267,7 +267,7 @@ m4trace:configure.ac:18: -1- AC_DEFINE_TRACE_LITERAL([_TANDEM_SOURCE])
m4trace:configure.ac:18: -1- m4_pattern_allow([^_TANDEM_SOURCE$]) m4trace:configure.ac:18: -1- m4_pattern_allow([^_TANDEM_SOURCE$])
m4trace:configure.ac:20: -1- AM_INIT_AUTOMAKE m4trace:configure.ac:20: -1- AM_INIT_AUTOMAKE
m4trace:configure.ac:20: -1- m4_pattern_allow([^AM_[A-Z]+FLAGS$]) m4trace:configure.ac:20: -1- m4_pattern_allow([^AM_[A-Z]+FLAGS$])
m4trace:configure.ac:20: -1- AM_AUTOMAKE_VERSION([1.11.1]) m4trace:configure.ac:20: -1- AM_AUTOMAKE_VERSION([1.10.3])
m4trace:configure.ac:20: -1- AC_REQUIRE_AUX_FILE([install-sh]) m4trace:configure.ac:20: -1- AC_REQUIRE_AUX_FILE([install-sh])
m4trace:configure.ac:20: -1- AC_SUBST([INSTALL_PROGRAM]) m4trace:configure.ac:20: -1- AC_SUBST([INSTALL_PROGRAM])
m4trace:configure.ac:20: -1- AC_SUBST_TRACE([INSTALL_PROGRAM]) m4trace:configure.ac:20: -1- AC_SUBST_TRACE([INSTALL_PROGRAM])
@@ -507,14 +507,6 @@ m4trace:configure.ac:21: -1- m4_pattern_allow([^HAVE_DLFCN_H$])
m4trace:configure.ac:24: -1- AC_SUBST([LT_VERSION], [0:36:0]) m4trace:configure.ac:24: -1- AC_SUBST([LT_VERSION], [0:36:0])
m4trace:configure.ac:24: -1- AC_SUBST_TRACE([LT_VERSION]) m4trace:configure.ac:24: -1- AC_SUBST_TRACE([LT_VERSION])
m4trace:configure.ac:24: -1- m4_pattern_allow([^LT_VERSION$]) m4trace:configure.ac:24: -1- m4_pattern_allow([^LT_VERSION$])
m4trace:configure.ac:26: -1- AM_SILENT_RULES([yes])
m4trace:configure.ac:26: -1- AC_SUBST([AM_DEFAULT_VERBOSITY])
m4trace:configure.ac:26: -1- AC_SUBST_TRACE([AM_DEFAULT_VERBOSITY])
m4trace:configure.ac:26: -1- m4_pattern_allow([^AM_DEFAULT_VERBOSITY$])
m4trace:configure.ac:26: -1- AC_SUBST([AM_BACKSLASH])
m4trace:configure.ac:26: -1- AC_SUBST_TRACE([AM_BACKSLASH])
m4trace:configure.ac:26: -1- m4_pattern_allow([^AM_BACKSLASH$])
m4trace:configure.ac:26: -1- _AM_SUBST_NOTMAKE([AM_BACKSLASH])
m4trace:configure.ac:31: -1- AC_SUBST([LN_S], [$as_ln_s]) m4trace:configure.ac:31: -1- AC_SUBST([LN_S], [$as_ln_s])
m4trace:configure.ac:31: -1- AC_SUBST_TRACE([LN_S]) m4trace:configure.ac:31: -1- AC_SUBST_TRACE([LN_S])
m4trace:configure.ac:31: -1- m4_pattern_allow([^LN_S$]) m4trace:configure.ac:31: -1- m4_pattern_allow([^LN_S$])
@@ -527,14 +519,14 @@ m4trace:configure.ac:33: -1- m4_pattern_allow([^NROFF$])
m4trace:configure.ac:33: -1- AC_SUBST([MANTYPE]) m4trace:configure.ac:33: -1- AC_SUBST([MANTYPE])
m4trace:configure.ac:33: -1- AC_SUBST_TRACE([MANTYPE]) m4trace:configure.ac:33: -1- AC_SUBST_TRACE([MANTYPE])
m4trace:configure.ac:33: -1- m4_pattern_allow([^MANTYPE$]) m4trace:configure.ac:33: -1- m4_pattern_allow([^MANTYPE$])
m4trace:configure.ac:38: -1- AH_OUTPUT([HAVE_LIBCURSES], [/* Define to 1 if you have the `curses\' library (-lcurses). */ m4trace:configure.ac:36: -1- AH_OUTPUT([HAVE_LIBCURSES], [/* Define to 1 if you have the `curses\' library (-lcurses). */
@%:@undef HAVE_LIBCURSES]) @%:@undef HAVE_LIBCURSES])
m4trace:configure.ac:38: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBCURSES]) m4trace:configure.ac:36: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBCURSES])
m4trace:configure.ac:38: -1- m4_pattern_allow([^HAVE_LIBCURSES$]) m4trace:configure.ac:36: -1- m4_pattern_allow([^HAVE_LIBCURSES$])
m4trace:configure.ac:38: -1- AH_OUTPUT([HAVE_LIBNCURSES], [/* Define to 1 if you have the `ncurses\' library (-lncurses). */ m4trace:configure.ac:36: -1- AH_OUTPUT([HAVE_LIBNCURSES], [/* Define to 1 if you have the `ncurses\' library (-lncurses). */
@%:@undef HAVE_LIBNCURSES]) @%:@undef HAVE_LIBNCURSES])
m4trace:configure.ac:38: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBNCURSES]) m4trace:configure.ac:36: -1- AC_DEFINE_TRACE_LITERAL([HAVE_LIBNCURSES])
m4trace:configure.ac:38: -1- m4_pattern_allow([^HAVE_LIBNCURSES$]) m4trace:configure.ac:36: -1- m4_pattern_allow([^HAVE_LIBNCURSES$])
m4trace:configure.ac:42: -1- AC_DEFINE_TRACE_LITERAL([WIDECHAR]) m4trace:configure.ac:42: -1- AC_DEFINE_TRACE_LITERAL([WIDECHAR])
m4trace:configure.ac:42: -1- m4_pattern_allow([^WIDECHAR$]) m4trace:configure.ac:42: -1- m4_pattern_allow([^WIDECHAR$])
m4trace:configure.ac:42: -1- AH_OUTPUT([WIDECHAR], [/* Define to 1 if you want wide-character code */ m4trace:configure.ac:42: -1- AH_OUTPUT([WIDECHAR], [/* Define to 1 if you want wide-character code */
@@ -548,6 +540,10 @@ m4trace:configure.ac:42: -1- AC_SUBST_TRACE([WIDECHAR_FALSE])
m4trace:configure.ac:42: -1- m4_pattern_allow([^WIDECHAR_FALSE$]) m4trace:configure.ac:42: -1- m4_pattern_allow([^WIDECHAR_FALSE$])
m4trace:configure.ac:42: -1- _AM_SUBST_NOTMAKE([WIDECHAR_TRUE]) m4trace:configure.ac:42: -1- _AM_SUBST_NOTMAKE([WIDECHAR_TRUE])
m4trace:configure.ac:42: -1- _AM_SUBST_NOTMAKE([WIDECHAR_FALSE]) m4trace:configure.ac:42: -1- _AM_SUBST_NOTMAKE([WIDECHAR_FALSE])
m4trace:configure.ac:45: -1- AC_DEFINE_TRACE_LITERAL([size_t])
m4trace:configure.ac:45: -1- m4_pattern_allow([^size_t$])
m4trace:configure.ac:45: -1- AH_OUTPUT([size_t], [/* Define to `unsigned int\' if <sys/types.h> does not define. */
@%:@undef size_t])
m4trace:configure.ac:45: -1- AC_DEFINE_TRACE_LITERAL([HAVE_ALLOCA_H]) m4trace:configure.ac:45: -1- AC_DEFINE_TRACE_LITERAL([HAVE_ALLOCA_H])
m4trace:configure.ac:45: -1- m4_pattern_allow([^HAVE_ALLOCA_H$]) m4trace:configure.ac:45: -1- m4_pattern_allow([^HAVE_ALLOCA_H$])
m4trace:configure.ac:45: -1- AH_OUTPUT([HAVE_ALLOCA_H], [/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix). m4trace:configure.ac:45: -1- AH_OUTPUT([HAVE_ALLOCA_H], [/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix).
@@ -621,10 +617,10 @@ m4trace:configure.ac:49: -1- AH_OUTPUT([HAVE_NCURSES_H], [/* Define to 1 if you
@%:@undef HAVE_NCURSES_H]) @%:@undef HAVE_NCURSES_H])
m4trace:configure.ac:49: -1- AH_OUTPUT([HAVE_SYS_CDEFS_H], [/* Define to 1 if you have the <sys/cdefs.h> header file. */ m4trace:configure.ac:49: -1- AH_OUTPUT([HAVE_SYS_CDEFS_H], [/* Define to 1 if you have the <sys/cdefs.h> header file. */
@%:@undef HAVE_SYS_CDEFS_H]) @%:@undef HAVE_SYS_CDEFS_H])
m4trace:configure.ac:60: -1- AH_OUTPUT([HAVE_TERM_H], [/* Define to 1 if you have the <term.h> header file. */ m4trace:configure.ac:54: -1- AH_OUTPUT([HAVE_TERM_H], [/* Define to 1 if you have the <term.h> header file. */
@%:@undef HAVE_TERM_H]) @%:@undef HAVE_TERM_H])
m4trace:configure.ac:60: -1- AC_DEFINE_TRACE_LITERAL([HAVE_TERM_H]) m4trace:configure.ac:54: -1- AC_DEFINE_TRACE_LITERAL([HAVE_TERM_H])
m4trace:configure.ac:60: -1- m4_pattern_allow([^HAVE_TERM_H$]) m4trace:configure.ac:54: -1- m4_pattern_allow([^HAVE_TERM_H$])
m4trace:configure.ac:63: -1- AC_DEFINE_TRACE_LITERAL([const]) m4trace:configure.ac:63: -1- AC_DEFINE_TRACE_LITERAL([const])
m4trace:configure.ac:63: -1- m4_pattern_allow([^const$]) m4trace:configure.ac:63: -1- m4_pattern_allow([^const$])
m4trace:configure.ac:63: -1- AH_OUTPUT([const], [/* Define to empty if `const\' does not conform to ANSI C. */ m4trace:configure.ac:63: -1- AH_OUTPUT([const], [/* Define to empty if `const\' does not conform to ANSI C. */
@@ -666,7 +662,7 @@ m4trace:configure.ac:70: -1- m4_pattern_allow([^HAVE_WORKING_FORK$])
m4trace:configure.ac:70: -1- AH_OUTPUT([HAVE_WORKING_FORK], [/* Define to 1 if `fork\' works. */ m4trace:configure.ac:70: -1- AH_OUTPUT([HAVE_WORKING_FORK], [/* Define to 1 if `fork\' works. */
@%:@undef HAVE_WORKING_FORK]) @%:@undef HAVE_WORKING_FORK])
m4trace:configure.ac:75: -1- _m4_warn([obsolete], [The macro `AC_TYPE_SIGNAL' is obsolete. m4trace:configure.ac:75: -1- _m4_warn([obsolete], [The macro `AC_TYPE_SIGNAL' is obsolete.
You should run autoupdate.], [../../lib/autoconf/types.m4:751: AC_TYPE_SIGNAL is expanded from... You should run autoupdate.], [../../lib/autoconf/types.m4:738: AC_TYPE_SIGNAL is expanded from...
configure.ac:75: the top level]) configure.ac:75: the top level])
m4trace:configure.ac:75: -1- AC_DEFINE_TRACE_LITERAL([RETSIGTYPE]) m4trace:configure.ac:75: -1- AC_DEFINE_TRACE_LITERAL([RETSIGTYPE])
m4trace:configure.ac:75: -1- m4_pattern_allow([^RETSIGTYPE$]) m4trace:configure.ac:75: -1- m4_pattern_allow([^RETSIGTYPE$])
@@ -677,14 +673,14 @@ m4trace:configure.ac:76: -1- m4_pattern_allow([^LSTAT_FOLLOWS_SLASHED_SYMLINK$])
m4trace:configure.ac:76: -1- AH_OUTPUT([LSTAT_FOLLOWS_SLASHED_SYMLINK], [/* Define to 1 if `lstat\' dereferences a symlink specified with a trailing m4trace:configure.ac:76: -1- AH_OUTPUT([LSTAT_FOLLOWS_SLASHED_SYMLINK], [/* Define to 1 if `lstat\' dereferences a symlink specified with a trailing
slash. */ slash. */
@%:@undef LSTAT_FOLLOWS_SLASHED_SYMLINK]) @%:@undef LSTAT_FOLLOWS_SLASHED_SYMLINK])
m4trace:configure.ac:76: -1- AC_LIBSOURCE([lstat.c])
m4trace:configure.ac:76: -1- AC_SUBST([LIB@&t@OBJS], ["$LIB@&t@OBJS lstat.$ac_objext"]) m4trace:configure.ac:76: -1- AC_SUBST([LIB@&t@OBJS], ["$LIB@&t@OBJS lstat.$ac_objext"])
m4trace:configure.ac:76: -1- AC_SUBST_TRACE([LIB@&t@OBJS]) m4trace:configure.ac:76: -1- AC_SUBST_TRACE([LIB@&t@OBJS])
m4trace:configure.ac:76: -1- m4_pattern_allow([^LIB@&t@OBJS$]) m4trace:configure.ac:76: -1- m4_pattern_allow([^LIB@&t@OBJS$])
m4trace:configure.ac:76: -1- AC_LIBSOURCE([stat.c]) m4trace:configure.ac:76: -1- AC_LIBSOURCE([lstat.c])
m4trace:configure.ac:76: -1- AC_SUBST([LIB@&t@OBJS], ["$LIB@&t@OBJS stat.$ac_objext"]) m4trace:configure.ac:76: -1- AC_SUBST([LIB@&t@OBJS], ["$LIB@&t@OBJS stat.$ac_objext"])
m4trace:configure.ac:76: -1- AC_SUBST_TRACE([LIB@&t@OBJS]) m4trace:configure.ac:76: -1- AC_SUBST_TRACE([LIB@&t@OBJS])
m4trace:configure.ac:76: -1- m4_pattern_allow([^LIB@&t@OBJS$]) m4trace:configure.ac:76: -1- m4_pattern_allow([^LIB@&t@OBJS$])
m4trace:configure.ac:76: -1- AC_LIBSOURCE([stat.c])
m4trace:configure.ac:76: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STAT_EMPTY_STRING_BUG]) m4trace:configure.ac:76: -1- AC_DEFINE_TRACE_LITERAL([HAVE_STAT_EMPTY_STRING_BUG])
m4trace:configure.ac:76: -1- m4_pattern_allow([^HAVE_STAT_EMPTY_STRING_BUG$]) m4trace:configure.ac:76: -1- m4_pattern_allow([^HAVE_STAT_EMPTY_STRING_BUG$])
m4trace:configure.ac:76: -1- AH_OUTPUT([HAVE_STAT_EMPTY_STRING_BUG], [/* Define to 1 if `stat\' has the bug that it succeeds when given the m4trace:configure.ac:76: -1- AH_OUTPUT([HAVE_STAT_EMPTY_STRING_BUG], [/* Define to 1 if `stat\' has the bug that it succeeds when given the
@@ -723,8 +719,8 @@ m4trace:configure.ac:77: -1- AH_OUTPUT([HAVE_ISSETUGID], [/* Define to 1 if you
m4trace:configure.ac:77: -1- AH_OUTPUT([HAVE_WCSDUP], [/* Define to 1 if you have the `wcsdup\' function. */ m4trace:configure.ac:77: -1- AH_OUTPUT([HAVE_WCSDUP], [/* Define to 1 if you have the `wcsdup\' function. */
@%:@undef HAVE_WCSDUP]) @%:@undef HAVE_WCSDUP])
m4trace:configure.ac:78: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete. m4trace:configure.ac:78: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
You should run autoupdate.], [../../lib/autoconf/general.m4:2655: AC_TRY_LINK is expanded from... You should run autoupdate.], [../../lib/autoconf/general.m4:2688: AC_TRY_LINK is expanded from...
acinclude.m4:50: EL_GETPW_R_POSIX is expanded from... acinclude.m4:36: EL_GETPW_R_POSIX is expanded from...
configure.ac:78: the top level]) configure.ac:78: the top level])
m4trace:configure.ac:78: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GETPW_R_POSIX]) m4trace:configure.ac:78: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GETPW_R_POSIX])
m4trace:configure.ac:78: -1- m4_pattern_allow([^HAVE_GETPW_R_POSIX$]) m4trace:configure.ac:78: -1- m4_pattern_allow([^HAVE_GETPW_R_POSIX$])
@@ -732,49 +728,38 @@ m4trace:configure.ac:78: -1- AH_OUTPUT([HAVE_GETPW_R_POSIX], [/* Define to 1 if
compatible. */ compatible. */
@%:@undef HAVE_GETPW_R_POSIX]) @%:@undef HAVE_GETPW_R_POSIX])
m4trace:configure.ac:79: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete. m4trace:configure.ac:79: -1- _m4_warn([obsolete], [The macro `AC_TRY_LINK' is obsolete.
You should run autoupdate.], [../../lib/autoconf/general.m4:2655: AC_TRY_LINK is expanded from... You should run autoupdate.], [../../lib/autoconf/general.m4:2688: AC_TRY_LINK is expanded from...
acinclude.m4:66: EL_GETPW_R_DRAFT is expanded from... acinclude.m4:52: EL_GETPW_R_DRAFT is expanded from...
configure.ac:79: the top level]) configure.ac:79: the top level])
m4trace:configure.ac:79: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GETPW_R_DRAFT]) m4trace:configure.ac:79: -1- AC_DEFINE_TRACE_LITERAL([HAVE_GETPW_R_DRAFT])
m4trace:configure.ac:79: -1- m4_pattern_allow([^HAVE_GETPW_R_DRAFT$]) m4trace:configure.ac:79: -1- m4_pattern_allow([^HAVE_GETPW_R_DRAFT$])
m4trace:configure.ac:79: -1- AH_OUTPUT([HAVE_GETPW_R_DRAFT], [/* Define to 1 if you have getpwnam_r and getpwuid_r that are draft POSIX.1 m4trace:configure.ac:79: -1- AH_OUTPUT([HAVE_GETPW_R_DRAFT], [/* Define to 1 if you have getpwnam_r and getpwuid_r that are draft POSIX.1
versions. */ versions. */
@%:@undef HAVE_GETPW_R_DRAFT]) @%:@undef HAVE_GETPW_R_DRAFT])
m4trace:configure.ac:87: -1- AH_OUTPUT([zzzz1], [ m4trace:configure.ac:82: -1- AH_OUTPUT([zzzz1], [
#include "sys.h" #include "sys.h"
#define SCCSID #define SCCSID
#undef LIBC_SCCS #undef LIBC_SCCS
#define lint #define lint
]) ])
m4trace:configure.ac:93: -1- AC_CONFIG_FILES([Makefile m4trace:configure.ac:89: -1- AC_CONFIG_FILES([Makefile
libedit.pc
src/Makefile src/Makefile
doc/Makefile ])
examples/Makefile]) m4trace:configure.ac:92: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs])
m4trace:configure.ac:94: -1- AC_SUBST([LIB@&t@OBJS], [$ac_libobjs]) m4trace:configure.ac:92: -1- AC_SUBST_TRACE([LIB@&t@OBJS])
m4trace:configure.ac:94: -1- AC_SUBST_TRACE([LIB@&t@OBJS]) m4trace:configure.ac:92: -1- m4_pattern_allow([^LIB@&t@OBJS$])
m4trace:configure.ac:94: -1- m4_pattern_allow([^LIB@&t@OBJS$]) m4trace:configure.ac:92: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs])
m4trace:configure.ac:94: -1- AC_SUBST([LTLIBOBJS], [$ac_ltlibobjs]) m4trace:configure.ac:92: -1- AC_SUBST_TRACE([LTLIBOBJS])
m4trace:configure.ac:94: -1- AC_SUBST_TRACE([LTLIBOBJS]) m4trace:configure.ac:92: -1- m4_pattern_allow([^LTLIBOBJS$])
m4trace:configure.ac:94: -1- m4_pattern_allow([^LTLIBOBJS$]) m4trace:configure.ac:92: -1- AC_SUBST_TRACE([top_builddir])
m4trace:configure.ac:94: -1- AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"]) m4trace:configure.ac:92: -1- AC_SUBST_TRACE([top_build_prefix])
m4trace:configure.ac:94: -1- AC_SUBST([am__EXEEXT_TRUE]) m4trace:configure.ac:92: -1- AC_SUBST_TRACE([srcdir])
m4trace:configure.ac:94: -1- AC_SUBST_TRACE([am__EXEEXT_TRUE]) m4trace:configure.ac:92: -1- AC_SUBST_TRACE([abs_srcdir])
m4trace:configure.ac:94: -1- m4_pattern_allow([^am__EXEEXT_TRUE$]) m4trace:configure.ac:92: -1- AC_SUBST_TRACE([top_srcdir])
m4trace:configure.ac:94: -1- AC_SUBST([am__EXEEXT_FALSE]) m4trace:configure.ac:92: -1- AC_SUBST_TRACE([abs_top_srcdir])
m4trace:configure.ac:94: -1- AC_SUBST_TRACE([am__EXEEXT_FALSE]) m4trace:configure.ac:92: -1- AC_SUBST_TRACE([builddir])
m4trace:configure.ac:94: -1- m4_pattern_allow([^am__EXEEXT_FALSE$]) m4trace:configure.ac:92: -1- AC_SUBST_TRACE([abs_builddir])
m4trace:configure.ac:94: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_TRUE]) m4trace:configure.ac:92: -1- AC_SUBST_TRACE([abs_top_builddir])
m4trace:configure.ac:94: -1- _AM_SUBST_NOTMAKE([am__EXEEXT_FALSE]) m4trace:configure.ac:92: -1- AC_SUBST_TRACE([INSTALL])
m4trace:configure.ac:94: -1- AC_SUBST_TRACE([top_builddir]) m4trace:configure.ac:92: -1- AC_SUBST_TRACE([MKDIR_P])
m4trace:configure.ac:94: -1- AC_SUBST_TRACE([top_build_prefix]) m4trace:configure.ac:92: -1- AC_REQUIRE_AUX_FILE([ltmain.sh])
m4trace:configure.ac:94: -1- AC_SUBST_TRACE([srcdir])
m4trace:configure.ac:94: -1- AC_SUBST_TRACE([abs_srcdir])
m4trace:configure.ac:94: -1- AC_SUBST_TRACE([top_srcdir])
m4trace:configure.ac:94: -1- AC_SUBST_TRACE([abs_top_srcdir])
m4trace:configure.ac:94: -1- AC_SUBST_TRACE([builddir])
m4trace:configure.ac:94: -1- AC_SUBST_TRACE([abs_builddir])
m4trace:configure.ac:94: -1- AC_SUBST_TRACE([abs_top_builddir])
m4trace:configure.ac:94: -1- AC_SUBST_TRACE([INSTALL])
m4trace:configure.ac:94: -1- AC_SUBST_TRACE([MKDIR_P])
m4trace:configure.ac:94: -1- AC_REQUIRE_AUX_FILE([ltmain.sh])

View File

@@ -918,34 +918,11 @@ vi_comment_out(EditLine *el, Int c)
* NB: posix implies that we should enter insert mode, however * NB: posix implies that we should enter insert mode, however
* this is against historical precedent... * this is against historical precedent...
*/ */
#ifdef __weak_reference
__weakref_visible char *my_get_alias_text(const char *)
__weak_reference(get_alias_text);
#endif
protected el_action_t protected el_action_t
/*ARGSUSED*/ /*ARGSUSED*/
vi_alias(EditLine *el, Int c) vi_alias(EditLine *el, Int c)
{ {
#ifdef __weak_reference
char alias_name[3];
char *alias_text;
if (my_get_alias_text == 0) {
return CC_ERROR;
}
alias_name[0] = '_';
alias_name[2] = 0;
if (el_getc(el, &alias_name[1]) != 1)
return CC_ERROR;
alias_text = my_get_alias_text(alias_name);
if (alias_text != NULL)
FUN(el,push)(el, ct_decode_string(alias_text, &el->el_scratch));
return CC_NORM;
#else
return CC_ERROR; return CC_ERROR;
#endif
} }
/* vi_to_history_line(): /* vi_to_history_line():