[poppler] [patch] Allow to build without cairo

[Albert Astals Cid]

A Divendres 04 Març 2005 11:45, Brad Hards va escriure:
> If you don't have cairo, the ./configure script dies (unless you use
> --disable-cairo-output), but there is a more pleasant way. With this patch,
> cairo is used if available.
Even if you use --disable-cairo-output ? I mean if i have cairo available but 
use --disable-cairo-output is it used? You sentence seems to imply yes.

Albert

>
> diff -u -4 -p -r1.1.1.1 configure.ac
> --- configure.ac        3 Mar 2005 19:45:58 -0000       1.1.1.1
> +++ configure.ac        4 Mar 2005 10:39:54 -0000
> @@ -112,12 +112,14 @@ AM_CONDITIONAL(BUILD_SPLASH_OUTPUT, test
>  AC_ARG_ENABLE(cairo-output,
>                AC_HELP_STRING([--disable-cairo-output],
>                              [Don't build the cairo graphics backend.]),,
>                enable_cairo_output="yes")
> -AM_CONDITIONAL(BUILD_CAIRO_OUTPUT, test x$enable_cairo_output = xyes)
>  if test x$enable_cairo_output = xyes; then
> -  PKG_CHECK_MODULES(CAIRO, cairo >= 0.3)
> +  PKG_CHECK_MODULES(CAIRO, cairo >= 0.3,
> +       [enable_cairo_output="yes"],
> +       [enable_cairo_output="no"])
>  fi
> +AM_CONDITIONAL(BUILD_CAIRO_OUTPUT, test x$enable_cairo_output = xyes)
>
>  AC_ARG_ENABLE(gtk-test,
>                AC_HELP_STRING([--disable-gtk-test],
>                              [Don't compile GTK+ test program.]),,