X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=configure.ac;h=ec5ee2eae28e4cbb8ccec7ecf0e314d040411d20;hb=dda82f83e66a6e5efa72f0e15a1f76a61f990e92;hp=7d33ca25daf29827ced92b991aa0e05179380989;hpb=5cdb1f83c37674ee6d588bb0104729d564012ecb;p=pspp diff --git a/configure.ac b/configure.ac index 7d33ca25da..ec5ee2eae2 100644 --- a/configure.ac +++ b/configure.ac @@ -56,11 +56,11 @@ AC_ARG_WITH([cairo], [], [with_cairo=yes]) AM_CONDITIONAL([HAVE_CAIRO], [test "$with_cairo" != no]) if test "$with_cairo" != no; then - PKG_CHECK_MODULES([CAIRO], [cairo >= 1.5 pango >= 1.20 pangocairo], + PKG_CHECK_MODULES([CAIRO], [cairo >= 1.5 pango >= 1.22 pangocairo], [CPPFLAGS="$CPPFLAGS $CAIRO_CFLAGS" AC_DEFINE([HAVE_CAIRO], 1, [Define to 1 if Cairo and Pango are available.])], - [PSPP_REQUIRED_PREREQ([cairo 1.5 or later and pango 1.20 or later (or use --without-cairo)])]) + [PSPP_REQUIRED_PREREQ([cairo 1.5 or later and pango 1.22 or later (or use --without-cairo)])]) AC_PATH_PROG([XMLLINT], [xmllint], [echo], [$PATH]) AC_SUBST(XMLLINT) fi @@ -73,6 +73,9 @@ AC_ARG_WITH([gui], AM_CONDITIONAL([HAVE_GUI], [test "$with_cairo" != no && test "$with_gui" != "no"]) if test "$with_cairo" != no && test "$with_gui" != "no"; then + PKG_CHECK_MODULES([GTHREAD], [gthread-2.0], [], + [PSPP_REQUIRED_PREREQ([gthread 2.0 (or use --without-gui)])]) + PKG_CHECK_MODULES([GTK], [gtk+-2.0 >= 2.16], [], [PSPP_REQUIRED_PREREQ([gtk+ 2.0 version 2.16 or later (or use --without-gui)])])