Merge branch 'kvm'

dc879904 · Cédric de Saint Martin · 527a7dc5 · 18d01df1 · dc879904
Commit dc879904 authored Jul 15, 2011 by Cédric de Saint Martin
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

stack/kvm.cfg stack/kvm.cfg +3 -2

No files found.
--- a/stack/kvm.cfg
+++ b/stack/kvm.cfg
@@ -12,6 +12,7 @@ extends =
  ../component/openssl/buildout.cfg
  ../component/rdiff-backup/buildout.cfg
  ../component/dcron/buildout.cfg
+  ../component/libpng/buildout.cfg
 parts =
  template
@@ -64,8 +65,8 @@ configure-options =
  --disable-docs
  --enable-vnc-png
  --disable-vnc-jpeg
-  --extra-cflags="-I${gnutls:location}/include -I${libuuid:location}/include -I${zlib:location}/include"
+  --extra-cflags="-I${gnutls:location}/include -I${libuuid:location}/include -I${zlib:location}/include -I${libpng:location}/include"
-  --extra-ldflags="-Wl,-rpath -Wl,${gnutls:location}/lib -L${libuuid:location}/lib -Wl,-rpath -Wl,${libuuid:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib"
+  --extra-ldflags="-Wl,-rpath -Wl,${gnutls:location}/lib -L${gnutls:location}/lib -Wl,-rpath -Wl,${libpng:location}/lib -L${libpng:location}/lib -L${libuuid:location}/lib -Wl,-rpath -Wl,${libuuid:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -lpng -lz -lgnutls"
  --disable-werror
 environment =
  PKG_CONFIG_PATH=${gnutls:location}/lib/pkgconfig