[SCM] libav/experimental: Make pkgconfig_generate() fill Libs with the required linking flags if the "shared" var has not been explicitely enabled, rather than if it has been explicitly disabled.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:51:12 UTC 2013


The following commit has been merged in the experimental branch:
commit 8cd6b388f43396eb022aeb0e75752d956de5f81f
Author: Stefano Sabatini <stefano.sabatini-lala at poste.it>
Date:   Tue Sep 15 23:54:31 2009 +0000

    Make pkgconfig_generate() fill Libs with the required linking flags
    if the "shared" var has not been explicitely enabled, rather than if
    it has been explicitly disabled.
    
    This way is not necessary to explicitly disable shared libraries in
    order to have a pc file usable with only static libraries.
    
    Originally committed as revision 19868 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/configure b/configure
index 6aa6177..a071b29 100755
--- a/configure
+++ b/configure
@@ -2796,10 +2796,10 @@ includedir=$incdir
 Name: $name
 Description: $comment
 Version: $version
-Requires: $(disabled shared && echo $requires)
+Requires: $(enabled shared || echo $requires)
 Requires.private: $(enabled shared && echo $requires)
 Conflicts:
-Libs: -L\${libdir} -l${shortname} $(disabled shared && echo $libs)
+Libs: -L\${libdir} -l${shortname} $(enabled shared || echo $libs)
 Libs.private: $(enabled shared && echo $libs)
 Cflags: -I\${includedir}
 EOF

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list