1 diff -urN asterisk-10.10.1.org/menuselect/Makefile asterisk-10.10.1/menuselect/Makefile
2 --- asterisk-10.10.1.org/menuselect/Makefile 2012-05-09 21:57:43.000000000 +0200
3 +++ asterisk-10.10.1/menuselect/Makefile 2012-12-09 16:21:44.578265277 +0100
5 # Basic set of sources and flags/libraries/includes
6 OBJS:=menuselect.o strcompat.o
7 CFLAGS+=-g -D_GNU_SOURCE -Wall
8 +MXML_LIB:=$(shell pkg-config --libs mxml)
10 ifeq ($(MENUSELECT_DEBUG),yes)
11 CFLAGS += -DMENUSELECT_DEBUG
15 G_OBJS += menuselect_gtk.o
16 - G_LIBS += $(GTK2_LIB)
17 + G_LIBS += $(MXML_LIB) $(GTK2_LIB)
18 G_INCLUDE += $(GTK2_INCLUDE)
19 ALL_TGTS += gmenuselect
23 N_OBJS += menuselect_newt.o
24 - N_LIBS += $(NEWT_LIB)
25 + N_LIBS += $(MXML_LIB) $(NEWT_LIB)
26 N_INCLUDE += $(NEWT_INCLUDE)
27 ALL_TGTS += nmenuselect
30 M_OBJS += menuselect_stub.o
31 +M_LIBS += $(MXML_LIB)
32 ALL_TGTS += menuselect
36 makeopts autoconfig.h: autoconfig.h.in makeopts.in
37 @./configure $(CONFIGURE_SILENT)
39 -$(ALL_TGTS): mxml/libmxml.a
43 menuselect_curses.o: CFLAGS+=$(C_INCLUDE)
44 diff -urN asterisk-10.10.1.org/menuselect/menuselect.c asterisk-10.10.1/menuselect/menuselect.c
45 --- asterisk-10.10.1.org/menuselect/menuselect.c 2011-11-09 23:22:13.000000000 +0100
46 +++ asterisk-10.10.1/menuselect/menuselect.c 2012-12-09 16:22:51.341349575 +0100
50 #include "autoconfig.h"
51 -#include "mxml/mxml.h"
53 #include "linkedlists.h"
54 #include "menuselect.h"