diff options
| author | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2012-01-17 23:57:44 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2012-01-18 01:22:52 +0000 |
| commit | f7f19d9589110feaa94efbf5964b67475d79b227 (patch) | |
| tree | 1528b76b099461df7a4ad906ebe40d3519fb8869 | |
| parent | 4d27e79429d2cffa6b04cbb83fe65def0454426c (diff) | |
configure: remove --disable-net option and always build libgstnet
It should work everywhere now, and -base and -good depend on
the GstNetMeta API.
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | libs/gst/Makefile.am | 18 |
2 files changed, 2 insertions, 20 deletions
diff --git a/configure.ac b/configure.ac index b35bb82292..808e384711 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 f638e616f1..d02c4c774c 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 |