summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorPetri Latvala <petri.latvala@intel.com>2017-08-03 16:34:45 +0300
committerDaniel Vetter <daniel.vetter@ffwll.ch>2017-08-03 19:33:23 +0200
commit28ed1c4efe2080feb079a59650f4c01e3345b99d (patch)
tree4c53de6d3edf6f9eddda3d0d73a9312341d0838c /configure.ac
parent4d0f59c62991f4e96d9b36427da1b2fc5a59f7a0 (diff)
configure.ac: Try to find XMLRPC with xmlrpc-c-config if pkg-config fails
Debian and Ubuntu have XMLRPC packages without pkg-config files. Let's do automatically what the user would anyway do manually. Signed-off-by: Petri Latvala <petri.latvala@intel.com> CC: Daniel Vetter <daniel.vetter@intel.com> CC: Paul Kocialkowski <paul.kocialkowski@linux.intel.com> CC: Lyude <lyude@redhat.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac15
1 files changed, 13 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 6d3db878..2ceea2c9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -191,8 +191,19 @@ AC_ARG_ENABLE(chamelium, AS_HELP_STRING([--enable-chamelium],
[enable_chamelium=no])
AM_CONDITIONAL(HAVE_CHAMELIUM, [test "x$enable_chamelium" = xyes])
if test "x$enable_chamelium" = xyes; then
- PKG_CHECK_MODULES(XMLRPC, xmlrpc xmlrpc_util xmlrpc_client, [],
- [AC_MSG_ERROR([Failed to find xmlrpc, required by chamelium.])])
+ PKG_CHECK_MODULES(XMLRPC, xmlrpc xmlrpc_util xmlrpc_client,
+ [xmlrpc=yes], [xmlrpc=no])
+ if test x"$xmlrpc" != xyes; then
+ AC_CHECK_PROG([XMLRPC_C_CONFIG], [xmlrpc-c-config], [yes], [no])
+ if test x"$XMLRPC_C_CONFIG" = xyes; then
+ XMLRPC_CFLAGS=$(xmlrpc-c-config client --cflags)
+ XMLRPC_LIBS=$(xmlrpc-c-config client --libs)
+ AC_SUBST(XMLRPC_CFLAGS)
+ AC_SUBST(XMLRPC_LIBS)
+ else
+ AC_MSG_ERROR([Failed to find xmlrpc, required by chamelium.])
+ fi
+ fi
PKG_CHECK_MODULES(PIXMAN, pixman-1, [],
[AC_MSG_ERROR([Failed to find pixman, required by chamelium.])])
if test x"$udev" != xyes; then