aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas White <taw@physics.org>2013-09-28 12:10:23 +0200
committerThomas White <taw@physics.org>2013-09-28 12:25:26 +0200
commite9c8ae21d54fbf5f70da4d5a6c9b58136cbaa1fa (patch)
tree73c67b9342ae9e86a8d37e4a5bf9f3367be99bda
parent0c8386b95dfa444660cdab2df03e3a6f0e175450 (diff)
configure.ac: Fix test for gdk-pixbuf
-rw-r--r--configure.ac19
1 files changed, 12 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac
index e5a2a976..03938aa2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -204,27 +204,32 @@ AS_IF([test "x$enable_pango" != "xno"],
])
+have_gdk_pixbuf=false
AC_MSG_CHECKING([whether to use GDK-pixbuf])
AC_ARG_ENABLE([gdk-pixbuf], AS_HELP_STRING([--disable-gdk-pixbuf],
- [Disable the use of gtk-pixbuf]))
+ [Disable the use of gdk-pixbuf]))
AS_IF([test "x$enable_gdk_pixbuf" != "xno"],
[
AC_MSG_RESULT([yes])
- PKG_CHECK_MODULES([GDK_pixbuf], [gdk-pixbuf], [],
+
+ PKG_CHECK_MODULES([GDK_pixbuf_2], [gdk-pixbuf-2.0],
[
- PKG_CHECK_MODULES([GDK_pixbuf_2], [gdk-pixbuf-2.0],
+ have_gdk_pixbuf=true
+ ], [
+ PKG_CHECK_MODULES([GDK_pixbuf], [gdk-pixbuf], [],
[
- AC_DEFINE([HAVE_GDK_PIXBUF], [1],
- [Define to 1 if gdk-pixbuf is available])
have_gdk_pixbuf=true
- ], [
- have_gdk_pixbuf=false
])
])
], [
AC_MSG_RESULT([no])
])
+AS_IF([test "$have_gdk_pixbuf" != "false"],
+[
+ AC_DEFINE([HAVE_GDK_PIXBUF], [1], [Define to 1 if gdk-pixbuf is available])
+])
+
AC_CHECK_LIB([pthread], [sched_setaffinity], [
AC_DEFINE([HAVE_CPU_AFFINITY], [1],