From 5d96fd4bf14d8fffebf0c2d43810ec3e032b05bf Mon Sep 17 00:00:00 2001 From: =?utf8?q?=D0=A0=D1=83=D1=81=D0=BB=D0=B0=D0=BD=20=D0=98=D0=B6=D0=B1?= =?utf8?q?=D1=83=D0=BB=D0=B0=D1=82=D0=BE=D0=B2?= Date: Fri, 21 Aug 2009 08:23:39 +0400 Subject: [PATCH] subparse: Remove dependency on regex.h as it's not used anyway Fixes bug #592544. --- configure.ac | 20 ++++++-------------- gst/subparse/gstsubparse.c | 1 - 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/configure.ac b/configure.ac index b818ea6..282f144 100644 --- a/configure.ac +++ b/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 AC_CHECK_HEADERS([malloc.h]) -dnl used in gst/subparse/gstsubparse.c -AC_CHECK_HEADERS([regex.h], HAVE_REGEX_H="yes", HAVE_REGEX_H="no") -AM_CONDITIONAL(HAVE_REGEX_H, test "x$HAVE_REGEX_H" = "xyes") - -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([ +ac_cppflags_save="$CPPFLAGS" +CPPFLAGS="`$PKG_CONFIG --cflags libxml-2.0`" +AC_COMPILE_IFELSE( + AC_LANG_PROGRAM([ #include ],[ #ifndef LIBXML_HTML_ENABLED #error libxml2 has no HTML support #endif /* LIBXML_HTML_ENABLED */ - ]), HAVE_LIBXML_HTML="yes", HAVE_LIBXML_HTML="no") - CPPFLAGS="$ac_cppflags_save" -else - HAVE_LIBXML_HTML="no" -fi + ]), HAVE_LIBXML_HTML="yes", HAVE_LIBXML_HTML="no") +CPPFLAGS="$ac_cppflags_save" AM_CONDITIONAL(HAVE_LIBXML_HTML, test "x$HAVE_LIBXML_HTML" = "xyes") dnl used in gst/tcp diff --git a/gst/subparse/gstsubparse.c b/gst/subparse/gstsubparse.c index 848cced..4312c50 100644 --- a/gst/subparse/gstsubparse.c +++ b/gst/subparse/gstsubparse.c @@ -27,7 +27,6 @@ #include #include #include -#include #include "gstsubparse.h" #include "gstssaparse.h" -- 2.7.4