From b48de203e7486c64249971486012bde9295298c4 Mon Sep 17 00:00:00 2001
From: Joachim Nilsson <joachim.nilsson@vmlinux.org>
Date: Mon, 2 Aug 2010 16:02:59 +0200
Subject: [PATCH] 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.
---
 src/Makefile.am |  6 +-----
 src/Makefile.in | 12 +++---------
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 4493edb..47cb2fd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,3 @@
 AUTOMAKE_OPTIONS        = foreign
 lib_LTLIBRARIES         = libeditline.la
-libeditline_la_SOURCES  = editline.c editline.h sysunix.c unix.h
-if CONFIG_DEFAULT_COMPLETE
-# Built-in completion handler.
-libeditline_la_SOURCES += complete.c
-endif
+libeditline_la_SOURCES  = editline.c editline.h complete.c sysunix.c unix.h
diff --git a/src/Makefile.in b/src/Makefile.in
index ee5f05a..2036e8d 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -34,8 +34,6 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-# Built-in completion handler.
-@CONFIG_DEFAULT_COMPLETE_TRUE@am__append_1 = complete.c
 subdir = src
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -73,10 +71,7 @@ am__base_list = \
 am__installdirs = "$(DESTDIR)$(libdir)"
 LTLIBRARIES = $(lib_LTLIBRARIES)
 libeditline_la_LIBADD =
-am__libeditline_la_SOURCES_DIST = editline.c editline.h sysunix.c \
-	unix.h complete.c
-@CONFIG_DEFAULT_COMPLETE_TRUE@am__objects_1 = complete.lo
-am_libeditline_la_OBJECTS = editline.lo sysunix.lo $(am__objects_1)
+am_libeditline_la_OBJECTS = editline.lo complete.lo sysunix.lo
 libeditline_la_OBJECTS = $(am_libeditline_la_OBJECTS)
 AM_V_lt = $(am__v_lt_$(V))
 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_0 = @echo "  GEN   " $@;
 SOURCES = $(libeditline_la_SOURCES)
-DIST_SOURCES = $(am__libeditline_la_SOURCES_DIST)
+DIST_SOURCES = $(libeditline_la_SOURCES)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -228,8 +223,7 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = foreign
 lib_LTLIBRARIES = libeditline.la
-libeditline_la_SOURCES = editline.c editline.h sysunix.c unix.h \
-	$(am__append_1)
+libeditline_la_SOURCES = editline.c editline.h complete.c sysunix.c unix.h
 all: all-am
 
 .SUFFIXES: