summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--ChangeLog.pre-2-106
-rw-r--r--configure.in17
3 files changed, 28 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 405c27f6f..279837cf8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-04-24 Alexander Larsson <alexl@redhat.com>
+
+ * configure.in:
+ Check for cairo-pdf.h.
+ Check for cairo-ps.h on non-win32.
+
2006-04-24 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkclipboard.h:
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 405c27f6f..279837cf8 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+2006-04-24 Alexander Larsson <alexl@redhat.com>
+
+ * configure.in:
+ Check for cairo-pdf.h.
+ Check for cairo-ps.h on non-win32.
+
2006-04-24 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkclipboard.h:
diff --git a/configure.in b/configure.in
index 83b44fe75..857bf9d53 100644
--- a/configure.in
+++ b/configure.in
@@ -1549,7 +1549,22 @@ if test "x$CUPS_CONFIG" != "xno"; then
fi
AM_CONDITIONAL(HAVE_CUPS, test "x$CUPS_CONFIG" != "xno")
-
+gtk_save_cppflags="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $GTK_DEP_CFLAGS"
+
+AC_CHECK_HEADER(cairo-pdf.h,,AC_MSG_ERROR([
+*** Can't find cairo-pdf.h. You must build Cairo with the pdf
+*** backend enabled.]))
+
+if test "$os_win32" != "yes"; then
+ AC_CHECK_HEADER(cairo-ps.h,,AC_MSG_ERROR([
+*** Can't find cairo-ps.h. You must build Cairo with the
+*** postscript backend enabled.]))
+fi
+
+CPPFLAGS="$gtk_save_cppflags"
+
+
################################################################
# Strip -export-dynamic from the link lines of various libraries
################################################################