Fix FTBFS due to missing flags for libxml

Fix FTBFS due to 'signals' definition conflict
pull/1/head
Slávek Banko 11 years ago
parent ffb88b27a1
commit b6474af74e

@ -1,6 +1,6 @@
####### General stuff
INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) $(LIBWV2_CFLAGS) $(all_includes) -I/usr/lib/i386-linux-gnu/glib-2.0/include -I/usr/lib/x86_64-linux-gnu/glib-2.0/include
INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) $(LIBWV2_CFLAGS) $(LIBXML_CFLAGS) $(all_includes) -I/usr/lib/i386-linux-gnu/glib-2.0/include -I/usr/lib/x86_64-linux-gnu/glib-2.0/include
####### Files
@ -9,7 +9,7 @@ kde_module_LTLIBRARIES = libmswordimport.la
libmswordimport_la_SOURCES = mswordimport.cpp document.cpp conversion.cpp \
texthandler.cpp tablehandler.cpp graphicshandler.cpp
libmswordimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
libmswordimport_la_LIBADD = $(KOFFICE_LIBS) $(LIBWV2_LIBS)
libmswordimport_la_LIBADD = $(KOFFICE_LIBS) $(LIBWV2_LIBS) $(LIBXML_LIBS)
METASOURCES = AUTO

@ -20,6 +20,7 @@
#include "graphicshandler.h"
#include "document.h"
#undef signals // Collides with GTK symbols
#include <wv2/olestream.h>
#include <KoStoreDevice.h>

Loading…
Cancel
Save