summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad <brad@comstyle.com>2011-07-30 01:45:55 -0400
committerJustin M. Forbes <jforbes@redhat.com>2011-10-03 14:41:44 -0500
commit336398391a8b82863b4eaafcff250625f68a71a2 (patch)
tree514f2057ce6f2644c1e08b7de89d926e9ad1c4ba
parent672aefeb5e0960e9f03d1d71eb1d0688fc54b8d2 (diff)
downloadqemu-336398391a8b82863b4eaafcff250625f68a71a2.tar.gz
Add support for finding libpng via pkg-config.
Signed-off-by: Brad Smith <brad@comstyle.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
-rwxr-xr-xconfigure6
1 files changed, 6 insertions, 0 deletions
diff --git a/configure b/configure
index 85c7aaefdf..29d6212119 100755
--- a/configure
+++ b/configure
@@ -1518,11 +1518,17 @@ int main(void) {
return 0;
}
EOF
+ if $pkg_config libpng --modversion >/dev/null 2>&1; then
+ vnc_png_cflags=`$pkg_config libpng --cflags 2> /dev/null`
+ vnc_png_libs=`$pkg_config libpng --libs 2> /dev/null`
+ else
vnc_png_cflags=""
vnc_png_libs="-lpng"
+ fi
if compile_prog "$vnc_png_cflags" "$vnc_png_libs" ; then
vnc_png=yes
libs_softmmu="$vnc_png_libs $libs_softmmu"
+ QEMU_CFLAGS="$QEMU_CFLAGS $vnc_png_cflags"
else
if test "$vnc_png" = "yes" ; then
feature_not_found "vnc-png"