aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnssi Hannula <anssi.hannula@iki.fi>2008-05-28 23:54:04 +0000
committerDiego Biurrun <diego@biurrun.de>2008-05-28 23:54:04 +0000
commit12701f6e31f465377462c0fc2d5b34477c1c422b (patch)
tree2a8513b582f934e6a0402d9d75b9d13f40f0244b
parent161dab177fb4b6cfef66c7538b7c0622f9287278 (diff)
downloadffmpeg-12701f6e31f465377462c0fc2d5b34477c1c422b.tar.gz
Define private libraries as 'Libs:' when only static libraries are built,
so that they work correctly even without pkgconfig's --static option. patch by Anssi Hannula, anssi.hannula gmail com Originally committed as revision 13514 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rwxr-xr-xconfigure7
1 files changed, 3 insertions, 4 deletions
diff --git a/configure b/configure
index 8255183e38..4a00c41b27 100755
--- a/configure
+++ b/configure
@@ -2181,8 +2181,8 @@ Description: $comment
Version: $version
Requires: $requires
Conflicts:
-Libs: -L\${libdir} -l${shortname}
-Libs.private: $libs
+Libs: -L\${libdir} -l${shortname} $(disabled shared && echo $libs)
+Libs.private: $(enabled shared && echo $libs)
Cflags: -I\${includedir}
EOF
cat <<EOF > $name-uninstalled.pc
@@ -2196,8 +2196,7 @@ Description: $comment
Version: $version
Requires: $requires
Conflicts:
-Libs: \${libdir}/${LIBPREF}${shortname}${LIBSUF}
-Libs.private: $libs
+Libs: \${libdir}/${LIBPREF}${shortname}${LIBSUF} $libs
Cflags: -I\${includedir}
EOF
}