diff options
| author | Hib Eris <hib@hiberis.nl> | 2014-08-12 18:12:45 +0200 |
|---|---|---|
| committer | Albert Astals Cid <aacid@kde.org> | 2014-08-12 18:13:54 +0200 |
| commit | 572c60764bbbd2080bfd7a926c646ad20b467aea (patch) | |
| tree | de55967a1efc008172894c2e79b7fd94b13f8096 /configure.ac | |
| parent | 4a4fe80d85a31b10822c7cd8eb5a0698bf306a52 (diff) | |
Makefile.am cleanups
Bug #79411
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 9436fddd..477b2f7e 100644 --- a/configure.ac +++ b/configure.ac @@ -465,6 +465,7 @@ fi CAIRO_VERSION="1.10.0" AC_SUBST(CAIRO_VERSION) +CAIRO_DEPS="cairo >= $CAIRO_VERSION cairo-ft >= $CAIRO_VERSION)" AC_ARG_ENABLE(cairo-output, AC_HELP_STRING([--disable-cairo-output], [Don't build the cairo graphics backend.]), @@ -472,9 +473,9 @@ AC_ARG_ENABLE(cairo-output, enable_cairo_output="try") use_cairo="" if test x$enable_cairo_output = xyes; then - PKG_CHECK_MODULES(CAIRO, cairo >= $CAIRO_VERSION cairo-ft >= $CAIRO_VERSION) + PKG_CHECK_MODULES(CAIRO, $CAIRO_DEPS) elif test x$enable_cairo_output = xtry; then - PKG_CHECK_MODULES(CAIRO, cairo >= $CAIRO_VERSION cairo-ft >= $CAIRO_VERSION, + PKG_CHECK_MODULES(CAIRO, $CAIRO_DEPS, [enable_cairo_output="yes"], [enable_cairo_output="no" use_cairo="no (requires cairo >= $CAIRO_VERSION)"]) @@ -699,15 +700,19 @@ fi AM_CONDITIONAL(BUILD_POPPLER_CPP, test "x$enable_poppler_cpp" = "xyes") +GTK_TEST_DEPS='gtk+-3.0 >= 3.8 gdk-pixbuf-2.0' +if test x$enable_cairo_output = xyes; then + GTK_TEST_DEPS="$GTK_TEST_DEPS $CAIRO_DEPS" +fi AC_ARG_ENABLE(gtk-test, AC_HELP_STRING([--disable-gtk-test], [Don't compile GTK+ test program.]), enable_gtk_test=$enableval, enable_gtk_test="try") if test x$enable_gtk_test = xyes; then - PKG_CHECK_MODULES(GTK_TEST, gtk+-3.0 >= 3.8 gdk-pixbuf-2.0) + PKG_CHECK_MODULES(GTK_TEST, $GTK_TEST_DEPS) elif test x$enable_gtk_test = xtry; then - PKG_CHECK_MODULES(GTK_TEST, gtk+-3.0 >= 3.8 gdk-pixbuf-2.0, + PKG_CHECK_MODULES(GTK_TEST, $GTK_TEST_DEPS, [enable_gtk_test="yes"], [enable_gtk_test="no"]) fi |