17 [test_pdf="no (requires $poppler_DEPENDENCY)"]) |
17 [test_pdf="no (requires $poppler_DEPENDENCY)"]) |
18 if test "x$test_pdf" = "xyes"; then |
18 if test "x$test_pdf" = "xyes"; then |
19 AC_DEFINE([CAIRO_CAN_TEST_PDF_SURFACE], 1, [Define to 1 if the PDF backend can be tested (need poppler and other dependencies for pdf2png)]) |
19 AC_DEFINE([CAIRO_CAN_TEST_PDF_SURFACE], 1, [Define to 1 if the PDF backend can be tested (need poppler and other dependencies for pdf2png)]) |
20 + # Ensure cairo is omitted so that no attempt is made to link to any |
20 + # Ensure cairo is omitted so that no attempt is made to link to any |
21 + # system-installed versions causing a multiple inclusion build failure. |
21 + # system-installed versions causing a multiple inclusion build failure. |
22 + POPPLER_LIBS=$(echo "$POPPLER_LIBS" | $SED -e 's/-lcairo //') |
22 + POPPLER_LIBS=$(echo "$POPPLER_LIBS " | $SED -e 's/-lcairo //g') |
23 else |
23 else |
24 AC_MSG_WARN([PDF backend will not be tested since poppler >= $POPPLER_VERSION_REQUIRED is not available]) |
24 AC_MSG_WARN([PDF backend will not be tested since poppler >= $POPPLER_VERSION_REQUIRED is not available]) |
25 fi |
25 fi |
26 @@ -645,6 +648,9 @@ |
26 @@ -645,6 +648,9 @@ |
27 [test_svg="no (requires $librsvg_DEPENDENCY)"]) |
27 [test_svg="no (requires $librsvg_DEPENDENCY)"]) |
28 if test "x$test_svg" = "xyes"; then |
28 if test "x$test_svg" = "xyes"; then |
29 AC_DEFINE([CAIRO_CAN_TEST_SVG_SURFACE], 1, [Define to 1 if the SVG backend can be tested]) |
29 AC_DEFINE([CAIRO_CAN_TEST_SVG_SURFACE], 1, [Define to 1 if the SVG backend can be tested]) |
30 + # Ensure cairo is omitted so that no attempt is made to link to any |
30 + # Ensure cairo is omitted so that no attempt is made to link to any |
31 + # system-installed versions causing a multiple inclusion build failure. |
31 + # system-installed versions causing a multiple inclusion build failure. |
32 + LIBRSVG_LIBS=$(echo "$LIBRSVG_LIBS" | $SED -e 's/-lcairo //') |
32 + LIBRSVG_LIBS=$(echo "$LIBRSVG_LIBS " | $SED -e 's/-lcairo //g') |
33 else |
33 else |
34 AC_MSG_WARN([SVG backend will not be tested since librsvg >= $LIBRSVG_VERSION_REQUIRED is not available]) |
34 AC_MSG_WARN([SVG backend will not be tested since librsvg >= $LIBRSVG_VERSION_REQUIRED is not available]) |
35 fi |
35 fi |
36 @@ -850,6 +856,9 @@ |
36 @@ -850,6 +856,9 @@ |
37 # We use GTK+ for some utility/debugging tools |
37 # We use GTK+ for some utility/debugging tools |
38 PKG_CHECK_MODULES(gtk, "gtk+-2.0",have_gtk=yes, have_gtk=no) |
38 PKG_CHECK_MODULES(gtk, "gtk+-2.0",have_gtk=yes, have_gtk=no) |
39 AM_CONDITIONAL(HAVE_GTK, test "x$have_gtk" = "xyes") |
39 AM_CONDITIONAL(HAVE_GTK, test "x$have_gtk" = "xyes") |
40 +# Ensure cairo is omitted so that no attempt is made to link to any |
40 +# Ensure cairo is omitted so that no attempt is made to link to any |
41 +# system-installed versions causing a multiple inclusion build failure. |
41 +# system-installed versions causing a multiple inclusion build failure. |
42 +gtk_LIBS=$(echo "$gtk_LIBS" | $SED -e 's/-lcairo //') |
42 +gtk_LIBS=$(echo "$gtk_LIBS " | $SED -e 's/-lcairo //g') |
43 |
43 |
44 AC_CONFIG_FILES([ |
44 AC_CONFIG_FILES([ |
45 Makefile |
45 Makefile |