mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-01-11 18:05:37 +00:00
xml check fix cross your fingers
Original commit message from CVS: xml check fix cross your fingers
This commit is contained in:
parent
a8c20dd476
commit
0d8986f3ed
2 changed files with 2 additions and 18 deletions
2
common
2
common
|
@ -1 +1 @@
|
||||||
Subproject commit 59ed6821982c4f5f989b1a635e34dc782d0a8e32
|
Subproject commit 49b94b4d92a9621d42aa6c80bd720e2abc747fe4
|
18
configure.ac
18
configure.ac
|
@ -135,23 +135,7 @@ LIBXML2_REQ="2.4.0"
|
||||||
AC_SUBST(LIBXML2_REQ)
|
AC_SUBST(LIBXML2_REQ)
|
||||||
|
|
||||||
dnl check for libxml2
|
dnl check for libxml2
|
||||||
LIBXML_PKG=', libxml-2.0'
|
GST_LIBXML2_CHECK()
|
||||||
PKG_CHECK_MODULES(XML, libxml-2.0 >= $LIBXML2_REQ, HAVE_LIBXML2=yes, HAVE_LIBXML2=no)
|
|
||||||
if test "x$HAVE_LIBXML2" = "xyes"; then
|
|
||||||
AC_DEFINE(HAVE_LIBXML2, 1, [Define if libxml2 is available])
|
|
||||||
else
|
|
||||||
AC_MSG_ERROR([Need libxml2 for glib2 builds -- you should be able to do without it -- this needs fixing])
|
|
||||||
fi
|
|
||||||
AC_SUBST(LIBXML_PKG)
|
|
||||||
AC_SUBST(XML_LIBS)
|
|
||||||
AC_SUBST(XML_CFLAGS)
|
|
||||||
dnl XML_LIBS might pull in -lz without zlib actually being on the system, so
|
|
||||||
dnl try if you can compile with these LIBS
|
|
||||||
if test "x$HAVE_LIBXML2" = "xyes"; then
|
|
||||||
AC_CHECK_LIB(xml2, xmlNewDoc, [],
|
|
||||||
[AC_MSG_ERROR([You might be missing zlib development stuff])],
|
|
||||||
$XML_LIBS)
|
|
||||||
fi
|
|
||||||
|
|
||||||
dnl popt checks
|
dnl popt checks
|
||||||
GST_CHECK_LIBHEADER(POPT, popt, poptStrippedArgv,, popt.h, POPT_LIBS="-lpopt",
|
GST_CHECK_LIBHEADER(POPT, popt, poptStrippedArgv,, popt.h, POPT_LIBS="-lpopt",
|
||||||
|
|
Loading…
Reference in a new issue