subparse: Remove dependency on regex.h as it's not used anyway

Fixes bug #592544.

diff --git a/configure.ac b/configure.ac
index b818ea6d7ac8e07f5b9b5a05abc7f82fa0b4cfab..282f1441e22ee843e6d1560d2297d57e76492614 100644 (file)
--- 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 <libxml/HTMLparser.h>
                      ],[
 #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 848cced0a1be000649c447deaa1e243dc0ea7dad..4312c50e374aa235f0742b34017df73011dab4e0 100644 (file)
--- a/gst/subparse/gstsubparse.c
+++ b/gst/subparse/gstsubparse.c
@@ -27,7 +27,6 @@
 #include <stdlib.h>
 #include <sys/types.h>
 #include <glib.h>
-#include <regex.h>
 
 #include "gstsubparse.h"
 #include "gstssaparse.h"