mirror of
				https://github.com/troglobit/editline.git
				synced 2025-10-31 08:18:11 +08:00 
			
		
		
		
	Always build complete.c now that we have changed completion handling.
After the revert of function pointers for rl_complete() and rl_list_possib(), introduced in v0.2.2, we need to build complete.c for all configurations. The user should use the rl_set_*_func() calls merged from the Heimdal project's readline fork.
This commit is contained in:
		| @@ -1,7 +1,3 @@ | |||||||
| AUTOMAKE_OPTIONS        = foreign | AUTOMAKE_OPTIONS        = foreign | ||||||
| lib_LTLIBRARIES         = libeditline.la | lib_LTLIBRARIES         = libeditline.la | ||||||
| libeditline_la_SOURCES  = editline.c editline.h sysunix.c unix.h | libeditline_la_SOURCES  = editline.c editline.h complete.c sysunix.c unix.h | ||||||
| if CONFIG_DEFAULT_COMPLETE |  | ||||||
| # Built-in completion handler. |  | ||||||
| libeditline_la_SOURCES += complete.c |  | ||||||
| endif |  | ||||||
|   | |||||||
| @@ -34,8 +34,6 @@ PRE_UNINSTALL = : | |||||||
| POST_UNINSTALL = : | POST_UNINSTALL = : | ||||||
| build_triplet = @build@ | build_triplet = @build@ | ||||||
| host_triplet = @host@ | host_triplet = @host@ | ||||||
| # Built-in completion handler. |  | ||||||
| @CONFIG_DEFAULT_COMPLETE_TRUE@am__append_1 = complete.c |  | ||||||
| subdir = src | subdir = src | ||||||
| DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in | DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in | ||||||
| ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 | ||||||
| @@ -73,10 +71,7 @@ am__base_list = \ | |||||||
| am__installdirs = "$(DESTDIR)$(libdir)" | am__installdirs = "$(DESTDIR)$(libdir)" | ||||||
| LTLIBRARIES = $(lib_LTLIBRARIES) | LTLIBRARIES = $(lib_LTLIBRARIES) | ||||||
| libeditline_la_LIBADD = | libeditline_la_LIBADD = | ||||||
| am__libeditline_la_SOURCES_DIST = editline.c editline.h sysunix.c \ | am_libeditline_la_OBJECTS = editline.lo complete.lo sysunix.lo | ||||||
| 	unix.h complete.c |  | ||||||
| @CONFIG_DEFAULT_COMPLETE_TRUE@am__objects_1 = complete.lo |  | ||||||
| am_libeditline_la_OBJECTS = editline.lo sysunix.lo $(am__objects_1) |  | ||||||
| libeditline_la_OBJECTS = $(am_libeditline_la_OBJECTS) | libeditline_la_OBJECTS = $(am_libeditline_la_OBJECTS) | ||||||
| AM_V_lt = $(am__v_lt_$(V)) | AM_V_lt = $(am__v_lt_$(V)) | ||||||
| am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) | am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) | ||||||
| @@ -108,7 +103,7 @@ AM_V_GEN = $(am__v_GEN_$(V)) | |||||||
| am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) | am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) | ||||||
| am__v_GEN_0 = @echo "  GEN   " $@; | am__v_GEN_0 = @echo "  GEN   " $@; | ||||||
| SOURCES = $(libeditline_la_SOURCES) | SOURCES = $(libeditline_la_SOURCES) | ||||||
| DIST_SOURCES = $(am__libeditline_la_SOURCES_DIST) | DIST_SOURCES = $(libeditline_la_SOURCES) | ||||||
| ETAGS = etags | ETAGS = etags | ||||||
| CTAGS = ctags | CTAGS = ctags | ||||||
| DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) | ||||||
| @@ -228,8 +223,7 @@ top_builddir = @top_builddir@ | |||||||
| top_srcdir = @top_srcdir@ | top_srcdir = @top_srcdir@ | ||||||
| AUTOMAKE_OPTIONS = foreign | AUTOMAKE_OPTIONS = foreign | ||||||
| lib_LTLIBRARIES = libeditline.la | lib_LTLIBRARIES = libeditline.la | ||||||
| libeditline_la_SOURCES = editline.c editline.h sysunix.c unix.h \ | libeditline_la_SOURCES = editline.c editline.h complete.c sysunix.c unix.h | ||||||
| 	$(am__append_1) |  | ||||||
| all: all-am | all: all-am | ||||||
|  |  | ||||||
| .SUFFIXES: | .SUFFIXES: | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user
	 Joachim Nilsson
					Joachim Nilsson