aboutsummaryrefslogtreecommitdiff
path: root/pixman
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-06-18 08:23:14 +0200
committermarha <marha@users.sourceforge.net>2013-06-18 08:23:14 +0200
commitb071050b9eda9d5e5185e582dbe9f4adba863ccc (patch)
tree6da290f7da04f9afc96691608b65967f2ee0e0fa /pixman
parent150771e7aabf4c864b0b970c5b8d773634793abe (diff)
downloadvcxsrv-b071050b9eda9d5e5185e582dbe9f4adba863ccc.tar.gz
vcxsrv-b071050b9eda9d5e5185e582dbe9f4adba863ccc.tar.bz2
vcxsrv-b071050b9eda9d5e5185e582dbe9f4adba863ccc.zip
libX11 libXmu libxcb/xcb-proto mesa mkfontscale pixman xkeyboard-config git update 18 June 2013
libxcb/xcb-proto commit e5f7c750815cb5170db363a2e5b09639b7354733 xkeyboard-config commit 30d804538462213ed01e8efc0b44a8e5a0aff990 libX11 commit 9dfb0f3c0a761590bcdc1f3396b1e064da4e18e8 pixman commit 279bdcda7ec3af8ac06312f4514b1b082a279544 mkfontscale commit f731c5c36f28ddd0f25f474d2991c96f9a7a915c libXmu commit e46ecb4e02b7f919b11efa79448d4db71d1deb69 mesa commit eb2021507556633cd6ba64cda26653e3c43e80df
Diffstat (limited to 'pixman')
-rw-r--r--pixman/configure.ac6
1 files changed, 3 insertions, 3 deletions
diff --git a/pixman/configure.ac b/pixman/configure.ac
index 221179ff1..5b9512ca5 100644
--- a/pixman/configure.ac
+++ b/pixman/configure.ac
@@ -616,7 +616,7 @@ AC_ARG_ENABLE(arm-iwmmxt2,
if test "x$IWMMXT_CFLAGS" = "x" ; then
IWMMXT_CFLAGS="-flax-vector-conversions -Winline -march=iwmmxt"
if test $enable_iwmmxt2 != no ; then
- IWMMXT_CFLAGS+="2"
+ IWMMXT_CFLAGS="${IWMMXT_CFLAGS}2"
fi
fi
@@ -778,7 +778,7 @@ PKG_PROG_PKG_CONFIG
if test $enable_gtk = yes ; then
AC_CHECK_LIB([pixman-1], [pixman_version_string])
- PKG_CHECK_MODULES(GTK, [gtk+-2.0 pixman-1])
+ PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.16 pixman-1])
fi
if test $enable_gtk = auto ; then
@@ -786,7 +786,7 @@ if test $enable_gtk = auto ; then
fi
if test $enable_gtk = auto ; then
- PKG_CHECK_MODULES(GTK, [gtk+-2.0 pixman-1], [enable_gtk=yes], [enable_gtk=no])
+ PKG_CHECK_MODULES(GTK, [gtk+-2.0 >= 2.16 pixman-1], [enable_gtk=yes], [enable_gtk=no])
fi
AM_CONDITIONAL(HAVE_GTK, [test "x$enable_gtk" = xyes])