Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
liblinphone
Commits
79c72fc8
Commit
79c72fc8
authored
Jun 12, 2013
by
Ghislain MARY
Browse files
libxml2 is now mandatory.
parent
0c421694
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
11 deletions
+8
-11
configure.ac
configure.ac
+4
-9
coreapi/Makefile.am
coreapi/Makefile.am
+4
-2
No files found.
configure.ac
View file @
79c72fc8
...
...
@@ -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)
...
...
coreapi/Makefile.am
View file @
79c72fc8
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment