[Freeswitch-svn] [commit] r11036 - freeswitch/trunk/libs/esl

[FreeSWITCH SVN]

Author: anthm
Date: Wed Dec 31 14:44:16 2008
New Revision: 11036

Log:
allow unix build without libedit

Modified:
   freeswitch/trunk/libs/esl/Makefile
   freeswitch/trunk/libs/esl/fs_cli.c

Modified: freeswitch/trunk/libs/esl/Makefile
==============================================================================
--- freeswitch/trunk/libs/esl/Makefile	(original)
+++ freeswitch/trunk/libs/esl/Makefile	Wed Dec 31 14:44:16 2008
@@ -2,7 +2,7 @@
 LIBEDIT_DIR=../../libs/libedit
 DEBUG=-g -ggdb
 PICKY=-O2 -ffast-math -Wall -Werror -Wunused-variable -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes
-CFLAGS=$(INCS) $(DEBUG) -I$(LIBEDIT_DIR)/src/ $(PICKY)
+CFLAGS=$(INCS) -DHAVE_EDITLINE $(DEBUG) -I$(LIBEDIT_DIR)/src/ $(PICKY)
 MYLIB=libesl.a
 LIBS=-lncurses -lpthread -lesl
 LDFLAGS=-L.

Modified: freeswitch/trunk/libs/esl/fs_cli.c
==============================================================================
--- freeswitch/trunk/libs/esl/fs_cli.c	(original)
+++ freeswitch/trunk/libs/esl/fs_cli.c	Wed Dec 31 14:44:16 2008
@@ -16,14 +16,14 @@
 #else
 #include <sys/select.h>
 #include <unistd.h>
-#include <histedit.h>
-#ifndef HAVE_EDITLINE
-#define HAVE_EDITLINE
-#endif
 #endif
 
 #include <getopt.h>
 
+#ifdef HAVE_EDITLINE
+#include <histedit.h>
+#endif
+
 static char prompt_str[512] = "";
 
 typedef struct {