From: Руслан Ижбулатов <lrn1986@gmail.com>
Date: Fri, 21 Aug 2009 04:23:39 +0000 (+0400)
Subject: subparse: Remove dependency on regex.h as it's not used anyway
X-Git-Tag: 1.19.3~511^2~9298
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5d96fd4bf14d8fffebf0c2d43810ec3e032b05bf;p=platform%2Fupstream%2Fgstreamer.git

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

Fixes bug #592544.
---

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 <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 848cced..4312c50 100644
--- 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"