[svn-commits] seanbright: branch 1.8 r280019 - in /branches/1.8: ./ build_tools/ include/as...
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Tue Jul 27 16:57:16 CDT 2010
Author: seanbright
Date: Tue Jul 27 16:57:07 2010
New Revision: 280019
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=280019
Log:
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/
Removed:
branches/1.8/main/editline/
Modified:
branches/1.8/build_tools/menuselect-deps.in
branches/1.8/configure
branches/1.8/configure.ac
branches/1.8/include/asterisk/autoconfig.h.in
branches/1.8/include/asterisk/term.h
branches/1.8/main/ (props changed)
branches/1.8/main/Makefile
branches/1.8/main/asterisk.c
branches/1.8/main/cli.c
branches/1.8/main/term.c
branches/1.8/main/xmldoc.c
branches/1.8/makeopts.in
Modified: branches/1.8/build_tools/menuselect-deps.in
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/build_tools/menuselect-deps.in?view=diff&rev=280019&r1=280018&r2=280019
==============================================================================
--- branches/1.8/build_tools/menuselect-deps.in (original)
+++ branches/1.8/build_tools/menuselect-deps.in Tue Jul 27 16:57:07 2010
@@ -23,6 +23,7 @@
JACK=@PBX_JACK@
KQUEUE=@PBX_KQUEUE@
LDAP=@PBX_LDAP@
+LIBEDIT=@PBX_LIBEDIT@
LIBXML2=@PBX_LIBXML2@
LTDL=@PBX_LTDL@
LUA=@PBX_LUA@
Modified: branches/1.8/configure.ac
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/configure.ac?view=diff&rev=280019&r1=280018&r2=280019
==============================================================================
--- branches/1.8/configure.ac (original)
+++ branches/1.8/configure.ac Tue Jul 27 16:57:07 2010
@@ -336,6 +336,7 @@
AST_EXT_LIB_SETUP([KQUEUE], [kqueue support], [kqueue])
AST_EXT_LIB_SETUP([LDAP], [OpenLDAP], [ldap])
AST_LIBCURL_CHECK_CONFIG([], [7.10.1])
+AST_EXT_LIB_SETUP([LIBEDIT], [NetBSD Editline library], [libedit])
AST_EXT_LIB_SETUP([LIBXML2], [LibXML2], [libxml2])
AST_EXT_LIB_SETUP([LTDL], [libtool], [ltdl])
AST_EXT_LIB_SETUP([LUA], [Lua], [lua])
@@ -1959,6 +1960,51 @@
AC_SUBST(GTK2_INCLUDE)
AC_SUBST(GTK2_LIB)
+PBX_LIBEDIT=0
+LIBEDIT_INCLUDE="-Ieditline -Ieditline/readline"
+LIBEDIT_LIB=
+LIBEDIT_EXTRA_LIB=
+LIBEDIT_OBJ=editline/libedit.a
+if test "${USE_LIBEDIT}" != "no"; then
+ AC_CHECK_TOOL(PKGCONFIG, pkg-config, no)
+ if test "${PKGCONFIG}" != "no"; then
+ if ${PKGCONFIG} --exists libedit; then
+ LIBEDIT_INCLUDE=$(${PKGCONFIG} libedit --cflags)
+ LIBEDIT_LIB=$(${PKGCONFIG} libedit --libs)
+ LIBEDIT_OBJ=
+ PBX_LIBEDIT=1
+ AC_DEFINE([HAVE_LIBEDIT], 1, [Define if your system has the NetBSD Editline libraries.])
+ fi
+ fi
+fi
+if test "${PBX_LIBEDIT}" != "1"; then
+ AC_CHECK_HEADER([vis.h], [HAS_VIS_H=yes], [HAS_VIS_H=no])
+ if test "${HAS_VIS_H}" = "yes"; then
+ # We may need -lbsd
+ old_LIBS=${LIBS}
+ LIBS=""
+ AC_LINK_IFELSE(
+ AC_LANG_PROGRAM(
+ [#include <stdlib.h>
+ #include <vis.h>], [vis(NULL,0,0,0)]),
+ ,
+ LIBS="-lbsd"
+ AC_LINK_IFELSE(
+ AC_LANG_PROGRAM(
+ [#include <stdlib.h>
+ #include <vis.h>], [vis(NULL,0,0,0)]),
+ LIBEDIT_EXTRA_LIB=$LIBS
+ )
+ )
+ LIBS=${old_LIBS}
+ fi
+fi
+AC_SUBST(PBX_LIBEDIT)
+AC_SUBST(LIBEDIT_INCLUDE)
+AC_SUBST(LIBEDIT_LIB)
+AC_SUBST(LIBEDIT_EXTRA_LIB)
+AC_SUBST(LIBEDIT_OBJ)
+
# build a GENERIC_ODBC result based on the presence of either UnixODBC (preferred)
# or iODBC
Modified: branches/1.8/include/asterisk/autoconfig.h.in
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/include/asterisk/autoconfig.h.in?view=diff&rev=280019&r1=280018&r2=280019
==============================================================================
--- branches/1.8/include/asterisk/autoconfig.h.in (original)
+++ branches/1.8/include/asterisk/autoconfig.h.in Tue Jul 27 16:57:07 2010
@@ -353,6 +353,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
Modified: branches/1.8/include/asterisk/term.h
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/include/asterisk/term.h?view=diff&rev=280019&r1=280018&r2=280019
==============================================================================
--- branches/1.8/include/asterisk/term.h (original)
+++ branches/1.8/include/asterisk/term.h Tue Jul 27 16:57:07 2010
@@ -98,11 +98,11 @@
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)
}
Propchange: branches/1.8/main/
------------------------------------------------------------------------------
--- svn:externals (added)
+++ svn:externals Tue Jul 27 16:57:07 2010
@@ -1,0 +1,1 @@
+editline https://origsvn.digium.com/svn/thirdparty/editline/trunk/
Modified: branches/1.8/main/Makefile
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/main/Makefile?view=diff&rev=280019&r1=280018&r2=280019
==============================================================================
--- branches/1.8/main/Makefile (original)
+++ branches/1.8/main/Makefile Tue Jul 27 16:57:07 2010
@@ -104,8 +104,8 @@
CHECK_SUBDIR: # do nothing, just make sure that we recurse in the subdir/
editline/libedit.a: CHECK_SUBDIR
- cd editline && test -f config.h || CFLAGS="$(PTHREAD_CFLAGS) $(subst $(ASTTOPDIR),../../,$(_ASTCFLAGS:-Werror=) $(ASTCFLAGS))" LDFLAGS="$(_ASTLDFLAGS) $(ASTLDFLAGS)" ./configure --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --with-ncurses=$(NCURSES_DIR) --with-curses=$(CURSES_DIR) --with-termcap=$(TERMCAP_DIR) --with-tinfo=$(TINFO_DIR)
- $(MAKE) -C editline libedit.a
+ cd editline && CFLAGS="$(PTHREAD_CFLAGS) $(subst $(ASTTOPDIR),../../,$(_ASTCFLAGS:-Werror=) $(ASTCFLAGS))" LDFLAGS="$(_ASTLDFLAGS) $(ASTLDFLAGS)" ./configure --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
+ $(MAKE) -C editline lib_a
db1-ast/libdb1.a: CHECK_SUBDIR
_ASTCFLAGS="$(_ASTCFLAGS) -Wno-strict-aliasing" ASTCFLAGS="$(ASTCFLAGS)" $(MAKE) -C db1-ast libdb1.a
@@ -137,7 +137,11 @@
$(CC) -g -c -Iinclude -DSTANDALONE ast_expr2f.c
$(CC) -g -c -Iinclude -DSTANDALONE ast_expr2.c
$(CC) -g -o testexpr2 ast_expr2f.o ast_expr2.o -lm
- rm ast_expr2.o ast_expr2f.o
+ rm ast_expr2.o ast_expr2f.o
+
+asterisk.o: ASTCFLAGS+=$(LIBEDIT_INCLUDE)
+
+cli.o: ASTCFLAGS+=$(LIBEDIT_INCLUDE)
ifneq ($(findstring ENABLE_UPLOADS,$(MENUSELECT_CFLAGS)),)
http.o: _ASTCFLAGS+=$(GMIME_INCLUDE)
@@ -173,13 +177,13 @@
$(OBJS): _ASTCFLAGS+=-DAST_MODULE=\"core\"
-$(MAIN_TGT): $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS)
+$(MAIN_TGT): $(OBJS) $(LIBEDIT_OBJ) db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS)
@$(CC) -c -o buildinfo.o $(_ASTCFLAGS) buildinfo.c $(ASTCFLAGS)
- $(ECHO_PREFIX) echo " [LD] $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) -> $@"
+ $(ECHO_PREFIX) echo " [LD] $(OBJS) $(LIBEDIT_OBJ) db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) $(LIBEDIT_EXTRA_LIB) -> $@"
ifneq ($(findstring chan_h323,$(MENUSELECT_CHANNELS)),)
- $(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(ASTLDFLAGS) $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(GMIMELDFLAGS)
-else
- $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(GMIMELDFLAGS)
+ $(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(ASTLDFLAGS) $(OBJS) $(LIBEDIT_OBJ) db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(GMIMELDFLAGS) $(LIBEDIT_LIB) $(LIBEDIT_EXTRA_LIB)
+else
+ $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(ASTLDFLAGS) $(H323LDFLAGS) $(OBJS) $(LIBEDIT_OBJ) db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(GMIMELDFLAGS) $(LIBEDIT_LIB) $(LIBEDIT_EXTRA_LIB)
endif
ifeq ($(GNU_LD),1)
Modified: branches/1.8/main/asterisk.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/main/asterisk.c?view=diff&rev=280019&r1=280018&r2=280019
==============================================================================
--- branches/1.8/main/asterisk.c (original)
+++ branches/1.8/main/asterisk.c Tue Jul 27 16:57:07 2010
@@ -107,6 +107,8 @@
#endif /* HAVE_CAP */
#endif /* linux */
+#include <histedit.h>
+
#include "asterisk/paths.h" /* we define here the variables so better agree on the prototype */
#include "asterisk/network.h"
#include "asterisk/cli.h"
@@ -130,7 +132,6 @@
#include "asterisk/utils.h"
#include "asterisk/file.h"
#include "asterisk/io.h"
-#include "editline/histedit.h"
#include "asterisk/config.h"
#include "asterisk/ast_version.h"
#include "asterisk/linkedlists.h"
@@ -1669,7 +1670,7 @@
close(ast_consock);
if (!ast_opt_remote)
unlink(ast_config_AST_PID);
- printf("%s", term_quit());
+ printf("%s", ast_term_quit());
if (restart) {
if (option_verbose || ast_opt_console)
ast_verbose("Preparing for Asterisk restart...\n");
@@ -1772,7 +1773,7 @@
static void consolehandler(char *s)
{
- printf("%s", term_end());
+ printf("%s", ast_term_end());
fflush(stdout);
/* Called when readline data is available */
@@ -2157,7 +2158,7 @@
for (tries = 0; tries < 30 * reconnects_per_second; tries++) {
if (ast_tryconnect()) {
fprintf(stderr, "Reconnect succeeded after %.3f seconds\n", 1.0 / reconnects_per_second * tries);
- printf("%s", term_quit());
+ printf("%s", ast_term_quit());
WELCOME_MESSAGE;
if (!ast_opt_mute)
fdsend(ast_consock, "logger mute silent");
@@ -2473,7 +2474,7 @@
int mlen = 0, maxmbuf = 2048;
/* Start with a 2048 byte buffer */
if (!(mbuf = ast_malloc(maxmbuf))) {
- lf->cursor[0] = savechr;
+ ((char *) lf->cursor)[0] = savechr;
return (char *)(CC_ERROR);
}
snprintf(buf, sizeof(buf), "_COMMAND MATCHESARRAY \"%s\" \"%s\"", lf->buffer, ptr);
@@ -2485,7 +2486,7 @@
/* Every step increment buffer 1024 bytes */
maxmbuf += 1024;
if (!(mbuf = ast_realloc(mbuf, maxmbuf))) {
- lf->cursor[0] = savechr;
+ ((char *) lf->cursor)[0] = savechr;
return (char *)(CC_ERROR);
}
}
@@ -2547,7 +2548,7 @@
ast_free(matches);
}
- lf->cursor[0] = savechr;
+ ((char *) lf->cursor)[0] = savechr;
return (char *)(long)retval;
}
@@ -2555,7 +2556,7 @@
static int ast_el_initialize(void)
{
HistEvent ev;
- char *editor = getenv("AST_EDITOR");
+ char *editor = getenv("AST_EDITMODE");
if (el != NULL)
el_end(el);
@@ -2583,6 +2584,17 @@
el_set(el, EL_BIND, "?", "ed-complete", NULL);
/* Bind ^D to redisplay */
el_set(el, EL_BIND, "^D", "ed-redisplay", NULL);
+ /* Bind Delete to delete char left */
+ el_set(el, EL_BIND, "\\e[3~", "ed-delete-next-char", NULL);
+ /* Bind Home and End to move to line start and end */
+ el_set(el, EL_BIND, "\\e[1~", "ed-move-to-beg", NULL);
+ el_set(el, EL_BIND, "\\e[4~", "ed-move-to-end", NULL);
+ /* Bind C-left and C-right to move by word (not all terminals) */
+ el_set(el, EL_BIND, "\\eOC", "vi-next-word", NULL);
+ el_set(el, EL_BIND, "\\eOD", "vi-prev-word", NULL);
+
+ /* Allow ~/.editrc or a file specified by EDITRC env to override */
+ el_source(el, NULL);
return 0;
}
@@ -2612,29 +2624,12 @@
static int ast_el_read_history(char *filename)
{
- char buf[MAX_HISTORY_COMMAND_LENGTH];
- FILE *f;
- int ret = -1;
+ HistEvent ev;
if (el_hist == NULL || el == NULL)
ast_el_initialize();
- if ((f = fopen(filename, "r")) == NULL)
- return ret;
-
- while (!feof(f)) {
- if (!fgets(buf, sizeof(buf), f))
- break;
- if (!strcmp(buf, "_HiStOrY_V2_\n"))
- continue;
- if (ast_all_zeros(buf))
- continue;
- if ((ret = ast_el_add_history(buf)) == -1)
- break;
- }
- fclose(f);
-
- return ret;
+ return history(el_hist, &ev, H_LOAD, filename);
}
static void ast_remotecontrol(char *data)
@@ -3498,7 +3493,7 @@
}
ast_term_init();
- printf("%s", term_end());
+ printf("%s", ast_term_end());
fflush(stdout);
if (ast_opt_console && !option_verbose)
@@ -3523,18 +3518,18 @@
quit_handler(0, 0, 0, 0);
exit(0);
}
- printf("%s", term_quit());
+ printf("%s", ast_term_quit());
ast_remotecontrol(NULL);
quit_handler(0, 0, 0, 0);
exit(0);
} else {
ast_log(LOG_ERROR, "Asterisk already running on %s. Use 'asterisk -r' to connect.\n", ast_config_AST_SOCKET);
- printf("%s", term_quit());
+ printf("%s", ast_term_quit());
exit(1);
}
} else if (ast_opt_remote || ast_opt_exec) {
ast_log(LOG_ERROR, "Unable to connect to remote asterisk (does %s exist?)\n", ast_config_AST_SOCKET);
- printf("%s", term_quit());
+ printf("%s", ast_term_quit());
exit(1);
}
/* Blindly write pid file since we couldn't connect */
@@ -3607,13 +3602,13 @@
}
if (ast_event_init()) {
- printf("%s", term_quit());
+ printf("%s", ast_term_quit());
exit(1);
}
#ifdef TEST_FRAMEWORK
if (ast_test_init()) {
- printf("%s", term_quit());
+ printf("%s", ast_term_quit());
exit(1);
}
#endif
@@ -3641,7 +3636,7 @@
initstate((unsigned int) getpid() * 65536 + (unsigned int) time(NULL), randompool, sizeof(randompool));
if (init_logger()) { /* Start logging subsystem */
- printf("%s", term_quit());
+ printf("%s", ast_term_quit());
exit(1);
}
@@ -3652,12 +3647,12 @@
ast_autoservice_init();
if (ast_timing_init()) {
- printf("%s", term_quit());
+ printf("%s", ast_term_quit());
exit(1);
}
if (ast_ssl_init()) {
- printf("%s", term_quit());
+ printf("%s", ast_term_quit());
exit(1);
}
@@ -3668,41 +3663,41 @@
/* initialize the data retrieval API */
if (ast_data_init()) {
- printf ("%s", term_quit());
+ printf ("%s", ast_term_quit());
exit(1);
}
ast_channels_init();
if ((moduleresult = load_modules(1))) { /* Load modules, pre-load only */
- printf("%s", term_quit());
+ printf("%s", ast_term_quit());
exit(moduleresult == -2 ? 2 : 1);
}
if (dnsmgr_init()) { /* Initialize the DNS manager */
- printf("%s", term_quit());
+ printf("%s", ast_term_quit());
exit(1);
}
ast_http_init(); /* Start the HTTP server, if needed */
if (init_manager()) {
- printf("%s", term_quit());
+ printf("%s", ast_term_quit());
exit(1);
}
if (ast_cdr_engine_init()) {
- printf("%s", term_quit());
+ printf("%s", ast_term_quit());
exit(1);
}
if (ast_cel_engine_init()) {
- printf("%s", term_quit());
+ printf("%s", ast_term_quit());
exit(1);
}
if (ast_device_state_engine_init()) {
- printf("%s", term_quit());
+ printf("%s", ast_term_quit());
exit(1);
}
@@ -3710,49 +3705,49 @@
ast_udptl_init();
if (ast_image_init()) {
- printf("%s", term_quit());
+ printf("%s", ast_term_quit());
exit(1);
}
if (ast_file_init()) {
- printf("%s", term_quit());
+ printf("%s", ast_term_quit());
exit(1);
}
if (load_pbx()) {
- printf("%s", term_quit());
+ printf("%s", ast_term_quit());
exit(1);
}
if (ast_indications_init()) {
- printf("%s", term_quit());
+ printf("%s", ast_term_quit());
exit(1);
}
ast_features_init();
if (init_framer()) {
- printf("%s", term_quit());
+ printf("%s", ast_term_quit());
exit(1);
}
if (astdb_init()) {
- printf("%s", term_quit());
+ printf("%s", ast_term_quit());
exit(1);
}
if (ast_enum_init()) {
- printf("%s", term_quit());
+ printf("%s", ast_term_quit());
exit(1);
}
if (ast_cc_init()) {
- printf("%s", term_quit());
+ printf("%s", ast_term_quit());
exit(1);
}
if ((moduleresult = load_modules(0))) { /* Load modules */
- printf("%s", term_quit());
+ printf("%s", ast_term_quit());
exit(moduleresult == -2 ? 2 : 1);
}
Modified: branches/1.8/main/cli.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/main/cli.c?view=diff&rev=280019&r1=280018&r2=280019
==============================================================================
--- branches/1.8/main/cli.c (original)
+++ branches/1.8/main/cli.c Tue Jul 27 16:57:07 2010
@@ -35,6 +35,11 @@
#include <regex.h>
#include <pwd.h>
#include <grp.h>
+#if defined(HAVE_LIBEDIT)
+#include <editline/readline.h>
+#else
+#include <readline.h>
+#endif
#include "asterisk/cli.h"
#include "asterisk/linkedlists.h"
@@ -44,7 +49,6 @@
#include "asterisk/utils.h"
#include "asterisk/app.h"
#include "asterisk/lock.h"
-#include "editline/readline/readline.h"
#include "asterisk/threadstorage.h"
/*!
Modified: branches/1.8/main/term.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/main/term.c?view=diff&rev=280019&r1=280018&r2=280019
==============================================================================
--- branches/1.8/main/term.c (original)
+++ branches/1.8/main/term.c Tue Jul 27 16:57:07 2010
@@ -351,17 +351,17 @@
}
}
-char *term_prep(void)
+char *ast_term_prep(void)
{
return prepdata;
}
-char *term_end(void)
+char *ast_term_end(void)
{
return enddata;
}
-char *term_quit(void)
+char *ast_term_quit(void)
{
return quitdata;
}
Modified: branches/1.8/main/xmldoc.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/main/xmldoc.c?view=diff&rev=280019&r1=280018&r2=280019
==============================================================================
--- branches/1.8/main/xmldoc.c (original)
+++ branches/1.8/main/xmldoc.c Tue Jul 27 16:57:07 2010
@@ -398,7 +398,7 @@
}
if (withcolors) {
- ast_str_append(&colorized, 0, "%s", term_end());
+ ast_str_append(&colorized, 0, "%s", ast_term_end());
if (!colorized) {
return NULL;
}
Modified: branches/1.8/makeopts.in
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/makeopts.in?view=diff&rev=280019&r1=280018&r2=280019
==============================================================================
--- branches/1.8/makeopts.in (original)
+++ branches/1.8/makeopts.in Tue Jul 27 16:57:07 2010
@@ -290,3 +290,8 @@
# if poll is not present, let the makefile know.
POLL_AVAILABLE=@HAS_POLL@
TIMERFD_INCLUDE=@TIMERFD_INCLUDE@
+
+LIBEDIT_INCLUDE=@LIBEDIT_INCLUDE@
+LIBEDIT_LIB=@LIBEDIT_LIB@
+LIBEDIT_OBJ=@LIBEDIT_OBJ@
+LIBEDIT_EXTRA_LIB=@LIBEDIT_EXTRA_LIB@
More information about the svn-commits
mailing list