Remove plugin specific static build option

Static and dynamic plugins now have the same interface. The standard
--enable-static/--enable-shared toggle are sufficient.

diff --git a/config.h.meson b/config.h.meson
index 03146df..0884dc9 100644 (file)
--- a/config.h.meson
+++ b/config.h.meson
@@ -61,9 +61,6 @@
 /* GStreamer package release date/time for plugins as YYYY-MM-DD */
 #mesondefine GST_PACKAGE_RELEASE_DATETIME
 
-/* Define if static plugins should be built */
-#mesondefine GST_PLUGIN_BUILD_STATIC
-
 /* location of the installed gst-plugin-scanner */
 #mesondefine GST_PLUGIN_SCANNER_INSTALLED
 

diff --git a/configure.ac b/configure.ac
index 9fa6824..58f1944 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -170,28 +170,6 @@ AC_SUBST([BASH_COMPLETION_DIR])
 AC_SUBST([BASH_HELPERS_DIR])
 AM_CONDITIONAL([ENABLE_BASH_COMPLETION],[test "x$with_bash_completion_dir" != "xno"])
 
-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/plugins/elements/Makefile.am b/plugins/elements/Makefile.am
index 3d11dbe..1bbc35f 100644 (file)
--- a/plugins/elements/Makefile.am
+++ b/plugins/elements/Makefile.am
@@ -33,7 +33,6 @@ libgstcoreelements_la_LIBADD = \
        $(top_builddir)/libs/gst/base/libgstbase-@GST_API_VERSION@.la \
        $(GST_OBJ_LIBS)
 libgstcoreelements_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstcoreelements_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS =               \
        gstcapsfilter.h         \

diff --git a/plugins/elements/meson.build b/plugins/elements/meson.build
index 9b0f4c8..abb2e26 100644 (file)
--- a/plugins/elements/meson.build
+++ b/plugins/elements/meson.build
@@ -28,7 +28,7 @@ gst_elements_sources = [
 if libtype != 'shared'
   gst_elements_static = static_library('gstcoreelements',
     gst_elements_sources,
-    c_args : gst_c_args + ['-DGST_PLUGIN_BUILD_STATIC'],
+    c_args : gst_c_args,
     include_directories : [configinc],
     dependencies : [gobject_dep, glib_dep, gst_dep, gst_base_dep],
     install : true,

diff --git a/plugins/tracers/Makefile.am b/plugins/tracers/Makefile.am
index d52bb28..975ca8b 100644 (file)
--- a/plugins/tracers/Makefile.am
+++ b/plugins/tracers/Makefile.am
@@ -30,7 +30,6 @@ libgstcoretracers_la_LIBADD = \
        $(GST_PRINTF_LA) \
        $(GST_OBJ_LIBS)
 libgstcoretracers_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstcoretracers_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = \
   gstlatency.h \