aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad <brad@comstyle.com>2011-07-30 01:45:55 -0400
committerAnthony Liguori <aliguori@us.ibm.com>2011-08-04 16:43:10 -0500
commit9af8025e24185172a8857ed9b32d1d0ccd6aa79b (patch)
tree2105a71b75383cc119156ec5aace710f6b068097
parent46f08792bb4a69ab8aab897c174d82b006026140 (diff)
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 fc60888843..269bf43e13 100755
--- a/configure
+++ b/configure
@@ -1512,11 +1512,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"