aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-09-14 14:25:02 +0200
committermarha <marha@users.sourceforge.net>2011-09-14 14:25:02 +0200
commit49659ef96348cc1bb20813abf7578acdb3cfe3d1 (patch)
treead3b2731c60606654653364aee8f81952449def0
parent16b53769eba7d5d8249a217aa29287d72b7713c2 (diff)
downloadvcxsrv-49659ef96348cc1bb20813abf7578acdb3cfe3d1.tar.gz
vcxsrv-49659ef96348cc1bb20813abf7578acdb3cfe3d1.tar.bz2
vcxsrv-49659ef96348cc1bb20813abf7578acdb3cfe3d1.zip
pixman git update 14 sep 2011
-rw-r--r--pixman/configure.ac2
-rw-r--r--pixman/test/Makefile.am4
2 files changed, 3 insertions, 3 deletions
diff --git a/pixman/configure.ac b/pixman/configure.ac
index 21613e135..dc523df0f 100644
--- a/pixman/configure.ac
+++ b/pixman/configure.ac
@@ -804,7 +804,7 @@ AC_SUBST(TOOLCHAIN_SUPPORTS_ATTRIBUTE_CONSTRUCTOR)
dnl ==================
dnl libpng
-AC_CHECK_LIB([png], [png_write_info], [have_libpng=yes], [have_libpng=no])
+PKG_CHECK_MODULES(PNG, [libpng], have_libpng=yes, have_libpng=no)
if test x$have_libpng = xyes; then
AC_DEFINE([HAVE_LIBPNG], [1], [Whether we have libpng])
diff --git a/pixman/test/Makefile.am b/pixman/test/Makefile.am
index 52ef8ad96..6687bed35 100644
--- a/pixman/test/Makefile.am
+++ b/pixman/test/Makefile.am
@@ -1,7 +1,7 @@
AM_CFLAGS = @OPENMP_CFLAGS@
AM_LDFLAGS = @OPENMP_CFLAGS@ @TESTPROGS_EXTRA_LDFLAGS@
-LDADD = $(top_builddir)/pixman/libpixman-1.la -lm -lpng
-INCLUDES = -I$(top_srcdir)/pixman -I$(top_builddir)/pixman
+LDADD = $(top_builddir)/pixman/libpixman-1.la -lm @PNG_LIBS@
+INCLUDES = -I$(top_srcdir)/pixman -I$(top_builddir)/pixman @PNG_CFLAGS@
TESTPROGRAMS = \
a1-trap-test \