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/configure.ac b/configure.ac
index 86174f3..3a73678 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -152,27 +152,9 @@ dnl *** set variables based on configure arguments ***
 dnl set location of plugin directory
 AG_GST_SET_PLUGINDIR
 
-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 Detect if we are building static plugins, in which case we need to
+dnl generates libav .la files and install the static libraries.
+AM_CONDITIONAL(GST_PLUGIN_BUILD_STATIC, test "x$enable_static" = "xyes")
 
 dnl define an ERROR_CFLAGS Makefile variable
 AG_GST_SET_ERROR_CFLAGS($FATAL_WARNINGS, [

diff --git a/ext/libav/Makefile.am b/ext/libav/Makefile.am
index 30529ae..ea09836 100644 (file)
--- a/ext/libav/Makefile.am
+++ b/ext/libav/Makefile.am
@@ -18,7 +18,6 @@ libgstlibav_la_SOURCES = gstav.c      \
 #                        gstavscale.c
 
 libgstlibav_la_CFLAGS = $(LIBAV_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
-libgstlibav_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 libgstlibav_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \
        -lgstaudio-$(GST_API_VERSION) -lgstvideo-$(GST_API_VERSION) \
        -lgstpbutils-$(GST_API_VERSION) $(GST_BASE_LIBS) \

diff --git a/ext/libswscale/Makefile.am b/ext/libswscale/Makefile.am
index 510647b..f05056d 100644 (file)
--- a/ext/libswscale/Makefile.am
+++ b/ext/libswscale/Makefile.am
@@ -8,7 +8,6 @@ libgstavscale_la_LIBADD = $(SWSCALE_LIBS) \
        $(GST_PLUGINS_BASE_LIBS) -lgstvideo-$(GST_API_VERSION) \
        $(GST_BASE_LIBS) $(ORC_LIBS) $(LIBM) -lz
 libgstavscale_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(DARWIN_LDFLAGS)
-libgstavscale_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 if HAVE_LIBAV_UNINSTALLED
 libgstavscale_la_DEPENDENCIES = $(SWSCALE_DEPS)