diff options
| author | marha <marha@users.sourceforge.net> | 2010-08-26 09:41:40 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-08-26 09:41:40 +0000 |
| commit | 29990b52b9d48ba282da3c773a92316a33cc0b19 (patch) | |
| tree | 5542038845387b00dc11aa00e5f0e4e61ba6c438 /pixman/configure.ac | |
| parent | f1e55ffbe94408dc7aee8a9a5fbb45fdd72afe9b (diff) | |
| parent | 9e5a55add045483af139e9e994325ca70eadc8fc (diff) | |
| download | vcxsrv-29990b52b9d48ba282da3c773a92316a33cc0b19.tar.gz vcxsrv-29990b52b9d48ba282da3c773a92316a33cc0b19.tar.bz2 vcxsrv-29990b52b9d48ba282da3c773a92316a33cc0b19.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'pixman/configure.ac')
| -rw-r--r-- | pixman/configure.ac | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/pixman/configure.ac b/pixman/configure.ac index 1b592de14..851a16a66 100644 --- a/pixman/configure.ac +++ b/pixman/configure.ac @@ -178,7 +178,6 @@ AC_SUBST(PIXMAN_VERSION_MICRO) AC_SUBST(LT_VERSION_INFO)
# Check for dependencies
-#PKG_CHECK_MODULES(DEP, x11)
PIXMAN_CHECK_CFLAG([-Wall])
PIXMAN_CHECK_CFLAG([-fno-strict-aliasing])
@@ -585,11 +584,18 @@ AC_ARG_ENABLE(gtk, [enable_gtk=$enableval], [enable_gtk=auto])
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])
+fi
+
if test $enable_gtk = auto ; then
- PKG_CHECK_EXISTS([gtk+-2.0], [enable_gtk=yes], [enable_gtk=no])
+ AC_CHECK_LIB([pixman-1], [pixman_version_string], [enable_gtk=auto], [enable_gtk=no])
fi
-if test $enable_gtk = yes ; then
- PKG_CHECK_MODULES(GTK, [gtk+-2.0])
+
+if test $enable_gtk = auto ; then
+ PKG_CHECK_MODULES(GTK, [gtk+-2.0 pixman-1], [enable_gtk=yes], [enable_gtk=no])
fi
AM_CONDITIONAL(HAVE_GTK, [test "x$enable_gtk" = xyes])
|