Make the LGPL build the default and require --enable-gpl to build a GPL licensed...

diff --git a/configure.ac b/configure.ac
index f26d2f8..f44c4e3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -241,11 +241,11 @@ if test "x$HAVE_LZMA" = "xno"; then
     AC_WARN([lzma not found, tiff reader will not be able to read lzma files])
 fi
 
-AC_ARG_ENABLE(lgpl,
-              [AC_HELP_STRING([--enable-lgpl], [build a LGPL licensed gst-libav])])
-AM_CONDITIONAL(GST_LIBAV_ENABLE_LGPL, test "x$enable_lgpl" = "xyes")
-if test "x$enable_lgpl" = "xyes"; then
-  AC_DEFINE([GST_LIBAV_ENABLE_LGPL], [], [Defined if building a LGPL-only version of gst-libav])
+AC_ARG_ENABLE(gpl,
+              [AC_HELP_STRING([--enable-gpl], [build a GPL licensed gst-libav])])
+AM_CONDITIONAL(GST_LIBAV_ENABLE_GPL, test "x$enable_gpl" = "xyes")
+if test "x$enable_gpl" = "xyes"; then
+  AC_DEFINE([GST_LIBAV_ENABLE_GPL], [], [Defined if building a GPL-licensed version of gst-libav])
 fi
 
 dnl *** configure external libs ***
@@ -325,7 +325,7 @@ else
         --disable-network --disable-hwaccels --disable-dxva2 --disable-vdpau\
         --disable-filters --disable-doc --enable-optimizations"
 
-  if test "x$enable_lgpl" != "xyes"; then
+  if test "x$enable_gpl" == "xyes"; then
     emblibav_configure_args="$emblibav_configure_args --enable-gpl"
   fi
 

diff --git a/ext/libav/gstav.c b/ext/libav/gstav.c
index 2321a4c..1c2e482 100644 (file)
--- a/ext/libav/gstav.c
+++ b/ext/libav/gstav.c
@@ -150,9 +150,9 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     libav,
     "All libav codecs and formats (" LIBAV_SOURCE ")",
     plugin_init, PACKAGE_VERSION,
-#ifdef GST_LIBAV_ENABLE_LGPL
-    "LGPL",
-#else
+#ifdef GST_LIBAV_ENABLE_GPL
     "GPL",
+#else
+    "LGPL",
 #endif
     "libav", "http://www.libav.org")

diff --git a/ext/libswscale/gstffmpegscale.c b/ext/libswscale/gstffmpegscale.c
index a2b0248..f34259b 100644 (file)
--- a/ext/libswscale/gstffmpegscale.c
+++ b/ext/libswscale/gstffmpegscale.c
@@ -743,9 +743,9 @@ GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     avvideoscale,
     "libav videoscaling element (" LIBAV_SOURCE ")", plugin_init,
     PACKAGE_VERSION,
-#ifdef GST_LIBAV_ENABLE_LGPL
-    "LGPL",
-#else
+#ifdef GST_LIBAV_ENABLE_GPL
     "GPL",
+#else
+    "LGPL",
 #endif
     "libav", "http://www.libav.org/")