mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-18 14:26:43 +00:00
subparse: Remove dependency on regex.h as it's not used anyway
Fixes bug #592544.
This commit is contained in:
parent
86b4c51c8c
commit
5d96fd4bf1
2 changed files with 6 additions and 15 deletions
20
configure.ac
20
configure.ac
|
@ -154,25 +154,17 @@ dnl used in gst/ffmpegcolorspace/mem.c
|
||||||
dnl FIXME: could be fixed by redefining av_malloc and av_free to GLib's
|
dnl FIXME: could be fixed by redefining av_malloc and av_free to GLib's
|
||||||
AC_CHECK_HEADERS([malloc.h])
|
AC_CHECK_HEADERS([malloc.h])
|
||||||
|
|
||||||
dnl used in gst/subparse/gstsubparse.c
|
ac_cppflags_save="$CPPFLAGS"
|
||||||
AC_CHECK_HEADERS([regex.h], HAVE_REGEX_H="yes", HAVE_REGEX_H="no")
|
CPPFLAGS="`$PKG_CONFIG --cflags libxml-2.0`"
|
||||||
AM_CONDITIONAL(HAVE_REGEX_H, test "x$HAVE_REGEX_H" = "xyes")
|
AC_COMPILE_IFELSE(
|
||||||
|
AC_LANG_PROGRAM([
|
||||||
if test "x$HAVE_REGEX_H" = "xyes"; then
|
|
||||||
ac_cppflags_save="$CPPFLAGS"
|
|
||||||
CPPFLAGS="`$PKG_CONFIG --cflags libxml-2.0`"
|
|
||||||
AC_COMPILE_IFELSE(
|
|
||||||
AC_LANG_PROGRAM([
|
|
||||||
#include <libxml/HTMLparser.h>
|
#include <libxml/HTMLparser.h>
|
||||||
],[
|
],[
|
||||||
#ifndef LIBXML_HTML_ENABLED
|
#ifndef LIBXML_HTML_ENABLED
|
||||||
#error libxml2 has no HTML support
|
#error libxml2 has no HTML support
|
||||||
#endif /* LIBXML_HTML_ENABLED */
|
#endif /* LIBXML_HTML_ENABLED */
|
||||||
]), HAVE_LIBXML_HTML="yes", HAVE_LIBXML_HTML="no")
|
]), HAVE_LIBXML_HTML="yes", HAVE_LIBXML_HTML="no")
|
||||||
CPPFLAGS="$ac_cppflags_save"
|
CPPFLAGS="$ac_cppflags_save"
|
||||||
else
|
|
||||||
HAVE_LIBXML_HTML="no"
|
|
||||||
fi
|
|
||||||
AM_CONDITIONAL(HAVE_LIBXML_HTML, test "x$HAVE_LIBXML_HTML" = "xyes")
|
AM_CONDITIONAL(HAVE_LIBXML_HTML, test "x$HAVE_LIBXML_HTML" = "xyes")
|
||||||
|
|
||||||
dnl used in gst/tcp
|
dnl used in gst/tcp
|
||||||
|
|
|
@ -27,7 +27,6 @@
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
#include <glib.h>
|
#include <glib.h>
|
||||||
#include <regex.h>
|
|
||||||
|
|
||||||
#include "gstsubparse.h"
|
#include "gstsubparse.h"
|
||||||
#include "gstssaparse.h"
|
#include "gstssaparse.h"
|
||||||
|
|
Loading…
Reference in a new issue