summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/gettext/gettext-0.20.1
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-core/gettext/gettext-0.20.1')
-rw-r--r--meta/recipes-core/gettext/gettext-0.20.1/add-with-bisonlocaledir.patch58
-rw-r--r--meta/recipes-core/gettext/gettext-0.20.1/cr-statement.c-timsort.h-fix-formatting-issues.patch71
-rw-r--r--meta/recipes-core/gettext/gettext-0.20.1/parallel.patch32
-rw-r--r--meta/recipes-core/gettext/gettext-0.20.1/run-ptest6
-rw-r--r--meta/recipes-core/gettext/gettext-0.20.1/serial-tests-config.patch56
-rw-r--r--meta/recipes-core/gettext/gettext-0.20.1/use-pkgconfig.patch713
6 files changed, 936 insertions, 0 deletions
diff --git a/meta/recipes-core/gettext/gettext-0.20.1/add-with-bisonlocaledir.patch b/meta/recipes-core/gettext/gettext-0.20.1/add-with-bisonlocaledir.patch
new file mode 100644
index 0000000000..35a131067a
--- /dev/null
+++ b/meta/recipes-core/gettext/gettext-0.20.1/add-with-bisonlocaledir.patch
@@ -0,0 +1,58 @@
1From 04bd40fe2c48c6e01ab418a04d27c4aff644ad96 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Wed, 17 Feb 2016 23:54:02 -0500
4Subject: [PATCH] m4/bison-i18n.m4: add --with-bisonlocaledir to assign
5 BISON_LOCALEDIR
6
7The variable BISON_LOCALEDIR is assigned only by the output of
8'bison --print-localedir', we add option --with-bisonlocaledir
9to assign it explicitly. It is helpful for user to split the
10native compile and cross compile.
11
12For backward compatibility, if option not used, it still
13make use of the output of 'bison --print-localedir'.
14
15Upstream-Status: Submitted [bison-patches@gnu.org]
16
17Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
18---
19 gettext-tools/gnulib-m4/bison-i18n.m4 | 10 ++++++++--
20 1 file changed, 8 insertions(+), 2 deletions(-)
21
22diff --git a/gettext-tools/gnulib-m4/bison-i18n.m4 b/gettext-tools/gnulib-m4/bison-i18n.m4
23index f5cfd3a..fb6ac4d 100644
24--- a/gettext-tools/gnulib-m4/bison-i18n.m4
25+++ b/gettext-tools/gnulib-m4/bison-i18n.m4
26@@ -14,11 +14,16 @@ dnl sets BISON_LOCALEDIR to indicate where to find the bison-runtime.mo files
27 dnl and defines YYENABLE_NLS if there are bison-runtime.mo files at all.
28 AC_DEFUN([BISON_I18N],
29 [
30+ dnl Default is not to set bisonlocaledir
31+ AC_ARG_WITH([bisonlocaledir],
32+ [ --with-bisonlocaledir sets BISON_LOCALEDIR to indicate where to find the bison-runtime.mo files],
33+ BISON_LOCALEDIR=$withval,
34+ BISON_LOCALEDIR=)
35+
36 if test -z "$USE_NLS"; then
37 echo "The BISON-I18N macro is used without being preceded by AM-GNU-GETTEXT." 1>&2
38 exit 1
39 fi
40- BISON_LOCALEDIR=
41 BISON_USE_NLS=no
42 if test "$USE_NLS" = yes; then
43 dnl Determine bison's localedir.
44@@ -26,9 +31,10 @@ AC_DEFUN([BISON_I18N],
45 dnl But even is YACC is called "yacc", it may be a script that invokes bison
46 dnl and accepts the --print-localedir option.
47 dnl YACC's default value is empty; BISON's default value is :.
48- if (${YACC-${BISON-:}} --print-localedir) >/dev/null 2>&1; then
49+ if test -z "$BISON_LOCALEDIR" -a ${YACC-${BISON-:}} --print-localedir >/dev/null 2>&1; then
50 BISON_LOCALEDIR=`${YACC-${BISON-:}} --print-localedir`
51 fi
52+ AC_MSG_RESULT([$BISON_LOCALEDIR])
53 AC_SUBST([BISON_LOCALEDIR])
54 if test -n "$BISON_LOCALEDIR"; then
55 dnl There is no need to enable internationalization if the user doesn't
56--
571.9.1
58
diff --git a/meta/recipes-core/gettext/gettext-0.20.1/cr-statement.c-timsort.h-fix-formatting-issues.patch b/meta/recipes-core/gettext/gettext-0.20.1/cr-statement.c-timsort.h-fix-formatting-issues.patch
new file mode 100644
index 0000000000..0561ed7d32
--- /dev/null
+++ b/meta/recipes-core/gettext/gettext-0.20.1/cr-statement.c-timsort.h-fix-formatting-issues.patch
@@ -0,0 +1,71 @@
1From f6245ef5530fc37a6243e798df34162fbbeab6f0 Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Sun, 19 Feb 2017 23:32:46 -0800
4Subject: [PATCH] cr-statement.c/timsort.h: fix formatting issues
5
6Fixed when compile with "-Wformat -Wformat-security -Werror=format-security":
7| gettext-tools/gnulib-lib/libcroco/cr-statement.c: In function 'cr_statement_dump_charset':
8| gettext-tools/gnulib-lib/libcroco/cr-statement.c:2661:17: error: format not a string literal and no format arguments [-Werror=format-security]
9| fprintf (a_fp, str) ;
10
11And:
12gettext-tools/gnulib-lib/libxml/timsort.h:326:80: warning: format '%lu' expects argument of type 'long unsigned int', but argument 3 has type 'unsigned int' [-Wformat=]
13 fprintf(stderr, "Error allocating temporary storage for tim sort: need %lu bytes", sizeof(SORT_TYPE) * new_size);
14
15Upstream-Status: Pending
16
17Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
18
19---
20 libtextstyle/lib/libcroco/cr-statement.c | 10 +++++-----
21 1 file changed, 5 insertions(+), 5 deletions(-)
22
23diff --git a/libtextstyle/lib/libcroco/cr-statement.c b/libtextstyle/lib/libcroco/cr-statement.c
24index 617520f..100104b 100644
25--- a/libtextstyle/lib/libcroco/cr-statement.c
26+++ b/libtextstyle/lib/libcroco/cr-statement.c
27@@ -2607,7 +2607,7 @@ cr_statement_dump_ruleset (CRStatement * a_this, FILE * a_fp, glong a_indent)
28 g_return_if_fail (a_fp && a_this);
29 str = cr_statement_ruleset_to_string (a_this, a_indent);
30 if (str) {
31- fprintf (a_fp, str);
32+ fprintf (a_fp, "%s", str);
33 g_free (str);
34 str = NULL;
35 }
36@@ -2658,7 +2658,7 @@ cr_statement_dump_charset (CRStatement * a_this, FILE * a_fp, gulong a_indent)
37 str = cr_statement_charset_to_string (a_this,
38 a_indent) ;
39 if (str) {
40- fprintf (a_fp, str) ;
41+ fprintf (a_fp, "%s", str) ;
42 g_free (str) ;
43 str = NULL ;
44 }
45@@ -2685,7 +2685,7 @@ cr_statement_dump_page (CRStatement * a_this, FILE * a_fp, gulong a_indent)
46
47 str = cr_statement_at_page_rule_to_string (a_this, a_indent) ;
48 if (str) {
49- fprintf (a_fp, str);
50+ fprintf (a_fp, "%s", str);
51 g_free (str) ;
52 str = NULL ;
53 }
54@@ -2711,7 +2711,7 @@ cr_statement_dump_media_rule (CRStatement * a_this,
55
56 str = cr_statement_media_rule_to_string (a_this, a_indent) ;
57 if (str) {
58- fprintf (a_fp, str) ;
59+ fprintf (a_fp, "%s", str) ;
60 g_free (str) ;
61 str = NULL ;
62 }
63@@ -2737,7 +2737,7 @@ cr_statement_dump_import_rule (CRStatement * a_this, FILE * a_fp,
64
65 str = cr_statement_import_rule_to_string (a_this, a_indent) ;
66 if (str) {
67- fprintf (a_fp, str) ;
68+ fprintf (a_fp, "%s", str) ;
69 g_free (str) ;
70 str = NULL ;
71 }
diff --git a/meta/recipes-core/gettext/gettext-0.20.1/parallel.patch b/meta/recipes-core/gettext/gettext-0.20.1/parallel.patch
new file mode 100644
index 0000000000..d96a376b7d
--- /dev/null
+++ b/meta/recipes-core/gettext/gettext-0.20.1/parallel.patch
@@ -0,0 +1,32 @@
1From 4a2a0a93b469093b60ffd0bec55d33d1e03d4713 Mon Sep 17 00:00:00 2001
2From: Joe Slater <jslater@windriver.com>
3Date: Thu, 7 Jun 2012 16:37:01 -0700
4Subject: [PATCH] instal libgettextlib.a before removing it
5
6In a multiple job build, Makefile can simultaneously
7be installing and removing libgettextlib.a. We serialize
8the operations.
9
10Upstream-Status: Pending
11
12Signed-off-by: Joe Slater <jslater@windriver.com>
13
14---
15 gettext-tools/gnulib-lib/Makefile.am | 4 ++++
16 1 file changed, 4 insertions(+)
17
18diff --git a/gettext-tools/gnulib-lib/Makefile.am b/gettext-tools/gnulib-lib/Makefile.am
19index 2126699..d2dd7e4 100644
20--- a/gettext-tools/gnulib-lib/Makefile.am
21+++ b/gettext-tools/gnulib-lib/Makefile.am
22@@ -58,6 +58,10 @@ endif
23 # Rules generated and collected by gnulib-tool.
24 include Makefile.gnulib
25
26+# defined in Makefile.gnulib but missing this dependency
27+#
28+install-exec-clean: install-libLTLIBRARIES
29+
30 # OS/2 does not support a DLL name longer than 8 characters.
31 if OS2
32 libgettextlib_la_LDFLAGS += -os2dllname gtlib
diff --git a/meta/recipes-core/gettext/gettext-0.20.1/run-ptest b/meta/recipes-core/gettext/gettext-0.20.1/run-ptest
new file mode 100644
index 0000000000..f17f3c87a7
--- /dev/null
+++ b/meta/recipes-core/gettext/gettext-0.20.1/run-ptest
@@ -0,0 +1,6 @@
1#!/bin/sh
2#
3#This script is used to run gettext test suites
4cd tests
5
6make -k runtest-TESTS top_srcdir=.. srcdir=. abs_srcdir=$PWD top_builddir=$PWD/../ abs_top_srcdir=$PWD/../ | cat
diff --git a/meta/recipes-core/gettext/gettext-0.20.1/serial-tests-config.patch b/meta/recipes-core/gettext/gettext-0.20.1/serial-tests-config.patch
new file mode 100644
index 0000000000..93f7c03334
--- /dev/null
+++ b/meta/recipes-core/gettext/gettext-0.20.1/serial-tests-config.patch
@@ -0,0 +1,56 @@
1From ed64a5724ef7d6eb4e9a876f817ea266a536e195 Mon Sep 17 00:00:00 2001
2From: "Hongjun.Yang" <hongjun.yang@windriver.com>
3Date: Thu, 28 Jul 2016 12:36:15 +0800
4Subject: [PATCH] fix for ptest
5
6Add serial-tests support, ptest need it
7
8Upstream-Status: Inappropriate [oe specific]
9
10Signed-off-by: Changqing Li <changqing.li@windriver.com>
11
12---
13 configure.ac | 2 +-
14 gettext-runtime/configure.ac | 2 +-
15 gettext-tools/configure.ac | 2 +-
16 3 files changed, 3 insertions(+), 3 deletions(-)
17
18diff --git a/configure.ac b/configure.ac
19index 38db6fd..f019ae0 100644
20--- a/configure.ac
21+++ b/configure.ac
22@@ -22,7 +22,7 @@ AC_INIT([gettext],
23 [bug-gettext@gnu.org])
24 AC_CONFIG_SRCDIR([gettext-tools/src/msgfmt.c])
25 AC_CONFIG_AUX_DIR([build-aux])
26-AM_INIT_AUTOMAKE([1.13 silent-rules parallel-tests tar-ustar])
27+AM_INIT_AUTOMAKE([1.13 silent-rules serial-tests tar-ustar])
28
29 dnl Override automake's tar command used for creating distributions.
30 am__tar='${AMTAR} chf - --format=ustar --owner=root --group=root "$$tardir"'
31diff --git a/gettext-runtime/configure.ac b/gettext-runtime/configure.ac
32index de203e7..138a07f 100644
33--- a/gettext-runtime/configure.ac
34+++ b/gettext-runtime/configure.ac
35@@ -22,7 +22,7 @@ AC_INIT([gettext-runtime],
36 [bug-gettext@gnu.org])
37 AC_CONFIG_SRCDIR([intl/dcigettext.c])
38 AC_CONFIG_AUX_DIR([../build-aux])
39-AM_INIT_AUTOMAKE([1.11.1 silent-rules parallel-tests])
40+AM_INIT_AUTOMAKE([1.11.1 silent-rules serial-tests])
41 AC_CONFIG_HEADERS([config.h])
42
43 dnl Installation directories.
44diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac
45index cf1dd73..b544d6d 100644
46--- a/gettext-tools/configure.ac
47+++ b/gettext-tools/configure.ac
48@@ -22,7 +22,7 @@ AC_INIT([gettext-tools],
49 [bug-gettext@gnu.org])
50 AC_CONFIG_SRCDIR([src/msgfmt.c])
51 AC_CONFIG_AUX_DIR([../build-aux])
52-AM_INIT_AUTOMAKE([1.11.1 silent-rules parallel-tests])
53+AM_INIT_AUTOMAKE([1.11.1 silent-rules serial-tests])
54 AC_CONFIG_HEADERS([config.h])
55
56 dnl Installation directories.
diff --git a/meta/recipes-core/gettext/gettext-0.20.1/use-pkgconfig.patch b/meta/recipes-core/gettext/gettext-0.20.1/use-pkgconfig.patch
new file mode 100644
index 0000000000..d3f3fe8e2f
--- /dev/null
+++ b/meta/recipes-core/gettext/gettext-0.20.1/use-pkgconfig.patch
@@ -0,0 +1,713 @@
1From ef414b06be80c6f605731abc9e674e396b80ec9e Mon Sep 17 00:00:00 2001
2From: Ross Burton <ross.burton@intel.com>
3Date: Tue, 23 Jan 2018 00:54:13 +0000
4Subject: [PATCH] gettext: beat library detection into shape
5
6For reasons which I just can't fathom gnulib doesn't use the expected tools to
7find libraries but badly reinvents the wheel. This will trivially lead to host
8contamination (explicit searches of /usr/lib) or incorrect RPATHs (bad
9canonicalisation resulting in relative paths).
10
11Simply delete all the crazy, and replace with a single call to pkg-config.
12
13Upstream-Status: Inappropriate [upstream still refuse to consider pkg-config]
14Signed-off-by: Ross Burton <ross.burton@intel.com>
15
16---
17 gettext-tools/gnulib-m4/libxml.m4 | 99 +----------------
18 .../gnulib-local/lib/term-styled-ostream.oo.c | 12 +-
19 libtextstyle/gnulib-local/m4/libcroco.m4 | 99 +++--------------
20 libtextstyle/gnulib-local/m4/libglib.m4 | 104 +++---------------
21 libtextstyle/gnulib-m4/libcroco.m4 | 99 +++--------------
22 libtextstyle/gnulib-m4/libglib.m4 | 104 +++---------------
23 libtextstyle/lib/term-styled-ostream.c | 12 +-
24 libtextstyle/lib/term-styled-ostream.oo.c | 12 +-
25 8 files changed, 87 insertions(+), 454 deletions(-)
26
27diff --git a/gettext-tools/gnulib-m4/libxml.m4 b/gettext-tools/gnulib-m4/libxml.m4
28index 05b9550..031ee65 100644
29--- a/gettext-tools/gnulib-m4/libxml.m4
30+++ b/gettext-tools/gnulib-m4/libxml.m4
31@@ -13,6 +13,7 @@ dnl gl_LIBXML(FORCE-INCLUDED)
32 dnl forces the use of the included or an external libxml.
33 AC_DEFUN([gl_LIBXML],
34 [
35+ AC_REQUIRE([PKG_PROG_PKG_CONFIG])
36 AC_REQUIRE([AM_ICONV_LINK])
37
38 ifelse([$1], , [
39@@ -30,100 +31,10 @@ AC_DEFUN([gl_LIBXML],
40 INCXML=
41 ifelse([$1], [yes], , [
42 if test "$gl_cv_libxml_use_included" != yes; then
43- dnl Figure out whether we can use a preinstalled libxml2, or have to use
44- dnl the included one.
45- AC_CACHE_VAL([gl_cv_libxml], [
46- gl_cv_libxml=no
47- gl_cv_LIBXML=
48- gl_cv_LTLIBXML=
49- gl_cv_INCXML=
50- gl_save_LIBS="$LIBS"
51- LIBS="$LIBS $LIBICONV"
52- dnl Search for libxml2 and define LIBXML2, LTLIBXML2 and INCXML2
53- dnl accordingly.
54- dnl Don't use xml2-config nor pkg-config, since it doesn't work when
55- dnl cross-compiling or when the C compiler in use is different from the
56- dnl one that built the library.
57- dnl Use a test program that tries to invoke xmlFree. On Cygwin 1.7.x,
58- dnl libxml2 is built in such a way that uses of xmlFree work fine with
59- dnl -Wl,--enable-auto-import but lead to a link error with
60- dnl -Wl,--disable-auto-import.
61- AC_LIB_LINKFLAGS_BODY([xml2])
62- LIBS="$gl_save_LIBS $LIBXML2 $LIBICONV"
63- AC_TRY_LINK([#include <libxml/xmlversion.h>
64- #include <libxml/xmlmemory.h>
65- #include <libxml/xpath.h>
66- ],
67- [xmlCheckVersion (0);
68- xmlFree ((void *) 0);
69- xmlXPathSetContextNode ((void *)0, (void *)0);
70- ],
71- [gl_cv_libxml=yes
72- gl_cv_LIBXML="$LIBXML2 $LIBICONV"
73- gl_cv_LTLIBXML="$LTLIBXML2 $LTLIBICONV"
74- ])
75- if test "$gl_cv_libxml" != yes; then
76- gl_save_CPPFLAGS="$CPPFLAGS"
77- CPPFLAGS="$CPPFLAGS $INCXML2"
78- AC_TRY_LINK([#include <libxml/xmlversion.h>
79- #include <libxml/xmlmemory.h>
80- #include <libxml/xpath.h>
81- ],
82- [xmlCheckVersion (0);
83- xmlFree ((void *) 0);
84- xmlXPathSetContextNode ((void *)0, (void *)0);
85- ],
86- [gl_cv_libxml=yes
87- gl_cv_LIBXML="$LIBXML2 $LIBICONV"
88- gl_cv_LTLIBXML="$LTLIBXML2 $LTLIBICONV"
89- gl_cv_INCXML="$INCXML2"
90- ])
91- if test "$gl_cv_libxml" != yes; then
92- dnl Often the include files are installed in /usr/include/libxml2.
93- dnl In libxml2-2.5, <libxml/xmlversion.h> is self-contained.
94- dnl In libxml2-2.6, it includes <libxml/xmlexports.h> which is
95- dnl self-contained.
96- libxml2_include_dir=
97- AC_TRY_CPP([#include <libxml2/libxml/xmlexports.h>],
98- [gl_ABSOLUTE_HEADER([libxml2/libxml/xmlexports.h])
99- libxml2_include_dir=`echo "$gl_cv_absolute_libxml2_libxml_xmlexports_h" | sed -e 's,.libxml.xmlexports\.h$,,'`
100- ])
101- if test -z "$libxml2_include_dir"; then
102- AC_TRY_CPP([#include <libxml2/libxml/xmlversion.h>],
103- [gl_ABSOLUTE_HEADER([libxml2/libxml/xmlversion.h])
104- libxml2_include_dir=`echo "$gl_cv_absolute_libxml2_libxml_xmlversion_h" | sed -e 's,.libxml.xmlversion\.h$,,'`
105- ])
106- fi
107- if test -n "$libxml2_include_dir" && test -d "$libxml2_include_dir"; then
108- CPPFLAGS="$gl_save_CPPFLAGS -I$libxml2_include_dir"
109- AC_TRY_LINK([#include <libxml/xmlversion.h>
110- #include <libxml/xmlmemory.h>
111- #include <libxml/xpath.h>
112- ],
113- [xmlCheckVersion (0);
114- xmlFree ((void *) 0);
115- xmlXPathSetContextNode ((void *)0, (void *)0);
116- ],
117- [gl_cv_libxml=yes
118- gl_cv_LIBXML="$LIBXML2 $LIBICONV"
119- gl_cv_LTLIBXML="$LTLIBXML2 $LTLIBICONV"
120- gl_cv_INCXML="-I$libxml2_include_dir"
121- ])
122- fi
123- fi
124- CPPFLAGS="$gl_save_CPPFLAGS"
125- fi
126- LIBS="$gl_save_LIBS"
127- ])
128- AC_MSG_CHECKING([for libxml])
129- AC_MSG_RESULT([$gl_cv_libxml])
130- if test $gl_cv_libxml = yes; then
131- LIBXML="$gl_cv_LIBXML"
132- LTLIBXML="$gl_cv_LTLIBXML"
133- INCXML="$gl_cv_INCXML"
134- else
135- gl_cv_libxml_use_included=yes
136- fi
137+ PKG_CHECK_MODULES([XML], [libxml-2.0])
138+ LIBXML=$XML_LIBS
139+ LTLIBXML=$XML_LIBS
140+ INCXML=$XML_CFLAGS
141 fi
142 ])
143 AC_SUBST([LIBXML])
144diff --git a/libtextstyle/gnulib-local/lib/term-styled-ostream.oo.c b/libtextstyle/gnulib-local/lib/term-styled-ostream.oo.c
145index 2cfd4a8..d42c8b4 100644
146--- a/libtextstyle/gnulib-local/lib/term-styled-ostream.oo.c
147+++ b/libtextstyle/gnulib-local/lib/term-styled-ostream.oo.c
148@@ -22,15 +22,15 @@
149
150 #include <stdlib.h>
151
152-#include <cr-om-parser.h>
153-#include <cr-sel-eng.h>
154-#include <cr-style.h>
155-#include <cr-rgb.h>
156+#include <libcroco/cr-om-parser.h>
157+#include <libcroco/cr-sel-eng.h>
158+#include <libcroco/cr-style.h>
159+#include <libcroco/cr-rgb.h>
160 /* <cr-fonts.h> has a broken double-inclusion guard in libcroco-0.6.1. */
161 #ifndef __CR_FONTS_H__
162-# include <cr-fonts.h>
163+# include <libcroco/cr-fonts.h>
164 #endif
165-#include <cr-string.h>
166+#include <libcroco/cr-string.h>
167
168 #include "term-ostream.h"
169 #include "hash.h"
170diff --git a/libtextstyle/gnulib-local/m4/libcroco.m4 b/libtextstyle/gnulib-local/m4/libcroco.m4
171index bc53cc6..10b2455 100644
172--- a/libtextstyle/gnulib-local/m4/libcroco.m4
173+++ b/libtextstyle/gnulib-local/m4/libcroco.m4
174@@ -1,99 +1,34 @@
175-# libcroco.m4 serial 3
176-dnl Copyright (C) 2006-2007, 2019 Free Software Foundation, Inc.
177+# libcroco.m4 serial 2 (gettext-0.17)
178+dnl Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
179 dnl This file is free software; the Free Software Foundation
180 dnl gives unlimited permission to copy and/or distribute it,
181 dnl with or without modifications, as long as this notice is preserved.
182
183 dnl From Bruno Haible.
184
185-dnl gl_LIBCROCO
186-dnl gives the user the option to decide whether to use the included or
187-dnl an external libcroco.
188-dnl gl_LIBCROCO(FORCE-INCLUDED)
189-dnl forces the use of the included or an external libcroco.
190 AC_DEFUN([gl_LIBCROCO],
191 [
192- ifelse([$1], [yes], , [
193- dnl libcroco depends on libglib.
194- AC_REQUIRE([gl_LIBGLIB])
195- ])
196+ AC_REQUIRE([PKG_PROG_PKG_CONFIG])
197+ dnl libcroco depends on libglib.
198+ AC_REQUIRE([gl_LIBGLIB])
199
200- ifelse([$1], , [
201- AC_MSG_CHECKING([whether included libcroco is requested])
202- AC_ARG_WITH([included-libcroco],
203- [ --with-included-libcroco use the libcroco included here],
204- [gl_cv_libcroco_force_included=$withval],
205- [gl_cv_libcroco_force_included=no])
206- AC_MSG_RESULT([$gl_cv_libcroco_force_included])
207- ], [gl_cv_libcroco_force_included=$1])
208+ AC_MSG_CHECKING([whether included libcroco is requested])
209+ AC_ARG_WITH([included-libcroco],
210+ [ --with-included-libcroco use the libcroco included here],
211+ [gl_cv_libcroco_force_included=$withval],
212+ [gl_cv_libcroco_force_included=no])
213+ AC_MSG_RESULT([$gl_cv_libcroco_force_included])
214
215 gl_cv_libcroco_use_included="$gl_cv_libcroco_force_included"
216 LIBCROCO=
217 LTLIBCROCO=
218 INCCROCO=
219- ifelse([$1], [yes], , [
220- if test "$gl_cv_libcroco_use_included" != yes; then
221- dnl Figure out whether we can use a preinstalled libcroco-0.6, or have to
222- dnl use the included one.
223- AC_CACHE_VAL([gl_cv_libcroco], [
224- gl_cv_libcroco=no
225- gl_cv_LIBCROCO=
226- gl_cv_LTLIBCROCO=
227- gl_cv_INCCROCO=
228- gl_save_LIBS="$LIBS"
229- dnl Search for libcroco and define LIBCROCO_0_6, LTLIBCROCO_0_6 and
230- dnl INCCROCO_0_6 accordingly.
231- dnl Don't use croco-0.6-config nor pkg-config, since it doesn't work when
232- dnl cross-compiling or when the C compiler in use is different from the
233- dnl one that built the library.
234- AC_LIB_LINKFLAGS_BODY([croco-0.6], [glib-2.0])
235- LIBS="$gl_save_LIBS $LIBCROCO_0_6"
236- AC_TRY_LINK([#include <libcroco-config.h>],
237- [const char *version = LIBCROCO_VERSION; return !version;],
238- [gl_cv_libcroco=yes
239- gl_cv_LIBCROCO="$LIBCROCO_0_6"
240- gl_cv_LTLIBCROCO="$LTLIBCROCO_0_6"
241- ])
242- if test "$gl_cv_libcroco" != yes; then
243- gl_save_CPPFLAGS="$CPPFLAGS"
244- CPPFLAGS="$CPPFLAGS $INCCROCO_0_6"
245- AC_TRY_LINK([#include <libcroco-config.h>],
246- [const char *version = LIBCROCO_VERSION; return !version;],
247- [gl_cv_libcroco=yes
248- gl_cv_LIBCROCO="$LIBCROCO_0_6"
249- gl_cv_LTLIBCROCO="$LTLIBCROCO_0_6"
250- gl_cv_INCCROCO="$INCCROCO_0_6"
251- ])
252- if test "$gl_cv_libcroco" != yes; then
253- dnl Often the include files are installed in
254- dnl /usr/include/libcroco-0.6/libcroco.
255- AC_TRY_LINK([#include <libcroco-0.6/libcroco/libcroco-config.h>],
256- [const char *version = LIBCROCO_VERSION; return !version;],
257- [gl_ABSOLUTE_HEADER([libcroco-0.6/libcroco/libcroco-config.h])
258- libcroco_include_dir=`echo "$gl_cv_absolute_libcroco_0_6_libcroco_libcroco_config_h" | sed -e 's,.libcroco-config\.h$,,'`
259- if test -d "$libcroco_include_dir"; then
260- gl_cv_libcroco=yes
261- gl_cv_LIBCROCO="$LIBCROCO_0_6"
262- gl_cv_LTLIBCROCO="$LTLIBCROCO_0_6"
263- gl_cv_INCCROCO="-I$libcroco_include_dir"
264- fi
265- ])
266- fi
267- CPPFLAGS="$gl_save_CPPFLAGS"
268- fi
269- LIBS="$gl_save_LIBS"
270- ])
271- AC_MSG_CHECKING([for libcroco])
272- AC_MSG_RESULT([$gl_cv_libcroco])
273- if test $gl_cv_libcroco = yes; then
274- LIBCROCO="$gl_cv_LIBCROCO"
275- LTLIBCROCO="$gl_cv_LTLIBCROCO"
276- INCCROCO="$gl_cv_INCCROCO"
277- else
278- gl_cv_libcroco_use_included=yes
279- fi
280- fi
281- ])
282+ if test "$gl_cv_libcroco_use_included" != yes; then
283+ PKG_CHECK_MODULES([CROCO], [libcroco-0.6])
284+ LIBCROCO=$CROCO_LIBS
285+ LTLIBCROCO=$CROCO_LIBS
286+ INCCROCO=$CROCO_CFLAGS
287+ fi
288 AC_SUBST([LIBCROCO])
289 AC_SUBST([LTLIBCROCO])
290 AC_SUBST([INCCROCO])
291diff --git a/libtextstyle/gnulib-local/m4/libglib.m4 b/libtextstyle/gnulib-local/m4/libglib.m4
292index bef6fa3..8841755 100644
293--- a/libtextstyle/gnulib-local/m4/libglib.m4
294+++ b/libtextstyle/gnulib-local/m4/libglib.m4
295@@ -1,105 +1,31 @@
296-# libglib.m4 serial 4
297-dnl Copyright (C) 2006-2007, 2019 Free Software Foundation, Inc.
298+# libglib.m4 serial 3 (gettext-0.17)
299+dnl Copyright (C) 2006-2007, 2015-2016 Free Software Foundation, Inc.
300 dnl This file is free software; the Free Software Foundation
301 dnl gives unlimited permission to copy and/or distribute it,
302 dnl with or without modifications, as long as this notice is preserved.
303
304 dnl From Bruno Haible.
305
306-dnl gl_LIBGLIB
307-dnl gives the user the option to decide whether to use the included or
308-dnl an external libglib.
309-dnl gl_LIBGLIB(FORCE-INCLUDED)
310-dnl forces the use of the included or an external libglib.
311 AC_DEFUN([gl_LIBGLIB],
312 [
313- ifelse([$1], , [
314- AC_MSG_CHECKING([whether included glib is requested])
315- AC_ARG_WITH([included-glib],
316- [ --with-included-glib use the glib2 included here],
317- [gl_cv_libglib_force_included=$withval],
318- [gl_cv_libglib_force_included=no])
319- AC_MSG_RESULT([$gl_cv_libglib_force_included])
320- ], [gl_cv_libglib_force_included=$1])
321+ AC_REQUIRE([PKG_PROG_PKG_CONFIG])
322+ AC_MSG_CHECKING([whether included glib is requested])
323+ AC_ARG_WITH([included-glib],
324+ [ --with-included-glib use the glib2 included here],
325+ [gl_cv_libglib_force_included=$withval],
326+ [gl_cv_libglib_force_included=no])
327+ AC_MSG_RESULT([$gl_cv_libglib_force_included])
328
329 gl_cv_libglib_use_included="$gl_cv_libglib_force_included"
330 LIBGLIB=
331 LTLIBGLIB=
332 INCGLIB=
333- ifelse([$1], [yes], , [
334- if test "$gl_cv_libglib_use_included" != yes; then
335- dnl Figure out whether we can use a preinstalled libglib-2.0, or have to use
336- dnl the included one.
337- AC_CACHE_VAL([gl_cv_libglib], [
338- gl_cv_libglib=no
339- gl_cv_LIBGLIB=
340- gl_cv_LTLIBGLIB=
341- gl_cv_INCGLIB=
342- gl_save_LIBS="$LIBS"
343- dnl Search for libglib2 and define LIBGLIB_2_0, LTLIBGLIB_2_0 and
344- dnl INCGLIB_2_0 accordingly.
345- dnl Don't use glib-config nor pkg-config, since it doesn't work when
346- dnl cross-compiling or when the C compiler in use is different from the
347- dnl one that built the library.
348- AC_LIB_LINKFLAGS_BODY([glib-2.0])
349- LIBS="$gl_save_LIBS $LIBGLIB_2_0"
350- AC_TRY_LINK([#include <glib.h>
351-#ifndef G_BEGIN_DECLS
352-error this glib.h includes a glibconfig.h from a glib version 1.x
353-#endif
354-],
355- [g_string_new ("foo");],
356- [gl_cv_libglib=yes
357- gl_cv_LIBGLIB="$LIBGLIB_2_0"
358- gl_cv_LTLIBGLIB="$LTLIBGLIB_2_0"
359- ])
360- if test "$gl_cv_libglib" != yes; then
361- gl_save_CPPFLAGS="$CPPFLAGS"
362- CPPFLAGS="$CPPFLAGS $INCGLIB_2_0"
363- AC_TRY_LINK([#include <glib.h>
364-#ifndef G_BEGIN_DECLS
365-error this glib.h includes a glibconfig.h from a glib version 1.x
366-#endif
367-],
368- [g_string_new ("foo");],
369- [gl_cv_libglib=yes
370- gl_cv_LIBGLIB="$LIBGLIB_2_0"
371- gl_cv_LTLIBGLIB="$LTLIBGLIB_2_0"
372- gl_cv_INCGLIB="$INCGLIB_2_0"
373- ])
374- if test "$gl_cv_libglib" != yes; then
375- dnl Often the include files are installed in /usr/include/glib-2.0
376- dnl and /usr/lib/glib-2.0/include.
377- if test -n "$LIBGLIB_2_0_PREFIX"; then
378- CPPFLAGS="$gl_save_CPPFLAGS -I$LIBGLIB_2_0_PREFIX/include/glib-2.0 -I$LIBGLIB_2_0_PREFIX/$acl_libdirstem/glib-2.0/include"
379- AC_TRY_LINK([#include <glib.h>
380-#ifndef G_BEGIN_DECLS
381-error this glib.h includes a glibconfig.h from a glib version 1.x
382-#endif
383-],
384- [g_string_new ("foo");],
385- [gl_cv_libglib=yes
386- gl_cv_LIBGLIB="$LIBGLIB_2_0"
387- gl_cv_LTLIBGLIB="$LTLIBGLIB_2_0"
388- gl_cv_INCGLIB="-I$LIBGLIB_2_0_PREFIX/include/glib-2.0 -I$LIBGLIB_2_0_PREFIX/$acl_libdirstem/glib-2.0/include"
389- ])
390- fi
391- fi
392- CPPFLAGS="$gl_save_CPPFLAGS"
393- fi
394- LIBS="$gl_save_LIBS"
395- ])
396- AC_MSG_CHECKING([for glib])
397- AC_MSG_RESULT([$gl_cv_libglib])
398- if test $gl_cv_libglib = yes; then
399- LIBGLIB="$gl_cv_LIBGLIB"
400- LTLIBGLIB="$gl_cv_LTLIBGLIB"
401- INCGLIB="$gl_cv_INCGLIB"
402- else
403- gl_cv_libglib_use_included=yes
404- fi
405- fi
406- ])
407+ if test "$gl_cv_libglib_use_included" != yes; then
408+ PKG_CHECK_MODULES([GLIB], [glib-2.0])
409+ LIBGLIB="$GLIB_LIBS"
410+ LTLIBGLIB="$GLIB_LIBS"
411+ INCGLIB="$GLIB_CFLAGS"
412+ fi
413 AC_SUBST([LIBGLIB])
414 AC_SUBST([LTLIBGLIB])
415 AC_SUBST([INCGLIB])
416diff --git a/libtextstyle/gnulib-m4/libcroco.m4 b/libtextstyle/gnulib-m4/libcroco.m4
417index bc53cc6..10b2455 100644
418--- a/libtextstyle/gnulib-m4/libcroco.m4
419+++ b/libtextstyle/gnulib-m4/libcroco.m4
420@@ -1,99 +1,34 @@
421-# libcroco.m4 serial 3
422-dnl Copyright (C) 2006-2007, 2019 Free Software Foundation, Inc.
423+# libcroco.m4 serial 2 (gettext-0.17)
424+dnl Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
425 dnl This file is free software; the Free Software Foundation
426 dnl gives unlimited permission to copy and/or distribute it,
427 dnl with or without modifications, as long as this notice is preserved.
428
429 dnl From Bruno Haible.
430
431-dnl gl_LIBCROCO
432-dnl gives the user the option to decide whether to use the included or
433-dnl an external libcroco.
434-dnl gl_LIBCROCO(FORCE-INCLUDED)
435-dnl forces the use of the included or an external libcroco.
436 AC_DEFUN([gl_LIBCROCO],
437 [
438- ifelse([$1], [yes], , [
439- dnl libcroco depends on libglib.
440- AC_REQUIRE([gl_LIBGLIB])
441- ])
442+ AC_REQUIRE([PKG_PROG_PKG_CONFIG])
443+ dnl libcroco depends on libglib.
444+ AC_REQUIRE([gl_LIBGLIB])
445
446- ifelse([$1], , [
447- AC_MSG_CHECKING([whether included libcroco is requested])
448- AC_ARG_WITH([included-libcroco],
449- [ --with-included-libcroco use the libcroco included here],
450- [gl_cv_libcroco_force_included=$withval],
451- [gl_cv_libcroco_force_included=no])
452- AC_MSG_RESULT([$gl_cv_libcroco_force_included])
453- ], [gl_cv_libcroco_force_included=$1])
454+ AC_MSG_CHECKING([whether included libcroco is requested])
455+ AC_ARG_WITH([included-libcroco],
456+ [ --with-included-libcroco use the libcroco included here],
457+ [gl_cv_libcroco_force_included=$withval],
458+ [gl_cv_libcroco_force_included=no])
459+ AC_MSG_RESULT([$gl_cv_libcroco_force_included])
460
461 gl_cv_libcroco_use_included="$gl_cv_libcroco_force_included"
462 LIBCROCO=
463 LTLIBCROCO=
464 INCCROCO=
465- ifelse([$1], [yes], , [
466- if test "$gl_cv_libcroco_use_included" != yes; then
467- dnl Figure out whether we can use a preinstalled libcroco-0.6, or have to
468- dnl use the included one.
469- AC_CACHE_VAL([gl_cv_libcroco], [
470- gl_cv_libcroco=no
471- gl_cv_LIBCROCO=
472- gl_cv_LTLIBCROCO=
473- gl_cv_INCCROCO=
474- gl_save_LIBS="$LIBS"
475- dnl Search for libcroco and define LIBCROCO_0_6, LTLIBCROCO_0_6 and
476- dnl INCCROCO_0_6 accordingly.
477- dnl Don't use croco-0.6-config nor pkg-config, since it doesn't work when
478- dnl cross-compiling or when the C compiler in use is different from the
479- dnl one that built the library.
480- AC_LIB_LINKFLAGS_BODY([croco-0.6], [glib-2.0])
481- LIBS="$gl_save_LIBS $LIBCROCO_0_6"
482- AC_TRY_LINK([#include <libcroco-config.h>],
483- [const char *version = LIBCROCO_VERSION; return !version;],
484- [gl_cv_libcroco=yes
485- gl_cv_LIBCROCO="$LIBCROCO_0_6"
486- gl_cv_LTLIBCROCO="$LTLIBCROCO_0_6"
487- ])
488- if test "$gl_cv_libcroco" != yes; then
489- gl_save_CPPFLAGS="$CPPFLAGS"
490- CPPFLAGS="$CPPFLAGS $INCCROCO_0_6"
491- AC_TRY_LINK([#include <libcroco-config.h>],
492- [const char *version = LIBCROCO_VERSION; return !version;],
493- [gl_cv_libcroco=yes
494- gl_cv_LIBCROCO="$LIBCROCO_0_6"
495- gl_cv_LTLIBCROCO="$LTLIBCROCO_0_6"
496- gl_cv_INCCROCO="$INCCROCO_0_6"
497- ])
498- if test "$gl_cv_libcroco" != yes; then
499- dnl Often the include files are installed in
500- dnl /usr/include/libcroco-0.6/libcroco.
501- AC_TRY_LINK([#include <libcroco-0.6/libcroco/libcroco-config.h>],
502- [const char *version = LIBCROCO_VERSION; return !version;],
503- [gl_ABSOLUTE_HEADER([libcroco-0.6/libcroco/libcroco-config.h])
504- libcroco_include_dir=`echo "$gl_cv_absolute_libcroco_0_6_libcroco_libcroco_config_h" | sed -e 's,.libcroco-config\.h$,,'`
505- if test -d "$libcroco_include_dir"; then
506- gl_cv_libcroco=yes
507- gl_cv_LIBCROCO="$LIBCROCO_0_6"
508- gl_cv_LTLIBCROCO="$LTLIBCROCO_0_6"
509- gl_cv_INCCROCO="-I$libcroco_include_dir"
510- fi
511- ])
512- fi
513- CPPFLAGS="$gl_save_CPPFLAGS"
514- fi
515- LIBS="$gl_save_LIBS"
516- ])
517- AC_MSG_CHECKING([for libcroco])
518- AC_MSG_RESULT([$gl_cv_libcroco])
519- if test $gl_cv_libcroco = yes; then
520- LIBCROCO="$gl_cv_LIBCROCO"
521- LTLIBCROCO="$gl_cv_LTLIBCROCO"
522- INCCROCO="$gl_cv_INCCROCO"
523- else
524- gl_cv_libcroco_use_included=yes
525- fi
526- fi
527- ])
528+ if test "$gl_cv_libcroco_use_included" != yes; then
529+ PKG_CHECK_MODULES([CROCO], [libcroco-0.6])
530+ LIBCROCO=$CROCO_LIBS
531+ LTLIBCROCO=$CROCO_LIBS
532+ INCCROCO=$CROCO_CFLAGS
533+ fi
534 AC_SUBST([LIBCROCO])
535 AC_SUBST([LTLIBCROCO])
536 AC_SUBST([INCCROCO])
537diff --git a/libtextstyle/gnulib-m4/libglib.m4 b/libtextstyle/gnulib-m4/libglib.m4
538index bef6fa3..8841755 100644
539--- a/libtextstyle/gnulib-m4/libglib.m4
540+++ b/libtextstyle/gnulib-m4/libglib.m4
541@@ -1,105 +1,31 @@
542-# libglib.m4 serial 4
543-dnl Copyright (C) 2006-2007, 2019 Free Software Foundation, Inc.
544+# libglib.m4 serial 3 (gettext-0.17)
545+dnl Copyright (C) 2006-2007, 2015-2016 Free Software Foundation, Inc.
546 dnl This file is free software; the Free Software Foundation
547 dnl gives unlimited permission to copy and/or distribute it,
548 dnl with or without modifications, as long as this notice is preserved.
549
550 dnl From Bruno Haible.
551
552-dnl gl_LIBGLIB
553-dnl gives the user the option to decide whether to use the included or
554-dnl an external libglib.
555-dnl gl_LIBGLIB(FORCE-INCLUDED)
556-dnl forces the use of the included or an external libglib.
557 AC_DEFUN([gl_LIBGLIB],
558 [
559- ifelse([$1], , [
560- AC_MSG_CHECKING([whether included glib is requested])
561- AC_ARG_WITH([included-glib],
562- [ --with-included-glib use the glib2 included here],
563- [gl_cv_libglib_force_included=$withval],
564- [gl_cv_libglib_force_included=no])
565- AC_MSG_RESULT([$gl_cv_libglib_force_included])
566- ], [gl_cv_libglib_force_included=$1])
567+ AC_REQUIRE([PKG_PROG_PKG_CONFIG])
568+ AC_MSG_CHECKING([whether included glib is requested])
569+ AC_ARG_WITH([included-glib],
570+ [ --with-included-glib use the glib2 included here],
571+ [gl_cv_libglib_force_included=$withval],
572+ [gl_cv_libglib_force_included=no])
573+ AC_MSG_RESULT([$gl_cv_libglib_force_included])
574
575 gl_cv_libglib_use_included="$gl_cv_libglib_force_included"
576 LIBGLIB=
577 LTLIBGLIB=
578 INCGLIB=
579- ifelse([$1], [yes], , [
580- if test "$gl_cv_libglib_use_included" != yes; then
581- dnl Figure out whether we can use a preinstalled libglib-2.0, or have to use
582- dnl the included one.
583- AC_CACHE_VAL([gl_cv_libglib], [
584- gl_cv_libglib=no
585- gl_cv_LIBGLIB=
586- gl_cv_LTLIBGLIB=
587- gl_cv_INCGLIB=
588- gl_save_LIBS="$LIBS"
589- dnl Search for libglib2 and define LIBGLIB_2_0, LTLIBGLIB_2_0 and
590- dnl INCGLIB_2_0 accordingly.
591- dnl Don't use glib-config nor pkg-config, since it doesn't work when
592- dnl cross-compiling or when the C compiler in use is different from the
593- dnl one that built the library.
594- AC_LIB_LINKFLAGS_BODY([glib-2.0])
595- LIBS="$gl_save_LIBS $LIBGLIB_2_0"
596- AC_TRY_LINK([#include <glib.h>
597-#ifndef G_BEGIN_DECLS
598-error this glib.h includes a glibconfig.h from a glib version 1.x
599-#endif
600-],
601- [g_string_new ("foo");],
602- [gl_cv_libglib=yes
603- gl_cv_LIBGLIB="$LIBGLIB_2_0"
604- gl_cv_LTLIBGLIB="$LTLIBGLIB_2_0"
605- ])
606- if test "$gl_cv_libglib" != yes; then
607- gl_save_CPPFLAGS="$CPPFLAGS"
608- CPPFLAGS="$CPPFLAGS $INCGLIB_2_0"
609- AC_TRY_LINK([#include <glib.h>
610-#ifndef G_BEGIN_DECLS
611-error this glib.h includes a glibconfig.h from a glib version 1.x
612-#endif
613-],
614- [g_string_new ("foo");],
615- [gl_cv_libglib=yes
616- gl_cv_LIBGLIB="$LIBGLIB_2_0"
617- gl_cv_LTLIBGLIB="$LTLIBGLIB_2_0"
618- gl_cv_INCGLIB="$INCGLIB_2_0"
619- ])
620- if test "$gl_cv_libglib" != yes; then
621- dnl Often the include files are installed in /usr/include/glib-2.0
622- dnl and /usr/lib/glib-2.0/include.
623- if test -n "$LIBGLIB_2_0_PREFIX"; then
624- CPPFLAGS="$gl_save_CPPFLAGS -I$LIBGLIB_2_0_PREFIX/include/glib-2.0 -I$LIBGLIB_2_0_PREFIX/$acl_libdirstem/glib-2.0/include"
625- AC_TRY_LINK([#include <glib.h>
626-#ifndef G_BEGIN_DECLS
627-error this glib.h includes a glibconfig.h from a glib version 1.x
628-#endif
629-],
630- [g_string_new ("foo");],
631- [gl_cv_libglib=yes
632- gl_cv_LIBGLIB="$LIBGLIB_2_0"
633- gl_cv_LTLIBGLIB="$LTLIBGLIB_2_0"
634- gl_cv_INCGLIB="-I$LIBGLIB_2_0_PREFIX/include/glib-2.0 -I$LIBGLIB_2_0_PREFIX/$acl_libdirstem/glib-2.0/include"
635- ])
636- fi
637- fi
638- CPPFLAGS="$gl_save_CPPFLAGS"
639- fi
640- LIBS="$gl_save_LIBS"
641- ])
642- AC_MSG_CHECKING([for glib])
643- AC_MSG_RESULT([$gl_cv_libglib])
644- if test $gl_cv_libglib = yes; then
645- LIBGLIB="$gl_cv_LIBGLIB"
646- LTLIBGLIB="$gl_cv_LTLIBGLIB"
647- INCGLIB="$gl_cv_INCGLIB"
648- else
649- gl_cv_libglib_use_included=yes
650- fi
651- fi
652- ])
653+ if test "$gl_cv_libglib_use_included" != yes; then
654+ PKG_CHECK_MODULES([GLIB], [glib-2.0])
655+ LIBGLIB="$GLIB_LIBS"
656+ LTLIBGLIB="$GLIB_LIBS"
657+ INCGLIB="$GLIB_CFLAGS"
658+ fi
659 AC_SUBST([LIBGLIB])
660 AC_SUBST([LTLIBGLIB])
661 AC_SUBST([INCGLIB])
662diff --git a/libtextstyle/lib/term-styled-ostream.c b/libtextstyle/lib/term-styled-ostream.c
663index 3675b5f..811e546 100644
664--- a/libtextstyle/lib/term-styled-ostream.c
665+++ b/libtextstyle/lib/term-styled-ostream.c
666@@ -28,15 +28,15 @@
667
668 #include <stdlib.h>
669
670-#include <cr-om-parser.h>
671-#include <cr-sel-eng.h>
672-#include <cr-style.h>
673-#include <cr-rgb.h>
674+#include <libcroco/cr-om-parser.h>
675+#include <libcroco/cr-sel-eng.h>
676+#include <libcroco/cr-style.h>
677+#include <libcroco/cr-rgb.h>
678 /* <cr-fonts.h> has a broken double-inclusion guard in libcroco-0.6.1. */
679 #ifndef __CR_FONTS_H__
680-# include <cr-fonts.h>
681+# include <libcroco/cr-fonts.h>
682 #endif
683-#include <cr-string.h>
684+#include <libcroco/cr-string.h>
685
686 #include "term-ostream.h"
687 #include "hash.h"
688diff --git a/libtextstyle/lib/term-styled-ostream.oo.c b/libtextstyle/lib/term-styled-ostream.oo.c
689index 2cfd4a8..d42c8b4 100644
690--- a/libtextstyle/lib/term-styled-ostream.oo.c
691+++ b/libtextstyle/lib/term-styled-ostream.oo.c
692@@ -22,15 +22,15 @@
693
694 #include <stdlib.h>
695
696-#include <cr-om-parser.h>
697-#include <cr-sel-eng.h>
698-#include <cr-style.h>
699-#include <cr-rgb.h>
700+#include <libcroco/cr-om-parser.h>
701+#include <libcroco/cr-sel-eng.h>
702+#include <libcroco/cr-style.h>
703+#include <libcroco/cr-rgb.h>
704 /* <cr-fonts.h> has a broken double-inclusion guard in libcroco-0.6.1. */
705 #ifndef __CR_FONTS_H__
706-# include <cr-fonts.h>
707+# include <libcroco/cr-fonts.h>
708 #endif
709-#include <cr-string.h>
710+#include <libcroco/cr-string.h>
711
712 #include "term-ostream.h"
713 #include "hash.h"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-07-02 17:27:34 +0000