diff options
| author | marha <marha@users.sourceforge.net> | 2011-09-12 09:07:21 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-09-12 09:07:21 +0200 |
| commit | 0b40f5f4b54453a77f4b09c431f8efc6875da61f (patch) | |
| tree | c1f08e0dd75a6ed7876c24c7219f93f01cab3605 /pixman/configure.ac | |
| parent | 75530c6eb2feebe234f7cb078c4caaf70c64981a (diff) | |
| parent | 24a692ce832161d3b794110dd82b1508d38a0887 (diff) | |
| download | vcxsrv-0b40f5f4b54453a77f4b09c431f8efc6875da61f.tar.gz vcxsrv-0b40f5f4b54453a77f4b09c431f8efc6875da61f.tar.bz2 vcxsrv-0b40f5f4b54453a77f4b09c431f8efc6875da61f.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/glsl/ast_to_hir.cpp
mesalib/src/glsl/glcpp/glcpp.c
mesalib/src/mesa/drivers/dri/common/dri_util.c
mesalib/src/mesa/drivers/dri/common/spantmp2.h
mesalib/src/mesa/drivers/dri/common/utils.c
mesalib/src/mesa/drivers/dri/swrast/swrast.c
mesalib/src/mesa/program/ir_to_mesa.cpp
mesalib/src/mesa/state_tracker/st_extensions.c
mesalib/src/mesa/state_tracker/st_mesa_to_tgsi.c
pixman/configure.ac
pixman/pixman/pixman-arm-neon-asm.S
pixman/test/Makefile.am
pixman/test/utils.c
pixman/test/utils.h
Diffstat (limited to 'pixman/configure.ac')
| -rw-r--r-- | pixman/configure.ac | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/pixman/configure.ac b/pixman/configure.ac index 7cbc2254a..41a766197 100644 --- a/pixman/configure.ac +++ b/pixman/configure.ac @@ -54,7 +54,7 @@ AC_PREREQ([2.57]) m4_define([pixman_major], 0)
m4_define([pixman_minor], 23)
-m4_define([pixman_micro], 3)
+m4_define([pixman_micro], 5)
m4_define([pixman_version],[pixman_major.pixman_minor.pixman_micro])
@@ -801,6 +801,17 @@ fi AC_MSG_RESULT($support_for_attribute_constructor)
AC_SUBST(TOOLCHAIN_SUPPORTS_ATTRIBUTE_CONSTRUCTOR)
+dnl ==================
+dnl libpng
+
+AC_CHECK_LIB([png], [png_write_info], [have_libpng=yes], [have_libpng=no])
+
+if test x$have_libpng = xyes; then
+ AC_DEFINE([HAVE_LIBPNG], [1], [Whether we have libpng])
+fi
+
+AC_SUBST(HAVE_LIBPNG)
+
AC_OUTPUT([pixman-1.pc
pixman-1-uninstalled.pc
Makefile
|