diff options
| author | Nicolas Dufresne <nicolas.dufresne@collabora.com> | 2017-05-16 14:44:43 -0400 |
|---|---|---|
| committer | Nicolas Dufresne <nicolas.dufresne@collabora.com> | 2017-05-16 14:44:43 -0400 |
| commit | e1d43cab6528c22e0c3108cf8215738a48d5a317 (patch) | |
| tree | 210f3944296ec50b35f5d9e54f895030bdab3b5d | |
| parent | 51cd53050ed881621aea26d52c5059f00a7c7d01 (diff) | |
Remove plugin specific static build option
Static and dynamic plugins now have the same interface. The standard
--enable-static/--enable-shared toggle are sufficient.
| -rw-r--r-- | configure.ac | 22 | ||||
| -rw-r--r-- | gst/rtsp-sink/Makefile.am | 1 |
2 files changed, 0 insertions, 23 deletions
diff --git a/configure.ac b/configure.ac index 4c65ceb..4c011ab 100644 --- a/configure.ac +++ b/configure.ac @@ -311,28 +311,6 @@ AC_SUBST([GST_OBJ_CFLAGS]) GST_OBJ_LIBS="\$(top_builddir)/gst/rtsp-server/libgstrtspserver-$GST_API_VERSION.la \$(GST_ALL_LIBS)" AC_SUBST([GST_OBJ_LIBS]) -dnl build static plugins or not -AC_MSG_CHECKING([whether to build static plugins or not]) -AC_ARG_ENABLE( - static-plugins, - AC_HELP_STRING( - [--enable-static-plugins], - [build static plugins @<:@default=no@:>@]), - [AS_CASE( - [$enableval], [no], [], [yes], [], - [AC_MSG_ERROR([bad value "$enableval" for --enable-static-plugins])])], - [enable_static_plugins=no]) -AC_MSG_RESULT([$enable_static_plugins]) -if test "x$enable_static_plugins" = xyes; then - AC_DEFINE(GST_PLUGIN_BUILD_STATIC, 1, - [Define if static plugins should be built]) - GST_PLUGIN_LIBTOOLFLAGS="" -else - GST_PLUGIN_LIBTOOLFLAGS="--tag=disable-static" -fi -AC_SUBST(GST_PLUGIN_LIBTOOLFLAGS) -AM_CONDITIONAL(GST_PLUGIN_BUILD_STATIC, test "x$enable_static_plugins" = "xyes") - dnl If only building static libraries, define GST_STATIC_COMPILATION. This is dnl needed only on Windows, but it doesn't hurt to have it everywhere. if test x$enable_static = xyes -a x$enable_shared = xno; then diff --git a/gst/rtsp-sink/Makefile.am b/gst/rtsp-sink/Makefile.am index 23807ce..f8092e5 100644 --- a/gst/rtsp-sink/Makefile.am +++ b/gst/rtsp-sink/Makefile.am @@ -13,6 +13,5 @@ libgstrtspclientsink_la_LIBADD = $(top_builddir)/gst/rtsp-server/libgstrtspserve -lgstsdp-@GST_API_VERSION@ $(GST_NET_LIBS) $(GST_LIBS) \ $(GIO_LIBS) libgstrtspclientsink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) -libgstrtspclientsink_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS) noinst_HEADERS = gstrtspclientsink.h |