From: Tim-Philipp Müller <tim.muller@collabora.co.uk>
Date: Tue, 17 Jan 2012 23:57:44 +0000 (+0000)
Subject: configure: remove  --disable-net option and always build libgstnet
X-Git-Tag: RELEASE-0.11.2~180
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f7f19d9589110feaa94efbf5964b67475d79b227;p=platform%2Fupstream%2Fgstreamer.git

configure: remove  --disable-net option and always build libgstnet

It should work everywhere now, and -base and -good depend on
the GstNetMeta API.
---

diff --git a/configure.ac b/configure.ac
index b35bb82..808e384 100644
--- a/configure.ac
+++ b/configure.ac
@@ -104,8 +104,6 @@ else
   GST_REGISTRY_DOC_TYPES=
 fi
 AC_SUBST(GST_REGISTRY_DOC_TYPES)
-AG_GST_CHECK_SUBSYSTEM_DISABLE(NET,[network distribution])
-AM_CONDITIONAL(GST_DISABLE_NET, test "x$GST_DISABLE_NET" = "xyes")
 AG_GST_CHECK_SUBSYSTEM_DISABLE(PLUGIN,[plugin])
 AM_CONDITIONAL(GST_DISABLE_PLUGIN, test "x$GST_DISABLE_PLUGIN" = "xyes")
 
@@ -814,7 +812,6 @@ if test "x${GST_DISABLE_TRACE}" = "xno"; then enable_trace="yes"; fi
 if test "x${GST_DISABLE_ALLOC_TRACE}" = "xno"; then enable_alloc_trace="yes"; fi
 if test "x${GST_DISABLE_PLUGIN}" = "xno"; then enable_plugin="yes"; fi
 if test "x${GST_DISABLE_REGISTRY}" = "xno"; then enable_registry="yes"; fi
-if test "x${GST_DISABLE_NET}" = "xno"; then enable_net="yes"; fi
 
 echo "
 
@@ -836,7 +833,6 @@ Configuration
 	Allocation tracing         : ${enable_alloc_trace}
 	Plugin registry            : ${enable_registry}
 	Plugin support	           : ${enable_plugin}
-	Network support            : ${enable_net}
 	Unit testing support       : ${BUILD_CHECK}
 
 	Debug                      : ${USE_DEBUG}
diff --git a/libs/gst/Makefile.am b/libs/gst/Makefile.am
index f638e61..d02c4c7 100644
--- a/libs/gst/Makefile.am
+++ b/libs/gst/Makefile.am
@@ -4,29 +4,15 @@ else
 SUBDIRS_CHECK =
 endif
 
-if GST_DISABLE_NET
-SUBDIRS_NET =
-else
-if HAVE_SYS_SOCKET_H
-SUBDIRS_NET = net
-else
-if HAVE_WINSOCK2_H
-SUBDIRS_NET = net
-else
-SUBDIRS_NET =
-endif
-endif
-endif
-
 if GST_DISABLE_REGISTRY
 SUBDIRS_HELPERS =
 else
 SUBDIRS_HELPERS = helpers
 endif
 
-SUBDIRS_ALWAYS = base controller
+SUBDIRS_ALWAYS = base controller net
 
-SUBDIRS = $(SUBDIRS_ALWAYS) $(SUBDIRS_CHECK) $(SUBDIRS_NET) $(SUBDIRS_HELPERS)
+SUBDIRS = $(SUBDIRS_ALWAYS) $(SUBDIRS_CHECK) $(SUBDIRS_HELPERS)
 DIST_SUBDIRS = $(SUBDIRS_ALWAYS) check net helpers
 
 Android.mk: Makefile.am