summaryrefslogtreecommitdiffstats
path: root/src/config
diff options
context:
space:
mode:
authorGreg Hudson <ghudson@mit.edu>2011-07-22 00:26:56 +0000
committerGreg Hudson <ghudson@mit.edu>2011-07-22 00:26:56 +0000
commited8bc7b5e8ba1f72a0ae083b3005fbe18718544b (patch)
treefc6cd75398fa2adb8ce685a50fcf56d5ee193e43 /src/config
parent0d1a70cd014579f6134d73fc073dc090f574e1c8 (diff)
downloadkrb5-ed8bc7b5e8ba1f72a0ae083b3005fbe18718544b.tar.gz
krb5-ed8bc7b5e8ba1f72a0ae083b3005fbe18718544b.tar.xz
krb5-ed8bc7b5e8ba1f72a0ae083b3005fbe18718544b.zip
Add libedit/readline support to ss
By default, look for libedit (using pkg-config) and use it in libss. Alternatively, the builder can explicitly ask for GNU Readline, but using it will break the dejagnu test suite and will also add a GPL dependency to libss and the programs using it. ticket: 6931 git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@25035 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/config')
-rw-r--r--src/config/pre.in6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/config/pre.in b/src/config/pre.in
index 7b96ebc7d..67117d6b4 100644
--- a/src/config/pre.in
+++ b/src/config/pre.in
@@ -369,9 +369,13 @@ SS_DEPS-k5 = $(BUILDTOP)/include/ss/ss.h $(BUILDTOP)/include/ss/ss_err.h
# GEN_LIB is -lgen if needed for regexp
GEN_LIB = @GEN_LIB@
+# Editline or readline flags and libraries.
+RL_CFLAGS = @RL_CFLAGS@
+RL_LIBS = @RL_LIBS@
+
SS_LIB = $(SS_LIB-@SS_VERSION@)
SS_LIB-sys = @SS_LIB@
-SS_LIB-k5 = $(TOPLIBD)/libss.a
+SS_LIB-k5 = $(TOPLIBD)/libss.a $(RL_LIBS)
KDB5_LIB = -lkdb5 $(KDB5_PLUGIN_LIBS)
DL_LIB = @DL_LIB@