summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/gettext
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-core/gettext')
-rw-r--r--meta/recipes-core/gettext/gettext-0.21/0001-msgmerge-29-Add-executable-file-mode-bits.patch23
-rw-r--r--meta/recipes-core/gettext/gettext-0.21/mingw.patch28
-rw-r--r--meta/recipes-core/gettext/gettext-0.21/use-pkgconfig.patch699
-rw-r--r--meta/recipes-core/gettext/gettext-minimal-0.21/Makefile.in.in510
-rw-r--r--meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/gettext.m4386
-rw-r--r--meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/host-cpu-c-abi.m4675
-rw-r--r--meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/iconv.m4288
-rw-r--r--meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/intlmacosx.m465
-rw-r--r--meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/lib-ld.m4168
-rw-r--r--meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/lib-link.m4800
-rw-r--r--meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/lib-prefix.m4320
-rw-r--r--meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/nls.m432
-rw-r--r--meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/po.m4450
-rw-r--r--meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/progtest.m491
-rwxr-xr-xmeta/recipes-core/gettext/gettext-minimal-0.21/config.rpath684
-rw-r--r--meta/recipes-core/gettext/gettext-minimal-0.21/remove-potcdate.sin25
-rw-r--r--meta/recipes-core/gettext/gettext-minimal-native_0.21.bb30
-rw-r--r--meta/recipes-core/gettext/gettext-minimal-native_0.22.5.bb46
-rw-r--r--meta/recipes-core/gettext/gettext-minimal/COPYING (renamed from meta/recipes-core/gettext/gettext-minimal-0.21/COPYING)0
-rw-r--r--meta/recipes-core/gettext/gettext-sources.inc4
-rw-r--r--meta/recipes-core/gettext/gettext/0001-init-env.in-do-not-add-C-CXX-parameters.patch (renamed from meta/recipes-core/gettext/gettext-0.21/0001-init-env.in-do-not-add-C-CXX-parameters.patch)2
-rw-r--r--meta/recipes-core/gettext/gettext/0001-tests-autopoint-3-unset-MAKEFLAGS.patch (renamed from meta/recipes-core/gettext/gettext-0.21/0001-tests-autopoint-3-unset-MAKEFLAGS.patch)6
-rw-r--r--meta/recipes-core/gettext/gettext/parallel.patch (renamed from meta/recipes-core/gettext/gettext-0.21/parallel.patch)7
-rw-r--r--meta/recipes-core/gettext/gettext/run-ptest (renamed from meta/recipes-core/gettext/gettext-0.21/run-ptest)0
-rw-r--r--meta/recipes-core/gettext/gettext/serial-tests-config.patch (renamed from meta/recipes-core/gettext/gettext-0.21/serial-tests-config.patch)9
-rw-r--r--meta/recipes-core/gettext/gettext/use-pkgconfig.patch391
-rw-r--r--meta/recipes-core/gettext/gettext_0.22.5.bb (renamed from meta/recipes-core/gettext/gettext_0.21.bb)70
27 files changed, 490 insertions, 5319 deletions
diff --git a/meta/recipes-core/gettext/gettext-0.21/0001-msgmerge-29-Add-executable-file-mode-bits.patch b/meta/recipes-core/gettext/gettext-0.21/0001-msgmerge-29-Add-executable-file-mode-bits.patch
deleted file mode 100644
index e42a6c0a4d..0000000000
--- a/meta/recipes-core/gettext/gettext-0.21/0001-msgmerge-29-Add-executable-file-mode-bits.patch
+++ /dev/null
@@ -1,23 +0,0 @@
1From 71988f83b69c4ed98d1b9418da80edf11a931894 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 23 Sep 2020 22:08:34 -0700
4Subject: [PATCH] msgmerge-29: Add executable file mode bits
5
6This script is installed with default mode bits and executed directly
7e.g ./msgmerge-29 when doing make check which results in
8
9/bin/bash: line 9: ./msgmerge-29: Permission denied
10
11Upstream-Status: Pending
12Signed-off-by: Khem Raj <raj.khem@gmail.com>
13---
14 gettext-tools/tests/msgmerge-29 | 0
15 1 file changed, 0 insertions(+), 0 deletions(-)
16 mode change 100644 => 100755 gettext-tools/tests/msgmerge-29
17
18diff --git a/gettext-tools/tests/msgmerge-29 b/gettext-tools/tests/msgmerge-29
19old mode 100644
20new mode 100755
21--
222.28.0
23
diff --git a/meta/recipes-core/gettext/gettext-0.21/mingw.patch b/meta/recipes-core/gettext/gettext-0.21/mingw.patch
deleted file mode 100644
index b062c784f6..0000000000
--- a/meta/recipes-core/gettext/gettext-0.21/mingw.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1From 7cf68dffb2adb76375bfb0781e277510523a1f3e Mon Sep 17 00:00:00 2001
2From: Michele Locati <michele@locati.it>
3Date: Thu, 30 Jul 2020 18:58:02 +0200
4Subject: [PATCH] build: Fix build failure on Cygwin and mingw.
5
6* gettext-tools/woe32dll/gettextsrc-exports.c: Export formatstring_ruby.
7
8Upstream-Status: Backport
9Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
10---
11 gettext-tools/woe32dll/gettextsrc-exports.c | 1 +
12 1 file changed, 1 insertion(+)
13
14diff --git a/gettext-tools/woe32dll/gettextsrc-exports.c b/gettext-tools/woe32dll/gettextsrc-exports.c
15index 4477ae8..6d76089 100644
16--- a/gettext-tools/woe32dll/gettextsrc-exports.c
17+++ b/gettext-tools/woe32dll/gettextsrc-exports.c
18@@ -50,6 +50,7 @@ VARIABLE(formatstring_python)
19 VARIABLE(formatstring_python_brace)
20 VARIABLE(formatstring_qt)
21 VARIABLE(formatstring_qt_plural)
22+VARIABLE(formatstring_ruby)
23 VARIABLE(formatstring_scheme)
24 VARIABLE(formatstring_sh)
25 VARIABLE(formatstring_smalltalk)
26--
271.9.1
28
diff --git a/meta/recipes-core/gettext/gettext-0.21/use-pkgconfig.patch b/meta/recipes-core/gettext/gettext-0.21/use-pkgconfig.patch
deleted file mode 100644
index fc77feb270..0000000000
--- a/meta/recipes-core/gettext/gettext-0.21/use-pkgconfig.patch
+++ /dev/null
@@ -1,699 +0,0 @@
1From 15647f679834be633fb4a9aeff4671b9cb95ccb8 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 | 100 +++---------------
21 libtextstyle/gnulib-m4/libcroco.m4 | 99 +++--------------
22 libtextstyle/gnulib-m4/libglib.m4 | 100 +++---------------
23 libtextstyle/lib/term-styled-ostream.c | 12 +--
24 libtextstyle/lib/term-styled-ostream.oo.c | 12 +--
25 8 files changed, 83 insertions(+), 450 deletions(-)
26
27diff --git a/gettext-tools/gnulib-m4/libxml.m4 b/gettext-tools/gnulib-m4/libxml.m4
28index 2f80c37..30ce58e 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 2ff978f..5ffb17a 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 "mem-hash-map.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 5853772..767fba2 100644
293--- a/libtextstyle/gnulib-local/m4/libglib.m4
294+++ b/libtextstyle/gnulib-local/m4/libglib.m4
295@@ -6,100 +6,26 @@ dnl with or without modifications, as long as this notice is preserved.
296
297 dnl From Bruno Haible.
298
299-dnl gl_LIBGLIB
300-dnl gives the user the option to decide whether to use the included or
301-dnl an external libglib.
302-dnl gl_LIBGLIB(FORCE-INCLUDED)
303-dnl forces the use of the included or an external libglib.
304 AC_DEFUN([gl_LIBGLIB],
305 [
306- ifelse([$1], , [
307- AC_MSG_CHECKING([whether included glib is requested])
308- AC_ARG_WITH([included-glib],
309- [ --with-included-glib use the glib2 included here],
310- [gl_cv_libglib_force_included=$withval],
311- [gl_cv_libglib_force_included=no])
312- AC_MSG_RESULT([$gl_cv_libglib_force_included])
313- ], [gl_cv_libglib_force_included=$1])
314+ AC_REQUIRE([PKG_PROG_PKG_CONFIG])
315+ AC_MSG_CHECKING([whether included glib is requested])
316+ AC_ARG_WITH([included-glib],
317+ [ --with-included-glib use the glib2 included here],
318+ [gl_cv_libglib_force_included=$withval],
319+ [gl_cv_libglib_force_included=no])
320+ AC_MSG_RESULT([$gl_cv_libglib_force_included])
321
322 gl_cv_libglib_use_included="$gl_cv_libglib_force_included"
323 LIBGLIB=
324 LTLIBGLIB=
325 INCGLIB=
326- ifelse([$1], [yes], , [
327- if test "$gl_cv_libglib_use_included" != yes; then
328- dnl Figure out whether we can use a preinstalled libglib-2.0, or have to use
329- dnl the included one.
330- AC_CACHE_VAL([gl_cv_libglib], [
331- gl_cv_libglib=no
332- gl_cv_LIBGLIB=
333- gl_cv_LTLIBGLIB=
334- gl_cv_INCGLIB=
335- gl_save_LIBS="$LIBS"
336- dnl Search for libglib2 and define LIBGLIB_2_0, LTLIBGLIB_2_0 and
337- dnl INCGLIB_2_0 accordingly.
338- dnl Don't use glib-config nor pkg-config, since it doesn't work when
339- dnl cross-compiling or when the C compiler in use is different from the
340- dnl one that built the library.
341- AC_LIB_LINKFLAGS_BODY([glib-2.0])
342- LIBS="$gl_save_LIBS $LIBGLIB_2_0"
343- AC_TRY_LINK([#include <glib.h>
344-#ifndef G_BEGIN_DECLS
345-error this glib.h includes a glibconfig.h from a glib version 1.x
346-#endif
347-],
348- [g_string_new ("foo");],
349- [gl_cv_libglib=yes
350- gl_cv_LIBGLIB="$LIBGLIB_2_0"
351- gl_cv_LTLIBGLIB="$LTLIBGLIB_2_0"
352- ])
353- if test "$gl_cv_libglib" != yes; then
354- gl_save_CPPFLAGS="$CPPFLAGS"
355- CPPFLAGS="$CPPFLAGS $INCGLIB_2_0"
356- AC_TRY_LINK([#include <glib.h>
357-#ifndef G_BEGIN_DECLS
358-error this glib.h includes a glibconfig.h from a glib version 1.x
359-#endif
360-],
361- [g_string_new ("foo");],
362- [gl_cv_libglib=yes
363- gl_cv_LIBGLIB="$LIBGLIB_2_0"
364- gl_cv_LTLIBGLIB="$LTLIBGLIB_2_0"
365- gl_cv_INCGLIB="$INCGLIB_2_0"
366- ])
367- if test "$gl_cv_libglib" != yes; then
368- dnl Often the include files are installed in /usr/include/glib-2.0
369- dnl and /usr/lib/glib-2.0/include.
370- if test -n "$LIBGLIB_2_0_PREFIX"; then
371- CPPFLAGS="$gl_save_CPPFLAGS -I$LIBGLIB_2_0_PREFIX/include/glib-2.0 -I$LIBGLIB_2_0_PREFIX/$acl_libdirstem/glib-2.0/include"
372- AC_TRY_LINK([#include <glib.h>
373-#ifndef G_BEGIN_DECLS
374-error this glib.h includes a glibconfig.h from a glib version 1.x
375-#endif
376-],
377- [g_string_new ("foo");],
378- [gl_cv_libglib=yes
379- gl_cv_LIBGLIB="$LIBGLIB_2_0"
380- gl_cv_LTLIBGLIB="$LTLIBGLIB_2_0"
381- gl_cv_INCGLIB="-I$LIBGLIB_2_0_PREFIX/include/glib-2.0 -I$LIBGLIB_2_0_PREFIX/$acl_libdirstem/glib-2.0/include"
382- ])
383- fi
384- fi
385- CPPFLAGS="$gl_save_CPPFLAGS"
386- fi
387- LIBS="$gl_save_LIBS"
388- ])
389- AC_MSG_CHECKING([for glib])
390- AC_MSG_RESULT([$gl_cv_libglib])
391- if test $gl_cv_libglib = yes; then
392- LIBGLIB="$gl_cv_LIBGLIB"
393- LTLIBGLIB="$gl_cv_LTLIBGLIB"
394- INCGLIB="$gl_cv_INCGLIB"
395- else
396- gl_cv_libglib_use_included=yes
397- fi
398- fi
399- ])
400+ if test "$gl_cv_libglib_use_included" != yes; then
401+ PKG_CHECK_MODULES([GLIB], [glib-2.0])
402+ LIBGLIB="$GLIB_LIBS"
403+ LTLIBGLIB="$GLIB_LIBS"
404+ INCGLIB="$GLIB_CFLAGS"
405+ fi
406 AC_SUBST([LIBGLIB])
407 AC_SUBST([LTLIBGLIB])
408 AC_SUBST([INCGLIB])
409diff --git a/libtextstyle/gnulib-m4/libcroco.m4 b/libtextstyle/gnulib-m4/libcroco.m4
410index bc53cc6..10b2455 100644
411--- a/libtextstyle/gnulib-m4/libcroco.m4
412+++ b/libtextstyle/gnulib-m4/libcroco.m4
413@@ -1,99 +1,34 @@
414-# libcroco.m4 serial 3
415-dnl Copyright (C) 2006-2007, 2019 Free Software Foundation, Inc.
416+# libcroco.m4 serial 2 (gettext-0.17)
417+dnl Copyright (C) 2006, 2015-2016 Free Software Foundation, Inc.
418 dnl This file is free software; the Free Software Foundation
419 dnl gives unlimited permission to copy and/or distribute it,
420 dnl with or without modifications, as long as this notice is preserved.
421
422 dnl From Bruno Haible.
423
424-dnl gl_LIBCROCO
425-dnl gives the user the option to decide whether to use the included or
426-dnl an external libcroco.
427-dnl gl_LIBCROCO(FORCE-INCLUDED)
428-dnl forces the use of the included or an external libcroco.
429 AC_DEFUN([gl_LIBCROCO],
430 [
431- ifelse([$1], [yes], , [
432- dnl libcroco depends on libglib.
433- AC_REQUIRE([gl_LIBGLIB])
434- ])
435+ AC_REQUIRE([PKG_PROG_PKG_CONFIG])
436+ dnl libcroco depends on libglib.
437+ AC_REQUIRE([gl_LIBGLIB])
438
439- ifelse([$1], , [
440- AC_MSG_CHECKING([whether included libcroco is requested])
441- AC_ARG_WITH([included-libcroco],
442- [ --with-included-libcroco use the libcroco included here],
443- [gl_cv_libcroco_force_included=$withval],
444- [gl_cv_libcroco_force_included=no])
445- AC_MSG_RESULT([$gl_cv_libcroco_force_included])
446- ], [gl_cv_libcroco_force_included=$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
454 gl_cv_libcroco_use_included="$gl_cv_libcroco_force_included"
455 LIBCROCO=
456 LTLIBCROCO=
457 INCCROCO=
458- ifelse([$1], [yes], , [
459- if test "$gl_cv_libcroco_use_included" != yes; then
460- dnl Figure out whether we can use a preinstalled libcroco-0.6, or have to
461- dnl use the included one.
462- AC_CACHE_VAL([gl_cv_libcroco], [
463- gl_cv_libcroco=no
464- gl_cv_LIBCROCO=
465- gl_cv_LTLIBCROCO=
466- gl_cv_INCCROCO=
467- gl_save_LIBS="$LIBS"
468- dnl Search for libcroco and define LIBCROCO_0_6, LTLIBCROCO_0_6 and
469- dnl INCCROCO_0_6 accordingly.
470- dnl Don't use croco-0.6-config nor pkg-config, since it doesn't work when
471- dnl cross-compiling or when the C compiler in use is different from the
472- dnl one that built the library.
473- AC_LIB_LINKFLAGS_BODY([croco-0.6], [glib-2.0])
474- LIBS="$gl_save_LIBS $LIBCROCO_0_6"
475- AC_TRY_LINK([#include <libcroco-config.h>],
476- [const char *version = LIBCROCO_VERSION; return !version;],
477- [gl_cv_libcroco=yes
478- gl_cv_LIBCROCO="$LIBCROCO_0_6"
479- gl_cv_LTLIBCROCO="$LTLIBCROCO_0_6"
480- ])
481- if test "$gl_cv_libcroco" != yes; then
482- gl_save_CPPFLAGS="$CPPFLAGS"
483- CPPFLAGS="$CPPFLAGS $INCCROCO_0_6"
484- AC_TRY_LINK([#include <libcroco-config.h>],
485- [const char *version = LIBCROCO_VERSION; return !version;],
486- [gl_cv_libcroco=yes
487- gl_cv_LIBCROCO="$LIBCROCO_0_6"
488- gl_cv_LTLIBCROCO="$LTLIBCROCO_0_6"
489- gl_cv_INCCROCO="$INCCROCO_0_6"
490- ])
491- if test "$gl_cv_libcroco" != yes; then
492- dnl Often the include files are installed in
493- dnl /usr/include/libcroco-0.6/libcroco.
494- AC_TRY_LINK([#include <libcroco-0.6/libcroco/libcroco-config.h>],
495- [const char *version = LIBCROCO_VERSION; return !version;],
496- [gl_ABSOLUTE_HEADER([libcroco-0.6/libcroco/libcroco-config.h])
497- libcroco_include_dir=`echo "$gl_cv_absolute_libcroco_0_6_libcroco_libcroco_config_h" | sed -e 's,.libcroco-config\.h$,,'`
498- if test -d "$libcroco_include_dir"; then
499- gl_cv_libcroco=yes
500- gl_cv_LIBCROCO="$LIBCROCO_0_6"
501- gl_cv_LTLIBCROCO="$LTLIBCROCO_0_6"
502- gl_cv_INCCROCO="-I$libcroco_include_dir"
503- fi
504- ])
505- fi
506- CPPFLAGS="$gl_save_CPPFLAGS"
507- fi
508- LIBS="$gl_save_LIBS"
509- ])
510- AC_MSG_CHECKING([for libcroco])
511- AC_MSG_RESULT([$gl_cv_libcroco])
512- if test $gl_cv_libcroco = yes; then
513- LIBCROCO="$gl_cv_LIBCROCO"
514- LTLIBCROCO="$gl_cv_LTLIBCROCO"
515- INCCROCO="$gl_cv_INCCROCO"
516- else
517- gl_cv_libcroco_use_included=yes
518- fi
519- fi
520- ])
521+ if test "$gl_cv_libcroco_use_included" != yes; then
522+ PKG_CHECK_MODULES([CROCO], [libcroco-0.6])
523+ LIBCROCO=$CROCO_LIBS
524+ LTLIBCROCO=$CROCO_LIBS
525+ INCCROCO=$CROCO_CFLAGS
526+ fi
527 AC_SUBST([LIBCROCO])
528 AC_SUBST([LTLIBCROCO])
529 AC_SUBST([INCCROCO])
530diff --git a/libtextstyle/gnulib-m4/libglib.m4 b/libtextstyle/gnulib-m4/libglib.m4
531index 5853772..767fba2 100644
532--- a/libtextstyle/gnulib-m4/libglib.m4
533+++ b/libtextstyle/gnulib-m4/libglib.m4
534@@ -6,100 +6,26 @@ dnl with or without modifications, as long as this notice is preserved.
535
536 dnl From Bruno Haible.
537
538-dnl gl_LIBGLIB
539-dnl gives the user the option to decide whether to use the included or
540-dnl an external libglib.
541-dnl gl_LIBGLIB(FORCE-INCLUDED)
542-dnl forces the use of the included or an external libglib.
543 AC_DEFUN([gl_LIBGLIB],
544 [
545- ifelse([$1], , [
546- AC_MSG_CHECKING([whether included glib is requested])
547- AC_ARG_WITH([included-glib],
548- [ --with-included-glib use the glib2 included here],
549- [gl_cv_libglib_force_included=$withval],
550- [gl_cv_libglib_force_included=no])
551- AC_MSG_RESULT([$gl_cv_libglib_force_included])
552- ], [gl_cv_libglib_force_included=$1])
553+ AC_REQUIRE([PKG_PROG_PKG_CONFIG])
554+ AC_MSG_CHECKING([whether included glib is requested])
555+ AC_ARG_WITH([included-glib],
556+ [ --with-included-glib use the glib2 included here],
557+ [gl_cv_libglib_force_included=$withval],
558+ [gl_cv_libglib_force_included=no])
559+ AC_MSG_RESULT([$gl_cv_libglib_force_included])
560
561 gl_cv_libglib_use_included="$gl_cv_libglib_force_included"
562 LIBGLIB=
563 LTLIBGLIB=
564 INCGLIB=
565- ifelse([$1], [yes], , [
566- if test "$gl_cv_libglib_use_included" != yes; then
567- dnl Figure out whether we can use a preinstalled libglib-2.0, or have to use
568- dnl the included one.
569- AC_CACHE_VAL([gl_cv_libglib], [
570- gl_cv_libglib=no
571- gl_cv_LIBGLIB=
572- gl_cv_LTLIBGLIB=
573- gl_cv_INCGLIB=
574- gl_save_LIBS="$LIBS"
575- dnl Search for libglib2 and define LIBGLIB_2_0, LTLIBGLIB_2_0 and
576- dnl INCGLIB_2_0 accordingly.
577- dnl Don't use glib-config nor pkg-config, since it doesn't work when
578- dnl cross-compiling or when the C compiler in use is different from the
579- dnl one that built the library.
580- AC_LIB_LINKFLAGS_BODY([glib-2.0])
581- LIBS="$gl_save_LIBS $LIBGLIB_2_0"
582- AC_TRY_LINK([#include <glib.h>
583-#ifndef G_BEGIN_DECLS
584-error this glib.h includes a glibconfig.h from a glib version 1.x
585-#endif
586-],
587- [g_string_new ("foo");],
588- [gl_cv_libglib=yes
589- gl_cv_LIBGLIB="$LIBGLIB_2_0"
590- gl_cv_LTLIBGLIB="$LTLIBGLIB_2_0"
591- ])
592- if test "$gl_cv_libglib" != yes; then
593- gl_save_CPPFLAGS="$CPPFLAGS"
594- CPPFLAGS="$CPPFLAGS $INCGLIB_2_0"
595- AC_TRY_LINK([#include <glib.h>
596-#ifndef G_BEGIN_DECLS
597-error this glib.h includes a glibconfig.h from a glib version 1.x
598-#endif
599-],
600- [g_string_new ("foo");],
601- [gl_cv_libglib=yes
602- gl_cv_LIBGLIB="$LIBGLIB_2_0"
603- gl_cv_LTLIBGLIB="$LTLIBGLIB_2_0"
604- gl_cv_INCGLIB="$INCGLIB_2_0"
605- ])
606- if test "$gl_cv_libglib" != yes; then
607- dnl Often the include files are installed in /usr/include/glib-2.0
608- dnl and /usr/lib/glib-2.0/include.
609- if test -n "$LIBGLIB_2_0_PREFIX"; then
610- CPPFLAGS="$gl_save_CPPFLAGS -I$LIBGLIB_2_0_PREFIX/include/glib-2.0 -I$LIBGLIB_2_0_PREFIX/$acl_libdirstem/glib-2.0/include"
611- AC_TRY_LINK([#include <glib.h>
612-#ifndef G_BEGIN_DECLS
613-error this glib.h includes a glibconfig.h from a glib version 1.x
614-#endif
615-],
616- [g_string_new ("foo");],
617- [gl_cv_libglib=yes
618- gl_cv_LIBGLIB="$LIBGLIB_2_0"
619- gl_cv_LTLIBGLIB="$LTLIBGLIB_2_0"
620- gl_cv_INCGLIB="-I$LIBGLIB_2_0_PREFIX/include/glib-2.0 -I$LIBGLIB_2_0_PREFIX/$acl_libdirstem/glib-2.0/include"
621- ])
622- fi
623- fi
624- CPPFLAGS="$gl_save_CPPFLAGS"
625- fi
626- LIBS="$gl_save_LIBS"
627- ])
628- AC_MSG_CHECKING([for glib])
629- AC_MSG_RESULT([$gl_cv_libglib])
630- if test $gl_cv_libglib = yes; then
631- LIBGLIB="$gl_cv_LIBGLIB"
632- LTLIBGLIB="$gl_cv_LTLIBGLIB"
633- INCGLIB="$gl_cv_INCGLIB"
634- else
635- gl_cv_libglib_use_included=yes
636- fi
637- fi
638- ])
639+ if test "$gl_cv_libglib_use_included" != yes; then
640+ PKG_CHECK_MODULES([GLIB], [glib-2.0])
641+ LIBGLIB="$GLIB_LIBS"
642+ LTLIBGLIB="$GLIB_LIBS"
643+ INCGLIB="$GLIB_CFLAGS"
644+ fi
645 AC_SUBST([LIBGLIB])
646 AC_SUBST([LTLIBGLIB])
647 AC_SUBST([INCGLIB])
648diff --git a/libtextstyle/lib/term-styled-ostream.c b/libtextstyle/lib/term-styled-ostream.c
649index 5484800..16793fa 100644
650--- a/libtextstyle/lib/term-styled-ostream.c
651+++ b/libtextstyle/lib/term-styled-ostream.c
652@@ -28,15 +28,15 @@
653
654 #include <stdlib.h>
655
656-#include <cr-om-parser.h>
657-#include <cr-sel-eng.h>
658-#include <cr-style.h>
659-#include <cr-rgb.h>
660+#include <libcroco/cr-om-parser.h>
661+#include <libcroco/cr-sel-eng.h>
662+#include <libcroco/cr-style.h>
663+#include <libcroco/cr-rgb.h>
664 /* <cr-fonts.h> has a broken double-inclusion guard in libcroco-0.6.1. */
665 #ifndef __CR_FONTS_H__
666-# include <cr-fonts.h>
667+# include <libcroco/cr-fonts.h>
668 #endif
669-#include <cr-string.h>
670+#include <libcroco/cr-string.h>
671
672 #include "term-ostream.h"
673 #include "mem-hash-map.h"
674diff --git a/libtextstyle/lib/term-styled-ostream.oo.c b/libtextstyle/lib/term-styled-ostream.oo.c
675index 2ff978f..5ffb17a 100644
676--- a/libtextstyle/lib/term-styled-ostream.oo.c
677+++ b/libtextstyle/lib/term-styled-ostream.oo.c
678@@ -22,15 +22,15 @@
679
680 #include <stdlib.h>
681
682-#include <cr-om-parser.h>
683-#include <cr-sel-eng.h>
684-#include <cr-style.h>
685-#include <cr-rgb.h>
686+#include <libcroco/cr-om-parser.h>
687+#include <libcroco/cr-sel-eng.h>
688+#include <libcroco/cr-style.h>
689+#include <libcroco/cr-rgb.h>
690 /* <cr-fonts.h> has a broken double-inclusion guard in libcroco-0.6.1. */
691 #ifndef __CR_FONTS_H__
692-# include <cr-fonts.h>
693+# include <libcroco/cr-fonts.h>
694 #endif
695-#include <cr-string.h>
696+#include <libcroco/cr-string.h>
697
698 #include "term-ostream.h"
699 #include "mem-hash-map.h"
diff --git a/meta/recipes-core/gettext/gettext-minimal-0.21/Makefile.in.in b/meta/recipes-core/gettext/gettext-minimal-0.21/Makefile.in.in
deleted file mode 100644
index 6b25f0d916..0000000000
--- a/meta/recipes-core/gettext/gettext-minimal-0.21/Makefile.in.in
+++ /dev/null
@@ -1,510 +0,0 @@
1# Makefile for PO directory in any package using GNU gettext.
2# Copyright (C) 1995-2000 Ulrich Drepper <drepper@gnu.ai.mit.edu>
3# Copyright (C) 2000-2020 Free Software Foundation, Inc.
4#
5# Copying and distribution of this file, with or without modification,
6# are permitted in any medium without royalty provided the copyright
7# notice and this notice are preserved. This file is offered as-is,
8# without any warranty.
9#
10# Origin: gettext-0.21
11GETTEXT_MACRO_VERSION = 0.20
12
13PACKAGE = @PACKAGE@
14VERSION = @VERSION@
15PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
16
17SED = @SED@
18SHELL = /bin/sh
19@SET_MAKE@
20
21srcdir = @srcdir@
22top_srcdir = @top_srcdir@
23VPATH = @srcdir@
24
25prefix = @prefix@
26exec_prefix = @exec_prefix@
27datarootdir = @datarootdir@
28datadir = @datadir@
29localedir = @localedir@
30gettextsrcdir = $(datadir)/gettext/po
31
32INSTALL = @INSTALL@
33INSTALL_DATA = @INSTALL_DATA@
34
35# We use $(mkdir_p).
36# In automake <= 1.9.x, $(mkdir_p) is defined either as "mkdir -p --" or as
37# "$(mkinstalldirs)" or as "$(install_sh) -d". For these automake versions,
38# @install_sh@ does not start with $(SHELL), so we add it.
39# In automake >= 1.10, @mkdir_p@ is derived from ${MKDIR_P}, which is defined
40# either as "/path/to/mkdir -p" or ".../install-sh -c -d". For these automake
41# versions, $(mkinstalldirs) and $(install_sh) are unused.
42mkinstalldirs = $(SHELL) @install_sh@ -d
43install_sh = $(SHELL) @install_sh@
44MKDIR_P = @MKDIR_P@
45mkdir_p = @mkdir_p@
46
47# When building gettext-tools, we prefer to use the built programs
48# rather than installed programs. However, we can't do that when we
49# are cross compiling.
50CROSS_COMPILING = @CROSS_COMPILING@
51
52GMSGFMT_ = @GMSGFMT@
53GMSGFMT_no = @GMSGFMT@
54GMSGFMT_yes = @GMSGFMT_015@
55GMSGFMT = $(GMSGFMT_$(USE_MSGCTXT))
56XGETTEXT_ = @XGETTEXT@
57XGETTEXT_no = @XGETTEXT@
58XGETTEXT_yes = @XGETTEXT_015@
59XGETTEXT = $(XGETTEXT_$(USE_MSGCTXT))
60MSGMERGE = @MSGMERGE@
61MSGMERGE_UPDATE = @MSGMERGE@ --update
62MSGMERGE_FOR_MSGFMT_OPTION = @MSGMERGE_FOR_MSGFMT_OPTION@
63MSGINIT = msginit
64MSGCONV = msgconv
65MSGFILTER = msgfilter
66
67POFILES = @POFILES@
68GMOFILES = @GMOFILES@
69UPDATEPOFILES = @UPDATEPOFILES@
70DUMMYPOFILES = @DUMMYPOFILES@
71DISTFILES.common = Makefile.in.in remove-potcdate.sin \
72$(DISTFILES.common.extra1) $(DISTFILES.common.extra2) $(DISTFILES.common.extra3)
73DISTFILES = $(DISTFILES.common) Makevars POTFILES.in \
74$(POFILES) $(GMOFILES) \
75$(DISTFILES.extra1) $(DISTFILES.extra2) $(DISTFILES.extra3)
76
77POTFILES = \
78
79CATALOGS = @CATALOGS@
80
81POFILESDEPS_ = $(srcdir)/$(DOMAIN).pot
82POFILESDEPS_yes = $(POFILESDEPS_)
83POFILESDEPS_no =
84POFILESDEPS = $(POFILESDEPS_$(PO_DEPENDS_ON_POT))
85
86DISTFILESDEPS_ = update-po
87DISTFILESDEPS_yes = $(DISTFILESDEPS_)
88DISTFILESDEPS_no =
89DISTFILESDEPS = $(DISTFILESDEPS_$(DIST_DEPENDS_ON_UPDATE_PO))
90
91# Makevars gets inserted here. (Don't remove this line!)
92
93all: all-@USE_NLS@
94
95
96.SUFFIXES:
97.SUFFIXES: .po .gmo .sed .sin .nop .po-create .po-update
98
99# The .pot file, stamp-po, .po files, and .gmo files appear in release tarballs.
100# The GNU Coding Standards say in
101# <https://www.gnu.org/prep/standards/html_node/Makefile-Basics.html>:
102# "GNU distributions usually contain some files which are not source files
103# ... . Since these files normally appear in the source directory, they
104# should always appear in the source directory, not in the build directory.
105# So Makefile rules to update them should put the updated files in the
106# source directory."
107# Therefore we put these files in the source directory, not the build directory.
108
109# During .po -> .gmo conversion, take into account the most recent changes to
110# the .pot file. This eliminates the need to update the .po files when the
111# .pot file has changed, which would be troublesome if the .po files are put
112# under version control.
113$(GMOFILES): $(srcdir)/$(DOMAIN).pot
114.po.gmo:
115 @lang=`echo $* | sed -e 's,.*/,,'`; \
116 test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
117 echo "$${cdcmd}rm -f $${lang}.gmo && $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.1po $${lang}.po $(DOMAIN).pot && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.1po && rm -f $${lang}.1po"; \
118 cd $(srcdir) && \
119 rm -f $${lang}.gmo && \
120 $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.1po $${lang}.po $(DOMAIN).pot && \
121 $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.1po && \
122 mv t-$${lang}.gmo $${lang}.gmo && \
123 rm -f $${lang}.1po
124
125.sin.sed:
126 sed -e '/^#/d' $< > t-$@
127 mv t-$@ $@
128
129
130all-yes: $(srcdir)/stamp-po
131all-no:
132
133# Ensure that the gettext macros and this Makefile.in.in are in sync.
134CHECK_MACRO_VERSION = \
135 test "$(GETTEXT_MACRO_VERSION)" = "@GETTEXT_MACRO_VERSION@" \
136 || { echo "*** error: gettext infrastructure mismatch: using a Makefile.in.in from gettext version $(GETTEXT_MACRO_VERSION) but the autoconf macros are from gettext version @GETTEXT_MACRO_VERSION@" 1>&2; \
137 exit 1; \
138 }
139
140# $(srcdir)/$(DOMAIN).pot is only created when needed. When xgettext finds no
141# internationalized messages, no $(srcdir)/$(DOMAIN).pot is created (because
142# we don't want to bother translators with empty POT files). We assume that
143# LINGUAS is empty in this case, i.e. $(POFILES) and $(GMOFILES) are empty.
144# In this case, $(srcdir)/stamp-po is a nop (i.e. a phony target).
145
146# $(srcdir)/stamp-po is a timestamp denoting the last time at which the CATALOGS
147# have been loosely updated. Its purpose is that when a developer or translator
148# checks out the package from a version control system, and the $(DOMAIN).pot
149# file is not under version control, "make" will update the $(DOMAIN).pot and
150# the $(CATALOGS), but subsequent invocations of "make" will do nothing. This
151# timestamp would not be necessary if updating the $(CATALOGS) would always
152# touch them; however, the rule for $(POFILES) has been designed to not touch
153# files that don't need to be changed.
154$(srcdir)/stamp-po: $(srcdir)/$(DOMAIN).pot
155 @$(CHECK_MACRO_VERSION)
156 test ! -f $(srcdir)/$(DOMAIN).pot || \
157 test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES)
158 @test ! -f $(srcdir)/$(DOMAIN).pot || { \
159 echo "touch $(srcdir)/stamp-po" && \
160 echo timestamp > $(srcdir)/stamp-poT && \
161 mv $(srcdir)/stamp-poT $(srcdir)/stamp-po; \
162 }
163
164# Note: Target 'all' must not depend on target '$(DOMAIN).pot-update',
165# otherwise packages like GCC can not be built if only parts of the source
166# have been downloaded.
167
168# This target rebuilds $(DOMAIN).pot; it is an expensive operation.
169# Note that $(DOMAIN).pot is not touched if it doesn't need to be changed.
170# The determination of whether the package xyz is a GNU one is based on the
171# heuristic whether some file in the top level directory mentions "GNU xyz".
172# If GNU 'find' is available, we avoid grepping through monster files.
173$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
174 package_gnu="$(PACKAGE_GNU)"; \
175 test -n "$$package_gnu" || { \
176 if { if (LC_ALL=C find --version) 2>/dev/null | grep GNU >/dev/null; then \
177 LC_ALL=C find -L $(top_srcdir) -maxdepth 1 -type f -size -10000000c -exec grep -i 'GNU @PACKAGE@' /dev/null '{}' ';' 2>/dev/null; \
178 else \
179 LC_ALL=C grep -i 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null; \
180 fi; \
181 } | grep -v 'libtool:' >/dev/null; then \
182 package_gnu=yes; \
183 else \
184 package_gnu=no; \
185 fi; \
186 }; \
187 if test "$$package_gnu" = "yes"; then \
188 package_prefix='GNU '; \
189 else \
190 package_prefix=''; \
191 fi; \
192 if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = '@'PACKAGE_BUGREPORT'@'; then \
193 msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \
194 else \
195 msgid_bugs_address='$(PACKAGE_BUGREPORT)'; \
196 fi; \
197 case `$(XGETTEXT) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
198 '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].* | 0.16 | 0.16.[0-1]*) \
199 $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
200 --add-comments=TRANSLATORS: \
201 --files-from=$(srcdir)/POTFILES.in \
202 --copyright-holder='$(COPYRIGHT_HOLDER)' \
203 --msgid-bugs-address="$$msgid_bugs_address" \
204 $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
205 ;; \
206 *) \
207 $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
208 --add-comments=TRANSLATORS: \
209 --files-from=$(srcdir)/POTFILES.in \
210 --copyright-holder='$(COPYRIGHT_HOLDER)' \
211 --package-name="$${package_prefix}@PACKAGE@" \
212 --package-version='@VERSION@' \
213 --msgid-bugs-address="$$msgid_bugs_address" \
214 $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
215 ;; \
216 esac
217 test ! -f $(DOMAIN).po || { \
218 if test -f $(srcdir)/$(DOMAIN).pot-header; then \
219 sed -e '1,/^#$$/d' < $(DOMAIN).po > $(DOMAIN).1po && \
220 cat $(srcdir)/$(DOMAIN).pot-header $(DOMAIN).1po > $(DOMAIN).po && \
221 rm -f $(DOMAIN).1po \
222 || exit 1; \
223 fi; \
224 if test -f $(srcdir)/$(DOMAIN).pot; then \
225 sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \
226 sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \
227 if cmp $(DOMAIN).1po $(DOMAIN).2po >/dev/null 2>&1; then \
228 rm -f $(DOMAIN).1po $(DOMAIN).2po $(DOMAIN).po; \
229 else \
230 rm -f $(DOMAIN).1po $(DOMAIN).2po $(srcdir)/$(DOMAIN).pot && \
231 mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \
232 fi; \
233 else \
234 mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \
235 fi; \
236 }
237
238# This rule has no dependencies: we don't need to update $(DOMAIN).pot at
239# every "make" invocation, only create it when it is missing.
240# Only "make $(DOMAIN).pot-update" or "make dist" will force an update.
241$(srcdir)/$(DOMAIN).pot:
242 $(MAKE) $(DOMAIN).pot-update
243
244# This target rebuilds a PO file if $(DOMAIN).pot has changed.
245# Note that a PO file is not touched if it doesn't need to be changed.
246$(POFILES): $(POFILESDEPS)
247 @test -f $(srcdir)/$(DOMAIN).pot || $(MAKE) $(srcdir)/$(DOMAIN).pot
248 @lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \
249 if test -f "$(srcdir)/$${lang}.po"; then \
250 test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
251 echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} --previous $${lang}.po $(DOMAIN).pot"; \
252 cd $(srcdir) \
253 && { case `$(MSGMERGE_UPDATE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
254 '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].*) \
255 $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) $${lang}.po $(DOMAIN).pot;; \
256 0.1[6-7] | 0.1[6-7].*) \
257 $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --previous $${lang}.po $(DOMAIN).pot;; \
258 *) \
259 $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} --previous $${lang}.po $(DOMAIN).pot;; \
260 esac; \
261 }; \
262 else \
263 $(MAKE) $${lang}.po-create; \
264 fi
265
266
267install: install-exec install-data
268install-exec:
269install-data: install-data-@USE_NLS@
270 if test "$(PACKAGE)" = "gettext-tools"; then \
271 $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
272 for file in $(DISTFILES.common) Makevars.template; do \
273 $(INSTALL_DATA) $(srcdir)/$$file \
274 $(DESTDIR)$(gettextsrcdir)/$$file; \
275 done; \
276 for file in Makevars; do \
277 rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
278 done; \
279 else \
280 : ; \
281 fi
282install-data-no: all
283install-data-yes: all
284 @catalogs='$(CATALOGS)'; \
285 for cat in $$catalogs; do \
286 cat=`basename $$cat`; \
287 lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
288 dir=$(localedir)/$$lang/LC_MESSAGES; \
289 $(mkdir_p) $(DESTDIR)$$dir; \
290 if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \
291 $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
292 echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
293 for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
294 if test -n "$$lc"; then \
295 if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
296 link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \
297 mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
298 mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
299 (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \
300 for file in *; do \
301 if test -f $$file; then \
302 ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \
303 fi; \
304 done); \
305 rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
306 else \
307 if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \
308 :; \
309 else \
310 rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \
311 mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
312 fi; \
313 fi; \
314 rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
315 ln -s ../LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \
316 ln $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \
317 cp -p $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
318 echo "installing $$realcat link as $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo"; \
319 fi; \
320 done; \
321 done
322
323install-strip: install
324
325installdirs: installdirs-exec installdirs-data
326installdirs-exec:
327installdirs-data: installdirs-data-@USE_NLS@
328 if test "$(PACKAGE)" = "gettext-tools"; then \
329 $(mkdir_p) $(DESTDIR)$(gettextsrcdir); \
330 else \
331 : ; \
332 fi
333installdirs-data-no:
334installdirs-data-yes:
335 @catalogs='$(CATALOGS)'; \
336 for cat in $$catalogs; do \
337 cat=`basename $$cat`; \
338 lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
339 dir=$(localedir)/$$lang/LC_MESSAGES; \
340 $(mkdir_p) $(DESTDIR)$$dir; \
341 for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \
342 if test -n "$$lc"; then \
343 if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \
344 link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \
345 mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
346 mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
347 (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \
348 for file in *; do \
349 if test -f $$file; then \
350 ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \
351 fi; \
352 done); \
353 rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \
354 else \
355 if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \
356 :; \
357 else \
358 rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \
359 mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \
360 fi; \
361 fi; \
362 fi; \
363 done; \
364 done
365
366# Define this as empty until I found a useful application.
367installcheck:
368
369uninstall: uninstall-exec uninstall-data
370uninstall-exec:
371uninstall-data: uninstall-data-@USE_NLS@
372 if test "$(PACKAGE)" = "gettext-tools"; then \
373 for file in $(DISTFILES.common) Makevars.template; do \
374 rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \
375 done; \
376 else \
377 : ; \
378 fi
379uninstall-data-no:
380uninstall-data-yes:
381 catalogs='$(CATALOGS)'; \
382 for cat in $$catalogs; do \
383 cat=`basename $$cat`; \
384 lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \
385 for lc in LC_MESSAGES $(EXTRA_LOCALE_CATEGORIES); do \
386 rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \
387 done; \
388 done
389
390check: all
391
392info dvi ps pdf html tags TAGS ctags CTAGS ID:
393
394install-dvi install-ps install-pdf install-html:
395
396mostlyclean:
397 rm -f remove-potcdate.sed
398 rm -f $(srcdir)/stamp-poT
399 rm -f core core.* $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po
400 rm -fr *.o
401
402clean: mostlyclean
403
404distclean: clean
405 rm -f Makefile Makefile.in POTFILES
406
407maintainer-clean: distclean
408 @echo "This command is intended for maintainers to use;"
409 @echo "it deletes files that may require special tools to rebuild."
410 rm -f $(srcdir)/$(DOMAIN).pot $(srcdir)/stamp-po $(GMOFILES)
411
412distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
413dist distdir:
414 test -z "$(DISTFILESDEPS)" || $(MAKE) $(DISTFILESDEPS)
415 @$(MAKE) dist2
416# This is a separate target because 'update-po' must be executed before.
417dist2: $(srcdir)/stamp-po $(DISTFILES)
418 @dists="$(DISTFILES)"; \
419 if test "$(PACKAGE)" = "gettext-tools"; then \
420 dists="$$dists Makevars.template"; \
421 fi; \
422 if test -f $(srcdir)/$(DOMAIN).pot; then \
423 dists="$$dists $(DOMAIN).pot stamp-po"; \
424 else \
425 case $(XGETTEXT) in \
426 :) echo "Warning: Creating a tarball without '$(DOMAIN).pot', because a suitable 'xgettext' program was not found in PATH." 1>&2;; \
427 *) echo "Warning: Creating a tarball without '$(DOMAIN).pot', because 'xgettext' found no strings to extract. Check the contents of the POTFILES.in file and the XGETTEXT_OPTIONS in the Makevars file." 1>&2;; \
428 esac; \
429 fi; \
430 if test -f $(srcdir)/ChangeLog; then \
431 dists="$$dists ChangeLog"; \
432 fi; \
433 for i in 0 1 2 3 4 5 6 7 8 9; do \
434 if test -f $(srcdir)/ChangeLog.$$i; then \
435 dists="$$dists ChangeLog.$$i"; \
436 fi; \
437 done; \
438 if test -f $(srcdir)/LINGUAS; then dists="$$dists LINGUAS"; fi; \
439 for file in $$dists; do \
440 if test -f $$file; then \
441 cp -p $$file $(distdir) || exit 1; \
442 else \
443 cp -p $(srcdir)/$$file $(distdir) || exit 1; \
444 fi; \
445 done
446
447update-po: Makefile
448 $(MAKE) $(DOMAIN).pot-update
449 test -z "$(UPDATEPOFILES)" || $(MAKE) $(UPDATEPOFILES)
450 $(MAKE) update-gmo
451
452# General rule for creating PO files.
453
454.nop.po-create:
455 @lang=`echo $@ | sed -e 's/\.po-create$$//'`; \
456 echo "File $$lang.po does not exist. If you are a translator, you can create it through 'msginit'." 1>&2; \
457 exit 1
458
459# General rule for updating PO files.
460
461.nop.po-update:
462 @lang=`echo $@ | sed -e 's/\.po-update$$//'`; \
463 if test "$(PACKAGE)" = "gettext-tools" && test "$(CROSS_COMPILING)" != "yes"; then PATH=`pwd`/../src:$$PATH; fi; \
464 tmpdir=`pwd`; \
465 echo "$$lang:"; \
466 test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
467 echo "$${cdcmd}$(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang --previous $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
468 cd $(srcdir); \
469 if { case `$(MSGMERGE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
470 '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].*) \
471 $(MSGMERGE) $(MSGMERGE_OPTIONS) -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \
472 0.1[6-7] | 0.1[6-7].*) \
473 $(MSGMERGE) $(MSGMERGE_OPTIONS) --previous -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \
474 *) \
475 $(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang --previous -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \
476 esac; \
477 }; then \
478 if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
479 rm -f $$tmpdir/$$lang.new.po; \
480 else \
481 if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \
482 :; \
483 else \
484 echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \
485 exit 1; \
486 fi; \
487 fi; \
488 else \
489 echo "msgmerge for $$lang.po failed!" 1>&2; \
490 rm -f $$tmpdir/$$lang.new.po; \
491 fi
492
493$(DUMMYPOFILES):
494
495update-gmo: Makefile $(GMOFILES)
496 @:
497
498# Recreate Makefile by invoking config.status. Explicitly invoke the shell,
499# because execution permission bits may not work on the current file system.
500# Use @SHELL@, which is the shell determined by autoconf for the use by its
501# scripts, not $(SHELL) which is hardwired to /bin/sh and may be deficient.
502Makefile: Makefile.in.in Makevars $(top_builddir)/config.status @POMAKEFILEDEPS@
503 cd $(top_builddir) \
504 && @SHELL@ ./config.status $(subdir)/$@.in po-directories
505
506force:
507
508# Tell versions [3.59,3.63) of GNU make not to export all variables.
509# Otherwise a system limit (for SysV at least) may be exceeded.
510.NOEXPORT:
diff --git a/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/gettext.m4 b/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/gettext.m4
deleted file mode 100644
index 4f25a27d93..0000000000
--- a/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/gettext.m4
+++ /dev/null
@@ -1,386 +0,0 @@
1# gettext.m4 serial 71 (gettext-0.20.2)
2dnl Copyright (C) 1995-2014, 2016, 2018-2020 Free Software Foundation, Inc.
3dnl This file is free software; the Free Software Foundation
4dnl gives unlimited permission to copy and/or distribute it,
5dnl with or without modifications, as long as this notice is preserved.
6dnl
7dnl This file can be used in projects which are not available under
8dnl the GNU General Public License or the GNU Lesser General Public
9dnl License but which still want to provide support for the GNU gettext
10dnl functionality.
11dnl Please note that the actual code of the GNU gettext library is covered
12dnl by the GNU Lesser General Public License, and the rest of the GNU
13dnl gettext package is covered by the GNU General Public License.
14dnl They are *not* in the public domain.
15
16dnl Authors:
17dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
18dnl Bruno Haible <haible@clisp.cons.org>, 2000-2006, 2008-2010.
19
20dnl Macro to add for using GNU gettext.
21
22dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]).
23dnl INTLSYMBOL must be one of 'external', 'use-libtool'.
24dnl INTLSYMBOL should be 'external' for packages other than GNU gettext, and
25dnl 'use-libtool' for the packages 'gettext-runtime' and 'gettext-tools'.
26dnl If INTLSYMBOL is 'use-libtool', then a libtool library
27dnl $(top_builddir)/intl/libintl.la will be created (shared and/or static,
28dnl depending on --{enable,disable}-{shared,static} and on the presence of
29dnl AM-DISABLE-SHARED).
30dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext
31dnl implementations (in libc or libintl) without the ngettext() function
32dnl will be ignored. If NEEDSYMBOL is specified and is
33dnl 'need-formatstring-macros', then GNU gettext implementations that don't
34dnl support the ISO C 99 <inttypes.h> formatstring macros will be ignored.
35dnl INTLDIR is used to find the intl libraries. If empty,
36dnl the value '$(top_builddir)/intl/' is used.
37dnl
38dnl The result of the configuration is one of three cases:
39dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled
40dnl and used.
41dnl Catalog format: GNU --> install in $(datadir)
42dnl Catalog extension: .mo after installation, .gmo in source tree
43dnl 2) GNU gettext has been found in the system's C library.
44dnl Catalog format: GNU --> install in $(datadir)
45dnl Catalog extension: .mo after installation, .gmo in source tree
46dnl 3) No internationalization, always use English msgid.
47dnl Catalog format: none
48dnl Catalog extension: none
49dnl If INTLSYMBOL is 'external', only cases 2 and 3 can occur.
50dnl The use of .gmo is historical (it was needed to avoid overwriting the
51dnl GNU format catalogs when building on a platform with an X/Open gettext),
52dnl but we keep it in order not to force irrelevant filename changes on the
53dnl maintainers.
54dnl
55AC_DEFUN([AM_GNU_GETTEXT],
56[
57 dnl Argument checking.
58 ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [use-libtool], ,
59 [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT
60])])])])
61 ifelse(ifelse([$1], [], [old])[]ifelse([$1], [no-libtool], [old]), [old],
62 [errprint([ERROR: Use of AM_GNU_GETTEXT without [external] argument is no longer supported.
63])])
64 ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], ,
65 [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT
66])])])])
67 define([gt_included_intl],
68 ifelse([$1], [external], [no], [yes]))
69 gt_NEEDS_INIT
70 AM_GNU_GETTEXT_NEED([$2])
71
72 AC_REQUIRE([AM_PO_SUBDIRS])dnl
73 ifelse(gt_included_intl, yes, [
74 AC_REQUIRE([AM_INTL_SUBDIR])dnl
75 ])
76
77 dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
78 AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
79 AC_REQUIRE([AC_LIB_RPATH])
80
81 dnl Sometimes libintl requires libiconv, so first search for libiconv.
82 dnl Ideally we would do this search only after the
83 dnl if test "$USE_NLS" = "yes"; then
84 dnl if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
85 dnl tests. But if configure.in invokes AM_ICONV after AM_GNU_GETTEXT
86 dnl the configure script would need to contain the same shell code
87 dnl again, outside any 'if'. There are two solutions:
88 dnl - Invoke AM_ICONV_LINKFLAGS_BODY here, outside any 'if'.
89 dnl - Control the expansions in more detail using AC_PROVIDE_IFELSE.
90 dnl Since AC_PROVIDE_IFELSE is not documented, we avoid it.
91 ifelse(gt_included_intl, yes, , [
92 AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
93 ])
94
95 dnl Sometimes, on Mac OS X, libintl requires linking with CoreFoundation.
96 gt_INTL_MACOSX
97
98 dnl Set USE_NLS.
99 AC_REQUIRE([AM_NLS])
100
101 ifelse(gt_included_intl, yes, [
102 BUILD_INCLUDED_LIBINTL=no
103 USE_INCLUDED_LIBINTL=no
104 ])
105 LIBINTL=
106 LTLIBINTL=
107 POSUB=
108
109 dnl Add a version number to the cache macros.
110 case " $gt_needs " in
111 *" need-formatstring-macros "*) gt_api_version=3 ;;
112 *" need-ngettext "*) gt_api_version=2 ;;
113 *) gt_api_version=1 ;;
114 esac
115 gt_func_gnugettext_libc="gt_cv_func_gnugettext${gt_api_version}_libc"
116 gt_func_gnugettext_libintl="gt_cv_func_gnugettext${gt_api_version}_libintl"
117
118 dnl If we use NLS figure out what method
119 if test "$USE_NLS" = "yes"; then
120 gt_use_preinstalled_gnugettext=no
121 ifelse(gt_included_intl, yes, [
122 AC_MSG_CHECKING([whether included gettext is requested])
123 AC_ARG_WITH([included-gettext],
124 [ --with-included-gettext use the GNU gettext library included here],
125 nls_cv_force_use_gnu_gettext=$withval,
126 nls_cv_force_use_gnu_gettext=no)
127 AC_MSG_RESULT([$nls_cv_force_use_gnu_gettext])
128
129 nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext"
130 if test "$nls_cv_force_use_gnu_gettext" != "yes"; then
131 ])
132 dnl User does not insist on using GNU NLS library. Figure out what
133 dnl to use. If GNU gettext is available we use this. Else we have
134 dnl to fall back to GNU NLS library.
135
136 if test $gt_api_version -ge 3; then
137 gt_revision_test_code='
138#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
139#define __GNU_GETTEXT_SUPPORTED_REVISION(major) ((major) == 0 ? 0 : -1)
140#endif
141changequote(,)dnl
142typedef int array [2 * (__GNU_GETTEXT_SUPPORTED_REVISION(0) >= 1) - 1];
143changequote([,])dnl
144'
145 else
146 gt_revision_test_code=
147 fi
148 if test $gt_api_version -ge 2; then
149 gt_expression_test_code=' + * ngettext ("", "", 0)'
150 else
151 gt_expression_test_code=
152 fi
153
154 AC_CACHE_CHECK([for GNU gettext in libc], [$gt_func_gnugettext_libc],
155 [AC_LINK_IFELSE(
156 [AC_LANG_PROGRAM(
157 [[
158#include <libintl.h>
159#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
160extern int _nl_msg_cat_cntr;
161extern int *_nl_domain_bindings;
162#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_domain_bindings)
163#else
164#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
165#endif
166$gt_revision_test_code
167 ]],
168 [[
169bindtextdomain ("", "");
170return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
171 ]])],
172 [eval "$gt_func_gnugettext_libc=yes"],
173 [eval "$gt_func_gnugettext_libc=no"])])
174
175 if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" != "yes"; }; then
176 dnl Sometimes libintl requires libiconv, so first search for libiconv.
177 ifelse(gt_included_intl, yes, , [
178 AM_ICONV_LINK
179 ])
180 dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL
181 dnl accordingly. Don't use AC_LIB_LINKFLAGS_BODY([intl],[iconv])
182 dnl because that would add "-liconv" to LIBINTL and LTLIBINTL
183 dnl even if libiconv doesn't exist.
184 AC_LIB_LINKFLAGS_BODY([intl])
185 AC_CACHE_CHECK([for GNU gettext in libintl],
186 [$gt_func_gnugettext_libintl],
187 [gt_save_CPPFLAGS="$CPPFLAGS"
188 CPPFLAGS="$CPPFLAGS $INCINTL"
189 gt_save_LIBS="$LIBS"
190 LIBS="$LIBS $LIBINTL"
191 dnl Now see whether libintl exists and does not depend on libiconv.
192 AC_LINK_IFELSE(
193 [AC_LANG_PROGRAM(
194 [[
195#include <libintl.h>
196#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
197extern int _nl_msg_cat_cntr;
198extern
199#ifdef __cplusplus
200"C"
201#endif
202const char *_nl_expand_alias (const char *);
203#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias (""))
204#else
205#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
206#endif
207$gt_revision_test_code
208 ]],
209 [[
210bindtextdomain ("", "");
211return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
212 ]])],
213 [eval "$gt_func_gnugettext_libintl=yes"],
214 [eval "$gt_func_gnugettext_libintl=no"])
215 dnl Now see whether libintl exists and depends on libiconv.
216 if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" != yes; } && test -n "$LIBICONV"; then
217 LIBS="$LIBS $LIBICONV"
218 AC_LINK_IFELSE(
219 [AC_LANG_PROGRAM(
220 [[
221#include <libintl.h>
222#ifndef __GNU_GETTEXT_SUPPORTED_REVISION
223extern int _nl_msg_cat_cntr;
224extern
225#ifdef __cplusplus
226"C"
227#endif
228const char *_nl_expand_alias (const char *);
229#define __GNU_GETTEXT_SYMBOL_EXPRESSION (_nl_msg_cat_cntr + *_nl_expand_alias (""))
230#else
231#define __GNU_GETTEXT_SYMBOL_EXPRESSION 0
232#endif
233$gt_revision_test_code
234 ]],
235 [[
236bindtextdomain ("", "");
237return * gettext ("")$gt_expression_test_code + __GNU_GETTEXT_SYMBOL_EXPRESSION
238 ]])],
239 [LIBINTL="$LIBINTL $LIBICONV"
240 LTLIBINTL="$LTLIBINTL $LTLIBICONV"
241 eval "$gt_func_gnugettext_libintl=yes"
242 ])
243 fi
244 CPPFLAGS="$gt_save_CPPFLAGS"
245 LIBS="$gt_save_LIBS"])
246 fi
247
248 dnl If an already present or preinstalled GNU gettext() is found,
249 dnl use it. But if this macro is used in GNU gettext, and GNU
250 dnl gettext is already preinstalled in libintl, we update this
251 dnl libintl. (Cf. the install rule in intl/Makefile.in.)
252 if { eval "gt_val=\$$gt_func_gnugettext_libc"; test "$gt_val" = "yes"; } \
253 || { { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; } \
254 && test "$PACKAGE" != gettext-runtime \
255 && test "$PACKAGE" != gettext-tools; }; then
256 gt_use_preinstalled_gnugettext=yes
257 else
258 dnl Reset the values set by searching for libintl.
259 LIBINTL=
260 LTLIBINTL=
261 INCINTL=
262 fi
263
264 ifelse(gt_included_intl, yes, [
265 if test "$gt_use_preinstalled_gnugettext" != "yes"; then
266 dnl GNU gettext is not found in the C library.
267 dnl Fall back on included GNU gettext library.
268 nls_cv_use_gnu_gettext=yes
269 fi
270 fi
271
272 if test "$nls_cv_use_gnu_gettext" = "yes"; then
273 dnl Mark actions used to generate GNU NLS library.
274 BUILD_INCLUDED_LIBINTL=yes
275 USE_INCLUDED_LIBINTL=yes
276 LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.la $LIBICONV $LIBTHREAD"
277 LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.la $LTLIBICONV $LTLIBTHREAD"
278 LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'`
279 fi
280
281 CATOBJEXT=
282 if test "$gt_use_preinstalled_gnugettext" = "yes" \
283 || test "$nls_cv_use_gnu_gettext" = "yes"; then
284 dnl Mark actions to use GNU gettext tools.
285 CATOBJEXT=.gmo
286 fi
287 ])
288
289 if test -n "$INTL_MACOSX_LIBS"; then
290 if test "$gt_use_preinstalled_gnugettext" = "yes" \
291 || test "$nls_cv_use_gnu_gettext" = "yes"; then
292 dnl Some extra flags are needed during linking.
293 LIBINTL="$LIBINTL $INTL_MACOSX_LIBS"
294 LTLIBINTL="$LTLIBINTL $INTL_MACOSX_LIBS"
295 fi
296 fi
297
298 if test "$gt_use_preinstalled_gnugettext" = "yes" \
299 || test "$nls_cv_use_gnu_gettext" = "yes"; then
300 AC_DEFINE([ENABLE_NLS], [1],
301 [Define to 1 if translation of program messages to the user's native language
302 is requested.])
303 else
304 USE_NLS=no
305 fi
306 fi
307
308 AC_MSG_CHECKING([whether to use NLS])
309 AC_MSG_RESULT([$USE_NLS])
310 if test "$USE_NLS" = "yes"; then
311 AC_MSG_CHECKING([where the gettext function comes from])
312 if test "$gt_use_preinstalled_gnugettext" = "yes"; then
313 if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
314 gt_source="external libintl"
315 else
316 gt_source="libc"
317 fi
318 else
319 gt_source="included intl directory"
320 fi
321 AC_MSG_RESULT([$gt_source])
322 fi
323
324 if test "$USE_NLS" = "yes"; then
325
326 if test "$gt_use_preinstalled_gnugettext" = "yes"; then
327 if { eval "gt_val=\$$gt_func_gnugettext_libintl"; test "$gt_val" = "yes"; }; then
328 AC_MSG_CHECKING([how to link with libintl])
329 AC_MSG_RESULT([$LIBINTL])
330 AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL])
331 fi
332
333 dnl For backward compatibility. Some packages may be using this.
334 AC_DEFINE([HAVE_GETTEXT], [1],
335 [Define if the GNU gettext() function is already present or preinstalled.])
336 AC_DEFINE([HAVE_DCGETTEXT], [1],
337 [Define if the GNU dcgettext() function is already present or preinstalled.])
338 fi
339
340 dnl We need to process the po/ directory.
341 POSUB=po
342 fi
343
344 ifelse(gt_included_intl, yes, [
345 dnl In GNU gettext we have to set BUILD_INCLUDED_LIBINTL to 'yes'
346 dnl because some of the testsuite requires it.
347 BUILD_INCLUDED_LIBINTL=yes
348
349 dnl Make all variables we use known to autoconf.
350 AC_SUBST([BUILD_INCLUDED_LIBINTL])
351 AC_SUBST([USE_INCLUDED_LIBINTL])
352 AC_SUBST([CATOBJEXT])
353 ])
354
355 dnl For backward compatibility. Some Makefiles may be using this.
356 INTLLIBS="$LIBINTL"
357 AC_SUBST([INTLLIBS])
358
359 dnl Make all documented variables known to autoconf.
360 AC_SUBST([LIBINTL])
361 AC_SUBST([LTLIBINTL])
362 AC_SUBST([POSUB])
363])
364
365
366dnl gt_NEEDS_INIT ensures that the gt_needs variable is initialized.
367m4_define([gt_NEEDS_INIT],
368[
369 m4_divert_text([DEFAULTS], [gt_needs=])
370 m4_define([gt_NEEDS_INIT], [])
371])
372
373
374dnl Usage: AM_GNU_GETTEXT_NEED([NEEDSYMBOL])
375AC_DEFUN([AM_GNU_GETTEXT_NEED],
376[
377 m4_divert_text([INIT_PREPARE], [gt_needs="$gt_needs $1"])
378])
379
380
381dnl Usage: AM_GNU_GETTEXT_VERSION([gettext-version])
382AC_DEFUN([AM_GNU_GETTEXT_VERSION], [])
383
384
385dnl Usage: AM_GNU_GETTEXT_REQUIRE_VERSION([gettext-version])
386AC_DEFUN([AM_GNU_GETTEXT_REQUIRE_VERSION], [])
diff --git a/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/host-cpu-c-abi.m4 b/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/host-cpu-c-abi.m4
deleted file mode 100644
index 6db2aa25ae..0000000000
--- a/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/host-cpu-c-abi.m4
+++ /dev/null
@@ -1,675 +0,0 @@
1# host-cpu-c-abi.m4 serial 13
2dnl Copyright (C) 2002-2020 Free Software Foundation, Inc.
3dnl This file is free software; the Free Software Foundation
4dnl gives unlimited permission to copy and/or distribute it,
5dnl with or without modifications, as long as this notice is preserved.
6
7dnl From Bruno Haible and Sam Steingold.
8
9dnl Sets the HOST_CPU variable to the canonical name of the CPU.
10dnl Sets the HOST_CPU_C_ABI variable to the canonical name of the CPU with its
11dnl C language ABI (application binary interface).
12dnl Also defines __${HOST_CPU}__ and __${HOST_CPU_C_ABI}__ as C macros in
13dnl config.h.
14dnl
15dnl This canonical name can be used to select a particular assembly language
16dnl source file that will interoperate with C code on the given host.
17dnl
18dnl For example:
19dnl * 'i386' and 'sparc' are different canonical names, because code for i386
20dnl will not run on SPARC CPUs and vice versa. They have different
21dnl instruction sets.
22dnl * 'sparc' and 'sparc64' are different canonical names, because code for
23dnl 'sparc' and code for 'sparc64' cannot be linked together: 'sparc' code
24dnl contains 32-bit instructions, whereas 'sparc64' code contains 64-bit
25dnl instructions. A process on a SPARC CPU can be in 32-bit mode or in 64-bit
26dnl mode, but not both.
27dnl * 'mips' and 'mipsn32' are different canonical names, because they use
28dnl different argument passing and return conventions for C functions, and
29dnl although the instruction set of 'mips' is a large subset of the
30dnl instruction set of 'mipsn32'.
31dnl * 'mipsn32' and 'mips64' are different canonical names, because they use
32dnl different sizes for the C types like 'int' and 'void *', and although
33dnl the instruction sets of 'mipsn32' and 'mips64' are the same.
34dnl * The same canonical name is used for different endiannesses. You can
35dnl determine the endianness through preprocessor symbols:
36dnl - 'arm': test __ARMEL__.
37dnl - 'mips', 'mipsn32', 'mips64': test _MIPSEB vs. _MIPSEL.
38dnl - 'powerpc64': test _BIG_ENDIAN vs. _LITTLE_ENDIAN.
39dnl * The same name 'i386' is used for CPUs of type i386, i486, i586
40dnl (Pentium), AMD K7, Pentium II, Pentium IV, etc., because
41dnl - Instructions that do not exist on all of these CPUs (cmpxchg,
42dnl MMX, SSE, SSE2, 3DNow! etc.) are not frequently used. If your
43dnl assembly language source files use such instructions, you will
44dnl need to make the distinction.
45dnl - Speed of execution of the common instruction set is reasonable across
46dnl the entire family of CPUs. If you have assembly language source files
47dnl that are optimized for particular CPU types (like GNU gmp has), you
48dnl will need to make the distinction.
49dnl See <https://en.wikipedia.org/wiki/X86_instruction_listings>.
50AC_DEFUN([gl_HOST_CPU_C_ABI],
51[
52 AC_REQUIRE([AC_CANONICAL_HOST])
53 AC_REQUIRE([gl_C_ASM])
54 AC_CACHE_CHECK([host CPU and C ABI], [gl_cv_host_cpu_c_abi],
55 [case "$host_cpu" in
56
57changequote(,)dnl
58 i[34567]86 )
59changequote([,])dnl
60 gl_cv_host_cpu_c_abi=i386
61 ;;
62
63 x86_64 )
64 # On x86_64 systems, the C compiler may be generating code in one of
65 # these ABIs:
66 # - 64-bit instruction set, 64-bit pointers, 64-bit 'long': x86_64.
67 # - 64-bit instruction set, 64-bit pointers, 32-bit 'long': x86_64
68 # with native Windows (mingw, MSVC).
69 # - 64-bit instruction set, 32-bit pointers, 32-bit 'long': x86_64-x32.
70 # - 32-bit instruction set, 32-bit pointers, 32-bit 'long': i386.
71 AC_COMPILE_IFELSE(
72 [AC_LANG_SOURCE(
73 [[#if (defined __x86_64__ || defined __amd64__ \
74 || defined _M_X64 || defined _M_AMD64)
75 int ok;
76 #else
77 error fail
78 #endif
79 ]])],
80 [AC_COMPILE_IFELSE(
81 [AC_LANG_SOURCE(
82 [[#if defined __ILP32__ || defined _ILP32
83 int ok;
84 #else
85 error fail
86 #endif
87 ]])],
88 [gl_cv_host_cpu_c_abi=x86_64-x32],
89 [gl_cv_host_cpu_c_abi=x86_64])],
90 [gl_cv_host_cpu_c_abi=i386])
91 ;;
92
93changequote(,)dnl
94 alphaev[4-8] | alphaev56 | alphapca5[67] | alphaev6[78] )
95changequote([,])dnl
96 gl_cv_host_cpu_c_abi=alpha
97 ;;
98
99 arm* | aarch64 )
100 # Assume arm with EABI.
101 # On arm64 systems, the C compiler may be generating code in one of
102 # these ABIs:
103 # - aarch64 instruction set, 64-bit pointers, 64-bit 'long': arm64.
104 # - aarch64 instruction set, 32-bit pointers, 32-bit 'long': arm64-ilp32.
105 # - 32-bit instruction set, 32-bit pointers, 32-bit 'long': arm or armhf.
106 AC_COMPILE_IFELSE(
107 [AC_LANG_SOURCE(
108 [[#ifdef __aarch64__
109 int ok;
110 #else
111 error fail
112 #endif
113 ]])],
114 [AC_COMPILE_IFELSE(
115 [AC_LANG_SOURCE(
116 [[#if defined __ILP32__ || defined _ILP32
117 int ok;
118 #else
119 error fail
120 #endif
121 ]])],
122 [gl_cv_host_cpu_c_abi=arm64-ilp32],
123 [gl_cv_host_cpu_c_abi=arm64])],
124 [# Don't distinguish little-endian and big-endian arm, since they
125 # don't require different machine code for simple operations and
126 # since the user can distinguish them through the preprocessor
127 # defines __ARMEL__ vs. __ARMEB__.
128 # But distinguish arm which passes floating-point arguments and
129 # return values in integer registers (r0, r1, ...) - this is
130 # gcc -mfloat-abi=soft or gcc -mfloat-abi=softfp - from arm which
131 # passes them in float registers (s0, s1, ...) and double registers
132 # (d0, d1, ...) - this is gcc -mfloat-abi=hard. GCC 4.6 or newer
133 # sets the preprocessor defines __ARM_PCS (for the first case) and
134 # __ARM_PCS_VFP (for the second case), but older GCC does not.
135 echo 'double ddd; void func (double dd) { ddd = dd; }' > conftest.c
136 # Look for a reference to the register d0 in the .s file.
137 AC_TRY_COMMAND(${CC-cc} $CFLAGS $CPPFLAGS $gl_c_asm_opt conftest.c) >/dev/null 2>&1
138 if LC_ALL=C grep 'd0,' conftest.$gl_asmext >/dev/null; then
139 gl_cv_host_cpu_c_abi=armhf
140 else
141 gl_cv_host_cpu_c_abi=arm
142 fi
143 rm -f conftest*
144 ])
145 ;;
146
147 hppa1.0 | hppa1.1 | hppa2.0* | hppa64 )
148 # On hppa, the C compiler may be generating 32-bit code or 64-bit
149 # code. In the latter case, it defines _LP64 and __LP64__.
150 AC_COMPILE_IFELSE(
151 [AC_LANG_SOURCE(
152 [[#ifdef __LP64__
153 int ok;
154 #else
155 error fail
156 #endif
157 ]])],
158 [gl_cv_host_cpu_c_abi=hppa64],
159 [gl_cv_host_cpu_c_abi=hppa])
160 ;;
161
162 ia64* )
163 # On ia64 on HP-UX, the C compiler may be generating 64-bit code or
164 # 32-bit code. In the latter case, it defines _ILP32.
165 AC_COMPILE_IFELSE(
166 [AC_LANG_SOURCE(
167 [[#ifdef _ILP32
168 int ok;
169 #else
170 error fail
171 #endif
172 ]])],
173 [gl_cv_host_cpu_c_abi=ia64-ilp32],
174 [gl_cv_host_cpu_c_abi=ia64])
175 ;;
176
177 mips* )
178 # We should also check for (_MIPS_SZPTR == 64), but gcc keeps this
179 # at 32.
180 AC_COMPILE_IFELSE(
181 [AC_LANG_SOURCE(
182 [[#if defined _MIPS_SZLONG && (_MIPS_SZLONG == 64)
183 int ok;
184 #else
185 error fail
186 #endif
187 ]])],
188 [gl_cv_host_cpu_c_abi=mips64],
189 [# In the n32 ABI, _ABIN32 is defined, _ABIO32 is not defined (but
190 # may later get defined by <sgidefs.h>), and _MIPS_SIM == _ABIN32.
191 # In the 32 ABI, _ABIO32 is defined, _ABIN32 is not defined (but
192 # may later get defined by <sgidefs.h>), and _MIPS_SIM == _ABIO32.
193 AC_COMPILE_IFELSE(
194 [AC_LANG_SOURCE(
195 [[#if (_MIPS_SIM == _ABIN32)
196 int ok;
197 #else
198 error fail
199 #endif
200 ]])],
201 [gl_cv_host_cpu_c_abi=mipsn32],
202 [gl_cv_host_cpu_c_abi=mips])])
203 ;;
204
205 powerpc* )
206 # Different ABIs are in use on AIX vs. Mac OS X vs. Linux,*BSD.
207 # No need to distinguish them here; the caller may distinguish
208 # them based on the OS.
209 # On powerpc64 systems, the C compiler may still be generating
210 # 32-bit code. And on powerpc-ibm-aix systems, the C compiler may
211 # be generating 64-bit code.
212 AC_COMPILE_IFELSE(
213 [AC_LANG_SOURCE(
214 [[#if defined __powerpc64__ || defined _ARCH_PPC64
215 int ok;
216 #else
217 error fail
218 #endif
219 ]])],
220 [# On powerpc64, there are two ABIs on Linux: The AIX compatible
221 # one and the ELFv2 one. The latter defines _CALL_ELF=2.
222 AC_COMPILE_IFELSE(
223 [AC_LANG_SOURCE(
224 [[#if defined _CALL_ELF && _CALL_ELF == 2
225 int ok;
226 #else
227 error fail
228 #endif
229 ]])],
230 [gl_cv_host_cpu_c_abi=powerpc64-elfv2],
231 [gl_cv_host_cpu_c_abi=powerpc64])
232 ],
233 [gl_cv_host_cpu_c_abi=powerpc])
234 ;;
235
236 rs6000 )
237 gl_cv_host_cpu_c_abi=powerpc
238 ;;
239
240 riscv32 | riscv64 )
241 # There are 2 architectures (with variants): rv32* and rv64*.
242 AC_COMPILE_IFELSE(
243 [AC_LANG_SOURCE(
244 [[#if __riscv_xlen == 64
245 int ok;
246 #else
247 error fail
248 #endif
249 ]])],
250 [cpu=riscv64],
251 [cpu=riscv32])
252 # There are 6 ABIs: ilp32, ilp32f, ilp32d, lp64, lp64f, lp64d.
253 # Size of 'long' and 'void *':
254 AC_COMPILE_IFELSE(
255 [AC_LANG_SOURCE(
256 [[#if defined __LP64__
257 int ok;
258 #else
259 error fail
260 #endif
261 ]])],
262 [main_abi=lp64],
263 [main_abi=ilp32])
264 # Float ABIs:
265 # __riscv_float_abi_double:
266 # 'float' and 'double' are passed in floating-point registers.
267 # __riscv_float_abi_single:
268 # 'float' are passed in floating-point registers.
269 # __riscv_float_abi_soft:
270 # No values are passed in floating-point registers.
271 AC_COMPILE_IFELSE(
272 [AC_LANG_SOURCE(
273 [[#if defined __riscv_float_abi_double
274 int ok;
275 #else
276 error fail
277 #endif
278 ]])],
279 [float_abi=d],
280 [AC_COMPILE_IFELSE(
281 [AC_LANG_SOURCE(
282 [[#if defined __riscv_float_abi_single
283 int ok;
284 #else
285 error fail
286 #endif
287 ]])],
288 [float_abi=f],
289 [float_abi=''])
290 ])
291 gl_cv_host_cpu_c_abi="${cpu}-${main_abi}${float_abi}"
292 ;;
293
294 s390* )
295 # On s390x, the C compiler may be generating 64-bit (= s390x) code
296 # or 31-bit (= s390) code.
297 AC_COMPILE_IFELSE(
298 [AC_LANG_SOURCE(
299 [[#if defined __LP64__ || defined __s390x__
300 int ok;
301 #else
302 error fail
303 #endif
304 ]])],
305 [gl_cv_host_cpu_c_abi=s390x],
306 [gl_cv_host_cpu_c_abi=s390])
307 ;;
308
309 sparc | sparc64 )
310 # UltraSPARCs running Linux have `uname -m` = "sparc64", but the
311 # C compiler still generates 32-bit code.
312 AC_COMPILE_IFELSE(
313 [AC_LANG_SOURCE(
314 [[#if defined __sparcv9 || defined __arch64__
315 int ok;
316 #else
317 error fail
318 #endif
319 ]])],
320 [gl_cv_host_cpu_c_abi=sparc64],
321 [gl_cv_host_cpu_c_abi=sparc])
322 ;;
323
324 *)
325 gl_cv_host_cpu_c_abi="$host_cpu"
326 ;;
327 esac
328 ])
329
330 dnl In most cases, $HOST_CPU and $HOST_CPU_C_ABI are the same.
331 HOST_CPU=`echo "$gl_cv_host_cpu_c_abi" | sed -e 's/-.*//'`
332 HOST_CPU_C_ABI="$gl_cv_host_cpu_c_abi"
333 AC_SUBST([HOST_CPU])
334 AC_SUBST([HOST_CPU_C_ABI])
335
336 # This was
337 # AC_DEFINE_UNQUOTED([__${HOST_CPU}__])
338 # AC_DEFINE_UNQUOTED([__${HOST_CPU_C_ABI}__])
339 # earlier, but KAI C++ 3.2d doesn't like this.
340 sed -e 's/-/_/g' >> confdefs.h <<EOF
341#ifndef __${HOST_CPU}__
342#define __${HOST_CPU}__ 1
343#endif
344#ifndef __${HOST_CPU_C_ABI}__
345#define __${HOST_CPU_C_ABI}__ 1
346#endif
347EOF
348 AH_TOP([/* CPU and C ABI indicator */
349#ifndef __i386__
350#undef __i386__
351#endif
352#ifndef __x86_64_x32__
353#undef __x86_64_x32__
354#endif
355#ifndef __x86_64__
356#undef __x86_64__
357#endif
358#ifndef __alpha__
359#undef __alpha__
360#endif
361#ifndef __arm__
362#undef __arm__
363#endif
364#ifndef __armhf__
365#undef __armhf__
366#endif
367#ifndef __arm64_ilp32__
368#undef __arm64_ilp32__
369#endif
370#ifndef __arm64__
371#undef __arm64__
372#endif
373#ifndef __hppa__
374#undef __hppa__
375#endif
376#ifndef __hppa64__
377#undef __hppa64__
378#endif
379#ifndef __ia64_ilp32__
380#undef __ia64_ilp32__
381#endif
382#ifndef __ia64__
383#undef __ia64__
384#endif
385#ifndef __m68k__
386#undef __m68k__
387#endif
388#ifndef __mips__
389#undef __mips__
390#endif
391#ifndef __mipsn32__
392#undef __mipsn32__
393#endif
394#ifndef __mips64__
395#undef __mips64__
396#endif
397#ifndef __powerpc__
398#undef __powerpc__
399#endif
400#ifndef __powerpc64__
401#undef __powerpc64__
402#endif
403#ifndef __powerpc64_elfv2__
404#undef __powerpc64_elfv2__
405#endif
406#ifndef __riscv32__
407#undef __riscv32__
408#endif
409#ifndef __riscv64__
410#undef __riscv64__
411#endif
412#ifndef __riscv32_ilp32__
413#undef __riscv32_ilp32__
414#endif
415#ifndef __riscv32_ilp32f__
416#undef __riscv32_ilp32f__
417#endif
418#ifndef __riscv32_ilp32d__
419#undef __riscv32_ilp32d__
420#endif
421#ifndef __riscv64_ilp32__
422#undef __riscv64_ilp32__
423#endif
424#ifndef __riscv64_ilp32f__
425#undef __riscv64_ilp32f__
426#endif
427#ifndef __riscv64_ilp32d__
428#undef __riscv64_ilp32d__
429#endif
430#ifndef __riscv64_lp64__
431#undef __riscv64_lp64__
432#endif
433#ifndef __riscv64_lp64f__
434#undef __riscv64_lp64f__
435#endif
436#ifndef __riscv64_lp64d__
437#undef __riscv64_lp64d__
438#endif
439#ifndef __s390__
440#undef __s390__
441#endif
442#ifndef __s390x__
443#undef __s390x__
444#endif
445#ifndef __sh__
446#undef __sh__
447#endif
448#ifndef __sparc__
449#undef __sparc__
450#endif
451#ifndef __sparc64__
452#undef __sparc64__
453#endif
454])
455
456])
457
458
459dnl Sets the HOST_CPU_C_ABI_32BIT variable to 'yes' if the C language ABI
460dnl (application binary interface) is a 32-bit one, to 'no' if it is a 64-bit
461dnl one, or to 'unknown' if unknown.
462dnl This is a simplified variant of gl_HOST_CPU_C_ABI.
463AC_DEFUN([gl_HOST_CPU_C_ABI_32BIT],
464[
465 AC_REQUIRE([AC_CANONICAL_HOST])
466 AC_CACHE_CHECK([32-bit host C ABI], [gl_cv_host_cpu_c_abi_32bit],
467 [if test -n "$gl_cv_host_cpu_c_abi"; then
468 case "$gl_cv_host_cpu_c_abi" in
469 i386 | x86_64-x32 | arm | armhf | arm64-ilp32 | hppa | ia64-ilp32 | mips | mipsn32 | powerpc | riscv*-ilp32* | s390 | sparc)
470 gl_cv_host_cpu_c_abi_32bit=yes ;;
471 x86_64 | alpha | arm64 | hppa64 | ia64 | mips64 | powerpc64 | powerpc64-elfv2 | riscv*-lp64* | s390x | sparc64 )
472 gl_cv_host_cpu_c_abi_32bit=no ;;
473 *)
474 gl_cv_host_cpu_c_abi_32bit=unknown ;;
475 esac
476 else
477 case "$host_cpu" in
478
479 # CPUs that only support a 32-bit ABI.
480 arc \
481 | bfin \
482 | cris* \
483 | csky \
484 | epiphany \
485 | ft32 \
486 | h8300 \
487 | m68k \
488 | microblaze | microblazeel \
489 | nds32 | nds32le | nds32be \
490 | nios2 | nios2eb | nios2el \
491 | or1k* \
492 | or32 \
493 | sh | sh[1234] | sh[1234]e[lb] \
494 | tic6x \
495 | xtensa* )
496 gl_cv_host_cpu_c_abi_32bit=yes
497 ;;
498
499 # CPUs that only support a 64-bit ABI.
500changequote(,)dnl
501 alpha | alphaev[4-8] | alphaev56 | alphapca5[67] | alphaev6[78] \
502 | mmix )
503changequote([,])dnl
504 gl_cv_host_cpu_c_abi_32bit=no
505 ;;
506
507changequote(,)dnl
508 i[34567]86 )
509changequote([,])dnl
510 gl_cv_host_cpu_c_abi_32bit=yes
511 ;;
512
513 x86_64 )
514 # On x86_64 systems, the C compiler may be generating code in one of
515 # these ABIs:
516 # - 64-bit instruction set, 64-bit pointers, 64-bit 'long': x86_64.
517 # - 64-bit instruction set, 64-bit pointers, 32-bit 'long': x86_64
518 # with native Windows (mingw, MSVC).
519 # - 64-bit instruction set, 32-bit pointers, 32-bit 'long': x86_64-x32.
520 # - 32-bit instruction set, 32-bit pointers, 32-bit 'long': i386.
521 AC_COMPILE_IFELSE(
522 [AC_LANG_SOURCE(
523 [[#if (defined __x86_64__ || defined __amd64__ \
524 || defined _M_X64 || defined _M_AMD64) \
525 && !(defined __ILP32__ || defined _ILP32)
526 int ok;
527 #else
528 error fail
529 #endif
530 ]])],
531 [gl_cv_host_cpu_c_abi_32bit=no],
532 [gl_cv_host_cpu_c_abi_32bit=yes])
533 ;;
534
535 arm* | aarch64 )
536 # Assume arm with EABI.
537 # On arm64 systems, the C compiler may be generating code in one of
538 # these ABIs:
539 # - aarch64 instruction set, 64-bit pointers, 64-bit 'long': arm64.
540 # - aarch64 instruction set, 32-bit pointers, 32-bit 'long': arm64-ilp32.
541 # - 32-bit instruction set, 32-bit pointers, 32-bit 'long': arm or armhf.
542 AC_COMPILE_IFELSE(
543 [AC_LANG_SOURCE(
544 [[#if defined __aarch64__ && !(defined __ILP32__ || defined _ILP32)
545 int ok;
546 #else
547 error fail
548 #endif
549 ]])],
550 [gl_cv_host_cpu_c_abi_32bit=no],
551 [gl_cv_host_cpu_c_abi_32bit=yes])
552 ;;
553
554 hppa1.0 | hppa1.1 | hppa2.0* | hppa64 )
555 # On hppa, the C compiler may be generating 32-bit code or 64-bit
556 # code. In the latter case, it defines _LP64 and __LP64__.
557 AC_COMPILE_IFELSE(
558 [AC_LANG_SOURCE(
559 [[#ifdef __LP64__
560 int ok;
561 #else
562 error fail
563 #endif
564 ]])],
565 [gl_cv_host_cpu_c_abi_32bit=no],
566 [gl_cv_host_cpu_c_abi_32bit=yes])
567 ;;
568
569 ia64* )
570 # On ia64 on HP-UX, the C compiler may be generating 64-bit code or
571 # 32-bit code. In the latter case, it defines _ILP32.
572 AC_COMPILE_IFELSE(
573 [AC_LANG_SOURCE(
574 [[#ifdef _ILP32
575 int ok;
576 #else
577 error fail
578 #endif
579 ]])],
580 [gl_cv_host_cpu_c_abi_32bit=yes],
581 [gl_cv_host_cpu_c_abi_32bit=no])
582 ;;
583
584 mips* )
585 # We should also check for (_MIPS_SZPTR == 64), but gcc keeps this
586 # at 32.
587 AC_COMPILE_IFELSE(
588 [AC_LANG_SOURCE(
589 [[#if defined _MIPS_SZLONG && (_MIPS_SZLONG == 64)
590 int ok;
591 #else
592 error fail
593 #endif
594 ]])],
595 [gl_cv_host_cpu_c_abi_32bit=no],
596 [gl_cv_host_cpu_c_abi_32bit=yes])
597 ;;
598
599 powerpc* )
600 # Different ABIs are in use on AIX vs. Mac OS X vs. Linux,*BSD.
601 # No need to distinguish them here; the caller may distinguish
602 # them based on the OS.
603 # On powerpc64 systems, the C compiler may still be generating
604 # 32-bit code. And on powerpc-ibm-aix systems, the C compiler may
605 # be generating 64-bit code.
606 AC_COMPILE_IFELSE(
607 [AC_LANG_SOURCE(
608 [[#if defined __powerpc64__ || defined _ARCH_PPC64
609 int ok;
610 #else
611 error fail
612 #endif
613 ]])],
614 [gl_cv_host_cpu_c_abi_32bit=no],
615 [gl_cv_host_cpu_c_abi_32bit=yes])
616 ;;
617
618 rs6000 )
619 gl_cv_host_cpu_c_abi_32bit=yes
620 ;;
621
622 riscv32 | riscv64 )
623 # There are 6 ABIs: ilp32, ilp32f, ilp32d, lp64, lp64f, lp64d.
624 # Size of 'long' and 'void *':
625 AC_COMPILE_IFELSE(
626 [AC_LANG_SOURCE(
627 [[#if defined __LP64__
628 int ok;
629 #else
630 error fail
631 #endif
632 ]])],
633 [gl_cv_host_cpu_c_abi_32bit=no],
634 [gl_cv_host_cpu_c_abi_32bit=yes])
635 ;;
636
637 s390* )
638 # On s390x, the C compiler may be generating 64-bit (= s390x) code
639 # or 31-bit (= s390) code.
640 AC_COMPILE_IFELSE(
641 [AC_LANG_SOURCE(
642 [[#if defined __LP64__ || defined __s390x__
643 int ok;
644 #else
645 error fail
646 #endif
647 ]])],
648 [gl_cv_host_cpu_c_abi_32bit=no],
649 [gl_cv_host_cpu_c_abi_32bit=yes])
650 ;;
651
652 sparc | sparc64 )
653 # UltraSPARCs running Linux have `uname -m` = "sparc64", but the
654 # C compiler still generates 32-bit code.
655 AC_COMPILE_IFELSE(
656 [AC_LANG_SOURCE(
657 [[#if defined __sparcv9 || defined __arch64__
658 int ok;
659 #else
660 error fail
661 #endif
662 ]])],
663 [gl_cv_host_cpu_c_abi_32bit=no],
664 [gl_cv_host_cpu_c_abi_32bit=yes])
665 ;;
666
667 *)
668 gl_cv_host_cpu_c_abi_32bit=unknown
669 ;;
670 esac
671 fi
672 ])
673
674 HOST_CPU_C_ABI_32BIT="$gl_cv_host_cpu_c_abi_32bit"
675])
diff --git a/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/iconv.m4 b/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/iconv.m4
deleted file mode 100644
index e593b7270a..0000000000
--- a/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/iconv.m4
+++ /dev/null
@@ -1,288 +0,0 @@
1# iconv.m4 serial 21
2dnl Copyright (C) 2000-2002, 2007-2014, 2016-2020 Free Software Foundation,
3dnl Inc.
4dnl This file is free software; the Free Software Foundation
5dnl gives unlimited permission to copy and/or distribute it,
6dnl with or without modifications, as long as this notice is preserved.
7
8dnl From Bruno Haible.
9
10AC_DEFUN([AM_ICONV_LINKFLAGS_BODY],
11[
12 dnl Prerequisites of AC_LIB_LINKFLAGS_BODY.
13 AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
14 AC_REQUIRE([AC_LIB_RPATH])
15
16 dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
17 dnl accordingly.
18 AC_LIB_LINKFLAGS_BODY([iconv])
19])
20
21AC_DEFUN([AM_ICONV_LINK],
22[
23 dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and
24 dnl those with the standalone portable GNU libiconv installed).
25 AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
26
27 dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV
28 dnl accordingly.
29 AC_REQUIRE([AM_ICONV_LINKFLAGS_BODY])
30
31 dnl Add $INCICONV to CPPFLAGS before performing the following checks,
32 dnl because if the user has installed libiconv and not disabled its use
33 dnl via --without-libiconv-prefix, he wants to use it. The first
34 dnl AC_LINK_IFELSE will then fail, the second AC_LINK_IFELSE will succeed.
35 am_save_CPPFLAGS="$CPPFLAGS"
36 AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV])
37
38 AC_CACHE_CHECK([for iconv], [am_cv_func_iconv], [
39 am_cv_func_iconv="no, consider installing GNU libiconv"
40 am_cv_lib_iconv=no
41 AC_LINK_IFELSE(
42 [AC_LANG_PROGRAM(
43 [[
44#include <stdlib.h>
45#include <iconv.h>
46 ]],
47 [[iconv_t cd = iconv_open("","");
48 iconv(cd,NULL,NULL,NULL,NULL);
49 iconv_close(cd);]])],
50 [am_cv_func_iconv=yes])
51 if test "$am_cv_func_iconv" != yes; then
52 am_save_LIBS="$LIBS"
53 LIBS="$LIBS $LIBICONV"
54 AC_LINK_IFELSE(
55 [AC_LANG_PROGRAM(
56 [[
57#include <stdlib.h>
58#include <iconv.h>
59 ]],
60 [[iconv_t cd = iconv_open("","");
61 iconv(cd,NULL,NULL,NULL,NULL);
62 iconv_close(cd);]])],
63 [am_cv_lib_iconv=yes]
64 [am_cv_func_iconv=yes])
65 LIBS="$am_save_LIBS"
66 fi
67 ])
68 if test "$am_cv_func_iconv" = yes; then
69 AC_CACHE_CHECK([for working iconv], [am_cv_func_iconv_works], [
70 dnl This tests against bugs in AIX 5.1, AIX 6.1..7.1, HP-UX 11.11,
71 dnl Solaris 10.
72 am_save_LIBS="$LIBS"
73 if test $am_cv_lib_iconv = yes; then
74 LIBS="$LIBS $LIBICONV"
75 fi
76 am_cv_func_iconv_works=no
77 for ac_iconv_const in '' 'const'; do
78 AC_RUN_IFELSE(
79 [AC_LANG_PROGRAM(
80 [[
81#include <iconv.h>
82#include <string.h>
83
84#ifndef ICONV_CONST
85# define ICONV_CONST $ac_iconv_const
86#endif
87 ]],
88 [[int result = 0;
89 /* Test against AIX 5.1 bug: Failures are not distinguishable from successful
90 returns. */
91 {
92 iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8");
93 if (cd_utf8_to_88591 != (iconv_t)(-1))
94 {
95 static ICONV_CONST char input[] = "\342\202\254"; /* EURO SIGN */
96 char buf[10];
97 ICONV_CONST char *inptr = input;
98 size_t inbytesleft = strlen (input);
99 char *outptr = buf;
100 size_t outbytesleft = sizeof (buf);
101 size_t res = iconv (cd_utf8_to_88591,
102 &inptr, &inbytesleft,
103 &outptr, &outbytesleft);
104 if (res == 0)
105 result |= 1;
106 iconv_close (cd_utf8_to_88591);
107 }
108 }
109 /* Test against Solaris 10 bug: Failures are not distinguishable from
110 successful returns. */
111 {
112 iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646");
113 if (cd_ascii_to_88591 != (iconv_t)(-1))
114 {
115 static ICONV_CONST char input[] = "\263";
116 char buf[10];
117 ICONV_CONST char *inptr = input;
118 size_t inbytesleft = strlen (input);
119 char *outptr = buf;
120 size_t outbytesleft = sizeof (buf);
121 size_t res = iconv (cd_ascii_to_88591,
122 &inptr, &inbytesleft,
123 &outptr, &outbytesleft);
124 if (res == 0)
125 result |= 2;
126 iconv_close (cd_ascii_to_88591);
127 }
128 }
129 /* Test against AIX 6.1..7.1 bug: Buffer overrun. */
130 {
131 iconv_t cd_88591_to_utf8 = iconv_open ("UTF-8", "ISO-8859-1");
132 if (cd_88591_to_utf8 != (iconv_t)(-1))
133 {
134 static ICONV_CONST char input[] = "\304";
135 static char buf[2] = { (char)0xDE, (char)0xAD };
136 ICONV_CONST char *inptr = input;
137 size_t inbytesleft = 1;
138 char *outptr = buf;
139 size_t outbytesleft = 1;
140 size_t res = iconv (cd_88591_to_utf8,
141 &inptr, &inbytesleft,
142 &outptr, &outbytesleft);
143 if (res != (size_t)(-1) || outptr - buf > 1 || buf[1] != (char)0xAD)
144 result |= 4;
145 iconv_close (cd_88591_to_utf8);
146 }
147 }
148#if 0 /* This bug could be worked around by the caller. */
149 /* Test against HP-UX 11.11 bug: Positive return value instead of 0. */
150 {
151 iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591");
152 if (cd_88591_to_utf8 != (iconv_t)(-1))
153 {
154 static ICONV_CONST char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
155 char buf[50];
156 ICONV_CONST char *inptr = input;
157 size_t inbytesleft = strlen (input);
158 char *outptr = buf;
159 size_t outbytesleft = sizeof (buf);
160 size_t res = iconv (cd_88591_to_utf8,
161 &inptr, &inbytesleft,
162 &outptr, &outbytesleft);
163 if ((int)res > 0)
164 result |= 8;
165 iconv_close (cd_88591_to_utf8);
166 }
167 }
168#endif
169 /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
170 provided. */
171 {
172 /* Try standardized names. */
173 iconv_t cd1 = iconv_open ("UTF-8", "EUC-JP");
174 /* Try IRIX, OSF/1 names. */
175 iconv_t cd2 = iconv_open ("UTF-8", "eucJP");
176 /* Try AIX names. */
177 iconv_t cd3 = iconv_open ("UTF-8", "IBM-eucJP");
178 /* Try HP-UX names. */
179 iconv_t cd4 = iconv_open ("utf8", "eucJP");
180 if (cd1 == (iconv_t)(-1) && cd2 == (iconv_t)(-1)
181 && cd3 == (iconv_t)(-1) && cd4 == (iconv_t)(-1))
182 result |= 16;
183 if (cd1 != (iconv_t)(-1))
184 iconv_close (cd1);
185 if (cd2 != (iconv_t)(-1))
186 iconv_close (cd2);
187 if (cd3 != (iconv_t)(-1))
188 iconv_close (cd3);
189 if (cd4 != (iconv_t)(-1))
190 iconv_close (cd4);
191 }
192 return result;
193]])],
194 [am_cv_func_iconv_works=yes], ,
195 [case "$host_os" in
196 aix* | hpux*) am_cv_func_iconv_works="guessing no" ;;
197 *) am_cv_func_iconv_works="guessing yes" ;;
198 esac])
199 test "$am_cv_func_iconv_works" = no || break
200 done
201 LIBS="$am_save_LIBS"
202 ])
203 case "$am_cv_func_iconv_works" in
204 *no) am_func_iconv=no am_cv_lib_iconv=no ;;
205 *) am_func_iconv=yes ;;
206 esac
207 else
208 am_func_iconv=no am_cv_lib_iconv=no
209 fi
210 if test "$am_func_iconv" = yes; then
211 AC_DEFINE([HAVE_ICONV], [1],
212 [Define if you have the iconv() function and it works.])
213 fi
214 if test "$am_cv_lib_iconv" = yes; then
215 AC_MSG_CHECKING([how to link with libiconv])
216 AC_MSG_RESULT([$LIBICONV])
217 else
218 dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV
219 dnl either.
220 CPPFLAGS="$am_save_CPPFLAGS"
221 LIBICONV=
222 LTLIBICONV=
223 fi
224 AC_SUBST([LIBICONV])
225 AC_SUBST([LTLIBICONV])
226])
227
228dnl Define AM_ICONV using AC_DEFUN_ONCE for Autoconf >= 2.64, in order to
229dnl avoid warnings like
230dnl "warning: AC_REQUIRE: `AM_ICONV' was expanded before it was required".
231dnl This is tricky because of the way 'aclocal' is implemented:
232dnl - It requires defining an auxiliary macro whose name ends in AC_DEFUN.
233dnl Otherwise aclocal's initial scan pass would miss the macro definition.
234dnl - It requires a line break inside the AC_DEFUN_ONCE and AC_DEFUN expansions.
235dnl Otherwise aclocal would emit many "Use of uninitialized value $1"
236dnl warnings.
237m4_define([gl_iconv_AC_DEFUN],
238 m4_version_prereq([2.64],
239 [[AC_DEFUN_ONCE(
240 [$1], [$2])]],
241 [m4_ifdef([gl_00GNULIB],
242 [[AC_DEFUN_ONCE(
243 [$1], [$2])]],
244 [[AC_DEFUN(
245 [$1], [$2])]])]))
246gl_iconv_AC_DEFUN([AM_ICONV],
247[
248 AM_ICONV_LINK
249 if test "$am_cv_func_iconv" = yes; then
250 AC_MSG_CHECKING([for iconv declaration])
251 AC_CACHE_VAL([am_cv_proto_iconv], [
252 AC_COMPILE_IFELSE(
253 [AC_LANG_PROGRAM(
254 [[
255#include <stdlib.h>
256#include <iconv.h>
257extern
258#ifdef __cplusplus
259"C"
260#endif
261#if defined(__STDC__) || defined(_MSC_VER) || defined(__cplusplus)
262size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
263#else
264size_t iconv();
265#endif
266 ]],
267 [[]])],
268 [am_cv_proto_iconv_arg1=""],
269 [am_cv_proto_iconv_arg1="const"])
270 am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"])
271 am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'`
272 AC_MSG_RESULT([
273 $am_cv_proto_iconv])
274 else
275 dnl When compiling GNU libiconv on a system that does not have iconv yet,
276 dnl pick the POSIX compliant declaration without 'const'.
277 am_cv_proto_iconv_arg1=""
278 fi
279 AC_DEFINE_UNQUOTED([ICONV_CONST], [$am_cv_proto_iconv_arg1],
280 [Define as const if the declaration of iconv() needs const.])
281 dnl Also substitute ICONV_CONST in the gnulib generated <iconv.h>.
282 m4_ifdef([gl_ICONV_H_DEFAULTS],
283 [AC_REQUIRE([gl_ICONV_H_DEFAULTS])
284 if test -n "$am_cv_proto_iconv_arg1"; then
285 ICONV_CONST="const"
286 fi
287 ])
288])
diff --git a/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/intlmacosx.m4 b/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/intlmacosx.m4
deleted file mode 100644
index ebd9937c1a..0000000000
--- a/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/intlmacosx.m4
+++ /dev/null
@@ -1,65 +0,0 @@
1# intlmacosx.m4 serial 8 (gettext-0.20.2)
2dnl Copyright (C) 2004-2014, 2016, 2019-2020 Free Software Foundation, Inc.
3dnl This file is free software; the Free Software Foundation
4dnl gives unlimited permission to copy and/or distribute it,
5dnl with or without modifications, as long as this notice is preserved.
6dnl
7dnl This file can be used in projects which are not available under
8dnl the GNU General Public License or the GNU Lesser General Public
9dnl License but which still want to provide support for the GNU gettext
10dnl functionality.
11dnl Please note that the actual code of the GNU gettext library is covered
12dnl by the GNU Lesser General Public License, and the rest of the GNU
13dnl gettext package is covered by the GNU General Public License.
14dnl They are *not* in the public domain.
15
16dnl Checks for special options needed on Mac OS X.
17dnl Defines INTL_MACOSX_LIBS.
18AC_DEFUN([gt_INTL_MACOSX],
19[
20 dnl Check for API introduced in Mac OS X 10.4.
21 AC_CACHE_CHECK([for CFPreferencesCopyAppValue],
22 [gt_cv_func_CFPreferencesCopyAppValue],
23 [gt_save_LIBS="$LIBS"
24 LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
25 AC_LINK_IFELSE(
26 [AC_LANG_PROGRAM(
27 [[#include <CoreFoundation/CFPreferences.h>]],
28 [[CFPreferencesCopyAppValue(NULL, NULL)]])],
29 [gt_cv_func_CFPreferencesCopyAppValue=yes],
30 [gt_cv_func_CFPreferencesCopyAppValue=no])
31 LIBS="$gt_save_LIBS"])
32 if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then
33 AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], [1],
34 [Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in the CoreFoundation framework.])
35 fi
36 dnl Don't check for the API introduced in Mac OS X 10.5, CFLocaleCopyCurrent,
37 dnl because in macOS 10.13.4 it has the following behaviour:
38 dnl When two or more languages are specified in the
39 dnl "System Preferences > Language & Region > Preferred Languages" panel,
40 dnl it returns en_CC where CC is the territory (even when English is not among
41 dnl the preferred languages!). What we want instead is what
42 dnl CFLocaleCopyCurrent returned in earlier macOS releases and what
43 dnl CFPreferencesCopyAppValue still returns, namely ll_CC where ll is the
44 dnl first among the preferred languages and CC is the territory.
45 AC_CACHE_CHECK([for CFLocaleCopyPreferredLanguages], [gt_cv_func_CFLocaleCopyPreferredLanguages],
46 [gt_save_LIBS="$LIBS"
47 LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
48 AC_LINK_IFELSE(
49 [AC_LANG_PROGRAM(
50 [[#include <CoreFoundation/CFLocale.h>]],
51 [[CFLocaleCopyPreferredLanguages();]])],
52 [gt_cv_func_CFLocaleCopyPreferredLanguages=yes],
53 [gt_cv_func_CFLocaleCopyPreferredLanguages=no])
54 LIBS="$gt_save_LIBS"])
55 if test $gt_cv_func_CFLocaleCopyPreferredLanguages = yes; then
56 AC_DEFINE([HAVE_CFLOCALECOPYPREFERREDLANGUAGES], [1],
57 [Define to 1 if you have the Mac OS X function CFLocaleCopyPreferredLanguages in the CoreFoundation framework.])
58 fi
59 INTL_MACOSX_LIBS=
60 if test $gt_cv_func_CFPreferencesCopyAppValue = yes \
61 || test $gt_cv_func_CFLocaleCopyPreferredLanguages = yes; then
62 INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
63 fi
64 AC_SUBST([INTL_MACOSX_LIBS])
65])
diff --git a/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/lib-ld.m4 b/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/lib-ld.m4
deleted file mode 100644
index 98c348faff..0000000000
--- a/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/lib-ld.m4
+++ /dev/null
@@ -1,168 +0,0 @@
1# lib-ld.m4 serial 9
2dnl Copyright (C) 1996-2003, 2009-2020 Free Software Foundation, Inc.
3dnl This file is free software; the Free Software Foundation
4dnl gives unlimited permission to copy and/or distribute it,
5dnl with or without modifications, as long as this notice is preserved.
6
7dnl Subroutines of libtool.m4,
8dnl with replacements s/_*LT_PATH/AC_LIB_PROG/ and s/lt_/acl_/ to avoid
9dnl collision with libtool.m4.
10
11dnl From libtool-2.4. Sets the variable with_gnu_ld to yes or no.
12AC_DEFUN([AC_LIB_PROG_LD_GNU],
13[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], [acl_cv_prog_gnu_ld],
14[# I'd rather use --version here, but apparently some GNU lds only accept -v.
15case `$LD -v 2>&1 </dev/null` in
16*GNU* | *'with BFD'*)
17 acl_cv_prog_gnu_ld=yes
18 ;;
19*)
20 acl_cv_prog_gnu_ld=no
21 ;;
22esac])
23with_gnu_ld=$acl_cv_prog_gnu_ld
24])
25
26dnl From libtool-2.4. Sets the variable LD.
27AC_DEFUN([AC_LIB_PROG_LD],
28[AC_REQUIRE([AC_PROG_CC])dnl
29AC_REQUIRE([AC_CANONICAL_HOST])dnl
30
31AC_ARG_WITH([gnu-ld],
32 [AS_HELP_STRING([--with-gnu-ld],
33 [assume the C compiler uses GNU ld [default=no]])],
34 [test "$withval" = no || with_gnu_ld=yes],
35 [with_gnu_ld=no])dnl
36
37# Prepare PATH_SEPARATOR.
38# The user is always right.
39if test "${PATH_SEPARATOR+set}" != set; then
40 # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
41 # contains only /bin. Note that ksh looks also at the FPATH variable,
42 # so we have to set that as well for the test.
43 PATH_SEPARATOR=:
44 (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
45 && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
46 || PATH_SEPARATOR=';'
47 }
48fi
49
50if test -n "$LD"; then
51 AC_MSG_CHECKING([for ld])
52elif test "$GCC" = yes; then
53 AC_MSG_CHECKING([for ld used by $CC])
54elif test "$with_gnu_ld" = yes; then
55 AC_MSG_CHECKING([for GNU ld])
56else
57 AC_MSG_CHECKING([for non-GNU ld])
58fi
59if test -n "$LD"; then
60 # Let the user override the test with a path.
61 :
62else
63 AC_CACHE_VAL([acl_cv_path_LD],
64 [
65 acl_cv_path_LD= # Final result of this test
66 ac_prog=ld # Program to search in $PATH
67 if test "$GCC" = yes; then
68 # Check if gcc -print-prog-name=ld gives a path.
69 case $host in
70 *-*-mingw*)
71 # gcc leaves a trailing carriage return which upsets mingw
72 acl_output=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
73 *)
74 acl_output=`($CC -print-prog-name=ld) 2>&5` ;;
75 esac
76 case $acl_output in
77 # Accept absolute paths.
78 [[\\/]]* | ?:[[\\/]]*)
79 re_direlt='/[[^/]][[^/]]*/\.\./'
80 # Canonicalize the pathname of ld
81 acl_output=`echo "$acl_output" | sed 's%\\\\%/%g'`
82 while echo "$acl_output" | grep "$re_direlt" > /dev/null 2>&1; do
83 acl_output=`echo $acl_output | sed "s%$re_direlt%/%"`
84 done
85 # Got the pathname. No search in PATH is needed.
86 acl_cv_path_LD="$acl_output"
87 ac_prog=
88 ;;
89 "")
90 # If it fails, then pretend we aren't using GCC.
91 ;;
92 *)
93 # If it is relative, then search for the first ld in PATH.
94 with_gnu_ld=unknown
95 ;;
96 esac
97 fi
98 if test -n "$ac_prog"; then
99 # Search for $ac_prog in $PATH.
100 acl_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
101 for ac_dir in $PATH; do
102 IFS="$acl_save_ifs"
103 test -z "$ac_dir" && ac_dir=.
104 if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
105 acl_cv_path_LD="$ac_dir/$ac_prog"
106 # Check to see if the program is GNU ld. I'd rather use --version,
107 # but apparently some variants of GNU ld only accept -v.
108 # Break only if it was the GNU/non-GNU ld that we prefer.
109 case `"$acl_cv_path_LD" -v 2>&1 </dev/null` in
110 *GNU* | *'with BFD'*)
111 test "$with_gnu_ld" != no && break
112 ;;
113 *)
114 test "$with_gnu_ld" != yes && break
115 ;;
116 esac
117 fi
118 done
119 IFS="$acl_save_ifs"
120 fi
121 case $host in
122 *-*-aix*)
123 AC_COMPILE_IFELSE(
124 [AC_LANG_SOURCE(
125 [[#if defined __powerpc64__ || defined _ARCH_PPC64
126 int ok;
127 #else
128 error fail
129 #endif
130 ]])],
131 [# The compiler produces 64-bit code. Add option '-b64' so that the
132 # linker groks 64-bit object files.
133 case "$acl_cv_path_LD " in
134 *" -b64 "*) ;;
135 *) acl_cv_path_LD="$acl_cv_path_LD -b64" ;;
136 esac
137 ], [])
138 ;;
139 sparc64-*-netbsd*)
140 AC_COMPILE_IFELSE(
141 [AC_LANG_SOURCE(
142 [[#if defined __sparcv9 || defined __arch64__
143 int ok;
144 #else
145 error fail
146 #endif
147 ]])],
148 [],
149 [# The compiler produces 32-bit code. Add option '-m elf32_sparc'
150 # so that the linker groks 32-bit object files.
151 case "$acl_cv_path_LD " in
152 *" -m elf32_sparc "*) ;;
153 *) acl_cv_path_LD="$acl_cv_path_LD -m elf32_sparc" ;;
154 esac
155 ])
156 ;;
157 esac
158 ])
159 LD="$acl_cv_path_LD"
160fi
161if test -n "$LD"; then
162 AC_MSG_RESULT([$LD])
163else
164 AC_MSG_RESULT([no])
165 AC_MSG_ERROR([no acceptable ld found in \$PATH])
166fi
167AC_LIB_PROG_LD_GNU
168])
diff --git a/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/lib-link.m4 b/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/lib-link.m4
deleted file mode 100644
index eecf70ec76..0000000000
--- a/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/lib-link.m4
+++ /dev/null
@@ -1,800 +0,0 @@
1# lib-link.m4 serial 31
2dnl Copyright (C) 2001-2020 Free Software Foundation, Inc.
3dnl This file is free software; the Free Software Foundation
4dnl gives unlimited permission to copy and/or distribute it,
5dnl with or without modifications, as long as this notice is preserved.
6
7dnl From Bruno Haible.
8
9AC_PREREQ([2.61])
10
11dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
12dnl the libraries corresponding to explicit and implicit dependencies.
13dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
14dnl augments the CPPFLAGS variable.
15dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
16dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
17AC_DEFUN([AC_LIB_LINKFLAGS],
18[
19 AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
20 AC_REQUIRE([AC_LIB_RPATH])
21 pushdef([Name],[m4_translit([$1],[./+-], [____])])
22 pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
23 [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
24 AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [
25 AC_LIB_LINKFLAGS_BODY([$1], [$2])
26 ac_cv_lib[]Name[]_libs="$LIB[]NAME"
27 ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
28 ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
29 ac_cv_lib[]Name[]_prefix="$LIB[]NAME[]_PREFIX"
30 ])
31 LIB[]NAME="$ac_cv_lib[]Name[]_libs"
32 LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
33 INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
34 LIB[]NAME[]_PREFIX="$ac_cv_lib[]Name[]_prefix"
35 AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
36 AC_SUBST([LIB]NAME)
37 AC_SUBST([LTLIB]NAME)
38 AC_SUBST([LIB]NAME[_PREFIX])
39 dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
40 dnl results of this search when this library appears as a dependency.
41 HAVE_LIB[]NAME=yes
42 popdef([NAME])
43 popdef([Name])
44])
45
46dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode, [missing-message])
47dnl searches for libname and the libraries corresponding to explicit and
48dnl implicit dependencies, together with the specified include files and
49dnl the ability to compile and link the specified testcode. The missing-message
50dnl defaults to 'no' and may contain additional hints for the user.
51dnl If found, it sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME}
52dnl and LTLIB${NAME} variables and augments the CPPFLAGS variable, and
53dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
54dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
55dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
56dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
57AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
58[
59 AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
60 AC_REQUIRE([AC_LIB_RPATH])
61 pushdef([Name],[m4_translit([$1],[./+-], [____])])
62 pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
63 [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
64
65 dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME
66 dnl accordingly.
67 AC_LIB_LINKFLAGS_BODY([$1], [$2])
68
69 dnl Add $INC[]NAME to CPPFLAGS before performing the following checks,
70 dnl because if the user has installed lib[]Name and not disabled its use
71 dnl via --without-lib[]Name-prefix, he wants to use it.
72 ac_save_CPPFLAGS="$CPPFLAGS"
73 AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
74
75 AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [
76 ac_save_LIBS="$LIBS"
77 dnl If $LIB[]NAME contains some -l options, add it to the end of LIBS,
78 dnl because these -l options might require -L options that are present in
79 dnl LIBS. -l options benefit only from the -L options listed before it.
80 dnl Otherwise, add it to the front of LIBS, because it may be a static
81 dnl library that depends on another static library that is present in LIBS.
82 dnl Static libraries benefit only from the static libraries listed after
83 dnl it.
84 case " $LIB[]NAME" in
85 *" -l"*) LIBS="$LIBS $LIB[]NAME" ;;
86 *) LIBS="$LIB[]NAME $LIBS" ;;
87 esac
88 AC_LINK_IFELSE(
89 [AC_LANG_PROGRAM([[$3]], [[$4]])],
90 [ac_cv_lib[]Name=yes],
91 [ac_cv_lib[]Name='m4_if([$5], [], [no], [[$5]])'])
92 LIBS="$ac_save_LIBS"
93 ])
94 if test "$ac_cv_lib[]Name" = yes; then
95 HAVE_LIB[]NAME=yes
96 AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the lib][$1 library.])
97 AC_MSG_CHECKING([how to link with lib[]$1])
98 AC_MSG_RESULT([$LIB[]NAME])
99 else
100 HAVE_LIB[]NAME=no
101 dnl If $LIB[]NAME didn't lead to a usable library, we don't need
102 dnl $INC[]NAME either.
103 CPPFLAGS="$ac_save_CPPFLAGS"
104 LIB[]NAME=
105 LTLIB[]NAME=
106 LIB[]NAME[]_PREFIX=
107 fi
108 AC_SUBST([HAVE_LIB]NAME)
109 AC_SUBST([LIB]NAME)
110 AC_SUBST([LTLIB]NAME)
111 AC_SUBST([LIB]NAME[_PREFIX])
112 popdef([NAME])
113 popdef([Name])
114])
115
116dnl Determine the platform dependent parameters needed to use rpath:
117dnl acl_libext,
118dnl acl_shlibext,
119dnl acl_libname_spec,
120dnl acl_library_names_spec,
121dnl acl_hardcode_libdir_flag_spec,
122dnl acl_hardcode_libdir_separator,
123dnl acl_hardcode_direct,
124dnl acl_hardcode_minus_L.
125AC_DEFUN([AC_LIB_RPATH],
126[
127 dnl Complain if config.rpath is missing.
128 AC_REQUIRE_AUX_FILE([config.rpath])
129 AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS
130 AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld
131 AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host
132 AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir
133 AC_CACHE_CHECK([for shared library run path origin], [acl_cv_rpath], [
134 CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \
135 ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh
136 . ./conftest.sh
137 rm -f ./conftest.sh
138 acl_cv_rpath=done
139 ])
140 wl="$acl_cv_wl"
141 acl_libext="$acl_cv_libext"
142 acl_shlibext="$acl_cv_shlibext"
143 acl_libname_spec="$acl_cv_libname_spec"
144 acl_library_names_spec="$acl_cv_library_names_spec"
145 acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
146 acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
147 acl_hardcode_direct="$acl_cv_hardcode_direct"
148 acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
149 dnl Determine whether the user wants rpath handling at all.
150 AC_ARG_ENABLE([rpath],
151 [ --disable-rpath do not hardcode runtime library paths],
152 :, enable_rpath=yes)
153])
154
155dnl AC_LIB_FROMPACKAGE(name, package)
156dnl declares that libname comes from the given package. The configure file
157dnl will then not have a --with-libname-prefix option but a
158dnl --with-package-prefix option. Several libraries can come from the same
159dnl package. This declaration must occur before an AC_LIB_LINKFLAGS or similar
160dnl macro call that searches for libname.
161AC_DEFUN([AC_LIB_FROMPACKAGE],
162[
163 pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
164 [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
165 define([acl_frompackage_]NAME, [$2])
166 popdef([NAME])
167 pushdef([PACK],[$2])
168 pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-],
169 [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
170 define([acl_libsinpackage_]PACKUP,
171 m4_ifdef([acl_libsinpackage_]PACKUP, [m4_defn([acl_libsinpackage_]PACKUP)[, ]],)[lib$1])
172 popdef([PACKUP])
173 popdef([PACK])
174])
175
176dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
177dnl the libraries corresponding to explicit and implicit dependencies.
178dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
179dnl Also, sets the LIB${NAME}_PREFIX variable to nonempty if libname was found
180dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
181AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
182[
183 AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
184 pushdef([NAME],[m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./+-],
185 [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
186 pushdef([PACK],[m4_ifdef([acl_frompackage_]NAME, [acl_frompackage_]NAME, lib[$1])])
187 pushdef([PACKUP],[m4_translit(PACK,[abcdefghijklmnopqrstuvwxyz./+-],
188 [ABCDEFGHIJKLMNOPQRSTUVWXYZ____])])
189 pushdef([PACKLIBS],[m4_ifdef([acl_frompackage_]NAME, [acl_libsinpackage_]PACKUP, lib[$1])])
190 dnl By default, look in $includedir and $libdir.
191 use_additional=yes
192 AC_LIB_WITH_FINAL_PREFIX([
193 eval additional_includedir=\"$includedir\"
194 eval additional_libdir=\"$libdir\"
195 eval additional_libdir2=\"$exec_prefix/$acl_libdirstem2\"
196 eval additional_libdir3=\"$exec_prefix/$acl_libdirstem3\"
197 ])
198 AC_ARG_WITH(PACK[-prefix],
199[[ --with-]]PACK[[-prefix[=DIR] search for ]PACKLIBS[ in DIR/include and DIR/lib
200 --without-]]PACK[[-prefix don't search for ]PACKLIBS[ in includedir and libdir]],
201[
202 if test "X$withval" = "Xno"; then
203 use_additional=no
204 else
205 if test "X$withval" = "X"; then
206 AC_LIB_WITH_FINAL_PREFIX([
207 eval additional_includedir=\"$includedir\"
208 eval additional_libdir=\"$libdir\"
209 eval additional_libdir2=\"$exec_prefix/$acl_libdirstem2\"
210 eval additional_libdir3=\"$exec_prefix/$acl_libdirstem3\"
211 ])
212 else
213 additional_includedir="$withval/include"
214 additional_libdir="$withval/$acl_libdirstem"
215 additional_libdir2="$withval/$acl_libdirstem2"
216 additional_libdir3="$withval/$acl_libdirstem3"
217 fi
218 fi
219])
220 if test "X$additional_libdir2" = "X$additional_libdir"; then
221 additional_libdir2=
222 fi
223 if test "X$additional_libdir3" = "X$additional_libdir"; then
224 additional_libdir3=
225 fi
226 dnl Search the library and its dependencies in $additional_libdir and
227 dnl $LDFLAGS. Using breadth-first-seach.
228 LIB[]NAME=
229 LTLIB[]NAME=
230 INC[]NAME=
231 LIB[]NAME[]_PREFIX=
232 dnl HAVE_LIB${NAME} is an indicator that LIB${NAME}, LTLIB${NAME} have been
233 dnl computed. So it has to be reset here.
234 HAVE_LIB[]NAME=
235 rpathdirs=
236 ltrpathdirs=
237 names_already_handled=
238 names_next_round='$1 $2'
239 while test -n "$names_next_round"; do
240 names_this_round="$names_next_round"
241 names_next_round=
242 for name in $names_this_round; do
243 already_handled=
244 for n in $names_already_handled; do
245 if test "$n" = "$name"; then
246 already_handled=yes
247 break
248 fi
249 done
250 if test -z "$already_handled"; then
251 names_already_handled="$names_already_handled $name"
252 dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
253 dnl or AC_LIB_HAVE_LINKFLAGS call.
254 uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`
255 eval value=\"\$HAVE_LIB$uppername\"
256 if test -n "$value"; then
257 if test "$value" = yes; then
258 eval value=\"\$LIB$uppername\"
259 test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value"
260 eval value=\"\$LTLIB$uppername\"
261 test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value"
262 else
263 dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined
264 dnl that this library doesn't exist. So just drop it.
265 :
266 fi
267 else
268 dnl Search the library lib$name in $additional_libdir and $LDFLAGS
269 dnl and the already constructed $LIBNAME/$LTLIBNAME.
270 found_dir=
271 found_la=
272 found_so=
273 found_a=
274 eval libname=\"$acl_libname_spec\" # typically: libname=lib$name
275 if test -n "$acl_shlibext"; then
276 shrext=".$acl_shlibext" # typically: shrext=.so
277 else
278 shrext=
279 fi
280 if test $use_additional = yes; then
281 for additional_libdir_variable in additional_libdir additional_libdir2 additional_libdir3; do
282 if test "X$found_dir" = "X"; then
283 eval dir=\$$additional_libdir_variable
284 if test -n "$dir"; then
285 dnl The same code as in the loop below:
286 dnl First look for a shared library.
287 if test -n "$acl_shlibext"; then
288 if test -f "$dir/$libname$shrext" && acl_is_expected_elfclass < "$dir/$libname$shrext"; then
289 found_dir="$dir"
290 found_so="$dir/$libname$shrext"
291 else
292 if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
293 ver=`(cd "$dir" && \
294 for f in "$libname$shrext".*; do echo "$f"; done \
295 | sed -e "s,^$libname$shrext\\\\.,," \
296 | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
297 | sed 1q ) 2>/dev/null`
298 if test -n "$ver" && test -f "$dir/$libname$shrext.$ver" && acl_is_expected_elfclass < "$dir/$libname$shrext.$ver"; then
299 found_dir="$dir"
300 found_so="$dir/$libname$shrext.$ver"
301 fi
302 else
303 eval library_names=\"$acl_library_names_spec\"
304 for f in $library_names; do
305 if test -f "$dir/$f" && acl_is_expected_elfclass < "$dir/$f"; then
306 found_dir="$dir"
307 found_so="$dir/$f"
308 break
309 fi
310 done
311 fi
312 fi
313 fi
314 dnl Then look for a static library.
315 if test "X$found_dir" = "X"; then
316 if test -f "$dir/$libname.$acl_libext" && ${AR-ar} -p "$dir/$libname.$acl_libext" | acl_is_expected_elfclass; then
317 found_dir="$dir"
318 found_a="$dir/$libname.$acl_libext"
319 fi
320 fi
321 if test "X$found_dir" != "X"; then
322 if test -f "$dir/$libname.la"; then
323 found_la="$dir/$libname.la"
324 fi
325 fi
326 fi
327 fi
328 done
329 fi
330 if test "X$found_dir" = "X"; then
331 for x in $LDFLAGS $LTLIB[]NAME; do
332 AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
333 case "$x" in
334 -L*)
335 dir=`echo "X$x" | sed -e 's/^X-L//'`
336 dnl First look for a shared library.
337 if test -n "$acl_shlibext"; then
338 if test -f "$dir/$libname$shrext" && acl_is_expected_elfclass < "$dir/$libname$shrext"; then
339 found_dir="$dir"
340 found_so="$dir/$libname$shrext"
341 else
342 if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
343 ver=`(cd "$dir" && \
344 for f in "$libname$shrext".*; do echo "$f"; done \
345 | sed -e "s,^$libname$shrext\\\\.,," \
346 | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
347 | sed 1q ) 2>/dev/null`
348 if test -n "$ver" && test -f "$dir/$libname$shrext.$ver" && acl_is_expected_elfclass < "$dir/$libname$shrext.$ver"; then
349 found_dir="$dir"
350 found_so="$dir/$libname$shrext.$ver"
351 fi
352 else
353 eval library_names=\"$acl_library_names_spec\"
354 for f in $library_names; do
355 if test -f "$dir/$f" && acl_is_expected_elfclass < "$dir/$f"; then
356 found_dir="$dir"
357 found_so="$dir/$f"
358 break
359 fi
360 done
361 fi
362 fi
363 fi
364 dnl Then look for a static library.
365 if test "X$found_dir" = "X"; then
366 if test -f "$dir/$libname.$acl_libext" && ${AR-ar} -p "$dir/$libname.$acl_libext" | acl_is_expected_elfclass; then
367 found_dir="$dir"
368 found_a="$dir/$libname.$acl_libext"
369 fi
370 fi
371 if test "X$found_dir" != "X"; then
372 if test -f "$dir/$libname.la"; then
373 found_la="$dir/$libname.la"
374 fi
375 fi
376 ;;
377 esac
378 if test "X$found_dir" != "X"; then
379 break
380 fi
381 done
382 fi
383 if test "X$found_dir" != "X"; then
384 dnl Found the library.
385 LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name"
386 if test "X$found_so" != "X"; then
387 dnl Linking with a shared library. We attempt to hardcode its
388 dnl directory into the executable's runpath, unless it's the
389 dnl standard /usr/lib.
390 if test "$enable_rpath" = no \
391 || test "X$found_dir" = "X/usr/$acl_libdirstem" \
392 || test "X$found_dir" = "X/usr/$acl_libdirstem2" \
393 || test "X$found_dir" = "X/usr/$acl_libdirstem3"; then
394 dnl No hardcoding is needed.
395 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
396 else
397 dnl Use an explicit option to hardcode DIR into the resulting
398 dnl binary.
399 dnl Potentially add DIR to ltrpathdirs.
400 dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
401 haveit=
402 for x in $ltrpathdirs; do
403 if test "X$x" = "X$found_dir"; then
404 haveit=yes
405 break
406 fi
407 done
408 if test -z "$haveit"; then
409 ltrpathdirs="$ltrpathdirs $found_dir"
410 fi
411 dnl The hardcoding into $LIBNAME is system dependent.
412 if test "$acl_hardcode_direct" = yes; then
413 dnl Using DIR/libNAME.so during linking hardcodes DIR into the
414 dnl resulting binary.
415 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
416 else
417 if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
418 dnl Use an explicit option to hardcode DIR into the resulting
419 dnl binary.
420 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
421 dnl Potentially add DIR to rpathdirs.
422 dnl The rpathdirs will be appended to $LIBNAME at the end.
423 haveit=
424 for x in $rpathdirs; do
425 if test "X$x" = "X$found_dir"; then
426 haveit=yes
427 break
428 fi
429 done
430 if test -z "$haveit"; then
431 rpathdirs="$rpathdirs $found_dir"
432 fi
433 else
434 dnl Rely on "-L$found_dir".
435 dnl But don't add it if it's already contained in the LDFLAGS
436 dnl or the already constructed $LIBNAME
437 haveit=
438 for x in $LDFLAGS $LIB[]NAME; do
439 AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
440 if test "X$x" = "X-L$found_dir"; then
441 haveit=yes
442 break
443 fi
444 done
445 if test -z "$haveit"; then
446 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
447 fi
448 if test "$acl_hardcode_minus_L" != no; then
449 dnl FIXME: Not sure whether we should use
450 dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
451 dnl here.
452 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
453 else
454 dnl We cannot use $acl_hardcode_runpath_var and LD_RUN_PATH
455 dnl here, because this doesn't fit in flags passed to the
456 dnl compiler. So give up. No hardcoding. This affects only
457 dnl very old systems.
458 dnl FIXME: Not sure whether we should use
459 dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
460 dnl here.
461 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
462 fi
463 fi
464 fi
465 fi
466 else
467 if test "X$found_a" != "X"; then
468 dnl Linking with a static library.
469 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a"
470 else
471 dnl We shouldn't come here, but anyway it's good to have a
472 dnl fallback.
473 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name"
474 fi
475 fi
476 dnl Assume the include files are nearby.
477 additional_includedir=
478 case "$found_dir" in
479 */$acl_libdirstem | */$acl_libdirstem/)
480 basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
481 if test "$name" = '$1'; then
482 LIB[]NAME[]_PREFIX="$basedir"
483 fi
484 additional_includedir="$basedir/include"
485 ;;
486 */$acl_libdirstem2 | */$acl_libdirstem2/)
487 basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
488 if test "$name" = '$1'; then
489 LIB[]NAME[]_PREFIX="$basedir"
490 fi
491 additional_includedir="$basedir/include"
492 ;;
493 */$acl_libdirstem3 | */$acl_libdirstem3/)
494 basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem3/"'*$,,'`
495 if test "$name" = '$1'; then
496 LIB[]NAME[]_PREFIX="$basedir"
497 fi
498 additional_includedir="$basedir/include"
499 ;;
500 esac
501 if test "X$additional_includedir" != "X"; then
502 dnl Potentially add $additional_includedir to $INCNAME.
503 dnl But don't add it
504 dnl 1. if it's the standard /usr/include,
505 dnl 2. if it's /usr/local/include and we are using GCC on Linux,
506 dnl 3. if it's already present in $CPPFLAGS or the already
507 dnl constructed $INCNAME,
508 dnl 4. if it doesn't exist as a directory.
509 if test "X$additional_includedir" != "X/usr/include"; then
510 haveit=
511 if test "X$additional_includedir" = "X/usr/local/include"; then
512 if test -n "$GCC"; then
513 case $host_os in
514 linux* | gnu* | k*bsd*-gnu) haveit=yes;;
515 esac
516 fi
517 fi
518 if test -z "$haveit"; then
519 for x in $CPPFLAGS $INC[]NAME; do
520 AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
521 if test "X$x" = "X-I$additional_includedir"; then
522 haveit=yes
523 break
524 fi
525 done
526 if test -z "$haveit"; then
527 if test -d "$additional_includedir"; then
528 dnl Really add $additional_includedir to $INCNAME.
529 INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir"
530 fi
531 fi
532 fi
533 fi
534 fi
535 dnl Look for dependencies.
536 if test -n "$found_la"; then
537 dnl Read the .la file. It defines the variables
538 dnl dlname, library_names, old_library, dependency_libs, current,
539 dnl age, revision, installed, dlopen, dlpreopen, libdir.
540 save_libdir="$libdir"
541 case "$found_la" in
542 */* | *\\*) . "$found_la" ;;
543 *) . "./$found_la" ;;
544 esac
545 libdir="$save_libdir"
546 dnl We use only dependency_libs.
547 for dep in $dependency_libs; do
548 case "$dep" in
549 -L*)
550 dependency_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
551 dnl Potentially add $dependency_libdir to $LIBNAME and $LTLIBNAME.
552 dnl But don't add it
553 dnl 1. if it's the standard /usr/lib,
554 dnl 2. if it's /usr/local/lib and we are using GCC on Linux,
555 dnl 3. if it's already present in $LDFLAGS or the already
556 dnl constructed $LIBNAME,
557 dnl 4. if it doesn't exist as a directory.
558 if test "X$dependency_libdir" != "X/usr/$acl_libdirstem" \
559 && test "X$dependency_libdir" != "X/usr/$acl_libdirstem2" \
560 && test "X$dependency_libdir" != "X/usr/$acl_libdirstem3"; then
561 haveit=
562 if test "X$dependency_libdir" = "X/usr/local/$acl_libdirstem" \
563 || test "X$dependency_libdir" = "X/usr/local/$acl_libdirstem2" \
564 || test "X$dependency_libdir" = "X/usr/local/$acl_libdirstem3"; then
565 if test -n "$GCC"; then
566 case $host_os in
567 linux* | gnu* | k*bsd*-gnu) haveit=yes;;
568 esac
569 fi
570 fi
571 if test -z "$haveit"; then
572 haveit=
573 for x in $LDFLAGS $LIB[]NAME; do
574 AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
575 if test "X$x" = "X-L$dependency_libdir"; then
576 haveit=yes
577 break
578 fi
579 done
580 if test -z "$haveit"; then
581 if test -d "$dependency_libdir"; then
582 dnl Really add $dependency_libdir to $LIBNAME.
583 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$dependency_libdir"
584 fi
585 fi
586 haveit=
587 for x in $LDFLAGS $LTLIB[]NAME; do
588 AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
589 if test "X$x" = "X-L$dependency_libdir"; then
590 haveit=yes
591 break
592 fi
593 done
594 if test -z "$haveit"; then
595 if test -d "$dependency_libdir"; then
596 dnl Really add $dependency_libdir to $LTLIBNAME.
597 LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$dependency_libdir"
598 fi
599 fi
600 fi
601 fi
602 ;;
603 -R*)
604 dir=`echo "X$dep" | sed -e 's/^X-R//'`
605 if test "$enable_rpath" != no; then
606 dnl Potentially add DIR to rpathdirs.
607 dnl The rpathdirs will be appended to $LIBNAME at the end.
608 haveit=
609 for x in $rpathdirs; do
610 if test "X$x" = "X$dir"; then
611 haveit=yes
612 break
613 fi
614 done
615 if test -z "$haveit"; then
616 rpathdirs="$rpathdirs $dir"
617 fi
618 dnl Potentially add DIR to ltrpathdirs.
619 dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
620 haveit=
621 for x in $ltrpathdirs; do
622 if test "X$x" = "X$dir"; then
623 haveit=yes
624 break
625 fi
626 done
627 if test -z "$haveit"; then
628 ltrpathdirs="$ltrpathdirs $dir"
629 fi
630 fi
631 ;;
632 -l*)
633 dnl Handle this in the next round.
634 names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
635 ;;
636 *.la)
637 dnl Handle this in the next round. Throw away the .la's
638 dnl directory; it is already contained in a preceding -L
639 dnl option.
640 names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
641 ;;
642 *)
643 dnl Most likely an immediate library name.
644 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep"
645 LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep"
646 ;;
647 esac
648 done
649 fi
650 else
651 dnl Didn't find the library; assume it is in the system directories
652 dnl known to the linker and runtime loader. (All the system
653 dnl directories known to the linker should also be known to the
654 dnl runtime loader, otherwise the system is severely misconfigured.)
655 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
656 LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name"
657 fi
658 fi
659 fi
660 done
661 done
662 if test "X$rpathdirs" != "X"; then
663 if test -n "$acl_hardcode_libdir_separator"; then
664 dnl Weird platform: only the last -rpath option counts, the user must
665 dnl pass all path elements in one option. We can arrange that for a
666 dnl single library, but not when more than one $LIBNAMEs are used.
667 alldirs=
668 for found_dir in $rpathdirs; do
669 alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
670 done
671 dnl Note: acl_hardcode_libdir_flag_spec uses $libdir and $wl.
672 acl_save_libdir="$libdir"
673 libdir="$alldirs"
674 eval flag=\"$acl_hardcode_libdir_flag_spec\"
675 libdir="$acl_save_libdir"
676 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
677 else
678 dnl The -rpath options are cumulative.
679 for found_dir in $rpathdirs; do
680 acl_save_libdir="$libdir"
681 libdir="$found_dir"
682 eval flag=\"$acl_hardcode_libdir_flag_spec\"
683 libdir="$acl_save_libdir"
684 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
685 done
686 fi
687 fi
688 if test "X$ltrpathdirs" != "X"; then
689 dnl When using libtool, the option that works for both libraries and
690 dnl executables is -R. The -R options are cumulative.
691 for found_dir in $ltrpathdirs; do
692 LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
693 done
694 fi
695 popdef([PACKLIBS])
696 popdef([PACKUP])
697 popdef([PACK])
698 popdef([NAME])
699])
700
701dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
702dnl unless already present in VAR.
703dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes
704dnl contains two or three consecutive elements that belong together.
705AC_DEFUN([AC_LIB_APPENDTOVAR],
706[
707 for element in [$2]; do
708 haveit=
709 for x in $[$1]; do
710 AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
711 if test "X$x" = "X$element"; then
712 haveit=yes
713 break
714 fi
715 done
716 if test -z "$haveit"; then
717 [$1]="${[$1]}${[$1]:+ }$element"
718 fi
719 done
720])
721
722dnl For those cases where a variable contains several -L and -l options
723dnl referring to unknown libraries and directories, this macro determines the
724dnl necessary additional linker options for the runtime path.
725dnl AC_LIB_LINKFLAGS_FROM_LIBS([LDADDVAR], [LIBSVALUE], [USE-LIBTOOL])
726dnl sets LDADDVAR to linker options needed together with LIBSVALUE.
727dnl If USE-LIBTOOL evaluates to non-empty, linking with libtool is assumed,
728dnl otherwise linking without libtool is assumed.
729AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS],
730[
731 AC_REQUIRE([AC_LIB_RPATH])
732 AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
733 $1=
734 if test "$enable_rpath" != no; then
735 if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
736 dnl Use an explicit option to hardcode directories into the resulting
737 dnl binary.
738 rpathdirs=
739 next=
740 for opt in $2; do
741 if test -n "$next"; then
742 dir="$next"
743 dnl No need to hardcode the standard /usr/lib.
744 if test "X$dir" != "X/usr/$acl_libdirstem" \
745 && test "X$dir" != "X/usr/$acl_libdirstem2" \
746 && test "X$dir" != "X/usr/$acl_libdirstem3"; then
747 rpathdirs="$rpathdirs $dir"
748 fi
749 next=
750 else
751 case $opt in
752 -L) next=yes ;;
753 -L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'`
754 dnl No need to hardcode the standard /usr/lib.
755 if test "X$dir" != "X/usr/$acl_libdirstem" \
756 && test "X$dir" != "X/usr/$acl_libdirstem2" \
757 && test "X$dir" != "X/usr/$acl_libdirstem3"; then
758 rpathdirs="$rpathdirs $dir"
759 fi
760 next= ;;
761 *) next= ;;
762 esac
763 fi
764 done
765 if test "X$rpathdirs" != "X"; then
766 if test -n ""$3""; then
767 dnl libtool is used for linking. Use -R options.
768 for dir in $rpathdirs; do
769 $1="${$1}${$1:+ }-R$dir"
770 done
771 else
772 dnl The linker is used for linking directly.
773 if test -n "$acl_hardcode_libdir_separator"; then
774 dnl Weird platform: only the last -rpath option counts, the user
775 dnl must pass all path elements in one option.
776 alldirs=
777 for dir in $rpathdirs; do
778 alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$dir"
779 done
780 acl_save_libdir="$libdir"
781 libdir="$alldirs"
782 eval flag=\"$acl_hardcode_libdir_flag_spec\"
783 libdir="$acl_save_libdir"
784 $1="$flag"
785 else
786 dnl The -rpath options are cumulative.
787 for dir in $rpathdirs; do
788 acl_save_libdir="$libdir"
789 libdir="$dir"
790 eval flag=\"$acl_hardcode_libdir_flag_spec\"
791 libdir="$acl_save_libdir"
792 $1="${$1}${$1:+ }$flag"
793 done
794 fi
795 fi
796 fi
797 fi
798 fi
799 AC_SUBST([$1])
800])
diff --git a/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/lib-prefix.m4 b/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/lib-prefix.m4
deleted file mode 100644
index c8a0b464c2..0000000000
--- a/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/lib-prefix.m4
+++ /dev/null
@@ -1,320 +0,0 @@
1# lib-prefix.m4 serial 17
2dnl Copyright (C) 2001-2005, 2008-2020 Free Software Foundation, Inc.
3dnl This file is free software; the Free Software Foundation
4dnl gives unlimited permission to copy and/or distribute it,
5dnl with or without modifications, as long as this notice is preserved.
6
7dnl From Bruno Haible.
8
9dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
10dnl to access previously installed libraries. The basic assumption is that
11dnl a user will want packages to use other packages he previously installed
12dnl with the same --prefix option.
13dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate
14dnl libraries, but is otherwise very convenient.
15AC_DEFUN([AC_LIB_PREFIX],
16[
17 AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
18 AC_REQUIRE([AC_PROG_CC])
19 AC_REQUIRE([AC_CANONICAL_HOST])
20 AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
21 AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
22 dnl By default, look in $includedir and $libdir.
23 use_additional=yes
24 AC_LIB_WITH_FINAL_PREFIX([
25 eval additional_includedir=\"$includedir\"
26 eval additional_libdir=\"$libdir\"
27 ])
28 AC_ARG_WITH([lib-prefix],
29[[ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib
30 --without-lib-prefix don't search for libraries in includedir and libdir]],
31[
32 if test "X$withval" = "Xno"; then
33 use_additional=no
34 else
35 if test "X$withval" = "X"; then
36 AC_LIB_WITH_FINAL_PREFIX([
37 eval additional_includedir=\"$includedir\"
38 eval additional_libdir=\"$libdir\"
39 ])
40 else
41 additional_includedir="$withval/include"
42 additional_libdir="$withval/$acl_libdirstem"
43 fi
44 fi
45])
46 if test $use_additional = yes; then
47 dnl Potentially add $additional_includedir to $CPPFLAGS.
48 dnl But don't add it
49 dnl 1. if it's the standard /usr/include,
50 dnl 2. if it's already present in $CPPFLAGS,
51 dnl 3. if it's /usr/local/include and we are using GCC on Linux,
52 dnl 4. if it doesn't exist as a directory.
53 if test "X$additional_includedir" != "X/usr/include"; then
54 haveit=
55 for x in $CPPFLAGS; do
56 AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
57 if test "X$x" = "X-I$additional_includedir"; then
58 haveit=yes
59 break
60 fi
61 done
62 if test -z "$haveit"; then
63 if test "X$additional_includedir" = "X/usr/local/include"; then
64 if test -n "$GCC"; then
65 case $host_os in
66 linux* | gnu* | k*bsd*-gnu) haveit=yes;;
67 esac
68 fi
69 fi
70 if test -z "$haveit"; then
71 if test -d "$additional_includedir"; then
72 dnl Really add $additional_includedir to $CPPFLAGS.
73 CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir"
74 fi
75 fi
76 fi
77 fi
78 dnl Potentially add $additional_libdir to $LDFLAGS.
79 dnl But don't add it
80 dnl 1. if it's the standard /usr/lib,
81 dnl 2. if it's already present in $LDFLAGS,
82 dnl 3. if it's /usr/local/lib and we are using GCC on Linux,
83 dnl 4. if it doesn't exist as a directory.
84 if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
85 haveit=
86 for x in $LDFLAGS; do
87 AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
88 if test "X$x" = "X-L$additional_libdir"; then
89 haveit=yes
90 break
91 fi
92 done
93 if test -z "$haveit"; then
94 if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
95 if test -n "$GCC"; then
96 case $host_os in
97 linux*) haveit=yes;;
98 esac
99 fi
100 fi
101 if test -z "$haveit"; then
102 if test -d "$additional_libdir"; then
103 dnl Really add $additional_libdir to $LDFLAGS.
104 LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
105 fi
106 fi
107 fi
108 fi
109 fi
110])
111
112dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix,
113dnl acl_final_exec_prefix, containing the values to which $prefix and
114dnl $exec_prefix will expand at the end of the configure script.
115AC_DEFUN([AC_LIB_PREPARE_PREFIX],
116[
117 dnl Unfortunately, prefix and exec_prefix get only finally determined
118 dnl at the end of configure.
119 if test "X$prefix" = "XNONE"; then
120 acl_final_prefix="$ac_default_prefix"
121 else
122 acl_final_prefix="$prefix"
123 fi
124 if test "X$exec_prefix" = "XNONE"; then
125 acl_final_exec_prefix='${prefix}'
126 else
127 acl_final_exec_prefix="$exec_prefix"
128 fi
129 acl_save_prefix="$prefix"
130 prefix="$acl_final_prefix"
131 eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
132 prefix="$acl_save_prefix"
133])
134
135dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the
136dnl variables prefix and exec_prefix bound to the values they will have
137dnl at the end of the configure script.
138AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
139[
140 acl_save_prefix="$prefix"
141 prefix="$acl_final_prefix"
142 acl_save_exec_prefix="$exec_prefix"
143 exec_prefix="$acl_final_exec_prefix"
144 $1
145 exec_prefix="$acl_save_exec_prefix"
146 prefix="$acl_save_prefix"
147])
148
149dnl AC_LIB_PREPARE_MULTILIB creates
150dnl - a function acl_is_expected_elfclass, that tests whether standard input
151dn; has a 32-bit or 64-bit ELF header, depending on the host CPU ABI,
152dnl - 3 variables acl_libdirstem, acl_libdirstem2, acl_libdirstem3, containing
153dnl the basename of the libdir to try in turn, either "lib" or "lib64" or
154dnl "lib/64" or "lib32" or "lib/sparcv9" or "lib/amd64" or similar.
155AC_DEFUN([AC_LIB_PREPARE_MULTILIB],
156[
157 dnl There is no formal standard regarding lib, lib32, and lib64.
158 dnl On most glibc systems, the current practice is that on a system supporting
159 dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under
160 dnl $prefix/lib64 and 32-bit libraries go under $prefix/lib. However, on
161 dnl Arch Linux based distributions, it's the opposite: 32-bit libraries go
162 dnl under $prefix/lib32 and 64-bit libraries go under $prefix/lib.
163 dnl We determine the compiler's default mode by looking at the compiler's
164 dnl library search path. If at least one of its elements ends in /lib64 or
165 dnl points to a directory whose absolute pathname ends in /lib64, we use that
166 dnl for 64-bit ABIs. Similarly for 32-bit ABIs. Otherwise we use the default,
167 dnl namely "lib".
168 dnl On Solaris systems, the current practice is that on a system supporting
169 dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under
170 dnl $prefix/lib/64 (which is a symlink to either $prefix/lib/sparcv9 or
171 dnl $prefix/lib/amd64) and 32-bit libraries go under $prefix/lib.
172 AC_REQUIRE([AC_CANONICAL_HOST])
173 AC_REQUIRE([gl_HOST_CPU_C_ABI_32BIT])
174
175 AC_CACHE_CHECK([for ELF binary format], [gl_cv_elf],
176 [AC_EGREP_CPP([Extensible Linking Format],
177 [#ifdef __ELF__
178 Extensible Linking Format
179 #endif
180 ],
181 [gl_cv_elf=yes],
182 [gl_cv_elf=no])
183 ])
184 if test $gl_cv_elf; then
185 # Extract the ELF class of a file (5th byte) in decimal.
186 # Cf. https://en.wikipedia.org/wiki/Executable_and_Linkable_Format#File_header
187 if od -A x < /dev/null >/dev/null 2>/dev/null; then
188 # Use POSIX od.
189 func_elfclass ()
190 {
191 od -A n -t d1 -j 4 -N 1
192 }
193 else
194 # Use BSD hexdump.
195 func_elfclass ()
196 {
197 dd bs=1 count=1 skip=4 2>/dev/null | hexdump -e '1/1 "%3d "'
198 echo
199 }
200 fi
201changequote(,)dnl
202 case $HOST_CPU_C_ABI_32BIT in
203 yes)
204 # 32-bit ABI.
205 acl_is_expected_elfclass ()
206 {
207 test "`func_elfclass | sed -e 's/[ ]//g'`" = 1
208 }
209 ;;
210 no)
211 # 64-bit ABI.
212 acl_is_expected_elfclass ()
213 {
214 test "`func_elfclass | sed -e 's/[ ]//g'`" = 2
215 }
216 ;;
217 *)
218 # Unknown.
219 acl_is_expected_elfclass ()
220 {
221 :
222 }
223 ;;
224 esac
225changequote([,])dnl
226 else
227 acl_is_expected_elfclass ()
228 {
229 :
230 }
231 fi
232
233 dnl Allow the user to override the result by setting acl_cv_libdirstems.
234 AC_CACHE_CHECK([for the common suffixes of directories in the library search path],
235 [acl_cv_libdirstems],
236 [dnl Try 'lib' first, because that's the default for libdir in GNU, see
237 dnl <https://www.gnu.org/prep/standards/html_node/Directory-Variables.html>.
238 acl_libdirstem=lib
239 acl_libdirstem2=
240 acl_libdirstem3=
241 case "$host_os" in
242 solaris*)
243 dnl See Solaris 10 Software Developer Collection > Solaris 64-bit Developer's Guide > The Development Environment
244 dnl <https://docs.oracle.com/cd/E19253-01/816-5138/dev-env/index.html>.
245 dnl "Portable Makefiles should refer to any library directories using the 64 symbolic link."
246 dnl But we want to recognize the sparcv9 or amd64 subdirectory also if the
247 dnl symlink is missing, so we set acl_libdirstem2 too.
248 if test $HOST_CPU_C_ABI_32BIT = no; then
249 acl_libdirstem2=lib/64
250 case "$host_cpu" in
251 sparc*) acl_libdirstem3=lib/sparcv9 ;;
252 i*86 | x86_64) acl_libdirstem3=lib/amd64 ;;
253 esac
254 fi
255 ;;
256 *)
257 dnl If $CC generates code for a 32-bit ABI, the libraries are
258 dnl surely under $prefix/lib or $prefix/lib32, not $prefix/lib64.
259 dnl Similarly, if $CC generates code for a 64-bit ABI, the libraries
260 dnl are surely under $prefix/lib or $prefix/lib64, not $prefix/lib32.
261 dnl Find the compiler's search path. However, non-system compilers
262 dnl sometimes have odd library search paths. But we can't simply invoke
263 dnl '/usr/bin/gcc -print-search-dirs' because that would not take into
264 dnl account the -m32/-m31 or -m64 options from the $CC or $CFLAGS.
265 searchpath=`(LC_ALL=C $CC $CPPFLAGS $CFLAGS -print-search-dirs) 2>/dev/null \
266 | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
267 if test $HOST_CPU_C_ABI_32BIT != no; then
268 # 32-bit or unknown ABI.
269 if test -d /usr/lib32; then
270 acl_libdirstem2=lib32
271 fi
272 fi
273 if test $HOST_CPU_C_ABI_32BIT != yes; then
274 # 64-bit or unknown ABI.
275 if test -d /usr/lib64; then
276 acl_libdirstem3=lib64
277 fi
278 fi
279 if test -n "$searchpath"; then
280 acl_save_IFS="${IFS= }"; IFS=":"
281 for searchdir in $searchpath; do
282 if test -d "$searchdir"; then
283 case "$searchdir" in
284 */lib32/ | */lib32 ) acl_libdirstem2=lib32 ;;
285 */lib64/ | */lib64 ) acl_libdirstem3=lib64 ;;
286 */../ | */.. )
287 # Better ignore directories of this form. They are misleading.
288 ;;
289 *) searchdir=`cd "$searchdir" && pwd`
290 case "$searchdir" in
291 */lib32 ) acl_libdirstem2=lib32 ;;
292 */lib64 ) acl_libdirstem3=lib64 ;;
293 esac ;;
294 esac
295 fi
296 done
297 IFS="$acl_save_IFS"
298 if test $HOST_CPU_C_ABI_32BIT = yes; then
299 # 32-bit ABI.
300 acl_libdirstem3=
301 fi
302 if test $HOST_CPU_C_ABI_32BIT = no; then
303 # 64-bit ABI.
304 acl_libdirstem2=
305 fi
306 fi
307 ;;
308 esac
309 test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem"
310 test -n "$acl_libdirstem3" || acl_libdirstem3="$acl_libdirstem"
311 acl_cv_libdirstems="$acl_libdirstem,$acl_libdirstem2,$acl_libdirstem3"
312 ])
313 dnl Decompose acl_cv_libdirstems into acl_libdirstem, acl_libdirstem2, and
314 dnl acl_libdirstem3.
315changequote(,)dnl
316 acl_libdirstem=`echo "$acl_cv_libdirstems" | sed -e 's/,.*//'`
317 acl_libdirstem2=`echo "$acl_cv_libdirstems" | sed -e 's/^[^,]*,//' -e 's/,.*//'`
318 acl_libdirstem3=`echo "$acl_cv_libdirstems" | sed -e 's/^[^,]*,[^,]*,//' -e 's/,.*//'`
319changequote([,])dnl
320])
diff --git a/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/nls.m4 b/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/nls.m4
deleted file mode 100644
index 5a506fc4b5..0000000000
--- a/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/nls.m4
+++ /dev/null
@@ -1,32 +0,0 @@
1# nls.m4 serial 6 (gettext-0.20.2)
2dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014, 2016, 2019-2020 Free
3dnl Software Foundation, Inc.
4dnl This file is free software; the Free Software Foundation
5dnl gives unlimited permission to copy and/or distribute it,
6dnl with or without modifications, as long as this notice is preserved.
7dnl
8dnl This file can be used in projects which are not available under
9dnl the GNU General Public License or the GNU Lesser General Public
10dnl License but which still want to provide support for the GNU gettext
11dnl functionality.
12dnl Please note that the actual code of the GNU gettext library is covered
13dnl by the GNU Lesser General Public License, and the rest of the GNU
14dnl gettext package is covered by the GNU General Public License.
15dnl They are *not* in the public domain.
16
17dnl Authors:
18dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
19dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
20
21AC_PREREQ([2.50])
22
23AC_DEFUN([AM_NLS],
24[
25 AC_MSG_CHECKING([whether NLS is requested])
26 dnl Default is enabled NLS
27 AC_ARG_ENABLE([nls],
28 [ --disable-nls do not use Native Language Support],
29 USE_NLS=$enableval, USE_NLS=yes)
30 AC_MSG_RESULT([$USE_NLS])
31 AC_SUBST([USE_NLS])
32])
diff --git a/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/po.m4 b/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/po.m4
deleted file mode 100644
index 3778fd7aac..0000000000
--- a/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/po.m4
+++ /dev/null
@@ -1,450 +0,0 @@
1# po.m4 serial 31 (gettext-0.20.2)
2dnl Copyright (C) 1995-2014, 2016, 2018-2020 Free Software Foundation, Inc.
3dnl This file is free software; the Free Software Foundation
4dnl gives unlimited permission to copy and/or distribute it,
5dnl with or without modifications, as long as this notice is preserved.
6dnl
7dnl This file can be used in projects which are not available under
8dnl the GNU General Public License or the GNU Lesser General Public
9dnl License but which still want to provide support for the GNU gettext
10dnl functionality.
11dnl Please note that the actual code of the GNU gettext library is covered
12dnl by the GNU Lesser General Public License, and the rest of the GNU
13dnl gettext package is covered by the GNU General Public License.
14dnl They are *not* in the public domain.
15
16dnl Authors:
17dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
18dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
19
20AC_PREREQ([2.60])
21
22dnl Checks for all prerequisites of the po subdirectory.
23AC_DEFUN([AM_PO_SUBDIRS],
24[
25 AC_REQUIRE([AC_PROG_MAKE_SET])dnl
26 AC_REQUIRE([AC_PROG_INSTALL])dnl
27 AC_REQUIRE([AC_PROG_MKDIR_P])dnl
28 AC_REQUIRE([AC_PROG_SED])dnl
29 AC_REQUIRE([AM_NLS])dnl
30
31 dnl Release version of the gettext macros. This is used to ensure that
32 dnl the gettext macros and po/Makefile.in.in are in sync.
33 AC_SUBST([GETTEXT_MACRO_VERSION], [0.20])
34
35 dnl Perform the following tests also if --disable-nls has been given,
36 dnl because they are needed for "make dist" to work.
37
38 dnl Search for GNU msgfmt in the PATH.
39 dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions.
40 dnl The second test excludes FreeBSD msgfmt.
41 AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt,
42 [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
43 (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
44 :)
45 AC_PATH_PROG([GMSGFMT], [gmsgfmt], [$MSGFMT])
46
47 dnl Test whether it is GNU msgfmt >= 0.15.
48changequote(,)dnl
49 case `$GMSGFMT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
50 '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) GMSGFMT_015=: ;;
51 *) GMSGFMT_015=$GMSGFMT ;;
52 esac
53changequote([,])dnl
54 AC_SUBST([GMSGFMT_015])
55
56 dnl Search for GNU xgettext 0.12 or newer in the PATH.
57 dnl The first test excludes Solaris xgettext and early GNU xgettext versions.
58 dnl The second test excludes FreeBSD xgettext.
59 AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
60 [$ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 &&
61 (if $ac_dir/$ac_word --omit-header --copyright-holder= --msgid-bugs-address= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)],
62 :)
63 dnl Remove leftover from FreeBSD xgettext call.
64 rm -f messages.po
65
66 dnl Test whether it is GNU xgettext >= 0.15.
67changequote(,)dnl
68 case `$XGETTEXT --version | sed 1q | sed -e 's,^[^0-9]*,,'` in
69 '' | 0.[0-9] | 0.[0-9].* | 0.1[0-4] | 0.1[0-4].*) XGETTEXT_015=: ;;
70 *) XGETTEXT_015=$XGETTEXT ;;
71 esac
72changequote([,])dnl
73 AC_SUBST([XGETTEXT_015])
74
75 dnl Search for GNU msgmerge 0.11 or newer in the PATH.
76 AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge,
77 [$ac_dir/$ac_word --update -q /dev/null /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1], :)
78
79 dnl Test whether it is GNU msgmerge >= 0.20.
80 if LC_ALL=C $MSGMERGE --help | grep ' --for-msgfmt ' >/dev/null; then
81 MSGMERGE_FOR_MSGFMT_OPTION='--for-msgfmt'
82 else
83 dnl Test whether it is GNU msgmerge >= 0.12.
84 if LC_ALL=C $MSGMERGE --help | grep ' --no-fuzzy-matching ' >/dev/null; then
85 MSGMERGE_FOR_MSGFMT_OPTION='--no-fuzzy-matching --no-location --quiet'
86 else
87 dnl With these old versions, $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) is
88 dnl slow. But this is not a big problem, as such old gettext versions are
89 dnl hardly in use any more.
90 MSGMERGE_FOR_MSGFMT_OPTION='--no-location --quiet'
91 fi
92 fi
93 AC_SUBST([MSGMERGE_FOR_MSGFMT_OPTION])
94
95 dnl Support for AM_XGETTEXT_OPTION.
96 test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS=
97 AC_SUBST([XGETTEXT_EXTRA_OPTIONS])
98
99 AC_CONFIG_COMMANDS([po-directories], [[
100 for ac_file in $CONFIG_FILES; do
101 # Support "outfile[:infile[:infile...]]"
102 case "$ac_file" in
103 *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;;
104 esac
105 # PO directories have a Makefile.in generated from Makefile.in.in.
106 case "$ac_file" in */Makefile.in)
107 # Adjust a relative srcdir.
108 ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
109 ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'`
110 ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
111 # In autoconf-2.13 it is called $ac_given_srcdir.
112 # In autoconf-2.50 it is called $srcdir.
113 test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
114 case "$ac_given_srcdir" in
115 .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
116 /*) top_srcdir="$ac_given_srcdir" ;;
117 *) top_srcdir="$ac_dots$ac_given_srcdir" ;;
118 esac
119 # Treat a directory as a PO directory if and only if it has a
120 # POTFILES.in file. This allows packages to have multiple PO
121 # directories under different names or in different locations.
122 if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then
123 rm -f "$ac_dir/POTFILES"
124 test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES"
125 gt_tab=`printf '\t'`
126 cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ${gt_tab}]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES"
127 POMAKEFILEDEPS="POTFILES.in"
128 # ALL_LINGUAS, POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES depend
129 # on $ac_dir but don't depend on user-specified configuration
130 # parameters.
131 if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
132 # The LINGUAS file contains the set of available languages.
133 if test -n "$OBSOLETE_ALL_LINGUAS"; then
134 test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
135 fi
136 ALL_LINGUAS=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
137 POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
138 else
139 # The set of available languages was given in configure.in.
140 ALL_LINGUAS=$OBSOLETE_ALL_LINGUAS
141 fi
142 # Compute POFILES
143 # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
144 # Compute UPDATEPOFILES
145 # as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
146 # Compute DUMMYPOFILES
147 # as $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
148 # Compute GMOFILES
149 # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
150 case "$ac_given_srcdir" in
151 .) srcdirpre= ;;
152 *) srcdirpre='$(srcdir)/' ;;
153 esac
154 POFILES=
155 UPDATEPOFILES=
156 DUMMYPOFILES=
157 GMOFILES=
158 for lang in $ALL_LINGUAS; do
159 POFILES="$POFILES $srcdirpre$lang.po"
160 UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
161 DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
162 GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
163 done
164 # CATALOGS depends on both $ac_dir and the user's LINGUAS
165 # environment variable.
166 INST_LINGUAS=
167 if test -n "$ALL_LINGUAS"; then
168 for presentlang in $ALL_LINGUAS; do
169 useit=no
170 if test "%UNSET%" != "$LINGUAS"; then
171 desiredlanguages="$LINGUAS"
172 else
173 desiredlanguages="$ALL_LINGUAS"
174 fi
175 for desiredlang in $desiredlanguages; do
176 # Use the presentlang catalog if desiredlang is
177 # a. equal to presentlang, or
178 # b. a variant of presentlang (because in this case,
179 # presentlang can be used as a fallback for messages
180 # which are not translated in the desiredlang catalog).
181 case "$desiredlang" in
182 "$presentlang"*) useit=yes;;
183 esac
184 done
185 if test $useit = yes; then
186 INST_LINGUAS="$INST_LINGUAS $presentlang"
187 fi
188 done
189 fi
190 CATALOGS=
191 if test -n "$INST_LINGUAS"; then
192 for lang in $INST_LINGUAS; do
193 CATALOGS="$CATALOGS $lang.gmo"
194 done
195 fi
196 test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile"
197 sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@POMAKEFILEDEPS@|$POMAKEFILEDEPS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile"
198 for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do
199 if test -f "$f"; then
200 case "$f" in
201 *.orig | *.bak | *~) ;;
202 *) cat "$f" >> "$ac_dir/Makefile" ;;
203 esac
204 fi
205 done
206 fi
207 ;;
208 esac
209 done]],
210 [# Capture the value of obsolete ALL_LINGUAS because we need it to compute
211 # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS.
212 OBSOLETE_ALL_LINGUAS="$ALL_LINGUAS"
213 # Capture the value of LINGUAS because we need it to compute CATALOGS.
214 LINGUAS="${LINGUAS-%UNSET%}"
215 ])
216])
217
218dnl Postprocesses a Makefile in a directory containing PO files.
219AC_DEFUN([AM_POSTPROCESS_PO_MAKEFILE],
220[
221 # When this code is run, in config.status, two variables have already been
222 # set:
223 # - OBSOLETE_ALL_LINGUAS is the value of LINGUAS set in configure.in,
224 # - LINGUAS is the value of the environment variable LINGUAS at configure
225 # time.
226
227changequote(,)dnl
228 # Adjust a relative srcdir.
229 ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'`
230 ac_dir_suffix=/`echo "$ac_dir"|sed 's%^\./%%'`
231 ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'`
232 # In autoconf-2.13 it is called $ac_given_srcdir.
233 # In autoconf-2.50 it is called $srcdir.
234 test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir"
235 case "$ac_given_srcdir" in
236 .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;;
237 /*) top_srcdir="$ac_given_srcdir" ;;
238 *) top_srcdir="$ac_dots$ac_given_srcdir" ;;
239 esac
240
241 # Find a way to echo strings without interpreting backslash.
242 if test "X`(echo '\t') 2>/dev/null`" = 'X\t'; then
243 gt_echo='echo'
244 else
245 if test "X`(printf '%s\n' '\t') 2>/dev/null`" = 'X\t'; then
246 gt_echo='printf %s\n'
247 else
248 echo_func () {
249 cat <<EOT
250$*
251EOT
252 }
253 gt_echo='echo_func'
254 fi
255 fi
256
257 # A sed script that extracts the value of VARIABLE from a Makefile.
258 tab=`printf '\t'`
259 sed_x_variable='
260# Test if the hold space is empty.
261x
262s/P/P/
263x
264ta
265# Yes it was empty. Look if we have the expected variable definition.
266/^['"${tab}"' ]*VARIABLE['"${tab}"' ]*=/{
267 # Seen the first line of the variable definition.
268 s/^['"${tab}"' ]*VARIABLE['"${tab}"' ]*=//
269 ba
270}
271bd
272:a
273# Here we are processing a line from the variable definition.
274# Remove comment, more precisely replace it with a space.
275s/#.*$/ /
276# See if the line ends in a backslash.
277tb
278:b
279s/\\$//
280# Print the line, without the trailing backslash.
281p
282tc
283# There was no trailing backslash. The end of the variable definition is
284# reached. Clear the hold space.
285s/^.*$//
286x
287bd
288:c
289# A trailing backslash means that the variable definition continues in the
290# next line. Put a nonempty string into the hold space to indicate this.
291s/^.*$/P/
292x
293:d
294'
295changequote([,])dnl
296
297 # Set POTFILES to the value of the Makefile variable POTFILES.
298 sed_x_POTFILES=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/POTFILES/g'`
299 POTFILES=`sed -n -e "$sed_x_POTFILES" < "$ac_file"`
300 # Compute POTFILES_DEPS as
301 # $(foreach file, $(POTFILES), $(top_srcdir)/$(file))
302 POTFILES_DEPS=
303 for file in $POTFILES; do
304 POTFILES_DEPS="$POTFILES_DEPS "'$(top_srcdir)/'"$file"
305 done
306 POMAKEFILEDEPS=""
307
308 if test -n "$OBSOLETE_ALL_LINGUAS"; then
309 test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete"
310 fi
311 if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then
312 # The LINGUAS file contains the set of available languages.
313 ALL_LINGUAS=`sed -e "/^#/d" -e "s/#.*//" "$ac_given_srcdir/$ac_dir/LINGUAS"`
314 POMAKEFILEDEPS="$POMAKEFILEDEPS LINGUAS"
315 else
316 # Set ALL_LINGUAS to the value of the Makefile variable LINGUAS.
317 sed_x_LINGUAS=`$gt_echo "$sed_x_variable" | sed -e '/^ *#/d' -e 's/VARIABLE/LINGUAS/g'`
318 ALL_LINGUAS=`sed -n -e "$sed_x_LINGUAS" < "$ac_file"`
319 fi
320 # Compute POFILES
321 # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).po)
322 # Compute UPDATEPOFILES
323 # as $(foreach lang, $(ALL_LINGUAS), $(lang).po-update)
324 # Compute DUMMYPOFILES
325 # as $(foreach lang, $(ALL_LINGUAS), $(lang).nop)
326 # Compute GMOFILES
327 # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).gmo)
328 # Compute PROPERTIESFILES
329 # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(DOMAIN)_$(lang).properties)
330 # Compute CLASSFILES
331 # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(DOMAIN)_$(lang).class)
332 # Compute QMFILES
333 # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(lang).qm)
334 # Compute MSGFILES
335 # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang)).msg)
336 # Compute RESOURCESDLLFILES
337 # as $(foreach lang, $(ALL_LINGUAS), $(srcdir)/$(frob $(lang))/$(DOMAIN).resources.dll)
338 case "$ac_given_srcdir" in
339 .) srcdirpre= ;;
340 *) srcdirpre='$(srcdir)/' ;;
341 esac
342 POFILES=
343 UPDATEPOFILES=
344 DUMMYPOFILES=
345 GMOFILES=
346 PROPERTIESFILES=
347 CLASSFILES=
348 QMFILES=
349 MSGFILES=
350 RESOURCESDLLFILES=
351 for lang in $ALL_LINGUAS; do
352 POFILES="$POFILES $srcdirpre$lang.po"
353 UPDATEPOFILES="$UPDATEPOFILES $lang.po-update"
354 DUMMYPOFILES="$DUMMYPOFILES $lang.nop"
355 GMOFILES="$GMOFILES $srcdirpre$lang.gmo"
356 PROPERTIESFILES="$PROPERTIESFILES \$(srcdir)/\$(DOMAIN)_$lang.properties"
357 CLASSFILES="$CLASSFILES \$(srcdir)/\$(DOMAIN)_$lang.class"
358 QMFILES="$QMFILES $srcdirpre$lang.qm"
359 frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
360 MSGFILES="$MSGFILES $srcdirpre$frobbedlang.msg"
361 frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
362 RESOURCESDLLFILES="$RESOURCESDLLFILES $srcdirpre$frobbedlang/\$(DOMAIN).resources.dll"
363 done
364 # CATALOGS depends on both $ac_dir and the user's LINGUAS
365 # environment variable.
366 INST_LINGUAS=
367 if test -n "$ALL_LINGUAS"; then
368 for presentlang in $ALL_LINGUAS; do
369 useit=no
370 if test "%UNSET%" != "$LINGUAS"; then
371 desiredlanguages="$LINGUAS"
372 else
373 desiredlanguages="$ALL_LINGUAS"
374 fi
375 for desiredlang in $desiredlanguages; do
376 # Use the presentlang catalog if desiredlang is
377 # a. equal to presentlang, or
378 # b. a variant of presentlang (because in this case,
379 # presentlang can be used as a fallback for messages
380 # which are not translated in the desiredlang catalog).
381 case "$desiredlang" in
382 "$presentlang"*) useit=yes;;
383 esac
384 done
385 if test $useit = yes; then
386 INST_LINGUAS="$INST_LINGUAS $presentlang"
387 fi
388 done
389 fi
390 CATALOGS=
391 JAVACATALOGS=
392 QTCATALOGS=
393 TCLCATALOGS=
394 CSHARPCATALOGS=
395 if test -n "$INST_LINGUAS"; then
396 for lang in $INST_LINGUAS; do
397 CATALOGS="$CATALOGS $lang.gmo"
398 JAVACATALOGS="$JAVACATALOGS \$(DOMAIN)_$lang.properties"
399 QTCATALOGS="$QTCATALOGS $lang.qm"
400 frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
401 TCLCATALOGS="$TCLCATALOGS $frobbedlang.msg"
402 frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
403 CSHARPCATALOGS="$CSHARPCATALOGS $frobbedlang/\$(DOMAIN).resources.dll"
404 done
405 fi
406
407 sed -e "s|@POTFILES_DEPS@|$POTFILES_DEPS|g" -e "s|@POFILES@|$POFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@PROPERTIESFILES@|$PROPERTIESFILES|g" -e "s|@CLASSFILES@|$CLASSFILES|g" -e "s|@QMFILES@|$QMFILES|g" -e "s|@MSGFILES@|$MSGFILES|g" -e "s|@RESOURCESDLLFILES@|$RESOURCESDLLFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" -e "s|@JAVACATALOGS@|$JAVACATALOGS|g" -e "s|@QTCATALOGS@|$QTCATALOGS|g" -e "s|@TCLCATALOGS@|$TCLCATALOGS|g" -e "s|@CSHARPCATALOGS@|$CSHARPCATALOGS|g" -e 's,^#distdir:,distdir:,' < "$ac_file" > "$ac_file.tmp"
408 tab=`printf '\t'`
409 if grep -l '@TCLCATALOGS@' "$ac_file" > /dev/null; then
410 # Add dependencies that cannot be formulated as a simple suffix rule.
411 for lang in $ALL_LINGUAS; do
412 frobbedlang=`echo $lang | sed -e 's/\..*$//' -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
413 cat >> "$ac_file.tmp" <<EOF
414$frobbedlang.msg: $lang.po
415${tab}@echo "\$(MSGFMT) -c --tcl -d \$(srcdir) -l $lang $srcdirpre$lang.po"; \
416${tab}\$(MSGFMT) -c --tcl -d "\$(srcdir)" -l $lang $srcdirpre$lang.po || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
417EOF
418 done
419 fi
420 if grep -l '@CSHARPCATALOGS@' "$ac_file" > /dev/null; then
421 # Add dependencies that cannot be formulated as a simple suffix rule.
422 for lang in $ALL_LINGUAS; do
423 frobbedlang=`echo $lang | sed -e 's/_/-/g' -e 's/^sr-CS/sr-SP/' -e 's/@latin$/-Latn/' -e 's/@cyrillic$/-Cyrl/' -e 's/^sr-SP$/sr-SP-Latn/' -e 's/^uz-UZ$/uz-UZ-Latn/'`
424 cat >> "$ac_file.tmp" <<EOF
425$frobbedlang/\$(DOMAIN).resources.dll: $lang.po
426${tab}@echo "\$(MSGFMT) -c --csharp -d \$(srcdir) -l $lang $srcdirpre$lang.po -r \$(DOMAIN)"; \
427${tab}\$(MSGFMT) -c --csharp -d "\$(srcdir)" -l $lang $srcdirpre$lang.po -r "\$(DOMAIN)" || { rm -f "\$(srcdir)/$frobbedlang.msg"; exit 1; }
428EOF
429 done
430 fi
431 if test -n "$POMAKEFILEDEPS"; then
432 cat >> "$ac_file.tmp" <<EOF
433Makefile: $POMAKEFILEDEPS
434EOF
435 fi
436 mv "$ac_file.tmp" "$ac_file"
437])
438
439dnl Initializes the accumulator used by AM_XGETTEXT_OPTION.
440AC_DEFUN([AM_XGETTEXT_OPTION_INIT],
441[
442 XGETTEXT_EXTRA_OPTIONS=
443])
444
445dnl Registers an option to be passed to xgettext in the po subdirectory.
446AC_DEFUN([AM_XGETTEXT_OPTION],
447[
448 AC_REQUIRE([AM_XGETTEXT_OPTION_INIT])
449 XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS $1"
450])
diff --git a/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/progtest.m4 b/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/progtest.m4
deleted file mode 100644
index f28010aed1..0000000000
--- a/meta/recipes-core/gettext/gettext-minimal-0.21/aclocal/progtest.m4
+++ /dev/null
@@ -1,91 +0,0 @@
1# progtest.m4 serial 8 (gettext-0.20.2)
2dnl Copyright (C) 1996-2003, 2005, 2008-2020 Free Software Foundation, Inc.
3dnl This file is free software; the Free Software Foundation
4dnl gives unlimited permission to copy and/or distribute it,
5dnl with or without modifications, as long as this notice is preserved.
6dnl
7dnl This file can be used in projects which are not available under
8dnl the GNU General Public License or the GNU Lesser General Public
9dnl License but which still want to provide support for the GNU gettext
10dnl functionality.
11dnl Please note that the actual code of the GNU gettext library is covered
12dnl by the GNU Lesser General Public License, and the rest of the GNU
13dnl gettext package is covered by the GNU General Public License.
14dnl They are *not* in the public domain.
15
16dnl Authors:
17dnl Ulrich Drepper <drepper@cygnus.com>, 1996.
18
19AC_PREREQ([2.50])
20
21# Search path for a program which passes the given test.
22
23dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR,
24dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]])
25AC_DEFUN([AM_PATH_PROG_WITH_TEST],
26[
27# Prepare PATH_SEPARATOR.
28# The user is always right.
29if test "${PATH_SEPARATOR+set}" != set; then
30 # Determine PATH_SEPARATOR by trying to find /bin/sh in a PATH which
31 # contains only /bin. Note that ksh looks also at the FPATH variable,
32 # so we have to set that as well for the test.
33 PATH_SEPARATOR=:
34 (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
35 && { (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \
36 || PATH_SEPARATOR=';'
37 }
38fi
39
40# Find out how to test for executable files. Don't use a zero-byte file,
41# as systems may use methods other than mode bits to determine executability.
42cat >conf$$.file <<_ASEOF
43#! /bin/sh
44exit 0
45_ASEOF
46chmod +x conf$$.file
47if test -x conf$$.file >/dev/null 2>&1; then
48 ac_executable_p="test -x"
49else
50 ac_executable_p="test -f"
51fi
52rm -f conf$$.file
53
54# Extract the first word of "$2", so it can be a program name with args.
55set dummy $2; ac_word=[$]2
56AC_MSG_CHECKING([for $ac_word])
57AC_CACHE_VAL([ac_cv_path_$1],
58[case "[$]$1" in
59 [[\\/]]* | ?:[[\\/]]*)
60 ac_cv_path_$1="[$]$1" # Let the user override the test with a path.
61 ;;
62 *)
63 ac_save_IFS="$IFS"; IFS=$PATH_SEPARATOR
64 for ac_dir in ifelse([$5], , $PATH, [$5]); do
65 IFS="$ac_save_IFS"
66 test -z "$ac_dir" && ac_dir=.
67 for ac_exec_ext in '' $ac_executable_extensions; do
68 if $ac_executable_p "$ac_dir/$ac_word$ac_exec_ext"; then
69 echo "$as_me: trying $ac_dir/$ac_word..." >&AS_MESSAGE_LOG_FD
70 if [$3]; then
71 ac_cv_path_$1="$ac_dir/$ac_word$ac_exec_ext"
72 break 2
73 fi
74 fi
75 done
76 done
77 IFS="$ac_save_IFS"
78dnl If no 4th arg is given, leave the cache variable unset,
79dnl so AC_PATH_PROGS will keep looking.
80ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4"
81])dnl
82 ;;
83esac])dnl
84$1="$ac_cv_path_$1"
85if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then
86 AC_MSG_RESULT([$][$1])
87else
88 AC_MSG_RESULT([no])
89fi
90AC_SUBST([$1])dnl
91])
diff --git a/meta/recipes-core/gettext/gettext-minimal-0.21/config.rpath b/meta/recipes-core/gettext/gettext-minimal-0.21/config.rpath
deleted file mode 100755
index 24be79cfb6..0000000000
--- a/meta/recipes-core/gettext/gettext-minimal-0.21/config.rpath
+++ /dev/null
@@ -1,684 +0,0 @@
1#! /bin/sh
2# Output a system dependent set of variables, describing how to set the
3# run time search path of shared libraries in an executable.
4#
5# Copyright 1996-2020 Free Software Foundation, Inc.
6# Taken from GNU libtool, 2001
7# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
8#
9# This file is free software; the Free Software Foundation gives
10# unlimited permission to copy and/or distribute it, with or without
11# modifications, as long as this notice is preserved.
12#
13# The first argument passed to this file is the canonical host specification,
14# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
15# or
16# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
17# The environment variables CC, GCC, LDFLAGS, LD, with_gnu_ld
18# should be set by the caller.
19#
20# The set of defined variables is at the end of this script.
21
22# Known limitations:
23# - On IRIX 6.5 with CC="cc", the run time search patch must not be longer
24# than 256 bytes, otherwise the compiler driver will dump core. The only
25# known workaround is to choose shorter directory names for the build
26# directory and/or the installation directory.
27
28# All known linkers require a '.a' archive for static linking (except MSVC,
29# which needs '.lib').
30libext=a
31shrext=.so
32
33host="$1"
34host_cpu=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
35host_vendor=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
36host_os=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
37
38# Code taken from libtool.m4's _LT_CC_BASENAME.
39
40for cc_temp in $CC""; do
41 case $cc_temp in
42 compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
43 distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
44 \-*) ;;
45 *) break;;
46 esac
47done
48cc_basename=`echo "$cc_temp" | sed -e 's%^.*/%%'`
49
50# Code taken from libtool.m4's _LT_COMPILER_PIC.
51
52wl=
53if test "$GCC" = yes; then
54 wl='-Wl,'
55else
56 case "$host_os" in
57 aix*)
58 wl='-Wl,'
59 ;;
60 mingw* | cygwin* | pw32* | os2* | cegcc*)
61 ;;
62 hpux9* | hpux10* | hpux11*)
63 wl='-Wl,'
64 ;;
65 irix5* | irix6* | nonstopux*)
66 wl='-Wl,'
67 ;;
68 linux* | k*bsd*-gnu | kopensolaris*-gnu)
69 case $cc_basename in
70 ecc*)
71 wl='-Wl,'
72 ;;
73 icc* | ifort*)
74 wl='-Wl,'
75 ;;
76 lf95*)
77 wl='-Wl,'
78 ;;
79 nagfor*)
80 wl='-Wl,-Wl,,'
81 ;;
82 pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
83 wl='-Wl,'
84 ;;
85 ccc*)
86 wl='-Wl,'
87 ;;
88 xl* | bgxl* | bgf* | mpixl*)
89 wl='-Wl,'
90 ;;
91 como)
92 wl='-lopt='
93 ;;
94 *)
95 case `$CC -V 2>&1 | sed 5q` in
96 *Sun\ F* | *Sun*Fortran*)
97 wl=
98 ;;
99 *Sun\ C*)
100 wl='-Wl,'
101 ;;
102 esac
103 ;;
104 esac
105 ;;
106 newsos6)
107 ;;
108 *nto* | *qnx*)
109 ;;
110 osf3* | osf4* | osf5*)
111 wl='-Wl,'
112 ;;
113 rdos*)
114 ;;
115 solaris*)
116 case $cc_basename in
117 f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
118 wl='-Qoption ld '
119 ;;
120 *)
121 wl='-Wl,'
122 ;;
123 esac
124 ;;
125 sunos4*)
126 wl='-Qoption ld '
127 ;;
128 sysv4 | sysv4.2uw2* | sysv4.3*)
129 wl='-Wl,'
130 ;;
131 sysv4*MP*)
132 ;;
133 sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
134 wl='-Wl,'
135 ;;
136 unicos*)
137 wl='-Wl,'
138 ;;
139 uts4*)
140 ;;
141 esac
142fi
143
144# Code taken from libtool.m4's _LT_LINKER_SHLIBS.
145
146hardcode_libdir_flag_spec=
147hardcode_libdir_separator=
148hardcode_direct=no
149hardcode_minus_L=no
150
151case "$host_os" in
152 cygwin* | mingw* | pw32* | cegcc*)
153 # FIXME: the MSVC++ port hasn't been tested in a loooong time
154 # When not using gcc, we currently assume that we are using
155 # Microsoft Visual C++.
156 if test "$GCC" != yes; then
157 with_gnu_ld=no
158 fi
159 ;;
160 interix*)
161 # we just hope/assume this is gcc and not c89 (= MSVC++)
162 with_gnu_ld=yes
163 ;;
164 openbsd*)
165 with_gnu_ld=no
166 ;;
167esac
168
169ld_shlibs=yes
170if test "$with_gnu_ld" = yes; then
171 # Set some defaults for GNU ld with shared library support. These
172 # are reset later if shared libraries are not supported. Putting them
173 # here allows them to be overridden if necessary.
174 # Unlike libtool, we use -rpath here, not --rpath, since the documented
175 # option of GNU ld is called -rpath, not --rpath.
176 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
177 case "$host_os" in
178 aix[3-9]*)
179 # On AIX/PPC, the GNU linker is very broken
180 if test "$host_cpu" != ia64; then
181 ld_shlibs=no
182 fi
183 ;;
184 amigaos*)
185 case "$host_cpu" in
186 powerpc)
187 ;;
188 m68k)
189 hardcode_libdir_flag_spec='-L$libdir'
190 hardcode_minus_L=yes
191 ;;
192 esac
193 ;;
194 beos*)
195 if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
196 :
197 else
198 ld_shlibs=no
199 fi
200 ;;
201 cygwin* | mingw* | pw32* | cegcc*)
202 # hardcode_libdir_flag_spec is actually meaningless, as there is
203 # no search path for DLLs.
204 hardcode_libdir_flag_spec='-L$libdir'
205 if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
206 :
207 else
208 ld_shlibs=no
209 fi
210 ;;
211 haiku*)
212 ;;
213 interix[3-9]*)
214 hardcode_direct=no
215 hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
216 ;;
217 gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
218 if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
219 :
220 else
221 ld_shlibs=no
222 fi
223 ;;
224 netbsd*)
225 ;;
226 solaris*)
227 if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
228 ld_shlibs=no
229 elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
230 :
231 else
232 ld_shlibs=no
233 fi
234 ;;
235 sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
236 case `$LD -v 2>&1` in
237 *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*)
238 ld_shlibs=no
239 ;;
240 *)
241 if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
242 hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
243 else
244 ld_shlibs=no
245 fi
246 ;;
247 esac
248 ;;
249 sunos4*)
250 hardcode_direct=yes
251 ;;
252 *)
253 if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
254 :
255 else
256 ld_shlibs=no
257 fi
258 ;;
259 esac
260 if test "$ld_shlibs" = no; then
261 hardcode_libdir_flag_spec=
262 fi
263else
264 case "$host_os" in
265 aix3*)
266 # Note: this linker hardcodes the directories in LIBPATH if there
267 # are no directories specified by -L.
268 hardcode_minus_L=yes
269 if test "$GCC" = yes; then
270 # Neither direct hardcoding nor static linking is supported with a
271 # broken collect2.
272 hardcode_direct=unsupported
273 fi
274 ;;
275 aix[4-9]*)
276 if test "$host_cpu" = ia64; then
277 # On IA64, the linker does run time linking by default, so we don't
278 # have to do anything special.
279 aix_use_runtimelinking=no
280 else
281 aix_use_runtimelinking=no
282 # Test if we are trying to use run time linking or normal
283 # AIX style linking. If -brtl is somewhere in LDFLAGS, we
284 # need to do runtime linking.
285 case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*)
286 for ld_flag in $LDFLAGS; do
287 if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
288 aix_use_runtimelinking=yes
289 break
290 fi
291 done
292 ;;
293 esac
294 fi
295 hardcode_direct=yes
296 hardcode_libdir_separator=':'
297 if test "$GCC" = yes; then
298 case $host_os in aix4.[012]|aix4.[012].*)
299 collect2name=`${CC} -print-prog-name=collect2`
300 if test -f "$collect2name" && \
301 strings "$collect2name" | grep resolve_lib_name >/dev/null
302 then
303 # We have reworked collect2
304 :
305 else
306 # We have old collect2
307 hardcode_direct=unsupported
308 hardcode_minus_L=yes
309 hardcode_libdir_flag_spec='-L$libdir'
310 hardcode_libdir_separator=
311 fi
312 ;;
313 esac
314 fi
315 # Begin _LT_AC_SYS_LIBPATH_AIX.
316 echo 'int main () { return 0; }' > conftest.c
317 ${CC} ${LDFLAGS} conftest.c -o conftest
318 aix_libpath=`dump -H conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
319}'`
320 if test -z "$aix_libpath"; then
321 aix_libpath=`dump -HX64 conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
322}'`
323 fi
324 if test -z "$aix_libpath"; then
325 aix_libpath="/usr/lib:/lib"
326 fi
327 rm -f conftest.c conftest
328 # End _LT_AC_SYS_LIBPATH_AIX.
329 if test "$aix_use_runtimelinking" = yes; then
330 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
331 else
332 if test "$host_cpu" = ia64; then
333 hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
334 else
335 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
336 fi
337 fi
338 ;;
339 amigaos*)
340 case "$host_cpu" in
341 powerpc)
342 ;;
343 m68k)
344 hardcode_libdir_flag_spec='-L$libdir'
345 hardcode_minus_L=yes
346 ;;
347 esac
348 ;;
349 bsdi[45]*)
350 ;;
351 cygwin* | mingw* | pw32* | cegcc*)
352 # When not using gcc, we currently assume that we are using
353 # Microsoft Visual C++.
354 # hardcode_libdir_flag_spec is actually meaningless, as there is
355 # no search path for DLLs.
356 hardcode_libdir_flag_spec=' '
357 libext=lib
358 ;;
359 darwin* | rhapsody*)
360 hardcode_direct=no
361 if { case $cc_basename in ifort*) true;; *) test "$GCC" = yes;; esac; }; then
362 :
363 else
364 ld_shlibs=no
365 fi
366 ;;
367 dgux*)
368 hardcode_libdir_flag_spec='-L$libdir'
369 ;;
370 freebsd2.[01]*)
371 hardcode_direct=yes
372 hardcode_minus_L=yes
373 ;;
374 freebsd* | dragonfly*)
375 hardcode_libdir_flag_spec='-R$libdir'
376 hardcode_direct=yes
377 ;;
378 hpux9*)
379 hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
380 hardcode_libdir_separator=:
381 hardcode_direct=yes
382 # hardcode_minus_L: Not really in the search PATH,
383 # but as the default location of the library.
384 hardcode_minus_L=yes
385 ;;
386 hpux10*)
387 if test "$with_gnu_ld" = no; then
388 hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
389 hardcode_libdir_separator=:
390 hardcode_direct=yes
391 # hardcode_minus_L: Not really in the search PATH,
392 # but as the default location of the library.
393 hardcode_minus_L=yes
394 fi
395 ;;
396 hpux11*)
397 if test "$with_gnu_ld" = no; then
398 hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
399 hardcode_libdir_separator=:
400 case $host_cpu in
401 hppa*64*|ia64*)
402 hardcode_direct=no
403 ;;
404 *)
405 hardcode_direct=yes
406 # hardcode_minus_L: Not really in the search PATH,
407 # but as the default location of the library.
408 hardcode_minus_L=yes
409 ;;
410 esac
411 fi
412 ;;
413 irix5* | irix6* | nonstopux*)
414 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
415 hardcode_libdir_separator=:
416 ;;
417 netbsd*)
418 hardcode_libdir_flag_spec='-R$libdir'
419 hardcode_direct=yes
420 ;;
421 newsos6)
422 hardcode_direct=yes
423 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
424 hardcode_libdir_separator=:
425 ;;
426 *nto* | *qnx*)
427 ;;
428 openbsd*)
429 if test -f /usr/libexec/ld.so; then
430 hardcode_direct=yes
431 if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
432 hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
433 else
434 case "$host_os" in
435 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
436 hardcode_libdir_flag_spec='-R$libdir'
437 ;;
438 *)
439 hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
440 ;;
441 esac
442 fi
443 else
444 ld_shlibs=no
445 fi
446 ;;
447 os2*)
448 hardcode_libdir_flag_spec='-L$libdir'
449 hardcode_minus_L=yes
450 ;;
451 osf3*)
452 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
453 hardcode_libdir_separator=:
454 ;;
455 osf4* | osf5*)
456 if test "$GCC" = yes; then
457 hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
458 else
459 # Both cc and cxx compiler support -rpath directly
460 hardcode_libdir_flag_spec='-rpath $libdir'
461 fi
462 hardcode_libdir_separator=:
463 ;;
464 solaris*)
465 hardcode_libdir_flag_spec='-R$libdir'
466 ;;
467 sunos4*)
468 hardcode_libdir_flag_spec='-L$libdir'
469 hardcode_direct=yes
470 hardcode_minus_L=yes
471 ;;
472 sysv4)
473 case $host_vendor in
474 sni)
475 hardcode_direct=yes # is this really true???
476 ;;
477 siemens)
478 hardcode_direct=no
479 ;;
480 motorola)
481 hardcode_direct=no #Motorola manual says yes, but my tests say they lie
482 ;;
483 esac
484 ;;
485 sysv4.3*)
486 ;;
487 sysv4*MP*)
488 if test -d /usr/nec; then
489 ld_shlibs=yes
490 fi
491 ;;
492 sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*)
493 ;;
494 sysv5* | sco3.2v5* | sco5v6*)
495 hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
496 hardcode_libdir_separator=':'
497 ;;
498 uts4*)
499 hardcode_libdir_flag_spec='-L$libdir'
500 ;;
501 *)
502 ld_shlibs=no
503 ;;
504 esac
505fi
506
507# Check dynamic linker characteristics
508# Code taken from libtool.m4's _LT_SYS_DYNAMIC_LINKER.
509# Unlike libtool.m4, here we don't care about _all_ names of the library, but
510# only about the one the linker finds when passed -lNAME. This is the last
511# element of library_names_spec in libtool.m4, or possibly two of them if the
512# linker has special search rules.
513library_names_spec= # the last element of library_names_spec in libtool.m4
514libname_spec='lib$name'
515case "$host_os" in
516 aix3*)
517 library_names_spec='$libname.a'
518 ;;
519 aix[4-9]*)
520 library_names_spec='$libname$shrext'
521 ;;
522 amigaos*)
523 case "$host_cpu" in
524 powerpc*)
525 library_names_spec='$libname$shrext' ;;
526 m68k)
527 library_names_spec='$libname.a' ;;
528 esac
529 ;;
530 beos*)
531 library_names_spec='$libname$shrext'
532 ;;
533 bsdi[45]*)
534 library_names_spec='$libname$shrext'
535 ;;
536 cygwin* | mingw* | pw32* | cegcc*)
537 shrext=.dll
538 library_names_spec='$libname.dll.a $libname.lib'
539 ;;
540 darwin* | rhapsody*)
541 shrext=.dylib
542 library_names_spec='$libname$shrext'
543 ;;
544 dgux*)
545 library_names_spec='$libname$shrext'
546 ;;
547 freebsd[23].*)
548 library_names_spec='$libname$shrext$versuffix'
549 ;;
550 freebsd* | dragonfly*)
551 library_names_spec='$libname$shrext'
552 ;;
553 gnu*)
554 library_names_spec='$libname$shrext'
555 ;;
556 haiku*)
557 library_names_spec='$libname$shrext'
558 ;;
559 hpux9* | hpux10* | hpux11*)
560 case $host_cpu in
561 ia64*)
562 shrext=.so
563 ;;
564 hppa*64*)
565 shrext=.sl
566 ;;
567 *)
568 shrext=.sl
569 ;;
570 esac
571 library_names_spec='$libname$shrext'
572 ;;
573 interix[3-9]*)
574 library_names_spec='$libname$shrext'
575 ;;
576 irix5* | irix6* | nonstopux*)
577 library_names_spec='$libname$shrext'
578 case "$host_os" in
579 irix5* | nonstopux*)
580 libsuff= shlibsuff=
581 ;;
582 *)
583 case $LD in
584 *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") libsuff= shlibsuff= ;;
585 *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") libsuff=32 shlibsuff=N32 ;;
586 *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") libsuff=64 shlibsuff=64 ;;
587 *) libsuff= shlibsuff= ;;
588 esac
589 ;;
590 esac
591 ;;
592 linux*oldld* | linux*aout* | linux*coff*)
593 ;;
594 linux* | k*bsd*-gnu | kopensolaris*-gnu)
595 library_names_spec='$libname$shrext'
596 ;;
597 knetbsd*-gnu)
598 library_names_spec='$libname$shrext'
599 ;;
600 netbsd*)
601 library_names_spec='$libname$shrext'
602 ;;
603 newsos6)
604 library_names_spec='$libname$shrext'
605 ;;
606 *nto* | *qnx*)
607 library_names_spec='$libname$shrext'
608 ;;
609 openbsd*)
610 library_names_spec='$libname$shrext$versuffix'
611 ;;
612 os2*)
613 libname_spec='$name'
614 shrext=.dll
615 library_names_spec='$libname.a'
616 ;;
617 osf3* | osf4* | osf5*)
618 library_names_spec='$libname$shrext'
619 ;;
620 rdos*)
621 ;;
622 solaris*)
623 library_names_spec='$libname$shrext'
624 ;;
625 sunos4*)
626 library_names_spec='$libname$shrext$versuffix'
627 ;;
628 sysv4 | sysv4.3*)
629 library_names_spec='$libname$shrext'
630 ;;
631 sysv4*MP*)
632 library_names_spec='$libname$shrext'
633 ;;
634 sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
635 library_names_spec='$libname$shrext'
636 ;;
637 tpf*)
638 library_names_spec='$libname$shrext'
639 ;;
640 uts4*)
641 library_names_spec='$libname$shrext'
642 ;;
643esac
644
645sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
646escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"`
647shlibext=`echo "$shrext" | sed -e 's,^\.,,'`
648escaped_libname_spec=`echo "X$libname_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
649escaped_library_names_spec=`echo "X$library_names_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
650escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"`
651
652LC_ALL=C sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <<EOF
653
654# How to pass a linker flag through the compiler.
655wl="$escaped_wl"
656
657# Static library suffix (normally "a").
658libext="$libext"
659
660# Shared library suffix (normally "so").
661shlibext="$shlibext"
662
663# Format of library name prefix.
664libname_spec="$escaped_libname_spec"
665
666# Library names that the linker finds when passed -lNAME.
667library_names_spec="$escaped_library_names_spec"
668
669# Flag to hardcode \$libdir into a binary during linking.
670# This must work even if \$libdir does not exist.
671hardcode_libdir_flag_spec="$escaped_hardcode_libdir_flag_spec"
672
673# Whether we need a single -rpath flag with a separated argument.
674hardcode_libdir_separator="$hardcode_libdir_separator"
675
676# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the
677# resulting binary.
678hardcode_direct="$hardcode_direct"
679
680# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
681# resulting binary.
682hardcode_minus_L="$hardcode_minus_L"
683
684EOF
diff --git a/meta/recipes-core/gettext/gettext-minimal-0.21/remove-potcdate.sin b/meta/recipes-core/gettext/gettext-minimal-0.21/remove-potcdate.sin
deleted file mode 100644
index 8c70dfbf14..0000000000
--- a/meta/recipes-core/gettext/gettext-minimal-0.21/remove-potcdate.sin
+++ /dev/null
@@ -1,25 +0,0 @@
1# Sed script that removes the POT-Creation-Date line in the header entry
2# from a POT file.
3#
4# Copyright (C) 2002 Free Software Foundation, Inc.
5# Copying and distribution of this file, with or without modification,
6# are permitted in any medium without royalty provided the copyright
7# notice and this notice are preserved. This file is offered as-is,
8# without any warranty.
9#
10# The distinction between the first and the following occurrences of the
11# pattern is achieved by looking at the hold space.
12/^"POT-Creation-Date: .*"$/{
13x
14# Test if the hold space is empty.
15s/P/P/
16ta
17# Yes it was empty. First occurrence. Remove the line.
18g
19d
20bb
21:a
22# The hold space was nonempty. Following occurrences. Do nothing.
23x
24:b
25}
diff --git a/meta/recipes-core/gettext/gettext-minimal-native_0.21.bb b/meta/recipes-core/gettext/gettext-minimal-native_0.21.bb
deleted file mode 100644
index 7a4dcbec57..0000000000
--- a/meta/recipes-core/gettext/gettext-minimal-native_0.21.bb
+++ /dev/null
@@ -1,30 +0,0 @@
1SUMMARY = "Minimal gettext for supporting native autoconf/automake"
2DESCRIPTION = "Contains the m4 macros sufficient to support building \
3autoconf/automake. This provides a significant build time speedup by \
4the removal of gettext-native from most dependency chains (now only \
5needed for gettext for the target)."
6SRC_URI = "file://aclocal/ \
7 file://config.rpath \
8 file://Makefile.in.in \
9 file://remove-potcdate.sin \
10 file://COPYING \
11"
12
13INHIBIT_DEFAULT_DEPS = "1"
14INHIBIT_AUTOTOOLS_DEPS = "1"
15
16LICENSE = "FSF-Unlimited"
17LIC_FILES_CHKSUM = "file://COPYING;md5=4bd090a20bfcd1a18f1f79837b5e3e91"
18
19inherit native
20
21S = "${WORKDIR}"
22
23do_install () {
24 install -d ${D}${datadir}/aclocal/
25 cp ${WORKDIR}/aclocal/*.m4 ${D}${datadir}/aclocal/
26 install -d ${D}${datadir}/gettext/po/
27 cp ${WORKDIR}/config.rpath ${D}${datadir}/gettext/
28 cp ${WORKDIR}/Makefile.in.in ${D}${datadir}/gettext/po/
29 cp ${WORKDIR}/remove-potcdate.sin ${D}${datadir}/gettext/po/
30}
diff --git a/meta/recipes-core/gettext/gettext-minimal-native_0.22.5.bb b/meta/recipes-core/gettext/gettext-minimal-native_0.22.5.bb
new file mode 100644
index 0000000000..96acf9bb9f
--- /dev/null
+++ b/meta/recipes-core/gettext/gettext-minimal-native_0.22.5.bb
@@ -0,0 +1,46 @@
1SUMMARY = "Minimal gettext for supporting native autoconf/automake"
2DESCRIPTION = "Contains the m4 macros sufficient to support building \
3autoconf/automake. This provides a significant build time speedup by \
4the removal of gettext-native from most dependency chains (now only \
5needed for gettext for the target)."
6
7require gettext-sources.inc
8SRC_URI += " \
9 file://COPYING \
10"
11
12INHIBIT_DEFAULT_DEPS = "1"
13INHIBIT_AUTOTOOLS_DEPS = "1"
14
15LICENSE = "FSF-Unlimited"
16LIC_FILES_CHKSUM = "file://${UNPACKDIR}/COPYING;md5=4bd090a20bfcd1a18f1f79837b5e3e91"
17
18inherit native
19
20S = "${WORKDIR}/gettext-${PV}"
21
22python get_aclocal_files() {
23 fpath = oe.path.join(d.getVar("S"), "/gettext-tools/m4/Makefile.am")
24 with open(fpath) as f:
25 content = f.read()
26 for l in content.replace("\\\n","").split("\n"):
27 if l.startswith("aclocal_DATA"):
28 aclocal_files = l.split("=")[1]
29 with open(oe.path.join(d.getVar("WORKDIR"),"aclocal-files"),'w') as outf:
30 outf.write(aclocal_files)
31 break
32 else:
33 bb.error("Could not obtain list of installed aclocal files from {}".format(fpath))
34}
35do_install[prefuncs] += "get_aclocal_files"
36
37do_install () {
38 install -d ${D}${datadir}/aclocal/
39 for i in `cat ${WORKDIR}/aclocal-files`; do
40 cp ${S}/gettext-tools/m4/$i ${D}${datadir}/aclocal/
41 done
42 install -d ${D}${datadir}/gettext/po/
43 cp ${S}/build-aux/config.rpath ${D}${datadir}/gettext/
44 cp ${S}/gettext-runtime/po/Makefile.in.in ${D}${datadir}/gettext/po/
45 cp ${S}/gettext-runtime/po/remove-potcdate.sin ${D}${datadir}/gettext/po/
46}
diff --git a/meta/recipes-core/gettext/gettext-minimal-0.21/COPYING b/meta/recipes-core/gettext/gettext-minimal/COPYING
index 3671ab6985..3671ab6985 100644
--- a/meta/recipes-core/gettext/gettext-minimal-0.21/COPYING
+++ b/meta/recipes-core/gettext/gettext-minimal/COPYING
diff --git a/meta/recipes-core/gettext/gettext-sources.inc b/meta/recipes-core/gettext/gettext-sources.inc
new file mode 100644
index 0000000000..fd05837528
--- /dev/null
+++ b/meta/recipes-core/gettext/gettext-sources.inc
@@ -0,0 +1,4 @@
1HOMEPAGE = "http://www.gnu.org/software/gettext/gettext.html"
2SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \
3 "
4SRC_URI[sha256sum] = "ec1705b1e969b83a9f073144ec806151db88127f5e40fe5a94cb6c8fa48996a0"
diff --git a/meta/recipes-core/gettext/gettext-0.21/0001-init-env.in-do-not-add-C-CXX-parameters.patch b/meta/recipes-core/gettext/gettext/0001-init-env.in-do-not-add-C-CXX-parameters.patch
index d45b75869a..33d45a038c 100644
--- a/meta/recipes-core/gettext/gettext-0.21/0001-init-env.in-do-not-add-C-CXX-parameters.patch
+++ b/meta/recipes-core/gettext/gettext/0001-init-env.in-do-not-add-C-CXX-parameters.patch
@@ -1,4 +1,4 @@
1From 9b912a47f790a7b282ec0c2295a188c5d8fb6a7c Mon Sep 17 00:00:00 2001 1From c58c503c532d20883a93ef778327c86dd6de24f6 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Fri, 6 Mar 2020 21:04:05 +0000 3Date: Fri, 6 Mar 2020 21:04:05 +0000
4Subject: [PATCH] init-env.in: do not add C/CXX parameters 4Subject: [PATCH] init-env.in: do not add C/CXX parameters
diff --git a/meta/recipes-core/gettext/gettext-0.21/0001-tests-autopoint-3-unset-MAKEFLAGS.patch b/meta/recipes-core/gettext/gettext/0001-tests-autopoint-3-unset-MAKEFLAGS.patch
index b0bc6b97a6..94afb255c3 100644
--- a/meta/recipes-core/gettext/gettext-0.21/0001-tests-autopoint-3-unset-MAKEFLAGS.patch
+++ b/meta/recipes-core/gettext/gettext/0001-tests-autopoint-3-unset-MAKEFLAGS.patch
@@ -1,4 +1,4 @@
1From 38b256e5aa7dfeb42acffd89565e53a2c0bab3e3 Mon Sep 17 00:00:00 2001 1From 7006142d199af13628edc687847a9a5bac48b45d Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Tue, 7 Jan 2020 16:44:38 +0100 3Date: Tue, 7 Jan 2020 16:44:38 +0100
4Subject: [PATCH] tests/autopoint-3: unset MAKEFLAGS 4Subject: [PATCH] tests/autopoint-3: unset MAKEFLAGS
@@ -13,10 +13,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
13 1 file changed, 1 insertion(+) 13 1 file changed, 1 insertion(+)
14 14
15diff --git a/gettext-tools/tests/autopoint-3 b/gettext-tools/tests/autopoint-3 15diff --git a/gettext-tools/tests/autopoint-3 b/gettext-tools/tests/autopoint-3
16index e13552b..55188df 100755 16index bd3fbf3..380eaac 100755
17--- a/gettext-tools/tests/autopoint-3 17--- a/gettext-tools/tests/autopoint-3
18+++ b/gettext-tools/tests/autopoint-3 18+++ b/gettext-tools/tests/autopoint-3
19@@ -126,6 +126,7 @@ test $? = 0 || { cat autopoint.err; Exit 1; } 19@@ -131,6 +131,7 @@ test $? = 0 || { cat autopoint.err; Exit 1; }
20 ${CONFIG_SHELL} ./configure >/dev/null 2>autpoint.err 20 ${CONFIG_SHELL} ./configure >/dev/null 2>autpoint.err
21 test $? = 0 || { cat autopoint.err; Exit 1; } 21 test $? = 0 || { cat autopoint.err; Exit 1; }
22 22
diff --git a/meta/recipes-core/gettext/gettext-0.21/parallel.patch b/meta/recipes-core/gettext/gettext/parallel.patch
index d96a376b7d..8ecba46fd0 100644
--- a/meta/recipes-core/gettext/gettext-0.21/parallel.patch
+++ b/meta/recipes-core/gettext/gettext/parallel.patch
@@ -1,4 +1,4 @@
1From 4a2a0a93b469093b60ffd0bec55d33d1e03d4713 Mon Sep 17 00:00:00 2001 1From 83333bc873c2655ff1de161f6b7db930f22f1cea Mon Sep 17 00:00:00 2001
2From: Joe Slater <jslater@windriver.com> 2From: Joe Slater <jslater@windriver.com>
3Date: Thu, 7 Jun 2012 16:37:01 -0700 3Date: Thu, 7 Jun 2012 16:37:01 -0700
4Subject: [PATCH] instal libgettextlib.a before removing it 4Subject: [PATCH] instal libgettextlib.a before removing it
@@ -10,16 +10,15 @@ the operations.
10Upstream-Status: Pending 10Upstream-Status: Pending
11 11
12Signed-off-by: Joe Slater <jslater@windriver.com> 12Signed-off-by: Joe Slater <jslater@windriver.com>
13
14--- 13---
15 gettext-tools/gnulib-lib/Makefile.am | 4 ++++ 14 gettext-tools/gnulib-lib/Makefile.am | 4 ++++
16 1 file changed, 4 insertions(+) 15 1 file changed, 4 insertions(+)
17 16
18diff --git a/gettext-tools/gnulib-lib/Makefile.am b/gettext-tools/gnulib-lib/Makefile.am 17diff --git a/gettext-tools/gnulib-lib/Makefile.am b/gettext-tools/gnulib-lib/Makefile.am
19index 2126699..d2dd7e4 100644 18index ab729cd..a0d713e 100644
20--- a/gettext-tools/gnulib-lib/Makefile.am 19--- a/gettext-tools/gnulib-lib/Makefile.am
21+++ b/gettext-tools/gnulib-lib/Makefile.am 20+++ b/gettext-tools/gnulib-lib/Makefile.am
22@@ -58,6 +58,10 @@ endif 21@@ -58,6 +58,10 @@ AM_CFLAGS = @WARN_CFLAGS@
23 # Rules generated and collected by gnulib-tool. 22 # Rules generated and collected by gnulib-tool.
24 include Makefile.gnulib 23 include Makefile.gnulib
25 24
diff --git a/meta/recipes-core/gettext/gettext-0.21/run-ptest b/meta/recipes-core/gettext/gettext/run-ptest
index f17f3c87a7..f17f3c87a7 100644
--- a/meta/recipes-core/gettext/gettext-0.21/run-ptest
+++ b/meta/recipes-core/gettext/gettext/run-ptest
diff --git a/meta/recipes-core/gettext/gettext-0.21/serial-tests-config.patch b/meta/recipes-core/gettext/gettext/serial-tests-config.patch
index 93f7c03334..7d39d6086a 100644
--- a/meta/recipes-core/gettext/gettext-0.21/serial-tests-config.patch
+++ b/meta/recipes-core/gettext/gettext/serial-tests-config.patch
@@ -1,4 +1,4 @@
1From ed64a5724ef7d6eb4e9a876f817ea266a536e195 Mon Sep 17 00:00:00 2001 1From aa8dfe0aafd0b53a6c5bac61b356ca92e1430a36 Mon Sep 17 00:00:00 2001
2From: "Hongjun.Yang" <hongjun.yang@windriver.com> 2From: "Hongjun.Yang" <hongjun.yang@windriver.com>
3Date: Thu, 28 Jul 2016 12:36:15 +0800 3Date: Thu, 28 Jul 2016 12:36:15 +0800
4Subject: [PATCH] fix for ptest 4Subject: [PATCH] fix for ptest
@@ -8,7 +8,6 @@ Add serial-tests support, ptest need it
8Upstream-Status: Inappropriate [oe specific] 8Upstream-Status: Inappropriate [oe specific]
9 9
10Signed-off-by: Changqing Li <changqing.li@windriver.com> 10Signed-off-by: Changqing Li <changqing.li@windriver.com>
11
12--- 11---
13 configure.ac | 2 +- 12 configure.ac | 2 +-
14 gettext-runtime/configure.ac | 2 +- 13 gettext-runtime/configure.ac | 2 +-
@@ -16,7 +15,7 @@ Signed-off-by: Changqing Li <changqing.li@windriver.com>
16 3 files changed, 3 insertions(+), 3 deletions(-) 15 3 files changed, 3 insertions(+), 3 deletions(-)
17 16
18diff --git a/configure.ac b/configure.ac 17diff --git a/configure.ac b/configure.ac
19index 38db6fd..f019ae0 100644 18index f4e54ea..a47ff14 100644
20--- a/configure.ac 19--- a/configure.ac
21+++ b/configure.ac 20+++ b/configure.ac
22@@ -22,7 +22,7 @@ AC_INIT([gettext], 21@@ -22,7 +22,7 @@ AC_INIT([gettext],
@@ -29,7 +28,7 @@ index 38db6fd..f019ae0 100644
29 dnl Override automake's tar command used for creating distributions. 28 dnl Override automake's tar command used for creating distributions.
30 am__tar='${AMTAR} chf - --format=ustar --owner=root --group=root "$$tardir"' 29 am__tar='${AMTAR} chf - --format=ustar --owner=root --group=root "$$tardir"'
31diff --git a/gettext-runtime/configure.ac b/gettext-runtime/configure.ac 30diff --git a/gettext-runtime/configure.ac b/gettext-runtime/configure.ac
32index de203e7..138a07f 100644 31index 126d069..aa23232 100644
33--- a/gettext-runtime/configure.ac 32--- a/gettext-runtime/configure.ac
34+++ b/gettext-runtime/configure.ac 33+++ b/gettext-runtime/configure.ac
35@@ -22,7 +22,7 @@ AC_INIT([gettext-runtime], 34@@ -22,7 +22,7 @@ AC_INIT([gettext-runtime],
@@ -42,7 +41,7 @@ index de203e7..138a07f 100644
42 41
43 dnl Installation directories. 42 dnl Installation directories.
44diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac 43diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac
45index cf1dd73..b544d6d 100644 44index 3610ee3..6f56a23 100644
46--- a/gettext-tools/configure.ac 45--- a/gettext-tools/configure.ac
47+++ b/gettext-tools/configure.ac 46+++ b/gettext-tools/configure.ac
48@@ -22,7 +22,7 @@ AC_INIT([gettext-tools], 47@@ -22,7 +22,7 @@ AC_INIT([gettext-tools],
diff --git a/meta/recipes-core/gettext/gettext/use-pkgconfig.patch b/meta/recipes-core/gettext/gettext/use-pkgconfig.patch
new file mode 100644
index 0000000000..ceb1856118
--- /dev/null
+++ b/meta/recipes-core/gettext/gettext/use-pkgconfig.patch
@@ -0,0 +1,391 @@
1From 6aa1338b916fe72c200b6f160b934be15b6ff590 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 gettext-tools/gnulib-m4/libxml.m4 | 105 ++---------------------
17 libtextstyle/gnulib-local/m4/libglib.m4 | 106 +++---------------------
18 libtextstyle/gnulib-m4/libglib.m4 | 106 +++---------------------
19 3 files changed, 31 insertions(+), 286 deletions(-)
20
21diff --git a/gettext-tools/gnulib-m4/libxml.m4 b/gettext-tools/gnulib-m4/libxml.m4
22index 0340490..0355388 100644
23--- a/gettext-tools/gnulib-m4/libxml.m4
24+++ b/gettext-tools/gnulib-m4/libxml.m4
25@@ -13,6 +13,7 @@ dnl gl_LIBXML(FORCE-INCLUDED)
26 dnl forces the use of the included or an external libxml.
27 AC_DEFUN([gl_LIBXML],
28 [
29+ AC_REQUIRE([PKG_PROG_PKG_CONFIG])
30 AC_REQUIRE([AM_ICONV_LINK])
31
32 ifelse([$1], , [
33@@ -30,106 +31,10 @@ AC_DEFUN([gl_LIBXML],
34 INCXML=
35 ifelse([$1], [yes], , [
36 if test "$gl_cv_libxml_use_included" != yes; then
37- dnl Figure out whether we can use a preinstalled libxml2, or have to use
38- dnl the included one.
39- AC_CACHE_VAL([gl_cv_libxml], [
40- gl_cv_libxml=no
41- gl_cv_LIBXML=
42- gl_cv_LTLIBXML=
43- gl_cv_INCXML=
44- gl_save_LIBS="$LIBS"
45- LIBS="$LIBS $LIBICONV"
46- dnl Search for libxml2 and define LIBXML2, LTLIBXML2 and INCXML2
47- dnl accordingly.
48- dnl Don't use xml2-config nor pkg-config, since it doesn't work when
49- dnl cross-compiling or when the C compiler in use is different from the
50- dnl one that built the library.
51- dnl Use a test program that tries to invoke xmlFree. On Cygwin 1.7.x,
52- dnl libxml2 is built in such a way that uses of xmlFree work fine with
53- dnl -Wl,--enable-auto-import but lead to a link error with
54- dnl -Wl,--disable-auto-import.
55- AC_LIB_LINKFLAGS_BODY([xml2])
56- LIBS="$gl_save_LIBS $LIBXML2 $LIBICONV"
57- AC_LINK_IFELSE(
58- [AC_LANG_PROGRAM(
59- [[#include <libxml/xmlversion.h>
60- #include <libxml/xmlmemory.h>
61- #include <libxml/xpath.h>
62- ]],
63- [[xmlCheckVersion (0);
64- xmlFree ((void *) 0);
65- xmlXPathSetContextNode ((void *)0, (void *)0);
66- ]])],
67- [gl_cv_libxml=yes
68- gl_cv_LIBXML="$LIBXML2 $LIBICONV"
69- gl_cv_LTLIBXML="$LTLIBXML2 $LTLIBICONV"
70- ])
71- if test "$gl_cv_libxml" != yes; then
72- gl_save_CPPFLAGS="$CPPFLAGS"
73- CPPFLAGS="$CPPFLAGS $INCXML2"
74- AC_LINK_IFELSE(
75- [AC_LANG_PROGRAM(
76- [[#include <libxml/xmlversion.h>
77- #include <libxml/xmlmemory.h>
78- #include <libxml/xpath.h>
79- ]],
80- [[xmlCheckVersion (0);
81- xmlFree ((void *) 0);
82- xmlXPathSetContextNode ((void *)0, (void *)0);
83- ]])],
84- [gl_cv_libxml=yes
85- gl_cv_LIBXML="$LIBXML2 $LIBICONV"
86- gl_cv_LTLIBXML="$LTLIBXML2 $LTLIBICONV"
87- gl_cv_INCXML="$INCXML2"
88- ])
89- if test "$gl_cv_libxml" != yes; then
90- dnl Often the include files are installed in /usr/include/libxml2.
91- dnl In libxml2-2.5, <libxml/xmlversion.h> is self-contained.
92- dnl In libxml2-2.6, it includes <libxml/xmlexports.h> which is
93- dnl self-contained.
94- libxml2_include_dir=
95- AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include <libxml2/libxml/xmlexports.h>]])],
96- [gl_ABSOLUTE_HEADER([libxml2/libxml/xmlexports.h])
97- libxml2_include_dir=`echo "$gl_cv_absolute_libxml2_libxml_xmlexports_h" | sed -e 's,.libxml.xmlexports\.h$,,'`
98- ])
99- if test -z "$libxml2_include_dir"; then
100- AC_PREPROC_IFELSE([AC_LANG_SOURCE([[#include <libxml2/libxml/xmlversion.h>]])],
101- [gl_ABSOLUTE_HEADER([libxml2/libxml/xmlversion.h])
102- libxml2_include_dir=`echo "$gl_cv_absolute_libxml2_libxml_xmlversion_h" | sed -e 's,.libxml.xmlversion\.h$,,'`
103- ])
104- fi
105- if test -n "$libxml2_include_dir" && test -d "$libxml2_include_dir"; then
106- CPPFLAGS="$gl_save_CPPFLAGS -I$libxml2_include_dir"
107- AC_LINK_IFELSE(
108- [AC_LANG_PROGRAM(
109- [[#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/m4/libglib.m4 b/libtextstyle/gnulib-local/m4/libglib.m4
145index dbc9eb8..136e512 100644
146--- a/libtextstyle/gnulib-local/m4/libglib.m4
147+++ b/libtextstyle/gnulib-local/m4/libglib.m4
148@@ -6,106 +6,26 @@ dnl with or without modifications, as long as this notice is preserved.
149
150 dnl From Bruno Haible.
151
152-dnl gl_LIBGLIB
153-dnl gives the user the option to decide whether to use the included or
154-dnl an external libglib.
155-dnl gl_LIBGLIB(FORCE-INCLUDED)
156-dnl forces the use of the included or an external libglib.
157 AC_DEFUN([gl_LIBGLIB],
158 [
159- ifelse([$1], , [
160- AC_MSG_CHECKING([whether included glib is requested])
161- AC_ARG_WITH([included-glib],
162- [ --with-included-glib use the glib2 included here],
163- [gl_cv_libglib_force_included=$withval],
164- [gl_cv_libglib_force_included=no])
165- AC_MSG_RESULT([$gl_cv_libglib_force_included])
166- ], [gl_cv_libglib_force_included=$1])
167+ AC_REQUIRE([PKG_PROG_PKG_CONFIG])
168+ AC_MSG_CHECKING([whether included glib is requested])
169+ AC_ARG_WITH([included-glib],
170+ [ --with-included-glib use the glib2 included here],
171+ [gl_cv_libglib_force_included=$withval],
172+ [gl_cv_libglib_force_included=no])
173+ AC_MSG_RESULT([$gl_cv_libglib_force_included])
174
175 gl_cv_libglib_use_included="$gl_cv_libglib_force_included"
176 LIBGLIB=
177 LTLIBGLIB=
178 INCGLIB=
179- ifelse([$1], [yes], , [
180- if test "$gl_cv_libglib_use_included" != yes; then
181- dnl Figure out whether we can use a preinstalled libglib-2.0, or have to use
182- dnl the included one.
183- AC_CACHE_VAL([gl_cv_libglib], [
184- gl_cv_libglib=no
185- gl_cv_LIBGLIB=
186- gl_cv_LTLIBGLIB=
187- gl_cv_INCGLIB=
188- gl_save_LIBS="$LIBS"
189- dnl Search for libglib2 and define LIBGLIB_2_0, LTLIBGLIB_2_0 and
190- dnl INCGLIB_2_0 accordingly.
191- dnl Don't use glib-config nor pkg-config, since it doesn't work when
192- dnl cross-compiling or when the C compiler in use is different from the
193- dnl one that built the library.
194- AC_LIB_LINKFLAGS_BODY([glib-2.0])
195- LIBS="$gl_save_LIBS $LIBGLIB_2_0"
196- AC_LINK_IFELSE(
197- [AC_LANG_PROGRAM(
198- [[#include <glib.h>
199- #ifndef G_BEGIN_DECLS
200- error this glib.h includes a glibconfig.h from a glib version 1.x
201- #endif
202- ]],
203- [[g_string_new ("foo");]])],
204- [gl_cv_libglib=yes
205- gl_cv_LIBGLIB="$LIBGLIB_2_0"
206- gl_cv_LTLIBGLIB="$LTLIBGLIB_2_0"
207- ])
208- if test "$gl_cv_libglib" != yes; then
209- gl_save_CPPFLAGS="$CPPFLAGS"
210- CPPFLAGS="$CPPFLAGS $INCGLIB_2_0"
211- AC_LINK_IFELSE(
212- [AC_LANG_PROGRAM(
213- [[#include <glib.h>
214- #ifndef G_BEGIN_DECLS
215- error this glib.h includes a glibconfig.h from a glib version 1.x
216- #endif
217- ]],
218- [[g_string_new ("foo");]])],
219- [gl_cv_libglib=yes
220- gl_cv_LIBGLIB="$LIBGLIB_2_0"
221- gl_cv_LTLIBGLIB="$LTLIBGLIB_2_0"
222- gl_cv_INCGLIB="$INCGLIB_2_0"
223- ])
224- if test "$gl_cv_libglib" != yes; then
225- dnl Often the include files are installed in /usr/include/glib-2.0
226- dnl and /usr/lib/glib-2.0/include.
227- if test -n "$LIBGLIB_2_0_PREFIX"; then
228- CPPFLAGS="$gl_save_CPPFLAGS -I$LIBGLIB_2_0_PREFIX/include/glib-2.0 -I$LIBGLIB_2_0_PREFIX/$acl_libdirstem/glib-2.0/include"
229- AC_LINK_IFELSE(
230- [AC_LANG_PROGRAM(
231- [[#include <glib.h>
232- #ifndef G_BEGIN_DECLS
233- error this glib.h includes a glibconfig.h from a glib version 1.x
234- #endif
235- ]],
236- [[g_string_new ("foo");]])],
237- [gl_cv_libglib=yes
238- gl_cv_LIBGLIB="$LIBGLIB_2_0"
239- gl_cv_LTLIBGLIB="$LTLIBGLIB_2_0"
240- gl_cv_INCGLIB="-I$LIBGLIB_2_0_PREFIX/include/glib-2.0 -I$LIBGLIB_2_0_PREFIX/$acl_libdirstem/glib-2.0/include"
241- ])
242- fi
243- fi
244- CPPFLAGS="$gl_save_CPPFLAGS"
245- fi
246- LIBS="$gl_save_LIBS"
247- ])
248- AC_MSG_CHECKING([for glib])
249- AC_MSG_RESULT([$gl_cv_libglib])
250- if test $gl_cv_libglib = yes; then
251- LIBGLIB="$gl_cv_LIBGLIB"
252- LTLIBGLIB="$gl_cv_LTLIBGLIB"
253- INCGLIB="$gl_cv_INCGLIB"
254- else
255- gl_cv_libglib_use_included=yes
256- fi
257- fi
258- ])
259+ if test "$gl_cv_libglib_use_included" != yes; then
260+ PKG_CHECK_MODULES([GLIB], [glib-2.0])
261+ LIBGLIB="$GLIB_LIBS"
262+ LTLIBGLIB="$GLIB_LIBS"
263+ INCGLIB="$GLIB_CFLAGS"
264+ fi
265 AC_SUBST([LIBGLIB])
266 AC_SUBST([LTLIBGLIB])
267 AC_SUBST([INCGLIB])
268diff --git a/libtextstyle/gnulib-m4/libglib.m4 b/libtextstyle/gnulib-m4/libglib.m4
269index dbc9eb8..136e512 100644
270--- a/libtextstyle/gnulib-m4/libglib.m4
271+++ b/libtextstyle/gnulib-m4/libglib.m4
272@@ -6,106 +6,26 @@ dnl with or without modifications, as long as this notice is preserved.
273
274 dnl From Bruno Haible.
275
276-dnl gl_LIBGLIB
277-dnl gives the user the option to decide whether to use the included or
278-dnl an external libglib.
279-dnl gl_LIBGLIB(FORCE-INCLUDED)
280-dnl forces the use of the included or an external libglib.
281 AC_DEFUN([gl_LIBGLIB],
282 [
283- ifelse([$1], , [
284- AC_MSG_CHECKING([whether included glib is requested])
285- AC_ARG_WITH([included-glib],
286- [ --with-included-glib use the glib2 included here],
287- [gl_cv_libglib_force_included=$withval],
288- [gl_cv_libglib_force_included=no])
289- AC_MSG_RESULT([$gl_cv_libglib_force_included])
290- ], [gl_cv_libglib_force_included=$1])
291+ AC_REQUIRE([PKG_PROG_PKG_CONFIG])
292+ AC_MSG_CHECKING([whether included glib is requested])
293+ AC_ARG_WITH([included-glib],
294+ [ --with-included-glib use the glib2 included here],
295+ [gl_cv_libglib_force_included=$withval],
296+ [gl_cv_libglib_force_included=no])
297+ AC_MSG_RESULT([$gl_cv_libglib_force_included])
298
299 gl_cv_libglib_use_included="$gl_cv_libglib_force_included"
300 LIBGLIB=
301 LTLIBGLIB=
302 INCGLIB=
303- ifelse([$1], [yes], , [
304- if test "$gl_cv_libglib_use_included" != yes; then
305- dnl Figure out whether we can use a preinstalled libglib-2.0, or have to use
306- dnl the included one.
307- AC_CACHE_VAL([gl_cv_libglib], [
308- gl_cv_libglib=no
309- gl_cv_LIBGLIB=
310- gl_cv_LTLIBGLIB=
311- gl_cv_INCGLIB=
312- gl_save_LIBS="$LIBS"
313- dnl Search for libglib2 and define LIBGLIB_2_0, LTLIBGLIB_2_0 and
314- dnl INCGLIB_2_0 accordingly.
315- dnl Don't use glib-config nor pkg-config, since it doesn't work when
316- dnl cross-compiling or when the C compiler in use is different from the
317- dnl one that built the library.
318- AC_LIB_LINKFLAGS_BODY([glib-2.0])
319- LIBS="$gl_save_LIBS $LIBGLIB_2_0"
320- AC_LINK_IFELSE(
321- [AC_LANG_PROGRAM(
322- [[#include <glib.h>
323- #ifndef G_BEGIN_DECLS
324- error this glib.h includes a glibconfig.h from a glib version 1.x
325- #endif
326- ]],
327- [[g_string_new ("foo");]])],
328- [gl_cv_libglib=yes
329- gl_cv_LIBGLIB="$LIBGLIB_2_0"
330- gl_cv_LTLIBGLIB="$LTLIBGLIB_2_0"
331- ])
332- if test "$gl_cv_libglib" != yes; then
333- gl_save_CPPFLAGS="$CPPFLAGS"
334- CPPFLAGS="$CPPFLAGS $INCGLIB_2_0"
335- AC_LINK_IFELSE(
336- [AC_LANG_PROGRAM(
337- [[#include <glib.h>
338- #ifndef G_BEGIN_DECLS
339- error this glib.h includes a glibconfig.h from a glib version 1.x
340- #endif
341- ]],
342- [[g_string_new ("foo");]])],
343- [gl_cv_libglib=yes
344- gl_cv_LIBGLIB="$LIBGLIB_2_0"
345- gl_cv_LTLIBGLIB="$LTLIBGLIB_2_0"
346- gl_cv_INCGLIB="$INCGLIB_2_0"
347- ])
348- if test "$gl_cv_libglib" != yes; then
349- dnl Often the include files are installed in /usr/include/glib-2.0
350- dnl and /usr/lib/glib-2.0/include.
351- if test -n "$LIBGLIB_2_0_PREFIX"; then
352- CPPFLAGS="$gl_save_CPPFLAGS -I$LIBGLIB_2_0_PREFIX/include/glib-2.0 -I$LIBGLIB_2_0_PREFIX/$acl_libdirstem/glib-2.0/include"
353- AC_LINK_IFELSE(
354- [AC_LANG_PROGRAM(
355- [[#include <glib.h>
356- #ifndef G_BEGIN_DECLS
357- error this glib.h includes a glibconfig.h from a glib version 1.x
358- #endif
359- ]],
360- [[g_string_new ("foo");]])],
361- [gl_cv_libglib=yes
362- gl_cv_LIBGLIB="$LIBGLIB_2_0"
363- gl_cv_LTLIBGLIB="$LTLIBGLIB_2_0"
364- gl_cv_INCGLIB="-I$LIBGLIB_2_0_PREFIX/include/glib-2.0 -I$LIBGLIB_2_0_PREFIX/$acl_libdirstem/glib-2.0/include"
365- ])
366- fi
367- fi
368- CPPFLAGS="$gl_save_CPPFLAGS"
369- fi
370- LIBS="$gl_save_LIBS"
371- ])
372- AC_MSG_CHECKING([for glib])
373- AC_MSG_RESULT([$gl_cv_libglib])
374- if test $gl_cv_libglib = yes; then
375- LIBGLIB="$gl_cv_LIBGLIB"
376- LTLIBGLIB="$gl_cv_LTLIBGLIB"
377- INCGLIB="$gl_cv_INCGLIB"
378- else
379- gl_cv_libglib_use_included=yes
380- fi
381- fi
382- ])
383+ if test "$gl_cv_libglib_use_included" != yes; then
384+ PKG_CHECK_MODULES([GLIB], [glib-2.0])
385+ LIBGLIB="$GLIB_LIBS"
386+ LTLIBGLIB="$GLIB_LIBS"
387+ INCGLIB="$GLIB_CFLAGS"
388+ fi
389 AC_SUBST([LIBGLIB])
390 AC_SUBST([LTLIBGLIB])
391 AC_SUBST([INCGLIB])
diff --git a/meta/recipes-core/gettext/gettext_0.21.bb b/meta/recipes-core/gettext/gettext_0.22.5.bb
index bc14867bbb..1a66d37916 100644
--- a/meta/recipes-core/gettext/gettext_0.21.bb
+++ b/meta/recipes-core/gettext/gettext_0.22.5.bb
@@ -3,27 +3,32 @@ DESCRIPTION = "GNU gettext is a set of tools that provides a framework to help o
3These tools include a set of conventions about how programs should be written to support message catalogs, a directory and file \ 3These tools include a set of conventions about how programs should be written to support message catalogs, a directory and file \
4naming organization for the message catalogs themselves, a runtime library supporting the retrieval of translated messages, and \ 4naming organization for the message catalogs themselves, a runtime library supporting the retrieval of translated messages, and \
5a few stand-alone programs to massage in various ways the sets of translatable and already translated strings." 5a few stand-alone programs to massage in various ways the sets of translatable and already translated strings."
6HOMEPAGE = "http://www.gnu.org/software/gettext/gettext.html"
7SECTION = "libs" 6SECTION = "libs"
8LICENSE = "GPLv3+ & LGPL-2.1+" 7LICENSE = "GPL-3.0-or-later & LGPL-2.1-or-later"
9LIC_FILES_CHKSUM = "file://COPYING;md5=c678957b0c8e964aa6c70fd77641a71e" 8LIC_FILES_CHKSUM = "file://COPYING;md5=c678957b0c8e964aa6c70fd77641a71e"
10 9
10# without libxml in PACKAGECONFIG vendor copy of the lib will be used
11LICENSE:append = " ${@bb.utils.contains('PACKAGECONFIG', 'libxml', '', '& MIT', d)}"
12LIC_FILES_CHKSUM:append = " ${@bb.utils.contains('PACKAGECONFIG', 'libxml', '', 'file://libtextstyle/lib/libxml/COPYING;md5=2044417e2e5006b65a8b9067b683fcf1', d)}"
13# without glib in PACKAGECONFIG vendor copy of the lib will be used
14LIC_FILES_CHKSUM:append = " ${@bb.utils.contains('PACKAGECONFIG', 'glib', '', 'file://libtextstyle/lib/glib/ghash.c;md5=e3159f5ac38dfe77af5cc0ee104dab2d;beginline=10;endline=27', d)}"
15
16
11DEPENDS = "gettext-native virtual/libiconv" 17DEPENDS = "gettext-native virtual/libiconv"
12DEPENDS_class-native = "gettext-minimal-native" 18DEPENDS:class-native = "gettext-minimal-native"
13PROVIDES = "virtual/libintl virtual/gettext" 19PROVIDES = "virtual/libintl virtual/gettext"
14PROVIDES_class-native = "virtual/gettext-native" 20PROVIDES:class-native = "virtual/gettext-native"
15RCONFLICTS_${PN} = "proxy-libintl" 21RCONFLICTS:${PN} = "proxy-libintl"
16SRC_URI = "${GNU_MIRROR}/gettext/gettext-${PV}.tar.gz \ 22
23require gettext-sources.inc
24SRC_URI += " \
17 file://parallel.patch \ 25 file://parallel.patch \
18 file://use-pkgconfig.patch \ 26 file://use-pkgconfig.patch \
19 file://run-ptest \ 27 file://run-ptest \
20 file://serial-tests-config.patch \ 28 file://serial-tests-config.patch \
21 file://0001-tests-autopoint-3-unset-MAKEFLAGS.patch \ 29 file://0001-tests-autopoint-3-unset-MAKEFLAGS.patch \
22 file://0001-init-env.in-do-not-add-C-CXX-parameters.patch \ 30 file://0001-init-env.in-do-not-add-C-CXX-parameters.patch \
23 file://mingw.patch \
24 file://0001-msgmerge-29-Add-executable-file-mode-bits.patch \
25 " 31 "
26SRC_URI[sha256sum] = "c77d0da3102aec9c07f43671e60611ebff89a996ef159497ce8e59d075786b12"
27 32
28inherit autotools texinfo pkgconfig ptest 33inherit autotools texinfo pkgconfig ptest
29 34
@@ -37,9 +42,10 @@ EXTRA_OECONF += "--without-lispdir \
37 --without-emacs \ 42 --without-emacs \
38 --without-cvs \ 43 --without-cvs \
39 --without-git \ 44 --without-git \
45 --without-included-libcroco \
40 --cache-file=${B}/config.cache \ 46 --cache-file=${B}/config.cache \
41 " 47 "
42EXTRA_OECONF_append_class-target = " \ 48EXTRA_OECONF:append:class-target = " \
43 --with-bisonlocaledir=${datadir}/locale \ 49 --with-bisonlocaledir=${datadir}/locale \
44 gt_cv_locale_fr_utf8=fr_FR \ 50 gt_cv_locale_fr_utf8=fr_FR \
45 gt_cv_locale_fr=fr_FR.ISO-8859-1 \ 51 gt_cv_locale_fr=fr_FR.ISO-8859-1 \
@@ -47,11 +53,10 @@ EXTRA_OECONF_append_class-target = " \
47 gt_cv_locale_de=de_DE.ISO-8859-1 \ 53 gt_cv_locale_de=de_DE.ISO-8859-1 \
48" 54"
49 55
50PACKAGECONFIG ??= "croco glib libxml" 56PACKAGECONFIG ??= "glib libxml"
51PACKAGECONFIG_class-native = "" 57PACKAGECONFIG:class-native = ""
52PACKAGECONFIG_class-nativesdk = "" 58PACKAGECONFIG:class-nativesdk = ""
53 59
54PACKAGECONFIG[croco] = "--without-included-libcroco,--with-included-libcroco,libcroco"
55PACKAGECONFIG[glib] = "--without-included-glib,--with-included-glib,glib-2.0" 60PACKAGECONFIG[glib] = "--without-included-glib,--with-included-glib,glib-2.0"
56PACKAGECONFIG[libxml] = "--without-included-libxml,--with-included-libxml,libxml2" 61PACKAGECONFIG[libxml] = "--without-included-libxml,--with-included-libxml,libxml2"
57# Need paths here to avoid host contamination but this can cause RPATH warnings 62# Need paths here to avoid host contamination but this can cause RPATH warnings
@@ -62,7 +67,7 @@ PACKAGECONFIG[msgcat-curses] = "--with-libncurses-prefix=${STAGING_LIBDIR}/..,--
62acpaths = '-I ${S}/gettext-runtime/m4 \ 67acpaths = '-I ${S}/gettext-runtime/m4 \
63 -I ${S}/gettext-tools/m4' 68 -I ${S}/gettext-tools/m4'
64 69
65do_install_append_libc-musl () { 70do_install:append:libc-musl () {
66 rm -f ${D}${libdir}/charset.alias 71 rm -f ${D}${libdir}/charset.alias
67 rm -f ${D}${includedir}/libintl.h 72 rm -f ${D}${includedir}/libintl.h
68 rm -f ${D}${libdir}/libintl.la 73 rm -f ${D}${libdir}/libintl.la
@@ -79,29 +84,29 @@ do_install_append_libc-musl () {
79# 4 KiB /ep93xx/libgcc-s-dev_4.2.2-r2_ep93xx.ipk 84# 4 KiB /ep93xx/libgcc-s-dev_4.2.2-r2_ep93xx.ipk
80 85
81PACKAGES =+ "libgettextlib libgettextsrc" 86PACKAGES =+ "libgettextlib libgettextsrc"
82FILES_libgettextlib = "${libdir}/libgettextlib-*.so*" 87FILES:libgettextlib = "${libdir}/libgettextlib-*.so*"
83FILES_libgettextsrc = "${libdir}/libgettextsrc-*.so*" 88FILES:libgettextsrc = "${libdir}/libgettextsrc-*.so*"
84 89
85PACKAGES =+ "gettext-runtime gettext-runtime-dev gettext-runtime-doc" 90PACKAGES =+ "gettext-runtime gettext-runtime-dev gettext-runtime-doc"
86 91
87FILES_${PN} += "${libdir}/${BPN}/*" 92FILES:${PN} += "${libdir}/${BPN}/*"
88 93
89# The its/Makefile.am has defined: 94# The its/Makefile.am has defined:
90# itsdir = $(pkgdatadir)$(PACKAGE_SUFFIX)/its 95# itsdir = $(pkgdatadir)$(PACKAGE_SUFFIX)/its
91# not itsdir = $(pkgdatadir), so use wildcard to match the version. 96# not itsdir = $(pkgdatadir), so use wildcard to match the version.
92FILES_${PN} += "${datadir}/${BPN}-*/*" 97FILES:${PN} += "${datadir}/${BPN}-*/*"
93 98
94FILES_gettext-runtime = "${bindir}/gettext \ 99FILES:gettext-runtime = "${bindir}/gettext \
95 ${bindir}/ngettext \ 100 ${bindir}/ngettext \
96 ${bindir}/envsubst \ 101 ${bindir}/envsubst \
97 ${bindir}/gettext.sh \ 102 ${bindir}/gettext.sh \
98 ${libdir}/libasprintf.so* \ 103 ${libdir}/libasprintf.so* \
99 ${libdir}/GNU.Gettext.dll \ 104 ${libdir}/GNU.Gettext.dll \
100 " 105 "
101FILES_gettext-runtime-dev += "${libdir}/libasprintf.a \ 106FILES:gettext-runtime-dev += "${libdir}/libasprintf.a \
102 ${includedir}/autosprintf.h \ 107 ${includedir}/autosprintf.h \
103 " 108 "
104FILES_gettext-runtime-doc = "${mandir}/man1/gettext.* \ 109FILES:gettext-runtime-doc = "${mandir}/man1/gettext.* \
105 ${mandir}/man1/ngettext.* \ 110 ${mandir}/man1/ngettext.* \
106 ${mandir}/man1/envsubst.* \ 111 ${mandir}/man1/envsubst.* \
107 ${mandir}/man1/.* \ 112 ${mandir}/man1/.* \
@@ -116,11 +121,11 @@ FILES_gettext-runtime-doc = "${mandir}/man1/gettext.* \
116 ${infodir}/autosprintf.info \ 121 ${infodir}/autosprintf.info \
117 " 122 "
118 123
119do_install_append() { 124do_install:append() {
120 rm -f ${D}${libdir}/preloadable_libintl.so 125 rm -f ${D}${libdir}/preloadable_libintl.so
121} 126}
122 127
123do_install_append_class-native () { 128do_install:append:class-native () {
124 rm ${D}${datadir}/aclocal/* 129 rm ${D}${datadir}/aclocal/*
125 rm ${D}${datadir}/gettext/config.rpath 130 rm ${D}${datadir}/gettext/config.rpath
126 rm ${D}${datadir}/gettext/po/Makefile.in.in 131 rm ${D}${datadir}/gettext/po/Makefile.in.in
@@ -170,12 +175,13 @@ do_install_ptest() {
170 install ${B}/gettext-tools/misc/* ${D}${PTEST_PATH}/misc 175 install ${B}/gettext-tools/misc/* ${D}${PTEST_PATH}/misc
171 find ${D}${PTEST_PATH}/ -name "*.o" -exec rm {} \; 176 find ${D}${PTEST_PATH}/ -name "*.o" -exec rm {} \;
172 chmod 0755 ${D}${PTEST_PATH}/tests/lang-vala ${D}${PTEST_PATH}/tests/plural-1 ${D}${PTEST_PATH}/tests/xgettext-tcl-4 \ 177 chmod 0755 ${D}${PTEST_PATH}/tests/lang-vala ${D}${PTEST_PATH}/tests/plural-1 ${D}${PTEST_PATH}/tests/xgettext-tcl-4 \
173 ${D}${PTEST_PATH}/tests/xgettext-vala-1 ${D}${PTEST_PATH}/tests/xgettext-po-2 178 ${D}${PTEST_PATH}/tests/xgettext-vala-1 ${D}${PTEST_PATH}/tests/xgettext-po-2 ${D}${PTEST_PATH}/tests/xgettext-vala-6
179 sed -i -e 's|${DEBUG_PREFIX_MAP}||g' ${D}${PTEST_PATH}/tests/init-env
174 fi 180 fi
175} 181}
176 182
177RDEPENDS_${PN}-ptest += "make" 183RDEPENDS:${PN}-ptest += "make xz bash gawk autoconf locale-base-de-de locale-base-fr-fr"
178RDEPENDS_${PN}-ptest_append_libc-glibc = "\ 184RDEPENDS:${PN}-ptest:append:libc-glibc = "\
179 glibc-gconv-big5 \ 185 glibc-gconv-big5 \
180 glibc-charmap-big5 \ 186 glibc-charmap-big5 \
181 glibc-gconv-cp1251 \ 187 glibc-gconv-cp1251 \
@@ -192,16 +198,16 @@ RDEPENDS_${PN}-ptest_append_libc-glibc = "\
192 glibc-charmap-euc-kr \ 198 glibc-charmap-euc-kr \
193 glibc-gconv-euc-jp \ 199 glibc-gconv-euc-jp \
194 glibc-charmap-euc-jp \ 200 glibc-charmap-euc-jp \
195 locale-base-de-de \ 201 glibc-gconv-gb18030 \
196 locale-base-fr-fr \ 202 glibc-charmap-gb18030 \
197" 203"
198 204
199RRECOMMENDS_${PN}-ptest_append_libc-glibc = "\ 205RRECOMMENDS:${PN}-ptest:append:libc-glibc = "\
200 locale-base-de-de.iso-8859-1 \ 206 locale-base-de-de.iso-8859-1 \
201 locale-base-fr-fr.iso-8859-1 \ 207 locale-base-fr-fr.iso-8859-1 \
202" 208"
203 209
204INSANE_SKIP_${PN}-ptest += "ldflags" 210INSANE_SKIP:${PN}-ptest += "ldflags"
205INSANE_SKIP_${PN}-ptest += "rpaths" 211INSANE_SKIP:${PN}-ptest += "rpaths"
206 212
207BBCLASSEXTEND = "native nativesdk" 213BBCLASSEXTEND = "native nativesdk"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-26 18:15:12 +0000