From d4ccd2c79b5ea7c03e5e41059b4cde0643848a51 Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Thu, 3 Nov 2005 00:42:57 +0000 Subject: [PATCH] subparse needs regex.h - might need to move to sys/ Original commit message from CVS: * configure.ac: * gst/Makefile.am: subparse needs regex.h - might need to move to sys/ --- common | 2 +- configure.ac | 7 +++++-- gst/Makefile.am | 10 ++++++++-- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/common b/common index a0c6a14..959da4a 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit a0c6a14dbc3cb62bf513502eaef83d0600a7c1ca +Subproject commit 959da4a43c2e6218eb4f43e8c7e29c1db4157db1 diff --git a/configure.ac b/configure.ac index 1a2c086..b9d4425 100644 --- a/configure.ac +++ b/configure.ac @@ -79,7 +79,6 @@ GST_PLUGINS_ALL="\ ffmpegcolorspace \ playback \ sine \ - subparse \ tcp \ typefind \ videotestsrc \ @@ -160,7 +159,11 @@ AC_HEADER_STDC dnl used in gst/ffmpegcolorspace/mem.c dnl FIXME: could be fixed by redefining av_malloc and av_free to GLib's -AC_CHECK_HEADER([malloc.h]) +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") dnl ffmpegcolorspace includes _stdint.h AX_CREATE_STDINT_H diff --git a/gst/Makefile.am b/gst/Makefile.am index 9352219..ee160a8 100644 --- a/gst/Makefile.am +++ b/gst/Makefile.am @@ -1,2 +1,8 @@ -SUBDIRS = $(GST_PLUGINS_SELECTED) -DIST_SUBDIRS = $(GST_PLUGINS_ALL) +if HAVE_REGEX_H +SUBPARSE = subparse +else +SUBPARSE = +endif + +SUBDIRS = $(GST_PLUGINS_SELECTED) $(SUBPARSE) +DIST_SUBDIRS = $(GST_PLUGINS_ALL) subparse -- 2.7.4