asterisk-external-libedit.patch

   1 From 016b626e7243d065c57a2dde2fdd6dc0be019060 Mon Sep 17 00:00:00 2001
   2 From: Jeffrey C. Ollie <jeff@ocjtech.us>
   3 Date: Sun, 23 Mar 2008 19:49:34 -0500
   4 Subject: [PATCH] Build using external libedit.
   5
   6 ---
   7  build_tools/menuselect-deps.in |    1 +
   8  configure.ac                   |   11 +++++++++++
   9  main/Makefile                  |   11 +++++------
  10  main/cli.c                     |    2 +-
  11  makeopts.in                    |    3 +++
  12  5 files changed, 21 insertions(+), 7 deletions(-)
  13
  14 diff --git a/build_tools/menuselect-deps.in b/build_tools/menuselect-deps.in
  15 index f2ea5e5..3df6918 100644
  16 --- a/build_tools/menuselect-deps.in
  17 +++ b/build_tools/menuselect-deps.in
  18 @@ -13,6 +13,7 @@ IKSEMEL=@PBX_IKSEMEL@
  19  IMAP_TK=@PBX_IMAP_TK@
  20  IXJUSER=@PBX_IXJUSER@
  21  KDE=@PBX_KDE@
  22 +LIBEDIT=@PBX_LIBEDIT@
  23  LTDL=@PBX_LTDL@
  24  NBS=@PBX_NBS@
  25  NETSNMP=@PBX_NETSNMP@
  26 diff --git a/configure.ac b/configure.ac
  27 index 0e08e78..3c93647 100644
  28 --- a/configure.ac
  29 +++ b/configure.ac
  30 @@ -1829,6 +1829,17 @@
  31  AC_SUBST(GTK2_INCLUDE)
  32  AC_SUBST(GTK2_LIB)
  33
  34 +AC_CHECK_TOOL(PKGCONFIG, pkg-config, No)
  35 +if test ! "x${PKGCONFIG}" = xNo; then
  36 +   LIBEDIT_INCLUDE=$(${PKGCONFIG} libedit --cflags 2>/dev/null)
  37 +   LIBEDIT_LIB=$(${PKGCONFIG} libedit --libs)
  38 +   PBX_LIBEDIT=1
  39 +   AC_DEFINE([HAVE_LIBEDIT], 1, [Define if your system has the libedit libraries.])
  40 +fi
  41 +AC_SUBST(PBX_LIBEDIT)
  42 +AC_SUBST(LIBEDIT_INCLUDE)
  43 +AC_SUBST(LIBEDIT_LIB)
  44 +
  45  if test -f makeopts; then
  46         ${ac_cv_path_EGREP} 'CURSES|GTK2|OSARCH|NEWT' makeopts > makeopts.acbak
  47  else
  48 diff --git a/main/Makefile b/main/Makefile
  49 index 53274ea..8469a33 100644
  50 --- a/main/Makefile
  51 +++ b/main/Makefile
  52 @@ -92,10 +92,6 @@
  53  ASTLINK+=-Wl,--version-script,asterisk.exports
  54  endif
  55
  56 -editline/libedit.a:
  57 -       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)
  58 -       $(MAKE) -C editline libedit.a
  59 -
  60  db1-ast/libdb1.a:
  61         _ASTCFLAGS="$(_ASTCFLAGS)" ASTCFLAGS="$(ASTCFLAGS) -Wno-strict-aliasing" $(MAKE) -C db1-ast libdb1.a
  62
  63 @@ -127,6 +123,8 @@
  64
  65  asterisk.o channel.o file.o: _ASTCFLAGS+=$(ZAPTEL_INCLUDE) $(DAHDI_INCLUDE)
  66
  67 +cli.o: ASTCLFAGS+=$(LIBEDIT_INCLUDE)
  68 +
  69  stdtime/localtime.o: _ASTCFLAGS+=$(AST_NO_STRICT_OVERFLOW)
  70
  71  AST_EMBED_LDSCRIPTS:=$(sort $(EMBED_LDSCRIPTS))
  72 @@ -141,18 +139,18 @@
  73    H323LDLIBS=
  74  endif
  75
  76 -asterisk: $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) asterisk.exports
  77 +asterisk: $(OBJS) db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) asterisk.exports
  78         @$(ASTTOPDIR)/build_tools/make_build_h > $(ASTTOPDIR)/include/asterisk/build.h.tmp
  79         @if cmp -s $(ASTTOPDIR)/include/asterisk/build.h.tmp $(ASTTOPDIR)/include/asterisk/build.h ; then echo ; else \
  80                 mv $(ASTTOPDIR)/include/asterisk/build.h.tmp $(ASTTOPDIR)/include/asterisk/build.h ; \
  81         fi
  82         @rm -f $(ASTTOPDIR)/include/asterisk/build.h.tmp
  83         @$(CC) -c -o buildinfo.o $(_ASTCFLAGS) buildinfo.c $(ASTCFLAGS)
  84 -       $(ECHO_PREFIX) echo "   [LD] $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) -> $@"
  85 +       $(ECHO_PREFIX) echo "   [LD] $(OBJS) db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) -> $@"
  86  ifneq ($(findstring chan_h323,$(MENUSELECT_CHANNELS)),)
  87 -       $(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(PTHREAD_CFLAGS) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(ASTLDFLAGS)
  88 +       $(CMD_PREFIX) $(CC) $(STATIC_BUILD) -o $@ $(ASTLINK) $(PTHREAD_CFLAGS) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(OBJS) db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(LIBEDIT_LIB) $(ASTLDFLAGS)
  89  else
  90 -       $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(PTHREAD_CFLAGS) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(H323LDFLAGS) $(OBJS) editline/libedit.a db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(H323LDLIBS) $(ASTLDFLAGS)
  91 +       $(CMD_PREFIX) $(CXX) $(STATIC_BUILD) -o $@ $(ASTLINK) $(PTHREAD_CFLAGS) $(AST_EMBED_LDFLAGS) $(_ASTLDFLAGS) $(H323LDFLAGS) $(OBJS) db1-ast/libdb1.a $(AST_EMBED_LDSCRIPTS) buildinfo.o $(AST_LIBS) $(AST_EMBED_LIBS) $(LIBEDIT_LIB) $(H323LDLIBS) $(ASTLDFLAGS)
  92  endif
  93
  94  clean::
  95 diff --git a/main/cli.c b/main/cli.c
  96 index e685268..3fc54ed 100644
  97 --- a/main/cli.c
  98 +++ b/main/cli.c
  99 @@ -35,6 +35,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.2 $")
 100  #include <string.h>
 101  #include <ctype.h>
 102  #include <regex.h>
 103 +#include <editline/readline.h>
 104
 105  #include "asterisk/logger.h"
 106  #include "asterisk/options.h"
 107 @@ -46,7 +47,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision: 1.2 $")
 108  #include "asterisk/utils.h"
 109  #include "asterisk/app.h"
 110  #include "asterisk/lock.h"
 111 -#include "editline/readline/readline.h"
 112  #include "asterisk/threadstorage.h"
 113
 114  extern unsigned long global_fin, global_fout;
 115 diff --git a/makeopts.in b/makeopts.in
 116 index 2966532..883ccc1 100644
 117 --- a/makeopts.in
 118 +++ b/makeopts.in
 119 @@ -197,3 +197,6 @@ TERMCAP_DIR=@TERMCAP_DIR@
 120  TINFO_INCLUDE=@TINFO_INCLUDE@
 121  TINFO_LIB=@TINFO_LIB@
 122  TINFO_DIR=@TINFO_DIR@
 123 +
 124 +LIBEDIT_INCLUDE=@LIBEDIT_INCLUDE@
 125 +LIBEDIT_LIB=@LIBEDIT_LIB@
 126 --
 127 1.5.5.2
 128