1 --- asterisk-1.6.1.12/menuselect/Makefile~ 2008-12-11 00:00:19.000000000 +0200
2 +++ asterisk-1.6.1.12/menuselect/Makefile 2009-12-30 23:14:47.201686543 +0200
4 # Basic set of sources and flags/libraries/includes
5 OBJS:=menuselect.o strcompat.o
6 CFLAGS:=-g -c -D_GNU_SOURCE -Wall
7 +MXML_LIB:=$(shell pkg-config --libs mxml)
9 ifeq ($(MENUSELECT_DEBUG),yes)
10 CFLAGS += -DMENUSELECT_DEBUG
14 G_OBJS += menuselect_gtk.o
15 - G_LIBS += $(GTK2_LIB)
16 + G_LIBS += $(MXML_LIB) $(GTK2_LIB)
17 G_INCLUDE += $(GTK2_INCLUDE)
18 ALL_TGTS += gmenuselect
22 N_OBJS += menuselect_newt.o
23 - N_LIBS += $(NEWT_LIB)
24 + N_LIBS += $(MXML_LIB) $(NEWT_LIB)
25 N_INCLUDE += $(NEWT_INCLUDE)
26 ALL_TGTS += nmenuselect
29 M_OBJS += menuselect_stub.o
30 +M_LIBS += $(MXML_LIB)
31 ALL_TGTS += menuselect
35 makeopts autoconfig.h: autoconfig.h.in makeopts.in
36 @./configure $(CONFIGURE_SILENT) CC= LD= AR= CFLAGS=
38 -$(ALL_TGTS): mxml/libmxml.a
42 menuselect_curses.o: CFLAGS+=$(C_INCLUDE)
43 --- asterisk-1.8.0/menuselect/menuselect.c.orig 2010-08-25 04:42:41.000000000 +0300
44 +++ asterisk-1.8.0/menuselect/menuselect.c 2010-10-23 12:10:31.077483673 +0300
48 #include "autoconfig.h"
49 -#include "mxml/mxml.h"
51 #include "linkedlists.h"
52 #include "menuselect.h"