Browse code

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

Stefano Sabatini authored on 2009/09/16 08:54:31
Showing 1 changed files
... ...
@@ -2796,10 +2796,10 @@ includedir=$incdir
2796 2796
 Name: $name
2797 2797
 Description: $comment
2798 2798
 Version: $version
2799
-Requires: $(disabled shared && echo $requires)
2799
+Requires: $(enabled shared || echo $requires)
2800 2800
 Requires.private: $(enabled shared && echo $requires)
2801 2801
 Conflicts:
2802
-Libs: -L\${libdir} -l${shortname} $(disabled shared && echo $libs)
2802
+Libs: -L\${libdir} -l${shortname} $(enabled shared || echo $libs)
2803 2803
 Libs.private: $(enabled shared && echo $libs)
2804 2804
 Cflags: -I\${includedir}
2805 2805
 EOF