From e121368e37b8bbc4f1697221bf48ca7b7152fb29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Mon, 12 Mar 2012 15:15:22 +0000 Subject: [PATCH] configure: check for libxml2 explicitly GStreamer may be built without the libxml2 dependency. --- configure.ac | 8 ++++++++ ges/Makefile.am | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 857a959e9b..b0c4fd906c 100644 --- a/configure.ac +++ b/configure.ac @@ -243,6 +243,14 @@ AC_SUBST(GLIB_PREFIX) AC_SUBST(GST_PREFIX) AC_SUBST(GSTPB_PREFIX) +dnl pitivi formatter needs libxml +PKG_CHECK_MODULES(XML, libxml-2.0, HAVE_LIBXML="yes", HAVE_LIBXML="no") +if test "x$HAVE_LIBXML" != "xyes"; then + AC_ERROR([libxml2 is required]) +fi +AC_SUBST(XML_LIBS) +AC_SUBST(XML_CFLAGS) + dnl GTK is optional and only used in examples HAVE_GTK=no HAVE_GTK_X11=no diff --git a/ges/Makefile.am b/ges/Makefile.am index a38f726101..46c36deff7 100644 --- a/ges/Makefile.am +++ b/ges/Makefile.am @@ -96,8 +96,8 @@ libges_@GST_MAJORMINOR@include_HEADERS = \ noinst_HEADERS = \ ges-internal.h -libges_@GST_MAJORMINOR@_la_CFLAGS = -I$(top_srcdir) $(GST_PBUTILS_CFLAGS) $(GST_VIDEO_CFLAGS) $(GST_CONTROLLER_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) -libges_@GST_MAJORMINOR@_la_LIBADD = $(GST_PBUTILS_LIBS) $(GST_VIDEO_LIBS) $(GST_CONTROLLER_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) +libges_@GST_MAJORMINOR@_la_CFLAGS = -I$(top_srcdir) $(GST_PBUTILS_CFLAGS) $(GST_VIDEO_CFLAGS) $(GST_CONTROLLER_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(XML_CFLAGS) +libges_@GST_MAJORMINOR@_la_LIBADD = $(GST_PBUTILS_LIBS) $(GST_VIDEO_LIBS) $(GST_CONTROLLER_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) $(XML_LIBS) libges_@GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) -export-symbols-regex \^_*\(ges_\|GES_\).* DISTCLEANFILE = $(CLEANFILES)