diff options
| author | marha <marha@users.sourceforge.net> | 2013-06-18 08:28:35 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-06-18 08:28:35 +0200 |
| commit | 230fe896faed312ef22d915e871fb5aee3ecfad0 (patch) | |
| tree | 971b0c0899c72496f97970319bfadfae383abbea /pixman | |
| parent | 180290f941da61bd80284d817e27c01cf789ee53 (diff) | |
| parent | b071050b9eda9d5e5185e582dbe9f4adba863ccc (diff) | |
| download | vcxsrv-230fe896faed312ef22d915e871fb5aee3ecfad0.tar.gz vcxsrv-230fe896faed312ef22d915e871fb5aee3ecfad0.tar.bz2 vcxsrv-230fe896faed312ef22d915e871fb5aee3ecfad0.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
libX11 libXmu libxcb/xcb-proto mesa mkfontscale pixman xkeyboard-config git update 18 June 2013
Diffstat (limited to 'pixman')
| -rw-r--r-- | pixman/configure.ac | 6 |
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]) |