From e9c8ae21d54fbf5f70da4d5a6c9b58136cbaa1fa Mon Sep 17 00:00:00 2001 From: Thomas White Date: Sat, 28 Sep 2013 12:10:23 +0200 Subject: configure.ac: Fix test for gdk-pixbuf --- configure.ac | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'configure.ac') 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], -- cgit v1.2.3