diff options
| author | marha <marha@users.sourceforge.net> | 2011-09-14 15:09:39 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-09-14 15:09:39 +0200 |
| commit | a0fc33d46dfe59745f22decb93fe147292335602 (patch) | |
| tree | 1a4f7f0752a1c8935e12130c3142031272495ce6 /pixman | |
| parent | dafebc5bb70303f0b5baf0b087cf4d9a64b5c7f0 (diff) | |
| parent | e066f54c99aecce620158fe7f31589242df55677 (diff) | |
| download | vcxsrv-a0fc33d46dfe59745f22decb93fe147292335602.tar.gz vcxsrv-a0fc33d46dfe59745f22decb93fe147292335602.tar.bz2 vcxsrv-a0fc33d46dfe59745f22decb93fe147292335602.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'pixman')
| -rw-r--r-- | pixman/configure.ac | 2 | ||||
| -rw-r--r-- | pixman/test/Makefile.am | 4 |
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 \ |