The tcp and subparse plugins are under gst, but not totaly free of dependencies....

Original commit message from CVS:
* configure.ac:
* gst/Makefile.am:
The tcp and subparse plugins are under gst, but not totaly free of
dependencies. Handle selection inconfigure.ac, so that they show up
on the final list of what is build and what is not. Maybe they should
better be moved to ext.

diff --git a/ChangeLog b/ChangeLog
index 6f6ce59..b67245d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2007-08-30  Stefan Kost  <ensonic@users.sf.net>
 
+       * configure.ac:
+       * gst/Makefile.am:
+         The tcp and subparse plugins are under gst, but not totaly free of
+         dependencies. Handle selection inconfigure.ac, so that they show up
+         on the final list of what is build and what is not. Maybe they should
+         better be moved to ext.
+
+2007-08-30  Stefan Kost  <ensonic@users.sf.net>
+
        Patch by: Daniel Díaz  <yosoy@danieldiaz.org>
 
        * configure.ac:

diff --git a/configure.ac b/configure.ac
index 0e85106..7feacf8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -213,12 +213,25 @@ if test "x$HAVE_REGEX_H" = "xyes"; then
                      ]), HAVE_LIBXML_HTML=yes, HAVE_LIBXML_HTML=no)
   AM_CONDITIONAL(HAVE_LIBXML_HTML, test "x$HAVE_LIBXML_HTML" = "xyes")
   CPPFLAGS="$ac_cppflags_save"
+  
+  if test "x$HAVE_LIBXML_HTML" = "xyes"; then
+    GST_PLUGINS_SELECTED="$GST_PLUGINS_SELECTED subparse"
+  else
+    GST_PLUGINS_NO="\t[subparse]\n$GST_PLUGINS_NO"
+  fi
+else
+  GST_PLUGINS_NO="\t[subparse]\n$GST_PLUGINS_NO"
 fi
 
 dnl used in gst/tcp
 AC_CHECK_HEADERS([sys/socket.h], 
   HAVE_SYS_SOCKET_H="yes", HAVE_SYS_SOCKET_H="no")
 AM_CONDITIONAL(HAVE_SYS_SOCKET_H, test "x$HAVE_SYS_SOCKET_H" = "xyes")
+if test "x$HAVE_SYS_SOCKET_H" = "xyes"; then
+  GST_PLUGINS_SELECTED="$GST_PLUGINS_SELECTED tcp"
+else
+  GST_PLUGINS_NO="\t[tcp]\n$GST_PLUGINS_NO"
+fi
 
 dnl used in gst-libs/gst/rtsp
 AC_CHECK_HEADERS([winsock2.h], HAVE_WINSOCK2_H=yes)

diff --git a/gst/Makefile.am b/gst/Makefile.am
index 2a51314..600796e 100644 (file)
--- a/gst/Makefile.am
+++ b/gst/Makefile.am
@@ -1,19 +1,3 @@
-if HAVE_REGEX_H
-if HAVE_LIBXML_HTML
-SUBPARSE = subparse
-else
-SUBPARSE =
-endif
-else
-SUBPARSE =
-endif
-
-if HAVE_SYS_SOCKET_H
-TCP = tcp
-else
-TCP =
-endif
-
-SUBDIRS = $(GST_PLUGINS_SELECTED) $(SUBPARSE) $(TCP)
+SUBDIRS = $(GST_PLUGINS_SELECTED)
 DIST_SUBDIRS = $(GST_PLUGINS_ALL) subparse tcp