Make it work with a preinstalled libcroco-0.6.1.

diff --git a/gnulib-local/ChangeLog b/gnulib-local/ChangeLog
index 7c7a68b6a6f39162f43a7f6780affae11134d230..280822109d0c43595ba7c0d1662133d18c4bbb32 100644 (file)
--- a/gnulib-local/ChangeLog
+++ b/gnulib-local/ChangeLog
@@ -1,3 +1,10 @@
+2007-10-27  Bruno Haible  <bruno@clisp.org>
+
+       * modules/libcroco (Makefile.am): When using the preinstalled libcroco,
+       add INCCROCO to AM_CPPFLAGS.
+       * lib/term-styled-ostream.oo.c: Work around broken double-inclusion
+       guard in libcroco-0.6.1.
+
 2007-10-27  Bruno Haible  <bruno@clisp.org>
 
        * modules/gettext-tools-misc (Makefile.am): Use @LTLIBC@ instead of

diff --git a/gnulib-local/lib/term-styled-ostream.oo.c b/gnulib-local/lib/term-styled-ostream.oo.c
index 92a5385c9147db1f1665156a5e2cc9f9443e6225..b9cbee58c616ef22d8918427093b07396aec8b2c 100644 (file)
--- a/gnulib-local/lib/term-styled-ostream.oo.c
+++ b/gnulib-local/lib/term-styled-ostream.oo.c
@@ -1,5 +1,5 @@
 /* Output stream for CSS styled text, producing ANSI escape sequences.
-   Copyright (C) 2006 Free Software Foundation, Inc.
+   Copyright (C) 2006-2007 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software: you can redistribute it and/or modify
@@ -26,7 +26,10 @@
 #include <cr-sel-eng.h>
 #include <cr-style.h>
 #include <cr-rgb.h>
-#include <cr-fonts.h>
+/* <cr-fonts.h> has a broken double-inclusion guard in libcroco-0.6.1.  */
+#ifndef __CR_FONTS_H__
+# include <cr-fonts.h>
+#endif
 #include <cr-string.h>
 
 #include "term-ostream.h"

diff --git a/gnulib-local/modules/libcroco b/gnulib-local/modules/libcroco
index 909892c1f60582b98c57de07fbde5a21a0e97681..6efeb555f38b677c8bc96367bf80570ad3a97176 100644 (file)
--- a/gnulib-local/modules/libcroco
+++ b/gnulib-local/modules/libcroco
@@ -75,6 +75,8 @@ AM_CPPFLAGS += -I$(srcdir)/libcroco
 lib_LIBADD += libcroco_rpl.la
 lib_DEPENDENCIES += libcroco_rpl.la
 noinst_LTLIBRARIES += libcroco_rpl.la
+else
+AM_CPPFLAGS += $(INCCROCO)
 endif
 
 libcroco_rpl_la_SOURCES = \