[poppler] configure.ac

[Adrian Johnson]

 configure.ac |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

New commits:
commit baaf93f0e47a1978f9ea80e9394543a25b763d77
Author: Adrian Johnson <ajohnson at redneon.com>
Date:   Thu Jan 12 01:05:07 2012 +1030

    configure.ac: print the cairo version required if not found
    
    Bug 44619

diff --git a/configure.ac b/configure.ac
index 0c542f1..f08906d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -381,12 +381,17 @@ AC_ARG_ENABLE(cairo-output,
                              [Don't build the cairo graphics backend.]),
               enable_cairo_output=$enableval,
               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)
 elif test x$enable_cairo_output = xtry; then
   PKG_CHECK_MODULES(CAIRO, cairo >= $CAIRO_VERSION cairo-ft >= $CAIRO_VERSION,
                     [enable_cairo_output="yes"],
-                    [enable_cairo_output="no"])
+                    [enable_cairo_output="no"
+		     use_cairo="no (requires cairo >= $CAIRO_VERSION)"])
+fi
+if test x$use_cairo = x; then
+   use_cairo=$enable_cairo_output
 fi
 
 AC_SUBST(CAIRO_CFLAGS)
@@ -644,7 +649,7 @@ echo ""
 echo "Building poppler with support for:"
 echo "  font configuration: $with_font_configuration"
 echo "  splash output:      $enable_splash_output"
-echo "  cairo output:       $enable_cairo_output"
+echo "  cairo output:       $use_cairo"
 echo "  qt4 wrapper:        $enable_poppler_qt4"
 echo "  glib wrapper:       $enable_poppler_glib"
 echo "    introspection:    $found_introspection"