mirror of
https://github.com/xenia-project/FFmpeg.git
synced 2024-11-24 03:59:43 +00:00
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
This commit is contained in:
parent
ea25c063c3
commit
8cd6b388f4
4
configure
vendored
4
configure
vendored
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user