From: Brad <brad@comstyle.com>
Date: Sat, 30 Jul 2011 05:45:55 +0000 (-0400)
Subject: Add support for finding libpng via pkg-config.
X-Git-Tag: v1.0-rc0~568^2~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9af8025e24185172a8857ed9b32d1d0ccd6aa79b;p=thirdparty%2Fqemu.git

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>
---

diff --git a/configure b/configure
index fc608888438..269bf43e133 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"