integrate fs_cli into core build

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@11035 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/Makefile.am b/Makefile.am
index 11bb1e71485be484514e00b94515c194e32482fd..6e0baf5ad8df864ef916c0eff1b6eadaaef08270 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -158,13 +158,18 @@ MOD_LINK       = $(BASE)/libfreeswitch.la
 CLEANFILES     = src/include/switch_version.h src/include/switch_swigable_cpp.h
 BUILT_SOURCES  = src/include/switch_version.h src/include/switch_swigable_cpp.h
 
-bin_PROGRAMS = freeswitch
+bin_PROGRAMS = freeswitch fs_cli
+fs_cli_SOURCES = libs/esl/src/esl.c libs/esl/src/esl_config.c libs/esl/src/esl_event.c libs/esl/src/esl_threadmutex.c libs/esl/fs_cli.c
 freeswitch_SOURCES = src/switch.c
-nodist_freeswitch_SOURCES = src/include/switch_version.h 
+nodist_freeswitch_SOURCES = src/include/switch_version.h
+fs_cli_CFLAGS = $(AM_CFLAGS) -Ilibs/esl/src/include 
+fs_cli_LDFLAGS = $(AM_LDFLAGS) -lpthread
 freeswitch_CFLAGS = $(AM_CFLAGS) $(CORE_CFLAGS)
 freeswitch_LDFLAGS = $(AM_LDFLAGS) -rpath $(libdir)
 freeswitch_LDADD = libfreeswitch.la libs/apr/libapr-1.la
 if ADD_LIBEDIT
+fs_cli_CFLAGS += -DHAVE_EDITLINE -Ilibs/libedit/src
+fs_cli_LDADD = libs/libedit/src/.libs/libedit.a
 freeswitch_CFLAGS    += -Ilibs/libedit/src -DSWITCH_HAVE_LIBEDIT
 freeswitch_LDADD      += libs/libedit/src/.libs/libedit.a
 endif

diff --git a/debian/freeswitch.install b/debian/freeswitch.install
index 072f67ec1e66113d7dbe467e7fe0ca6cd2f0f739..47596869706f0c285cbd005aea1da12f17c4c8ca 100644 (file)
--- a/debian/freeswitch.install
+++ b/debian/freeswitch.install
@@ -1,5 +1,6 @@
 opt/freeswitch/htdocs/*
 opt/freeswitch/bin/freeswitch
+opt/freeswitch/bin/fs_cli
 opt/freeswitch/bin/scripts/*
 opt/freeswitch/lib/libfreeswitch*.so*
 opt/freeswitch/lib/libopenzap*.so*

diff --git a/libs/esl/Makefile b/libs/esl/Makefile
index 69dda1af2fd5286cefac6472e8b3e4583325aa11..c1d431f57e65ec491c2e4e66c96c1c8a789a874f 100644 (file)
--- a/libs/esl/Makefile
+++ b/libs/esl/Makefile
@@ -2,7 +2,7 @@ INCS=-Isrc/include
 LIBEDIT_DIR=../../libs/libedit
 DEBUG=-g -ggdb
 PICKY=-O2 -ffast-math -Wall -Werror -Wunused-variable -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes
-CFLAGS=$(INCS) -D_GNU_SOURCE $(DEBUG) -I$(LIBEDIT_DIR)/src/ $(PICKY)
+CFLAGS=$(INCS) $(DEBUG) -I$(LIBEDIT_DIR)/src/ $(PICKY)
 MYLIB=libesl.a
 LIBS=-lncurses -lpthread -lesl
 LDFLAGS=-L.

diff --git a/libs/esl/fs_cli.c b/libs/esl/fs_cli.c
index fb5f1187b45fce291be8a81e0be171b3e410c455..1d526207fd4fd558b73f90366d64086d4f2bbfc3 100644 (file)
--- a/libs/esl/fs_cli.c
+++ b/libs/esl/fs_cli.c
@@ -1,3 +1,7 @@
+#ifndef _XOPEN_SOURCE
+#define _XOPEN_SOURCE 500
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <esl.h>
@@ -11,9 +15,12 @@
 #include <io.h>
 #else
 #include <sys/select.h>
+#include <unistd.h>
 #include <histedit.h>
+#ifndef HAVE_EDITLINE
 #define HAVE_EDITLINE
 #endif
+#endif
 
 #include <getopt.h>