external-libedit.patch

   1 Index: build_tools/menuselect-deps.in
   2 ===================================================================
   3 --- build_tools/menuselect-deps.in.orig 2010-07-28 01:30:38.000000000 +0300
   4 +++ build_tools/menuselect-deps.in      2010-10-23 12:28:17.140817003 +0300
   5 @@ -23,6 +23,7 @@
   6  JACK=@PBX_JACK@
   7  KQUEUE=@PBX_KQUEUE@
   8  LDAP=@PBX_LDAP@
   9 +LIBEDIT=@PBX_LIBEDIT@
  10  LIBXML2=@PBX_LIBXML2@
  11  LTDL=@PBX_LTDL@
  12  LUA=@PBX_LUA@
  13 Index: configure.ac
  14 ===================================================================
  15 --- configure.ac        (revision 226061)
  16 +++ configure.ac        (working copy)
  17 @@ -267,6 +267,7 @@
  18  AST_EXT_LIB_SETUP([ISDNNET], [ISDN4Linux Library], [isdnnet])
  19  AST_EXT_LIB_SETUP([JACK], [Jack Audio Connection Kit], [jack])
  20  AST_EXT_LIB_SETUP([LDAP], [OpenLDAP], [ldap])
  21 +AST_EXT_LIB_SETUP([LIBEDIT], [NetBSD Editline library], [libedit])
  22  AST_LIBCURL_CHECK_CONFIG([], [7.10.1])
  23  AST_EXT_LIB_SETUP([LIBXML2], [LibXML2], [libxml2])
  24  AST_EXT_LIB_SETUP([LTDL], [libtool], [ltdl])
  25 @@ -1593,6 +1594,27 @@
  26  AST_EXT_LIB_CHECK([SDL_IMAGE], [SDL_image], [IMG_Load], [SDL_image.h], [${SDL_LIB}], [${SDL_INCLUDE}])
  27  AST_EXT_LIB_CHECK([FFMPEG], [avcodec], [sws_getContext], [ffmpeg/avcodec.h], [-lpthread -lz -lm])
  28
  29 +PBX_LIBEDIT=0
  30 +LIBEDIT_INCLUDE=-Ieditline/readline
  31 +LIBEDIT_LIB=
  32 +LIBEDIT_OBJ=editline/libedit.a
  33 +if test  "${USE_LIBEDIT}" != "no"; then
  34 +   AC_CHECK_TOOL(PKGCONFIG, pkg-config, no)
  35 +   if test "${PKGCONFIG}" != "no"; then
  36 +      if ${PKGCONFIG} --exists libedit; then
  37 +         LIBEDIT_INCLUDE=$(${PKGCONFIG} libedit --cflags)
  38 +         LIBEDIT_LIB=$(${PKGCONFIG} libedit --libs)
  39 +         LIBEDIT_OBJ=
  40 +         PBX_LIBEDIT=1
  41 +         AC_DEFINE([HAVE_LIBEDIT], 1, [Define if your system has the NetBSD Editline libraries.])
  42 +      fi
  43 +   fi
  44 +fi
  45 +AC_SUBST(PBX_LIBEDIT)
  46 +AC_SUBST(LIBEDIT_INCLUDE)
  47 +AC_SUBST(LIBEDIT_LIB)
  48 +AC_SUBST(LIBEDIT_OBJ)
  49 +
  50  # possible places for video4linux version 1
  51  AC_CHECK_HEADER([linux/videodev.h],
  52         [AC_DEFINE_UNQUOTED([HAVE_VIDEODEV_H], 1, [Define to 1 if your system has linux/videodev.h.])])
  53 --- main/Makefile.orig  2010-08-02 17:41:46.000000000 +0300
  54 +++ main/Makefile       2010-10-23 12:25:20.520816998 +0300
  55 @@ -103,9 +103,9 @@
  56
  57  CHECK_SUBDIR:  # do nothing, just make sure that we recurse in the subdir/
  58
  59 -editline/libedit.a: CHECK_SUBDIR
  60 +$(LIBEDIT_OBJ): CHECK_SUBDIR
  61         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)
  62 -       $(MAKE) -C editline libedit.a
  63 +       $(MAKE) -C editline $(LIBEDIT_OBJ)
  64
  65  db1-ast/libdb1.a: CHECK_SUBDIR
  66         _ASTCFLAGS="$(_ASTCFLAGS) -Wno-strict-aliasing" ASTCFLAGS="$(ASTCFLAGS)" $(MAKE) -C db1-ast libdb1.a
  67 @@ -139,6 +139,8 @@
  68         $(CC) -g -o testexpr2 ast_expr2f.o ast_expr2.o -lm
  69         rm ast_expr2.o ast_expr2f.o
  70
  71 +cli.o: ASTCFLAGS+=$(LIBEDIT_INCLUDE)
  72 +
  73  ifneq ($(findstring ENABLE_UPLOADS,$(MENUSELECT_CFLAGS)),)
  74  http.o: _ASTCFLAGS+=$(GMIME_INCLUDE)
  75  endif
  76 @@ -173,13 +175,13 @@
  77
  78  $(OBJS): _ASTCFLAGS+=-DAST_MODULE=\"core\"
  79
  80 -$(MAIN_TGT): $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS)
  81 +$(MAIN_TGT): $(OBJS) $(LIBEDIT_OBJ) db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS)
  82         @$(CC) -c -o buildinfo.o $(_ASTCFLAGS) buildinfo.c $(ASTCFLAGS)
  83 -       $(ECHO_PREFIX) echo "   [LD] $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) -> $@"
  84 +       $(ECHO_PREFIX) echo "   [LD] $(OBJS) $(LIBEDIT_OBJ) db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) -> $@"
  85  ifneq ($(findstring chan_h323,$(MENUSELECT_CHANNELS)),)
  86 -       $(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)
  87 +       $(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)
  88  else
  89 -       $(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)
  90 +       $(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)
  91  endif
  92
  93  ifeq ($(GNU_LD),1)
  94
  95 Index: main/cli.c
  96 ===================================================================
  97 --- main/cli.c  (revision 226061)
  98 +++ main/cli.c  (working copy)
  99 @@ -34,6 +34,8 @@
 100  #include <ctype.h>
 101  #include <regex.h>
 102
 103 +#include <readline.h>
 104 +
 105  #include "asterisk/cli.h"
 106  #include "asterisk/linkedlists.h"
 107  #include "asterisk/module.h"
 108 @@ -42,7 +44,6 @@
 109  #include "asterisk/utils.h"
 110  #include "asterisk/app.h"
 111  #include "asterisk/lock.h"
 112 -#include "editline/readline/readline.h"
 113  #include "asterisk/threadstorage.h"
 114
 115  /*!
 116 Index: makeopts.in
 117 ===================================================================
 118 --- makeopts.in (revision 226061)
 119 +++ makeopts.in (working copy)
 120 @@ -263,3 +263,8 @@
 121  # if poll is not present, let the makefile know.
 122  POLL_AVAILABLE=@HAS_POLL@
 123  TIMERFD_INCLUDE=@TIMERFD_INCLUDE@
 124 +
 125 +LIBEDIT_INCLUDE=@LIBEDIT_INCLUDE@
 126 +LIBEDIT_LIB=@LIBEDIT_LIB@
 127 +LIBEDIT_OBJ=@LIBEDIT_OBJ@
 128 +