summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/gettext
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2019-12-17 17:00:08 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-01-02 16:39:13 +0000
commit0ae95bcc5113a9913aeabaccd5629f2165d986ed (patch)
tree3d38f845fe8af8281805296a825d2e71a763430f /meta/recipes-core/gettext
parent1f1d9c25a79b90604a0c43921b32850a6d01e5d3 (diff)
downloadpoky-0ae95bcc5113a9913aeabaccd5629f2165d986ed.tar.gz
gettext-minimal-native: update to 0.20.1
Rather than update a tarball, I took m4 files directly from an install of 0.20.1. The patch is dropped as guile has long been removed from oe-core. (From OE-Core rev: be1fe0120f99e88580cde8fe9004d8135458cac4) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/gettext')
-rw-r--r--meta/recipes-core/gettext/gettext-minimal-0.19.8.1/0001-PATCH-Disable-the-test-to-convert-euc-jp.patch38
-rw-r--r--meta/recipes-core/gettext/gettext-minimal-0.19.8.1/aclocal.tgzbin40014 -> 0 bytes
-rw-r--r--meta/recipes-core/gettext/gettext-minimal-0.20.1/COPYING (renamed from meta/recipes-core/gettext/gettext-minimal-0.19.8.1/COPYING)0
-rw-r--r--meta/recipes-core/gettext/gettext-minimal-0.20.1/Makefile.in.in (renamed from meta/recipes-core/gettext/gettext-minimal-0.19.8.1/Makefile.in.in)124
-rw-r--r--meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/gettext.m4386
-rw-r--r--meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/host-cpu-c-abi.m4644
-rw-r--r--meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/iconv.m4288
-rw-r--r--meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/intlmacosx.m472
-rw-r--r--meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/lib-ld.m4168
-rw-r--r--meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/lib-link.m4774
-rw-r--r--meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/lib-prefix.m4249
-rw-r--r--meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/nls.m432
-rw-r--r--meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/po.m4450
-rw-r--r--meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/progtest.m491
-rwxr-xr-xmeta/recipes-core/gettext/gettext-minimal-0.20.1/config.rpath (renamed from meta/recipes-core/gettext/gettext-minimal-0.19.8.1/config.rpath)2
-rw-r--r--meta/recipes-core/gettext/gettext-minimal-0.20.1/remove-potcdate.sin (renamed from meta/recipes-core/gettext/gettext-minimal-0.19.8.1/remove-potcdate.sin)8
-rw-r--r--meta/recipes-core/gettext/gettext-minimal-native_0.20.1.bb (renamed from meta/recipes-core/gettext/gettext-minimal-native_0.19.8.1.bb)5
17 files changed, 3236 insertions, 95 deletions
diff --git a/meta/recipes-core/gettext/gettext-minimal-0.19.8.1/0001-PATCH-Disable-the-test-to-convert-euc-jp.patch b/meta/recipes-core/gettext/gettext-minimal-0.19.8.1/0001-PATCH-Disable-the-test-to-convert-euc-jp.patch
deleted file mode 100644
index 29ef2a5a63..0000000000
--- a/meta/recipes-core/gettext/gettext-minimal-0.19.8.1/0001-PATCH-Disable-the-test-to-convert-euc-jp.patch
+++ /dev/null
@@ -1,38 +0,0 @@
1[PATCH] Disable the test to convert euc-jp
2
3Remove the test "Test against HP-UX 11.11 bug:
4No converter from EUC-JP to UTF-8 is provided"
5since we don't support HP-UX and if the euc-jp is not
6installed on the host, the dependence will be built without
7iconv support and will cause guile-native building fail.
8
9Upstream-Status: Inappropriate [OE specific]
10
11Signed-off-by: Roy Li <rongqing.li@windriver.com>
12---
13 iconv.m4 | 2 ++
14 1 file changed, 2 insertions(+)
15
16diff --git a/iconv.m4 b/iconv.m4
17index 4e37363..35f54bd 100644
18--- a/iconv.m4
19+++ b/iconv.m4
20@@ -165,6 +165,7 @@ AC_DEFUN([AM_ICONV_LINK],
21 }
22 }
23 #endif
24+#if 0
25 /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is
26 provided. */
27 if (/* Try standardized names. */
28@@ -176,6 +177,7 @@ AC_DEFUN([AM_ICONV_LINK],
29 /* Try HP-UX names. */
30 && iconv_open ("utf8", "eucJP") == (iconv_t)(-1))
31 result |= 16;
32+#endif
33 return result;
34 ]])],
35 [am_cv_func_iconv_works=yes], ,
36--
372.0.1
38
diff --git a/meta/recipes-core/gettext/gettext-minimal-0.19.8.1/aclocal.tgz b/meta/recipes-core/gettext/gettext-minimal-0.19.8.1/aclocal.tgz
deleted file mode 100644
index 9b2d1f561d..0000000000
--- a/meta/recipes-core/gettext/gettext-minimal-0.19.8.1/aclocal.tgz
+++ /dev/null
Binary files differ
diff --git a/meta/recipes-core/gettext/gettext-minimal-0.19.8.1/COPYING b/meta/recipes-core/gettext/gettext-minimal-0.20.1/COPYING
index 3671ab6985..3671ab6985 100644
--- a/meta/recipes-core/gettext/gettext-minimal-0.19.8.1/COPYING
+++ b/meta/recipes-core/gettext/gettext-minimal-0.20.1/COPYING
diff --git a/meta/recipes-core/gettext/gettext-minimal-0.19.8.1/Makefile.in.in b/meta/recipes-core/gettext/gettext-minimal-0.20.1/Makefile.in.in
index 38c293d2ed..fdb6ad3588 100644
--- a/meta/recipes-core/gettext/gettext-minimal-0.19.8.1/Makefile.in.in
+++ b/meta/recipes-core/gettext/gettext-minimal-0.20.1/Makefile.in.in
@@ -1,13 +1,14 @@
1# Makefile for PO directory in any package using GNU gettext. 1# Makefile for PO directory in any package using GNU gettext.
2# Copyright (C) 1995-1997, 2000-2007, 2009-2010 by Ulrich Drepper <drepper@gnu.ai.mit.edu> 2# Copyright (C) 1995-2000 Ulrich Drepper <drepper@gnu.ai.mit.edu>
3# Copyright (C) 2000-2019 Free Software Foundation, Inc.
3# 4#
4# Copying and distribution of this file, with or without modification, 5# Copying and distribution of this file, with or without modification,
5# are permitted in any medium without royalty provided the copyright 6# are permitted in any medium without royalty provided the copyright
6# notice and this notice are preserved. This file is offered as-is, 7# notice and this notice are preserved. This file is offered as-is,
7# without any warranty. 8# without any warranty.
8# 9#
9# Origin: gettext-0.19.8 10# Origin: gettext-0.20
10GETTEXT_MACRO_VERSION = 0.19 11GETTEXT_MACRO_VERSION = 0.20
11 12
12PACKAGE = @PACKAGE@ 13PACKAGE = @PACKAGE@
13VERSION = @VERSION@ 14VERSION = @VERSION@
@@ -52,16 +53,13 @@ GMSGFMT_ = @GMSGFMT@
52GMSGFMT_no = @GMSGFMT@ 53GMSGFMT_no = @GMSGFMT@
53GMSGFMT_yes = @GMSGFMT_015@ 54GMSGFMT_yes = @GMSGFMT_015@
54GMSGFMT = $(GMSGFMT_$(USE_MSGCTXT)) 55GMSGFMT = $(GMSGFMT_$(USE_MSGCTXT))
55MSGFMT_ = @MSGFMT@
56MSGFMT_no = @MSGFMT@
57MSGFMT_yes = @MSGFMT_015@
58MSGFMT = $(MSGFMT_$(USE_MSGCTXT))
59XGETTEXT_ = @XGETTEXT@ 56XGETTEXT_ = @XGETTEXT@
60XGETTEXT_no = @XGETTEXT@ 57XGETTEXT_no = @XGETTEXT@
61XGETTEXT_yes = @XGETTEXT_015@ 58XGETTEXT_yes = @XGETTEXT_015@
62XGETTEXT = $(XGETTEXT_$(USE_MSGCTXT)) 59XGETTEXT = $(XGETTEXT_$(USE_MSGCTXT))
63MSGMERGE = msgmerge 60MSGMERGE = @MSGMERGE@
64MSGMERGE_UPDATE = @MSGMERGE@ --update 61MSGMERGE_UPDATE = @MSGMERGE@ --update
62MSGMERGE_FOR_MSGFMT_OPTION = @MSGMERGE_FOR_MSGFMT_OPTION@
65MSGINIT = msginit 63MSGINIT = msginit
66MSGCONV = msgconv 64MSGCONV = msgconv
67MSGFILTER = msgfilter 65MSGFILTER = msgfilter
@@ -93,17 +91,32 @@ DISTFILESDEPS = $(DISTFILESDEPS_$(DIST_DEPENDS_ON_UPDATE_PO))
93# Makevars gets inserted here. (Don't remove this line!) 91# Makevars gets inserted here. (Don't remove this line!)
94 92
95.SUFFIXES: 93.SUFFIXES:
96.SUFFIXES: .po .gmo .mo .sed .sin .nop .po-create .po-update 94.SUFFIXES: .po .gmo .sed .sin .nop .po-create .po-update
97 95
98.po.mo: 96# The .pot file, stamp-po, .po files, and .gmo files appear in release tarballs.
99 @echo "$(MSGFMT) -c -o $@ $<"; \ 97# The GNU Coding Standards say in
100 $(MSGFMT) -c -o t-$@ $< && mv t-$@ $@ 98# <https://www.gnu.org/prep/standards/html_node/Makefile-Basics.html>:
101 99# "GNU distributions usually contain some files which are not source files
102.po.gmo: 100# ... . Since these files normally appear in the source directory, they
101# should always appear in the source directory, not in the build directory.
102# So Makefile rules to update them should put the updated files in the
103# source directory."
104# Therefore we put these files in the source directory, not the build directory.
105
106# During .po -> .gmo conversion, take into account the most recent changes to
107# the .pot file. This eliminates the need to update the .po files when the
108# .pot file has changed, which would be troublesome if the .po files are put
109# under version control.
110.po.gmo: $(srcdir)/$(DOMAIN).pot
103 @lang=`echo $* | sed -e 's,.*/,,'`; \ 111 @lang=`echo $* | sed -e 's,.*/,,'`; \
104 test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ 112 test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
105 echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.po"; \ 113 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"; \
106 cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo 114 cd $(srcdir) && \
115 rm -f $${lang}.gmo && \
116 $(MSGMERGE) $(MSGMERGE_FOR_MSGFMT_OPTION) -o $${lang}.1po $${lang}.po $(DOMAIN).pot && \
117 $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.1po && \
118 mv t-$${lang}.gmo $${lang}.gmo && \
119 rm -f $${lang}.1po
107 120
108.sin.sed: 121.sin.sed:
109 sed -e '/^#/d' $< > t-$@ 122 sed -e '/^#/d' $< > t-$@
@@ -112,7 +125,7 @@ DISTFILESDEPS = $(DISTFILESDEPS_$(DIST_DEPENDS_ON_UPDATE_PO))
112 125
113all: all-@USE_NLS@ 126all: all-@USE_NLS@
114 127
115all-yes: stamp-po 128all-yes: $(srcdir)/stamp-po
116all-no: 129all-no:
117 130
118# Ensure that the gettext macros and this Makefile.in.in are in sync. 131# Ensure that the gettext macros and this Makefile.in.in are in sync.
@@ -126,24 +139,24 @@ CHECK_MACRO_VERSION = \
126# internationalized messages, no $(srcdir)/$(DOMAIN).pot is created (because 139# internationalized messages, no $(srcdir)/$(DOMAIN).pot is created (because
127# we don't want to bother translators with empty POT files). We assume that 140# we don't want to bother translators with empty POT files). We assume that
128# LINGUAS is empty in this case, i.e. $(POFILES) and $(GMOFILES) are empty. 141# LINGUAS is empty in this case, i.e. $(POFILES) and $(GMOFILES) are empty.
129# In this case, stamp-po is a nop (i.e. a phony target). 142# In this case, $(srcdir)/stamp-po is a nop (i.e. a phony target).
130 143
131# stamp-po is a timestamp denoting the last time at which the CATALOGS have 144# $(srcdir)/stamp-po is a timestamp denoting the last time at which the CATALOGS
132# been loosely updated. Its purpose is that when a developer or translator 145# have been loosely updated. Its purpose is that when a developer or translator
133# checks out the package via CVS, and the $(DOMAIN).pot file is not in CVS, 146# checks out the package from a version control system, and the $(DOMAIN).pot
134# "make" will update the $(DOMAIN).pot and the $(CATALOGS), but subsequent 147# file is not under version control, "make" will update the $(DOMAIN).pot and
135# invocations of "make" will do nothing. This timestamp would not be necessary 148# the $(CATALOGS), but subsequent invocations of "make" will do nothing. This
136# if updating the $(CATALOGS) would always touch them; however, the rule for 149# timestamp would not be necessary if updating the $(CATALOGS) would always
137# $(POFILES) has been designed to not touch files that don't need to be 150# touch them; however, the rule for $(POFILES) has been designed to not touch
138# changed. 151# files that don't need to be changed.
139stamp-po: $(srcdir)/$(DOMAIN).pot 152$(srcdir)/stamp-po: $(srcdir)/$(DOMAIN).pot
140 @$(CHECK_MACRO_VERSION) 153 @$(CHECK_MACRO_VERSION)
141 test ! -f $(srcdir)/$(DOMAIN).pot || \ 154 test ! -f $(srcdir)/$(DOMAIN).pot || \
142 test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES) 155 test -z "$(GMOFILES)" || $(MAKE) $(GMOFILES)
143 @test ! -f $(srcdir)/$(DOMAIN).pot || { \ 156 @test ! -f $(srcdir)/$(DOMAIN).pot || { \
144 echo "touch stamp-po" && \ 157 echo "touch $(srcdir)/stamp-po" && \
145 echo timestamp > stamp-poT && \ 158 echo timestamp > $(srcdir)/stamp-poT && \
146 mv stamp-poT stamp-po; \ 159 mv $(srcdir)/stamp-poT $(srcdir)/stamp-po; \
147 } 160 }
148 161
149# Note: Target 'all' must not depend on target '$(DOMAIN).pot-update', 162# Note: Target 'all' must not depend on target '$(DOMAIN).pot-update',
@@ -159,11 +172,9 @@ $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
159 package_gnu="$(PACKAGE_GNU)"; \ 172 package_gnu="$(PACKAGE_GNU)"; \
160 test -n "$$package_gnu" || { \ 173 test -n "$$package_gnu" || { \
161 if { if (LC_ALL=C find --version) 2>/dev/null | grep GNU >/dev/null; then \ 174 if { if (LC_ALL=C find --version) 2>/dev/null | grep GNU >/dev/null; then \
162 LC_ALL=C find -L $(top_srcdir) -maxdepth 1 -type f \ 175 LC_ALL=C find -L $(top_srcdir) -maxdepth 1 -type f -size -10000000c -exec grep -i 'GNU @PACKAGE@' /dev/null '{}' ';' 2>/dev/null; \
163 -size -10000000c -exec grep 'GNU @PACKAGE@' \
164 /dev/null '{}' ';' 2>/dev/null; \
165 else \ 176 else \
166 LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null; \ 177 LC_ALL=C grep -i 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null; \
167 fi; \ 178 fi; \
168 } | grep -v 'libtool:' >/dev/null; then \ 179 } | grep -v 'libtool:' >/dev/null; then \
169 package_gnu=yes; \ 180 package_gnu=yes; \
@@ -184,26 +195,29 @@ $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed
184 case `$(XGETTEXT) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \ 195 case `$(XGETTEXT) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
185 '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].* | 0.16 | 0.16.[0-1]*) \ 196 '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].* | 0.16 | 0.16.[0-1]*) \
186 $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \ 197 $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
187 --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \ 198 --add-comments=TRANSLATORS: \
188 --files-from=$(srcdir)/POTFILES.in \ 199 --files-from=$(srcdir)/POTFILES.in \
189 --copyright-holder='$(COPYRIGHT_HOLDER)' \ 200 --copyright-holder='$(COPYRIGHT_HOLDER)' \
190 --msgid-bugs-address="$$msgid_bugs_address" \ 201 --msgid-bugs-address="$$msgid_bugs_address" \
202 $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
191 ;; \ 203 ;; \
192 *) \ 204 *) \
193 $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \ 205 $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \
194 --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \ 206 --add-comments=TRANSLATORS: \
195 --files-from=$(srcdir)/POTFILES.in \ 207 --files-from=$(srcdir)/POTFILES.in \
196 --copyright-holder='$(COPYRIGHT_HOLDER)' \ 208 --copyright-holder='$(COPYRIGHT_HOLDER)' \
197 --package-name="$${package_prefix}@PACKAGE@" \ 209 --package-name="$${package_prefix}@PACKAGE@" \
198 --package-version='@VERSION@' \ 210 --package-version='@VERSION@' \
199 --msgid-bugs-address="$$msgid_bugs_address" \ 211 --msgid-bugs-address="$$msgid_bugs_address" \
212 $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \
200 ;; \ 213 ;; \
201 esac 214 esac
202 test ! -f $(DOMAIN).po || { \ 215 test ! -f $(DOMAIN).po || { \
203 if test -f $(srcdir)/$(DOMAIN).pot-header; then \ 216 if test -f $(srcdir)/$(DOMAIN).pot-header; then \
204 sed -e '1,/^#$$/d' < $(DOMAIN).po > $(DOMAIN).1po && \ 217 sed -e '1,/^#$$/d' < $(DOMAIN).po > $(DOMAIN).1po && \
205 cat $(srcdir)/$(DOMAIN).pot-header $(DOMAIN).1po > $(DOMAIN).po; \ 218 cat $(srcdir)/$(DOMAIN).pot-header $(DOMAIN).1po > $(DOMAIN).po && \
206 rm -f $(DOMAIN).1po; \ 219 rm -f $(DOMAIN).1po \
220 || exit 1; \
207 fi; \ 221 fi; \
208 if test -f $(srcdir)/$(DOMAIN).pot; then \ 222 if test -f $(srcdir)/$(DOMAIN).pot; then \
209 sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \ 223 sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \
@@ -228,17 +242,19 @@ $(srcdir)/$(DOMAIN).pot:
228# This target rebuilds a PO file if $(DOMAIN).pot has changed. 242# This target rebuilds a PO file if $(DOMAIN).pot has changed.
229# Note that a PO file is not touched if it doesn't need to be changed. 243# Note that a PO file is not touched if it doesn't need to be changed.
230$(POFILES): $(POFILESDEPS) 244$(POFILES): $(POFILESDEPS)
245 @test -f $(srcdir)/$(DOMAIN).pot || $(MAKE) $(srcdir)/$(DOMAIN).pot
231 @lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \ 246 @lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \
232 if test -f "$(srcdir)/$${lang}.po"; then \ 247 if test -f "$(srcdir)/$${lang}.po"; then \
233 test -f $(srcdir)/$(DOMAIN).pot || $(MAKE) $(srcdir)/$(DOMAIN).pot; \
234 test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ 248 test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
235 echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot"; \ 249 echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} --previous $${lang}.po $(DOMAIN).pot"; \
236 cd $(srcdir) \ 250 cd $(srcdir) \
237 && { case `$(MSGMERGE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \ 251 && { case `$(MSGMERGE_UPDATE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
238 '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \ 252 '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].*) \
239 $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) $${lang}.po $(DOMAIN).pot;; \ 253 $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) $${lang}.po $(DOMAIN).pot;; \
254 0.1[6-7] | 0.1[6-7].*) \
255 $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --previous $${lang}.po $(DOMAIN).pot;; \
240 *) \ 256 *) \
241 $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot;; \ 257 $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} --previous $${lang}.po $(DOMAIN).pot;; \
242 esac; \ 258 esac; \
243 }; \ 259 }; \
244 else \ 260 else \
@@ -373,28 +389,30 @@ check: all
373 389
374info dvi ps pdf html tags TAGS ctags CTAGS ID: 390info dvi ps pdf html tags TAGS ctags CTAGS ID:
375 391
392install-dvi install-ps install-pdf install-html:
393
376mostlyclean: 394mostlyclean:
377 rm -f remove-potcdate.sed 395 rm -f remove-potcdate.sed
378 rm -f stamp-poT 396 rm -f $(srcdir)/stamp-poT
379 rm -f core core.* $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po 397 rm -f core core.* $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po
380 rm -fr *.o 398 rm -fr *.o
381 399
382clean: mostlyclean 400clean: mostlyclean
383 401
384distclean: clean 402distclean: clean
385 rm -f Makefile Makefile.in POTFILES *.mo 403 rm -f Makefile Makefile.in POTFILES
386 404
387maintainer-clean: distclean 405maintainer-clean: distclean
388 @echo "This command is intended for maintainers to use;" 406 @echo "This command is intended for maintainers to use;"
389 @echo "it deletes files that may require special tools to rebuild." 407 @echo "it deletes files that may require special tools to rebuild."
390 rm -f stamp-po $(GMOFILES) 408 rm -f $(srcdir)/$(DOMAIN).pot $(srcdir)/stamp-po $(GMOFILES)
391 409
392distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) 410distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
393dist distdir: 411dist distdir:
394 test -z "$(DISTFILESDEPS)" || $(MAKE) $(DISTFILESDEPS) 412 test -z "$(DISTFILESDEPS)" || $(MAKE) $(DISTFILESDEPS)
395 @$(MAKE) dist2 413 @$(MAKE) dist2
396# This is a separate target because 'update-po' must be executed before. 414# This is a separate target because 'update-po' must be executed before.
397dist2: stamp-po $(DISTFILES) 415dist2: $(srcdir)/stamp-po $(DISTFILES)
398 dists="$(DISTFILES)"; \ 416 dists="$(DISTFILES)"; \
399 if test "$(PACKAGE)" = "gettext-tools"; then \ 417 if test "$(PACKAGE)" = "gettext-tools"; then \
400 dists="$$dists Makevars.template"; \ 418 dists="$$dists Makevars.template"; \
@@ -439,13 +457,15 @@ update-po: Makefile
439 tmpdir=`pwd`; \ 457 tmpdir=`pwd`; \
440 echo "$$lang:"; \ 458 echo "$$lang:"; \
441 test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ 459 test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \
442 echo "$${cdcmd}$(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \ 460 echo "$${cdcmd}$(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang --previous $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \
443 cd $(srcdir); \ 461 cd $(srcdir); \
444 if { case `$(MSGMERGE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \ 462 if { case `$(MSGMERGE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \
445 '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \ 463 '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].*) \
446 $(MSGMERGE) $(MSGMERGE_OPTIONS) -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \ 464 $(MSGMERGE) $(MSGMERGE_OPTIONS) -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \
465 0.1[6-7] | 0.1[6-7].*) \
466 $(MSGMERGE) $(MSGMERGE_OPTIONS) --previous -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \
447 *) \ 467 *) \
448 $(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \ 468 $(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang --previous -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \
449 esac; \ 469 esac; \
450 }; then \ 470 }; then \
451 if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ 471 if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \
diff --git a/meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/gettext.m4 b/meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/gettext.m4
new file mode 100644
index 0000000000..e7832418ea
--- /dev/null
+++ b/meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/gettext.m4
@@ -0,0 +1,386 @@
1# gettext.m4 serial 70 (gettext-0.20)
2dnl Copyright (C) 1995-2014, 2016, 2018 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 Library 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 Library 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.20.1/aclocal/host-cpu-c-abi.m4 b/meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/host-cpu-c-abi.m4
new file mode 100644
index 0000000000..4407296d08
--- /dev/null
+++ b/meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/host-cpu-c-abi.m4
@@ -0,0 +1,644 @@
1# host-cpu-c-abi.m4 serial 11
2dnl Copyright (C) 2002-2019 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[4567]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, or to 'no' otherwise.
461dnl This is a simplified variant of gl_HOST_CPU_C_ABI.
462AC_DEFUN([gl_HOST_CPU_C_ABI_32BIT],
463[
464 AC_REQUIRE([AC_CANONICAL_HOST])
465 AC_CACHE_CHECK([32-bit host C ABI], [gl_cv_host_cpu_c_abi_32bit],
466 [if test -n "$gl_cv_host_cpu_c_abi"; then
467 case "$gl_cv_host_cpu_c_abi" in
468 i386 | x86_64-x32 | arm | armhf | arm64-ilp32 | hppa | ia64-ilp32 | mips | mipsn32 | powerpc | riscv*-ilp32* | s390 | sparc)
469 gl_cv_host_cpu_c_abi_32bit=yes ;;
470 *)
471 gl_cv_host_cpu_c_abi_32bit=no ;;
472 esac
473 else
474 case "$host_cpu" in
475
476changequote(,)dnl
477 i[4567]86 )
478changequote([,])dnl
479 gl_cv_host_cpu_c_abi_32bit=yes
480 ;;
481
482 x86_64 )
483 # On x86_64 systems, the C compiler may be generating code in one of
484 # these ABIs:
485 # - 64-bit instruction set, 64-bit pointers, 64-bit 'long': x86_64.
486 # - 64-bit instruction set, 64-bit pointers, 32-bit 'long': x86_64
487 # with native Windows (mingw, MSVC).
488 # - 64-bit instruction set, 32-bit pointers, 32-bit 'long': x86_64-x32.
489 # - 32-bit instruction set, 32-bit pointers, 32-bit 'long': i386.
490 AC_COMPILE_IFELSE(
491 [AC_LANG_SOURCE(
492 [[#if (defined __x86_64__ || defined __amd64__ \
493 || defined _M_X64 || defined _M_AMD64) \
494 && !(defined __ILP32__ || defined _ILP32)
495 int ok;
496 #else
497 error fail
498 #endif
499 ]])],
500 [gl_cv_host_cpu_c_abi_32bit=no],
501 [gl_cv_host_cpu_c_abi_32bit=yes])
502 ;;
503
504 arm* | aarch64 )
505 # Assume arm with EABI.
506 # On arm64 systems, the C compiler may be generating code in one of
507 # these ABIs:
508 # - aarch64 instruction set, 64-bit pointers, 64-bit 'long': arm64.
509 # - aarch64 instruction set, 32-bit pointers, 32-bit 'long': arm64-ilp32.
510 # - 32-bit instruction set, 32-bit pointers, 32-bit 'long': arm or armhf.
511 AC_COMPILE_IFELSE(
512 [AC_LANG_SOURCE(
513 [[#if defined __aarch64__ && !(defined __ILP32__ || defined _ILP32)
514 int ok;
515 #else
516 error fail
517 #endif
518 ]])],
519 [gl_cv_host_cpu_c_abi_32bit=no],
520 [gl_cv_host_cpu_c_abi_32bit=yes])
521 ;;
522
523 hppa1.0 | hppa1.1 | hppa2.0* | hppa64 )
524 # On hppa, the C compiler may be generating 32-bit code or 64-bit
525 # code. In the latter case, it defines _LP64 and __LP64__.
526 AC_COMPILE_IFELSE(
527 [AC_LANG_SOURCE(
528 [[#ifdef __LP64__
529 int ok;
530 #else
531 error fail
532 #endif
533 ]])],
534 [gl_cv_host_cpu_c_abi_32bit=no],
535 [gl_cv_host_cpu_c_abi_32bit=yes])
536 ;;
537
538 ia64* )
539 # On ia64 on HP-UX, the C compiler may be generating 64-bit code or
540 # 32-bit code. In the latter case, it defines _ILP32.
541 AC_COMPILE_IFELSE(
542 [AC_LANG_SOURCE(
543 [[#ifdef _ILP32
544 int ok;
545 #else
546 error fail
547 #endif
548 ]])],
549 [gl_cv_host_cpu_c_abi_32bit=yes],
550 [gl_cv_host_cpu_c_abi_32bit=no])
551 ;;
552
553 mips* )
554 # We should also check for (_MIPS_SZPTR == 64), but gcc keeps this
555 # at 32.
556 AC_COMPILE_IFELSE(
557 [AC_LANG_SOURCE(
558 [[#if defined _MIPS_SZLONG && (_MIPS_SZLONG == 64)
559 int ok;
560 #else
561 error fail
562 #endif
563 ]])],
564 [gl_cv_host_cpu_c_abi_32bit=no],
565 [gl_cv_host_cpu_c_abi_32bit=yes])
566 ;;
567
568 powerpc* )
569 # Different ABIs are in use on AIX vs. Mac OS X vs. Linux,*BSD.
570 # No need to distinguish them here; the caller may distinguish
571 # them based on the OS.
572 # On powerpc64 systems, the C compiler may still be generating
573 # 32-bit code. And on powerpc-ibm-aix systems, the C compiler may
574 # be generating 64-bit code.
575 AC_COMPILE_IFELSE(
576 [AC_LANG_SOURCE(
577 [[#if defined __powerpc64__ || defined _ARCH_PPC64
578 int ok;
579 #else
580 error fail
581 #endif
582 ]])],
583 [gl_cv_host_cpu_c_abi_32bit=no],
584 [gl_cv_host_cpu_c_abi_32bit=yes])
585 ;;
586
587 rs6000 )
588 gl_cv_host_cpu_c_abi_32bit=yes
589 ;;
590
591 riscv32 | riscv64 )
592 # There are 6 ABIs: ilp32, ilp32f, ilp32d, lp64, lp64f, lp64d.
593 # Size of 'long' and 'void *':
594 AC_COMPILE_IFELSE(
595 [AC_LANG_SOURCE(
596 [[#if defined __LP64__
597 int ok;
598 #else
599 error fail
600 #endif
601 ]])],
602 [gl_cv_host_cpu_c_abi_32bit=no],
603 [gl_cv_host_cpu_c_abi_32bit=yes])
604 ;;
605
606 s390* )
607 # On s390x, the C compiler may be generating 64-bit (= s390x) code
608 # or 31-bit (= s390) code.
609 AC_COMPILE_IFELSE(
610 [AC_LANG_SOURCE(
611 [[#if defined __LP64__ || defined __s390x__
612 int ok;
613 #else
614 error fail
615 #endif
616 ]])],
617 [gl_cv_host_cpu_c_abi_32bit=no],
618 [gl_cv_host_cpu_c_abi_32bit=yes])
619 ;;
620
621 sparc | sparc64 )
622 # UltraSPARCs running Linux have `uname -m` = "sparc64", but the
623 # C compiler still generates 32-bit code.
624 AC_COMPILE_IFELSE(
625 [AC_LANG_SOURCE(
626 [[#if defined __sparcv9 || defined __arch64__
627 int ok;
628 #else
629 error fail
630 #endif
631 ]])],
632 [gl_cv_host_cpu_c_abi_32bit=no],
633 [gl_cv_host_cpu_c_abi_32bit=yes])
634 ;;
635
636 *)
637 gl_cv_host_cpu_c_abi_32bit=no
638 ;;
639 esac
640 fi
641 ])
642
643 HOST_CPU_C_ABI_32BIT="$gl_cv_host_cpu_c_abi_32bit"
644])
diff --git a/meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/iconv.m4 b/meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/iconv.m4
new file mode 100644
index 0000000000..a285e9daa5
--- /dev/null
+++ b/meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/iconv.m4
@@ -0,0 +1,288 @@
1# iconv.m4 serial 21
2dnl Copyright (C) 2000-2002, 2007-2014, 2016-2019 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.20.1/aclocal/intlmacosx.m4 b/meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/intlmacosx.m4
new file mode 100644
index 0000000000..30e6f50e0a
--- /dev/null
+++ b/meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/intlmacosx.m4
@@ -0,0 +1,72 @@
1# intlmacosx.m4 serial 6 (gettext-0.20)
2dnl Copyright (C) 2004-2014, 2016, 2019 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 Library 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 Library 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 Check for API introduced in Mac OS X 10.5.
37 AC_CACHE_CHECK([for CFLocaleCopyCurrent], [gt_cv_func_CFLocaleCopyCurrent],
38 [gt_save_LIBS="$LIBS"
39 LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
40 AC_LINK_IFELSE(
41 [AC_LANG_PROGRAM(
42 [[#include <CoreFoundation/CFLocale.h>]],
43 [[CFLocaleCopyCurrent();]])],
44 [gt_cv_func_CFLocaleCopyCurrent=yes],
45 [gt_cv_func_CFLocaleCopyCurrent=no])
46 LIBS="$gt_save_LIBS"])
47 if test $gt_cv_func_CFLocaleCopyCurrent = yes; then
48 AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], [1],
49 [Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the CoreFoundation framework.])
50 fi
51 AC_CACHE_CHECK([for CFLocaleCopyPreferredLanguages], [gt_cv_func_CFLocaleCopyPreferredLanguages],
52 [gt_save_LIBS="$LIBS"
53 LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation"
54 AC_LINK_IFELSE(
55 [AC_LANG_PROGRAM(
56 [[#include <CoreFoundation/CFLocale.h>]],
57 [[CFLocaleCopyPreferredLanguages();]])],
58 [gt_cv_func_CFLocaleCopyPreferredLanguages=yes],
59 [gt_cv_func_CFLocaleCopyPreferredLanguages=no])
60 LIBS="$gt_save_LIBS"])
61 if test $gt_cv_func_CFLocaleCopyPreferredLanguages = yes; then
62 AC_DEFINE([HAVE_CFLOCALECOPYPREFERREDLANGUAGES], [1],
63 [Define to 1 if you have the Mac OS X function CFLocaleCopyPreferredLanguages in the CoreFoundation framework.])
64 fi
65 INTL_MACOSX_LIBS=
66 if test $gt_cv_func_CFPreferencesCopyAppValue = yes \
67 || test $gt_cv_func_CFLocaleCopyCurrent = yes \
68 || test $gt_cv_func_CFLocaleCopyPreferredLanguages = yes; then
69 INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation"
70 fi
71 AC_SUBST([INTL_MACOSX_LIBS])
72])
diff --git a/meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/lib-ld.m4 b/meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/lib-ld.m4
new file mode 100644
index 0000000000..a18719630d
--- /dev/null
+++ b/meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/lib-ld.m4
@@ -0,0 +1,168 @@
1# lib-ld.m4 serial 9
2dnl Copyright (C) 1996-2003, 2009-2019 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.20.1/aclocal/lib-link.m4 b/meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/lib-link.m4
new file mode 100644
index 0000000000..0ff10731fa
--- /dev/null
+++ b/meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/lib-link.m4
@@ -0,0 +1,774 @@
1# lib-link.m4 serial 28
2dnl Copyright (C) 2001-2019 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 ])
196 AC_ARG_WITH(PACK[-prefix],
197[[ --with-]]PACK[[-prefix[=DIR] search for ]PACKLIBS[ in DIR/include and DIR/lib
198 --without-]]PACK[[-prefix don't search for ]PACKLIBS[ in includedir and libdir]],
199[
200 if test "X$withval" = "Xno"; then
201 use_additional=no
202 else
203 if test "X$withval" = "X"; then
204 AC_LIB_WITH_FINAL_PREFIX([
205 eval additional_includedir=\"$includedir\"
206 eval additional_libdir=\"$libdir\"
207 ])
208 else
209 additional_includedir="$withval/include"
210 additional_libdir="$withval/$acl_libdirstem"
211 if test "$acl_libdirstem2" != "$acl_libdirstem" \
212 && test ! -d "$withval/$acl_libdirstem"; then
213 additional_libdir="$withval/$acl_libdirstem2"
214 fi
215 fi
216 fi
217])
218 dnl Search the library and its dependencies in $additional_libdir and
219 dnl $LDFLAGS. Using breadth-first-seach.
220 LIB[]NAME=
221 LTLIB[]NAME=
222 INC[]NAME=
223 LIB[]NAME[]_PREFIX=
224 dnl HAVE_LIB${NAME} is an indicator that LIB${NAME}, LTLIB${NAME} have been
225 dnl computed. So it has to be reset here.
226 HAVE_LIB[]NAME=
227 rpathdirs=
228 ltrpathdirs=
229 names_already_handled=
230 names_next_round='$1 $2'
231 while test -n "$names_next_round"; do
232 names_this_round="$names_next_round"
233 names_next_round=
234 for name in $names_this_round; do
235 already_handled=
236 for n in $names_already_handled; do
237 if test "$n" = "$name"; then
238 already_handled=yes
239 break
240 fi
241 done
242 if test -z "$already_handled"; then
243 names_already_handled="$names_already_handled $name"
244 dnl See if it was already located by an earlier AC_LIB_LINKFLAGS
245 dnl or AC_LIB_HAVE_LINKFLAGS call.
246 uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./+-|ABCDEFGHIJKLMNOPQRSTUVWXYZ____|'`
247 eval value=\"\$HAVE_LIB$uppername\"
248 if test -n "$value"; then
249 if test "$value" = yes; then
250 eval value=\"\$LIB$uppername\"
251 test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value"
252 eval value=\"\$LTLIB$uppername\"
253 test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value"
254 else
255 dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined
256 dnl that this library doesn't exist. So just drop it.
257 :
258 fi
259 else
260 dnl Search the library lib$name in $additional_libdir and $LDFLAGS
261 dnl and the already constructed $LIBNAME/$LTLIBNAME.
262 found_dir=
263 found_la=
264 found_so=
265 found_a=
266 eval libname=\"$acl_libname_spec\" # typically: libname=lib$name
267 if test -n "$acl_shlibext"; then
268 shrext=".$acl_shlibext" # typically: shrext=.so
269 else
270 shrext=
271 fi
272 if test $use_additional = yes; then
273 dir="$additional_libdir"
274 dnl The same code as in the loop below:
275 dnl First look for a shared library.
276 if test -n "$acl_shlibext"; then
277 if test -f "$dir/$libname$shrext"; then
278 found_dir="$dir"
279 found_so="$dir/$libname$shrext"
280 else
281 if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
282 ver=`(cd "$dir" && \
283 for f in "$libname$shrext".*; do echo "$f"; done \
284 | sed -e "s,^$libname$shrext\\\\.,," \
285 | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
286 | sed 1q ) 2>/dev/null`
287 if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
288 found_dir="$dir"
289 found_so="$dir/$libname$shrext.$ver"
290 fi
291 else
292 eval library_names=\"$acl_library_names_spec\"
293 for f in $library_names; do
294 if test -f "$dir/$f"; then
295 found_dir="$dir"
296 found_so="$dir/$f"
297 break
298 fi
299 done
300 fi
301 fi
302 fi
303 dnl Then look for a static library.
304 if test "X$found_dir" = "X"; then
305 if test -f "$dir/$libname.$acl_libext"; then
306 found_dir="$dir"
307 found_a="$dir/$libname.$acl_libext"
308 fi
309 fi
310 if test "X$found_dir" != "X"; then
311 if test -f "$dir/$libname.la"; then
312 found_la="$dir/$libname.la"
313 fi
314 fi
315 fi
316 if test "X$found_dir" = "X"; then
317 for x in $LDFLAGS $LTLIB[]NAME; do
318 AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
319 case "$x" in
320 -L*)
321 dir=`echo "X$x" | sed -e 's/^X-L//'`
322 dnl First look for a shared library.
323 if test -n "$acl_shlibext"; then
324 if test -f "$dir/$libname$shrext"; then
325 found_dir="$dir"
326 found_so="$dir/$libname$shrext"
327 else
328 if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
329 ver=`(cd "$dir" && \
330 for f in "$libname$shrext".*; do echo "$f"; done \
331 | sed -e "s,^$libname$shrext\\\\.,," \
332 | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
333 | sed 1q ) 2>/dev/null`
334 if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
335 found_dir="$dir"
336 found_so="$dir/$libname$shrext.$ver"
337 fi
338 else
339 eval library_names=\"$acl_library_names_spec\"
340 for f in $library_names; do
341 if test -f "$dir/$f"; then
342 found_dir="$dir"
343 found_so="$dir/$f"
344 break
345 fi
346 done
347 fi
348 fi
349 fi
350 dnl Then look for a static library.
351 if test "X$found_dir" = "X"; then
352 if test -f "$dir/$libname.$acl_libext"; then
353 found_dir="$dir"
354 found_a="$dir/$libname.$acl_libext"
355 fi
356 fi
357 if test "X$found_dir" != "X"; then
358 if test -f "$dir/$libname.la"; then
359 found_la="$dir/$libname.la"
360 fi
361 fi
362 ;;
363 esac
364 if test "X$found_dir" != "X"; then
365 break
366 fi
367 done
368 fi
369 if test "X$found_dir" != "X"; then
370 dnl Found the library.
371 LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name"
372 if test "X$found_so" != "X"; then
373 dnl Linking with a shared library. We attempt to hardcode its
374 dnl directory into the executable's runpath, unless it's the
375 dnl standard /usr/lib.
376 if test "$enable_rpath" = no \
377 || test "X$found_dir" = "X/usr/$acl_libdirstem" \
378 || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then
379 dnl No hardcoding is needed.
380 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
381 else
382 dnl Use an explicit option to hardcode DIR into the resulting
383 dnl binary.
384 dnl Potentially add DIR to ltrpathdirs.
385 dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
386 haveit=
387 for x in $ltrpathdirs; do
388 if test "X$x" = "X$found_dir"; then
389 haveit=yes
390 break
391 fi
392 done
393 if test -z "$haveit"; then
394 ltrpathdirs="$ltrpathdirs $found_dir"
395 fi
396 dnl The hardcoding into $LIBNAME is system dependent.
397 if test "$acl_hardcode_direct" = yes; then
398 dnl Using DIR/libNAME.so during linking hardcodes DIR into the
399 dnl resulting binary.
400 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
401 else
402 if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
403 dnl Use an explicit option to hardcode DIR into the resulting
404 dnl binary.
405 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
406 dnl Potentially add DIR to rpathdirs.
407 dnl The rpathdirs will be appended to $LIBNAME at the end.
408 haveit=
409 for x in $rpathdirs; do
410 if test "X$x" = "X$found_dir"; then
411 haveit=yes
412 break
413 fi
414 done
415 if test -z "$haveit"; then
416 rpathdirs="$rpathdirs $found_dir"
417 fi
418 else
419 dnl Rely on "-L$found_dir".
420 dnl But don't add it if it's already contained in the LDFLAGS
421 dnl or the already constructed $LIBNAME
422 haveit=
423 for x in $LDFLAGS $LIB[]NAME; do
424 AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
425 if test "X$x" = "X-L$found_dir"; then
426 haveit=yes
427 break
428 fi
429 done
430 if test -z "$haveit"; then
431 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
432 fi
433 if test "$acl_hardcode_minus_L" != no; then
434 dnl FIXME: Not sure whether we should use
435 dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
436 dnl here.
437 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
438 else
439 dnl We cannot use $acl_hardcode_runpath_var and LD_RUN_PATH
440 dnl here, because this doesn't fit in flags passed to the
441 dnl compiler. So give up. No hardcoding. This affects only
442 dnl very old systems.
443 dnl FIXME: Not sure whether we should use
444 dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
445 dnl here.
446 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
447 fi
448 fi
449 fi
450 fi
451 else
452 if test "X$found_a" != "X"; then
453 dnl Linking with a static library.
454 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a"
455 else
456 dnl We shouldn't come here, but anyway it's good to have a
457 dnl fallback.
458 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name"
459 fi
460 fi
461 dnl Assume the include files are nearby.
462 additional_includedir=
463 case "$found_dir" in
464 */$acl_libdirstem | */$acl_libdirstem/)
465 basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
466 if test "$name" = '$1'; then
467 LIB[]NAME[]_PREFIX="$basedir"
468 fi
469 additional_includedir="$basedir/include"
470 ;;
471 */$acl_libdirstem2 | */$acl_libdirstem2/)
472 basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'`
473 if test "$name" = '$1'; then
474 LIB[]NAME[]_PREFIX="$basedir"
475 fi
476 additional_includedir="$basedir/include"
477 ;;
478 esac
479 if test "X$additional_includedir" != "X"; then
480 dnl Potentially add $additional_includedir to $INCNAME.
481 dnl But don't add it
482 dnl 1. if it's the standard /usr/include,
483 dnl 2. if it's /usr/local/include and we are using GCC on Linux,
484 dnl 3. if it's already present in $CPPFLAGS or the already
485 dnl constructed $INCNAME,
486 dnl 4. if it doesn't exist as a directory.
487 if test "X$additional_includedir" != "X/usr/include"; then
488 haveit=
489 if test "X$additional_includedir" = "X/usr/local/include"; then
490 if test -n "$GCC"; then
491 case $host_os in
492 linux* | gnu* | k*bsd*-gnu) haveit=yes;;
493 esac
494 fi
495 fi
496 if test -z "$haveit"; then
497 for x in $CPPFLAGS $INC[]NAME; do
498 AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
499 if test "X$x" = "X-I$additional_includedir"; then
500 haveit=yes
501 break
502 fi
503 done
504 if test -z "$haveit"; then
505 if test -d "$additional_includedir"; then
506 dnl Really add $additional_includedir to $INCNAME.
507 INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir"
508 fi
509 fi
510 fi
511 fi
512 fi
513 dnl Look for dependencies.
514 if test -n "$found_la"; then
515 dnl Read the .la file. It defines the variables
516 dnl dlname, library_names, old_library, dependency_libs, current,
517 dnl age, revision, installed, dlopen, dlpreopen, libdir.
518 save_libdir="$libdir"
519 case "$found_la" in
520 */* | *\\*) . "$found_la" ;;
521 *) . "./$found_la" ;;
522 esac
523 libdir="$save_libdir"
524 dnl We use only dependency_libs.
525 for dep in $dependency_libs; do
526 case "$dep" in
527 -L*)
528 additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'`
529 dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME.
530 dnl But don't add it
531 dnl 1. if it's the standard /usr/lib,
532 dnl 2. if it's /usr/local/lib and we are using GCC on Linux,
533 dnl 3. if it's already present in $LDFLAGS or the already
534 dnl constructed $LIBNAME,
535 dnl 4. if it doesn't exist as a directory.
536 if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \
537 && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then
538 haveit=
539 if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \
540 || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then
541 if test -n "$GCC"; then
542 case $host_os in
543 linux* | gnu* | k*bsd*-gnu) haveit=yes;;
544 esac
545 fi
546 fi
547 if test -z "$haveit"; then
548 haveit=
549 for x in $LDFLAGS $LIB[]NAME; do
550 AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
551 if test "X$x" = "X-L$additional_libdir"; then
552 haveit=yes
553 break
554 fi
555 done
556 if test -z "$haveit"; then
557 if test -d "$additional_libdir"; then
558 dnl Really add $additional_libdir to $LIBNAME.
559 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir"
560 fi
561 fi
562 haveit=
563 for x in $LDFLAGS $LTLIB[]NAME; do
564 AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
565 if test "X$x" = "X-L$additional_libdir"; then
566 haveit=yes
567 break
568 fi
569 done
570 if test -z "$haveit"; then
571 if test -d "$additional_libdir"; then
572 dnl Really add $additional_libdir to $LTLIBNAME.
573 LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir"
574 fi
575 fi
576 fi
577 fi
578 ;;
579 -R*)
580 dir=`echo "X$dep" | sed -e 's/^X-R//'`
581 if test "$enable_rpath" != no; then
582 dnl Potentially add DIR to rpathdirs.
583 dnl The rpathdirs will be appended to $LIBNAME at the end.
584 haveit=
585 for x in $rpathdirs; do
586 if test "X$x" = "X$dir"; then
587 haveit=yes
588 break
589 fi
590 done
591 if test -z "$haveit"; then
592 rpathdirs="$rpathdirs $dir"
593 fi
594 dnl Potentially add DIR to ltrpathdirs.
595 dnl The ltrpathdirs will be appended to $LTLIBNAME at the end.
596 haveit=
597 for x in $ltrpathdirs; do
598 if test "X$x" = "X$dir"; then
599 haveit=yes
600 break
601 fi
602 done
603 if test -z "$haveit"; then
604 ltrpathdirs="$ltrpathdirs $dir"
605 fi
606 fi
607 ;;
608 -l*)
609 dnl Handle this in the next round.
610 names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'`
611 ;;
612 *.la)
613 dnl Handle this in the next round. Throw away the .la's
614 dnl directory; it is already contained in a preceding -L
615 dnl option.
616 names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'`
617 ;;
618 *)
619 dnl Most likely an immediate library name.
620 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep"
621 LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep"
622 ;;
623 esac
624 done
625 fi
626 else
627 dnl Didn't find the library; assume it is in the system directories
628 dnl known to the linker and runtime loader. (All the system
629 dnl directories known to the linker should also be known to the
630 dnl runtime loader, otherwise the system is severely misconfigured.)
631 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name"
632 LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name"
633 fi
634 fi
635 fi
636 done
637 done
638 if test "X$rpathdirs" != "X"; then
639 if test -n "$acl_hardcode_libdir_separator"; then
640 dnl Weird platform: only the last -rpath option counts, the user must
641 dnl pass all path elements in one option. We can arrange that for a
642 dnl single library, but not when more than one $LIBNAMEs are used.
643 alldirs=
644 for found_dir in $rpathdirs; do
645 alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
646 done
647 dnl Note: acl_hardcode_libdir_flag_spec uses $libdir and $wl.
648 acl_save_libdir="$libdir"
649 libdir="$alldirs"
650 eval flag=\"$acl_hardcode_libdir_flag_spec\"
651 libdir="$acl_save_libdir"
652 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
653 else
654 dnl The -rpath options are cumulative.
655 for found_dir in $rpathdirs; do
656 acl_save_libdir="$libdir"
657 libdir="$found_dir"
658 eval flag=\"$acl_hardcode_libdir_flag_spec\"
659 libdir="$acl_save_libdir"
660 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
661 done
662 fi
663 fi
664 if test "X$ltrpathdirs" != "X"; then
665 dnl When using libtool, the option that works for both libraries and
666 dnl executables is -R. The -R options are cumulative.
667 for found_dir in $ltrpathdirs; do
668 LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir"
669 done
670 fi
671 popdef([PACKLIBS])
672 popdef([PACKUP])
673 popdef([PACK])
674 popdef([NAME])
675])
676
677dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR,
678dnl unless already present in VAR.
679dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes
680dnl contains two or three consecutive elements that belong together.
681AC_DEFUN([AC_LIB_APPENDTOVAR],
682[
683 for element in [$2]; do
684 haveit=
685 for x in $[$1]; do
686 AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
687 if test "X$x" = "X$element"; then
688 haveit=yes
689 break
690 fi
691 done
692 if test -z "$haveit"; then
693 [$1]="${[$1]}${[$1]:+ }$element"
694 fi
695 done
696])
697
698dnl For those cases where a variable contains several -L and -l options
699dnl referring to unknown libraries and directories, this macro determines the
700dnl necessary additional linker options for the runtime path.
701dnl AC_LIB_LINKFLAGS_FROM_LIBS([LDADDVAR], [LIBSVALUE], [USE-LIBTOOL])
702dnl sets LDADDVAR to linker options needed together with LIBSVALUE.
703dnl If USE-LIBTOOL evaluates to non-empty, linking with libtool is assumed,
704dnl otherwise linking without libtool is assumed.
705AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS],
706[
707 AC_REQUIRE([AC_LIB_RPATH])
708 AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
709 $1=
710 if test "$enable_rpath" != no; then
711 if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
712 dnl Use an explicit option to hardcode directories into the resulting
713 dnl binary.
714 rpathdirs=
715 next=
716 for opt in $2; do
717 if test -n "$next"; then
718 dir="$next"
719 dnl No need to hardcode the standard /usr/lib.
720 if test "X$dir" != "X/usr/$acl_libdirstem" \
721 && test "X$dir" != "X/usr/$acl_libdirstem2"; then
722 rpathdirs="$rpathdirs $dir"
723 fi
724 next=
725 else
726 case $opt in
727 -L) next=yes ;;
728 -L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'`
729 dnl No need to hardcode the standard /usr/lib.
730 if test "X$dir" != "X/usr/$acl_libdirstem" \
731 && test "X$dir" != "X/usr/$acl_libdirstem2"; then
732 rpathdirs="$rpathdirs $dir"
733 fi
734 next= ;;
735 *) next= ;;
736 esac
737 fi
738 done
739 if test "X$rpathdirs" != "X"; then
740 if test -n ""$3""; then
741 dnl libtool is used for linking. Use -R options.
742 for dir in $rpathdirs; do
743 $1="${$1}${$1:+ }-R$dir"
744 done
745 else
746 dnl The linker is used for linking directly.
747 if test -n "$acl_hardcode_libdir_separator"; then
748 dnl Weird platform: only the last -rpath option counts, the user
749 dnl must pass all path elements in one option.
750 alldirs=
751 for dir in $rpathdirs; do
752 alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$dir"
753 done
754 acl_save_libdir="$libdir"
755 libdir="$alldirs"
756 eval flag=\"$acl_hardcode_libdir_flag_spec\"
757 libdir="$acl_save_libdir"
758 $1="$flag"
759 else
760 dnl The -rpath options are cumulative.
761 for dir in $rpathdirs; do
762 acl_save_libdir="$libdir"
763 libdir="$dir"
764 eval flag=\"$acl_hardcode_libdir_flag_spec\"
765 libdir="$acl_save_libdir"
766 $1="${$1}${$1:+ }$flag"
767 done
768 fi
769 fi
770 fi
771 fi
772 fi
773 AC_SUBST([$1])
774])
diff --git a/meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/lib-prefix.m4 b/meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/lib-prefix.m4
new file mode 100644
index 0000000000..8adb17bb91
--- /dev/null
+++ b/meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/lib-prefix.m4
@@ -0,0 +1,249 @@
1# lib-prefix.m4 serial 14
2dnl Copyright (C) 2001-2005, 2008-2019 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 variable acl_libdirstem, containing the basename of the libdir, either
151dnl "lib" or "lib64" or "lib/64",
152dnl - a variable acl_libdirstem2, as a secondary possible value for
153dnl acl_libdirstem, either the same as acl_libdirstem or "lib/sparcv9" or
154dnl "lib/amd64".
155AC_DEFUN([AC_LIB_PREPARE_MULTILIB],
156[
157 dnl There is no formal standard regarding lib and lib64.
158 dnl On 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. We determine
161 dnl the compiler's default mode by looking at the compiler's library search
162 dnl path. If at least one of its elements ends in /lib64 or points to a
163 dnl directory whose absolute pathname ends in /lib64, we assume a 64-bit ABI.
164 dnl Otherwise we use the default, namely "lib".
165 dnl On Solaris systems, the current practice is that on a system supporting
166 dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under
167 dnl $prefix/lib/64 (which is a symlink to either $prefix/lib/sparcv9 or
168 dnl $prefix/lib/amd64) and 32-bit libraries go under $prefix/lib.
169 AC_REQUIRE([AC_CANONICAL_HOST])
170 AC_REQUIRE([gl_HOST_CPU_C_ABI_32BIT])
171
172 case "$host_os" in
173 solaris*)
174 AC_CACHE_CHECK([for 64-bit host], [gl_cv_solaris_64bit],
175 [AC_COMPILE_IFELSE(
176 [AC_LANG_SOURCE(
177 [[#ifdef _LP64
178 int ok;
179 #else
180 error fail
181 #endif
182 ]])],
183 [gl_cv_solaris_64bit=yes],
184 [gl_cv_solaris_64bit=no])
185 ]);;
186 esac
187
188 dnl Allow the user to override the result by setting acl_cv_libdirstems.
189 AC_CACHE_CHECK([for the common suffixes of directories in the library search path],
190 [acl_cv_libdirstems],
191 [acl_libdirstem=lib
192 acl_libdirstem2=
193 case "$host_os" in
194 solaris*)
195 dnl See Solaris 10 Software Developer Collection > Solaris 64-bit Developer's Guide > The Development Environment
196 dnl <https://docs.oracle.com/cd/E19253-01/816-5138/dev-env/index.html>.
197 dnl "Portable Makefiles should refer to any library directories using the 64 symbolic link."
198 dnl But we want to recognize the sparcv9 or amd64 subdirectory also if the
199 dnl symlink is missing, so we set acl_libdirstem2 too.
200 if test $gl_cv_solaris_64bit = yes; then
201 acl_libdirstem=lib/64
202 case "$host_cpu" in
203 sparc*) acl_libdirstem2=lib/sparcv9 ;;
204 i*86 | x86_64) acl_libdirstem2=lib/amd64 ;;
205 esac
206 fi
207 ;;
208 *)
209 dnl If $CC generates code for a 32-bit ABI, the libraries are
210 dnl surely under $prefix/lib, not $prefix/lib64.
211 if test "$HOST_CPU_C_ABI_32BIT" != yes; then
212 dnl The result is a property of the system. However, non-system
213 dnl compilers sometimes have odd library search paths. Therefore
214 dnl prefer asking /usr/bin/gcc, if available, rather than $CC.
215 searchpath=`(if test -f /usr/bin/gcc \
216 && LC_ALL=C /usr/bin/gcc -print-search-dirs >/dev/null 2>/dev/null; then \
217 LC_ALL=C /usr/bin/gcc -print-search-dirs; \
218 else \
219 LC_ALL=C $CC -print-search-dirs; \
220 fi) 2>/dev/null \
221 | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
222 if test -n "$searchpath"; then
223 acl_save_IFS="${IFS= }"; IFS=":"
224 for searchdir in $searchpath; do
225 if test -d "$searchdir"; then
226 case "$searchdir" in
227 */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
228 */../ | */.. )
229 # Better ignore directories of this form. They are misleading.
230 ;;
231 *) searchdir=`cd "$searchdir" && pwd`
232 case "$searchdir" in
233 */lib64 ) acl_libdirstem=lib64 ;;
234 esac ;;
235 esac
236 fi
237 done
238 IFS="$acl_save_IFS"
239 fi
240 fi
241 ;;
242 esac
243 test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem"
244 acl_cv_libdirstems="$acl_libdirstem,$acl_libdirstem2"
245 ])
246 # Decompose acl_cv_libdirstems into acl_libdirstem and acl_libdirstem2.
247 acl_libdirstem=`echo "$acl_cv_libdirstems" | sed -e 's/,.*//'`
248 acl_libdirstem2=`echo "$acl_cv_libdirstems" | sed -e '/,/s/.*,//'`
249])
diff --git a/meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/nls.m4 b/meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/nls.m4
new file mode 100644
index 0000000000..b62f614857
--- /dev/null
+++ b/meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/nls.m4
@@ -0,0 +1,32 @@
1# nls.m4 serial 5 (gettext-0.18)
2dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014, 2016, 2019 Free Software
3dnl 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 Library 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 Library 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.20.1/aclocal/po.m4 b/meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/po.m4
new file mode 100644
index 0000000000..143792dba5
--- /dev/null
+++ b/meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/po.m4
@@ -0,0 +1,450 @@
1# po.m4 serial 30 (gettext-0.20)
2dnl Copyright (C) 1995-2014, 2016, 2018-2019 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 Library 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 Library 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.20.1/aclocal/progtest.m4 b/meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/progtest.m4
new file mode 100644
index 0000000000..5f186b1490
--- /dev/null
+++ b/meta/recipes-core/gettext/gettext-minimal-0.20.1/aclocal/progtest.m4
@@ -0,0 +1,91 @@
1# progtest.m4 serial 7 (gettext-0.18.2)
2dnl Copyright (C) 1996-2003, 2005, 2008-2019 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 Library 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 Library 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.19.8.1/config.rpath b/meta/recipes-core/gettext/gettext-minimal-0.20.1/config.rpath
index 98183ff2f2..be202c1a9e 100755
--- a/meta/recipes-core/gettext/gettext-minimal-0.19.8.1/config.rpath
+++ b/meta/recipes-core/gettext/gettext-minimal-0.20.1/config.rpath
@@ -2,7 +2,7 @@
2# Output a system dependent set of variables, describing how to set the 2# Output a system dependent set of variables, describing how to set the
3# run time search path of shared libraries in an executable. 3# run time search path of shared libraries in an executable.
4# 4#
5# Copyright 1996-2016 Free Software Foundation, Inc. 5# Copyright 1996-2019 Free Software Foundation, Inc.
6# Taken from GNU libtool, 2001 6# Taken from GNU libtool, 2001
7# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 7# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
8# 8#
diff --git a/meta/recipes-core/gettext/gettext-minimal-0.19.8.1/remove-potcdate.sin b/meta/recipes-core/gettext/gettext-minimal-0.20.1/remove-potcdate.sin
index 2436c49e78..8c70dfbf14 100644
--- a/meta/recipes-core/gettext/gettext-minimal-0.19.8.1/remove-potcdate.sin
+++ b/meta/recipes-core/gettext/gettext-minimal-0.20.1/remove-potcdate.sin
@@ -1,6 +1,12 @@
1# Sed script that remove the POT-Creation-Date line in the header entry 1# Sed script that removes the POT-Creation-Date line in the header entry
2# from a POT file. 2# from a POT file.
3# 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#
4# The distinction between the first and the following occurrences of the 10# The distinction between the first and the following occurrences of the
5# pattern is achieved by looking at the hold space. 11# pattern is achieved by looking at the hold space.
6/^"POT-Creation-Date: .*"$/{ 12/^"POT-Creation-Date: .*"$/{
diff --git a/meta/recipes-core/gettext/gettext-minimal-native_0.19.8.1.bb b/meta/recipes-core/gettext/gettext-minimal-native_0.20.1.bb
index 26ff19975d..7a4dcbec57 100644
--- a/meta/recipes-core/gettext/gettext-minimal-native_0.19.8.1.bb
+++ b/meta/recipes-core/gettext/gettext-minimal-native_0.20.1.bb
@@ -3,12 +3,11 @@ DESCRIPTION = "Contains the m4 macros sufficient to support building \
3autoconf/automake. This provides a significant build time speedup by \ 3autoconf/automake. This provides a significant build time speedup by \
4the removal of gettext-native from most dependency chains (now only \ 4the removal of gettext-native from most dependency chains (now only \
5needed for gettext for the target)." 5needed for gettext for the target)."
6SRC_URI = "file://aclocal.tgz \ 6SRC_URI = "file://aclocal/ \
7 file://config.rpath \ 7 file://config.rpath \
8 file://Makefile.in.in \ 8 file://Makefile.in.in \
9 file://remove-potcdate.sin \ 9 file://remove-potcdate.sin \
10 file://COPYING \ 10 file://COPYING \
11 file://0001-PATCH-Disable-the-test-to-convert-euc-jp.patch \
12" 11"
13 12
14INHIBIT_DEFAULT_DEPS = "1" 13INHIBIT_DEFAULT_DEPS = "1"
@@ -23,7 +22,7 @@ S = "${WORKDIR}"
23 22
24do_install () { 23do_install () {
25 install -d ${D}${datadir}/aclocal/ 24 install -d ${D}${datadir}/aclocal/
26 cp ${WORKDIR}/*.m4 ${D}${datadir}/aclocal/ 25 cp ${WORKDIR}/aclocal/*.m4 ${D}${datadir}/aclocal/
27 install -d ${D}${datadir}/gettext/po/ 26 install -d ${D}${datadir}/gettext/po/
28 cp ${WORKDIR}/config.rpath ${D}${datadir}/gettext/ 27 cp ${WORKDIR}/config.rpath ${D}${datadir}/gettext/
29 cp ${WORKDIR}/Makefile.in.in ${D}${datadir}/gettext/po/ 28 cp ${WORKDIR}/Makefile.in.in ${D}${datadir}/gettext/po/