mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 12:11:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

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

Browse source 
It should work everywhere now, and -base and -good depend on
the GstNetMeta API.
This commit is contained in:
Tim-Philipp Müller 2012-01-17 23:57:44 +00:00
parent 4d27e79429
commit f7f19d9589
2 changed files with 2 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
configure.ac
View file

@ -104,8 +104,6 @@ else
GST_REGISTRY_DOC_TYPES= GST_REGISTRY_DOC_TYPES=
fi fi
AC_SUBST(GST_REGISTRY_DOC_TYPES) 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]) AG_GST_CHECK_SUBSYSTEM_DISABLE(PLUGIN,[plugin])
AM_CONDITIONAL(GST_DISABLE_PLUGIN, test "x$GST_DISABLE_PLUGIN" = "xyes") 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_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_PLUGIN}" = "xno"; then enable_plugin="yes"; fi
if test "x${GST_DISABLE_REGISTRY}" = "xno"; then enable_registry="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 " echo "
@ -836,7 +833,6 @@ Configuration
Allocation tracing : ${enable_alloc_trace} Allocation tracing : ${enable_alloc_trace}
Plugin registry : ${enable_registry} Plugin registry : ${enable_registry}
Plugin support : ${enable_plugin} Plugin support : ${enable_plugin}
Network support : ${enable_net}
Unit testing support : ${BUILD_CHECK} Unit testing support : ${BUILD_CHECK}
Debug : ${USE_DEBUG} Debug : ${USE_DEBUG}

18
libs/gst/Makefile.am
View file

@ -4,29 +4,15 @@ else
SUBDIRS_CHECK = SUBDIRS_CHECK =
endif 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 if GST_DISABLE_REGISTRY
SUBDIRS_HELPERS = SUBDIRS_HELPERS =
else else
SUBDIRS_HELPERS = helpers SUBDIRS_HELPERS = helpers
endif 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 DIST_SUBDIRS = $(SUBDIRS_ALWAYS) check net helpers
Android.mk: Makefile.am Android.mk: Makefile.am