summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorStefano Sabatini <stefano.sabatini-lala@poste.it>2009-09-15 23:54:31 +0000
committerStefano Sabatini <stefano.sabatini-lala@poste.it>2009-09-15 23:54:31 +0000
commit8cd6b388f43396eb022aeb0e75752d956de5f81f (patch)
treee6aa51edd509365ead2aac6179062264211315df /configure
parentea25c063c303160e92b2566057614bd6863c48ea (diff)
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
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure4
1 files changed, 2 insertions, 2 deletions
diff --git a/configure b/configure
index 6aa6177546..a071b29697 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