Merge "Fix include path to point to sysroot"
diff --git a/configure.ac b/configure.ac
index f826305..e77b4f2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,6 +14,9 @@
AC_PROG_LIBTOOL
AC_PROG_CXX
+PKG_CHECK_MODULES([LIBXML], [libxml-2.0])
+AC_SUBST([LIBXML_CFLAGS])
+AC_SUBST([LIBXML_LIBS])
# Checks for libraries.
diff --git a/ipacm/inc/IPACM_Xml.h b/ipacm/inc/IPACM_Xml.h
index 14fc7ff..7079791 100644
--- a/ipacm/inc/IPACM_Xml.h
+++ b/ipacm/inc/IPACM_Xml.h
@@ -51,8 +51,8 @@
#include <string.h>
#include <arpa/inet.h>
#include <stdint.h>
-#include "libxml/parser.h"
-#include "libxml/tree.h"
+#include <libxml/parser.h>
+#include <libxml/tree.h>
#define IPACM_ASSERT(a) \
if (!(a)) { \
diff --git a/ipacm/src/Makefile.am b/ipacm/src/Makefile.am
index 545a1db..250c32c 100644
--- a/ipacm/src/Makefile.am
+++ b/ipacm/src/Makefile.am
@@ -1,6 +1,8 @@
EXTRA_CPPFLAGS = -DDEBUG
-
-AM_CPPFLAGS = -I./../inc -I$(WORKSPACE)/data-ipa-cfg-mgr/ipanat/inc -I$(WORKSPACE)/kernel/include -I/usr/include/libxml2
+AM_CPPFLAGS = -I./../inc \
+ -I$(WORKSPACE)/data-ipa-cfg-mgr/ipanat/inc \
+ -I$(WORKSPACE)/kernel/include \
+ ${LIBXML_CFLAGS}
AM_CPPFLAGS += -Wall -Wundef -Wno-trigraphs
ipacm_SOURCES = IPACM_Main.cpp \
@@ -25,7 +27,7 @@
bin_PROGRAMS = ipacm
-requiredlibs = -lxml2 -lpthread -lnetfilter_conntrack -lnfnetlink\
+requiredlibs = ${LIBXML_LIB} -lxml2 -lpthread -lnetfilter_conntrack -lnfnetlink\
../../ipanat/src/libipanat.la
ipacm_LDADD = $(requiredlibs)