aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorseanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b>2010-07-27 21:57:07 +0000
committerseanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b>2010-07-27 21:57:07 +0000
commit2c79b41903b9483e57ab646e1016a355a04c3df2 (patch)
treeeb45702aee2dbcce056f9325db62aef4d82d58f3 /include
parentbebdb0fda152a29d8e336408d2eee31d06bce0d7 (diff)
Add ability to use system libedit and update bundled libedit.
The version of libedit that is bundled with asterisk is old and has some bugs. This patch updates the bundled version of libedit within asterisk, and also updates asterisk to use the system libedit instead if one is available (and pkg-config is available). This review integrates several patches from other users specifically kkm and tzafrir. (closes issue #15929) Reported by: kkm Patches: 015929-astcli-editrc-trunk.240324.diff uploaded by kkm (license 888) (issue #16858) Reported by: jw-asterisk (closes issue #17039) Reported by: tzafrir Patches: 0001-allow-using-system-copy-of-libedit.patch uploaded by tzafrir (license 46) Review: https://reviewboard.asterisk.org/r/807/ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.8@280019 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include')
-rw-r--r--include/asterisk/autoconfig.h.in3
-rw-r--r--include/asterisk/term.h6
2 files changed, 6 insertions, 3 deletions
diff --git a/include/asterisk/autoconfig.h.in b/include/asterisk/autoconfig.h.in
index acd3140c7..6fd10e8ae 100644
--- a/include/asterisk/autoconfig.h.in
+++ b/include/asterisk/autoconfig.h.in
@@ -354,6 +354,9 @@
/* Define to 1 if you have the OpenLDAP library. */
#undef HAVE_LDAP
+/* Define if your system has the NetBSD Editline libraries. */
+#undef HAVE_LIBEDIT
+
/* Define to 1 if you have the <libintl.h> header file. */
#undef HAVE_LIBINTL_H
diff --git a/include/asterisk/term.h b/include/asterisk/term.h
index bbdc75319..a9df7f2be 100644
--- a/include/asterisk/term.h
+++ b/include/asterisk/term.h
@@ -98,11 +98,11 @@ void term_filter_escapes(char *line);
char *term_prompt(char *outbuf, const char *inbuf, int maxout);
-char *term_prep(void);
+char *ast_term_prep(void);
-char *term_end(void);
+char *ast_term_end(void);
-char *term_quit(void);
+char *ast_term_quit(void);
#if defined(__cplusplus) || defined(c_plusplus)
}