libxml2 is now mandatory.

This commit is contained in:
Ghislain MARY 2013-06-12 11:26:32 +02:00
parent 0c4216948d
commit 79c72fc860
2 changed files with 8 additions and 11 deletions

View file

@ -202,15 +202,10 @@ if test "$build_upnp" != "false" ; then
AC_DEFINE(BUILD_UPNP, 1, [Define if upnp enabled])
fi
dnl check libxml2 (needed for tools)
if test "$build_tools" != "false" ; then
PKG_CHECK_MODULES(LIBXML2, [libxml-2.0],[],
[if test "$build_tools" = "true" ; then
AC_MSG_ERROR([Could not found libxml2, tools cannot be compiled.])
else
build_tools=false
fi]
)
dnl check libxml2
PKG_CHECK_MODULES(LIBXML2, [libxml-2.0],[libxml2_found=yes],foo=bar)
if test "$libxml2_found" != "yes" ; then
AC_MSG_ERROR([libxml2 not found. Install it and try again (the package is usually named libxml2-dev in the Linux distributions)])
fi
AM_CONDITIONAL(BUILD_TOOLS, test x$build_tools != xfalse)

View file

@ -92,7 +92,8 @@ liblinphone_la_LIBADD= \
$(ORTP_LIBS) $(OPENSSL_LIBS) \
$(TUNNEL_LIBS) \
$(LIBSOUP_LIBS) \
$(SQLITE3_LIBS)
$(SQLITE3_LIBS) \
$(LIBXML2_LIBS)
if ENABLE_TESTS
@ -126,7 +127,8 @@ AM_CFLAGS=\
-DORTP_INET6 \
$(VIDEO_CFLAGS) \
$(TUNNEL_CFLAGS) \
$(SQLITE3_CFLAGS)
$(SQLITE3_CFLAGS) \
$(LIBXML2_CFLAGS)
if BUILD_WIZARD
AM_CFLAGS+= -DBUILD_WIZARD