1 diff -dur asterisk-12.0.0.orig/menuselect/Makefile asterisk-12.0.0/menuselect/Makefile
2 --- asterisk-12.0.0.orig/menuselect/Makefile 2012-05-09 21:57:43.000000000 +0200
3 +++ asterisk-12.0.0/menuselect/Makefile 2014-01-08 12:23:16.000000000 +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 C_OBJS += menuselect_curses.o
16 - C_LIBS +=$(NCURSES_LIB)
17 + C_LIBS += $(MXML_LIB) $(NCURSES_LIB)
18 C_INCLUDE += $(NCURSES_INCLUDE)
19 ALL_TGTS += cmenuselect
22 C_OBJS += menuselect_curses.o
23 - C_LIBS +=$(CURSES_LIB)
24 + C_LIBS += $(MXML_LIB) $(CURSES_LIB)
25 C_INCLUDE += $(CURSES_INCLUDE)
26 ALL_TGTS += cmenuselect
31 G_OBJS += menuselect_gtk.o
32 - G_LIBS += $(GTK2_LIB)
33 + G_LIBS += $(MXML_LIB) $(GTK2_LIB)
34 G_INCLUDE += $(GTK2_INCLUDE)
35 ALL_TGTS += gmenuselect
39 N_OBJS += menuselect_newt.o
40 - N_LIBS += $(NEWT_LIB)
41 + N_LIBS += $(MXML_LIB) $(NEWT_LIB)
42 N_INCLUDE += $(NEWT_INCLUDE)
43 ALL_TGTS += nmenuselect
46 M_OBJS += menuselect_stub.o
47 +M_LIBS += $(MXML_LIB)
48 ALL_TGTS += menuselect
52 makeopts autoconfig.h: autoconfig.h.in makeopts.in
53 @./configure $(CONFIGURE_SILENT)
55 -$(ALL_TGTS): mxml/libmxml.a
59 menuselect_curses.o: CFLAGS+=$(C_INCLUDE)
60 diff -dur asterisk-12.0.0.orig/menuselect/menuselect.c asterisk-12.0.0/menuselect/menuselect.c
61 --- asterisk-12.0.0.orig/menuselect/menuselect.c 2011-11-09 23:22:13.000000000 +0100
62 +++ asterisk-12.0.0/menuselect/menuselect.c 2014-01-08 12:21:41.000000000 +0100
66 #include "autoconfig.h"
67 -#include "mxml/mxml.h"
69 #include "linkedlists.h"
70 #include "menuselect.h"