[svn-commits] branch group/autoconf_and_menuselect r22230 - in /team/group/autoconf_and_men...

[svn-commits at lists.digium.com]

Author: russell
Date: Sun Apr 23 19:33:52 2006
New Revision: 22230

URL: http://svn.digium.com/view/asterisk?rev=22230&view=rev
Log:
add curses to configure and build menuselect with that info

Modified:
    team/group/autoconf_and_menuselect/build_tools/Makefile
    team/group/autoconf_and_menuselect/configure.ac
    team/group/autoconf_and_menuselect/makeopts.in

Modified: team/group/autoconf_and_menuselect/build_tools/Makefile
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/build_tools/Makefile?rev=22230&r1=22229&r2=22230&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/build_tools/Makefile (original)
+++ team/group/autoconf_and_menuselect/build_tools/Makefile Sun Apr 23 19:33:52 2006
@@ -1,15 +1,15 @@
 MENUSELECT_OBJS=menuselect.o menuselect_curses.o
-
 MENUSELECT_CFLAGS=-g -c -D_GNU_SOURCE -I../ -I../include/
+MENUSELECT_LIBS=../mxml/libmxml.a $(CURSES_LIB)
 
 menuselect: $(MENUSELECT_OBJS)
-	$(CC) -g -o $@ $(MENUSELECT_OBJS) ../mxml/libmxml.a -lcurses
+	$(CC) -g -o $@ $(MENUSELECT_OBJS) $(MENUSELECT_LIBS)
 
 menuselect.o: menuselect.c menuselect.h
 	$(CC) -o $@ $(MENUSELECT_CFLAGS) $<
 
 menuselect_curses.o: menuselect_curses.c menuselect.h
-	$(CC) -o $@ $(MENUSELECT_CFLAGS) $<
+	$(CC) -o $@ $(MENUSELECT_CFLAGS) $(CURSES_INCLUDE) $<
 
 clean:
 	rm -f menuselect *.o

Modified: team/group/autoconf_and_menuselect/configure.ac
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/configure.ac?rev=22230&r1=22229&r2=22230&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/configure.ac (original)
+++ team/group/autoconf_and_menuselect/configure.ac Sun Apr 23 19:33:52 2006
@@ -158,6 +158,7 @@
 AC_SUBST(AST_DEVMODE)
 
 AST_EXT_LIB([asound], [snd_spcm_init], [alsa/asoundlib.h], [ALSA], [Advanced Linux Sound Architecture], [-lm -ldl])
+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([newt], [newtBell], [newt.h], [NEWT], [newt])

Modified: team/group/autoconf_and_menuselect/makeopts.in
URL: http://svn.digium.com/view/asterisk/team/group/autoconf_and_menuselect/makeopts.in?rev=22230&r1=22229&r2=22230&view=diff
==============================================================================
--- team/group/autoconf_and_menuselect/makeopts.in (original)
+++ team/group/autoconf_and_menuselect/makeopts.in Sun Apr 23 19:33:52 2006
@@ -99,3 +99,5 @@
 GSM_LIB=@gsm_LIB@
 GSM_INCLUDE=@gsm_INCLUDE@
 
+CURSES_LIB=@curses_LIB@
+CURSES_INCLUDE=@curses_INCLUDE@