apparently some systems may have ncurses that doesn't provide backwards compat

with curses.  So, check for both and use whatever is found

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@22346 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/build_tools/Makefile b/build_tools/Makefile
index 7f4d8b4..0825cd6 100644 (file)
--- a/build_tools/Makefile
+++ b/build_tools/Makefile
@@ -1,6 +1,14 @@
 MENUSELECT_OBJS=menuselect.o menuselect_curses.o ../strcompat.o
 MENUSELECT_CFLAGS=-g -c -D_GNU_SOURCE -I../ -I../include/
-MENUSELECT_LIBS=../mxml/libmxml.a $(CURSES_LIB)
+MENUSELECT_LIBS=../mxml/libmxml.a
+
+ifneq ($(NCURSES_LIB),)
+  MENUSELECT_LIBS+=$(NCURSES_LIB)
+  MENUSELECT_INCLUDE=$(NCURSES_INCLUDE)
+else
+  MENUSELECT_LIBS+=$(CURSES_LIB)
+  MENUSELECT_INCLUDE=$(CURSES_INCLUDE)
+endif
 
 menuselect: $(MENUSELECT_OBJS)
        $(CC) -g -o $@ $(MENUSELECT_OBJS) $(MENUSELECT_LIBS)
@@ -9,7 +17,7 @@ menuselect.o: menuselect.c menuselect.h
        $(CC) -o $@ $(MENUSELECT_CFLAGS) $<
 
 menuselect_curses.o: menuselect_curses.c menuselect.h
-       $(CC) -o $@ $(MENUSELECT_CFLAGS) $(CURSES_INCLUDE) $<
+       $(CC) -o $@ $(MENUSELECT_CFLAGS) $(MENUSELECT_INCLUDE) $<
 
 clean:
        rm -f menuselect *.o

diff --git a/configure.ac b/configure.ac
index 5c63428..4fe2c1f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -161,6 +161,7 @@ AST_EXT_LIB([asound], [snd_spcm_init], [alsa/asoundlib.h], [ALSA], [Advanced Lin
 AST_EXT_LIB([curses], [initscr], [curses.h], [CURSES], [curses], [])
 AST_EXT_LIB([mfcr2], [mfcr2_MakeCall], [libmfcr2.h], [MFCR2], [MFCR2])
 AST_EXT_LIB([nbs], [nbs_setup], [nbs.h], [NBS], [Network Broadcast Sound])
+AST_EXT_LIB([ncurses], [initscr], [curses.h], [NCURSES], [ncurses], [])
 AST_EXT_LIB([newt], [newtBell], [newt.h], [NEWT], [newt])
 AST_EXT_LIB([odbc], [SQLConnect], [sql.h], [UNIXODBC], [unixODBC])
 AST_EXT_LIB([ogg], [ogg_sync_init], [], [OGG], [OGG])

diff --git a/makeopts.in b/makeopts.in
index d897775..7350b29 100644 (file)
--- a/makeopts.in
+++ b/makeopts.in
@@ -101,3 +101,6 @@ GSM_INCLUDE=@gsm_INCLUDE@
 
 CURSES_LIB=@curses_LIB@
 CURSES_INCLUDE=@curses_INCLUDE@
+
+NCURSES_LIB=@ncurses_LIB@
+NCURSES_INCLUDE=@ncurses_INCLUDE@