Merge ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/master
- Git
- lp:~azzar1/ubuntu/+source/gnome-initial-setup
- ubuntu/master
- Merge into ubuntu/master
Proposed by
Andrea Azzarone
Status: | Merged |
---|---|
Approved by: | Sebastien Bacher |
Approved revision: | f97e281cdaa2a8df92690d956dbb0f26dcf2871b |
Merged at revision: | f97e281cdaa2a8df92690d956dbb0f26dcf2871b |
Proposed branch: | ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/master |
Merge into: | ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/master |
Diff against target: |
36488 lines (+15792/-7899) 165 files modified
ABOUT-NLS (+1379/-0) Makefile.am (+12/-1) Makefile.in (+43/-37) NEWS (+13/-0) aclocal.m4 (+96/-622) compile (+4/-4) config.guess (+277/-277) config.h.in (+7/-14) config.rpath (+684/-0) config.sub (+159/-162) configure (+1951/-1225) configure.ac (+4/-12) data/Makefile.am (+3/-1) data/Makefile.in (+28/-33) data/gnome-initial-setup-first-login.desktop.in.in (+2/-1) data/gnome-initial-setup.desktop.in.in (+2/-1) data/meson.build (+59/-0) debian/changelog (+39/-0) debian/control (+5/-3) debian/control.in (+5/-3) debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch (+453/-112) debian/patches/0001-Display-the-ubuntu-welcome-wizard-in-Unity.patch (+8/-11) debian/patches/0001-Don-t-run-welcome-tour-at-end.patch (+2/-2) debian/patches/0001-Ensure-stamp-file-if-the-user-quit-the-wizard.patch (+5/-5) debian/patches/0001-Make-summary-page-explicitly-request-navigation-butt.patch (+23/-39) debian/patches/0006-goa-Add-Ubuntu-Single-Sign-On-to-the-list.patch (+23/-0) debian/patches/0007-goa-adjust-description-to-not-mention-email-or-conta.patch (+25/-0) debian/patches/series (+2/-3) debian/rules (+3/-3) debian/watch (+1/-1) depcomp (+4/-4) dev/null (+0/-2) gnome-initial-setup/Makefile.am (+7/-1) gnome-initial-setup/Makefile.in (+82/-58) gnome-initial-setup/gis-assistant.c (+33/-13) gnome-initial-setup/gis-page.c (+8/-0) gnome-initial-setup/gis-page.h (+2/-1) gnome-initial-setup/gnome-initial-setup.c (+67/-28) gnome-initial-setup/meson.build (+70/-0) gnome-initial-setup/pages/Makefile.am (+4/-0) gnome-initial-setup/pages/Makefile.in (+30/-33) gnome-initial-setup/pages/account/Makefile.am (+5/-1) gnome-initial-setup/pages/account/Makefile.in (+84/-55) gnome-initial-setup/pages/account/account-resources.c (+2295/-2143) gnome-initial-setup/pages/account/account.gresource.xml (+1/-0) gnome-initial-setup/pages/account/gis-account-avatar-chooser.ui (+39/-0) gnome-initial-setup/pages/account/gis-account-page-local.c (+0/-1) gnome-initial-setup/pages/account/gis-account-page.h (+0/-2) gnome-initial-setup/pages/account/gis-account-pages.c (+4/-5) gnome-initial-setup/pages/account/gis-account-pages.h (+1/-1) gnome-initial-setup/pages/account/meson.build (+33/-0) gnome-initial-setup/pages/account/um-photo-dialog.c (+101/-164) gnome-initial-setup/pages/account/um-photo-dialog.h (+4/-0) gnome-initial-setup/pages/account/um-realm-generated.c (+74/-69) gnome-initial-setup/pages/account/um-realm-generated.h (+3/-2) gnome-initial-setup/pages/account/um-realm-manager.c (+2/-2) gnome-initial-setup/pages/eulas/Makefile.am (+7/-1) gnome-initial-setup/pages/eulas/Makefile.in (+66/-50) gnome-initial-setup/pages/eulas/gis-eula-pages.c (+10/-6) gnome-initial-setup/pages/eulas/gis-eula-pages.h (+1/-1) gnome-initial-setup/pages/eulas/meson.build (+14/-0) gnome-initial-setup/pages/goa/Makefile.am (+7/-1) gnome-initial-setup/pages/goa/Makefile.in (+58/-48) gnome-initial-setup/pages/goa/gis-goa-page.c (+4/-5) gnome-initial-setup/pages/goa/gis-goa-page.h (+1/-1) gnome-initial-setup/pages/goa/meson.build (+10/-0) gnome-initial-setup/pages/keyboard/Makefile.am (+7/-1) gnome-initial-setup/pages/keyboard/Makefile.in (+71/-51) gnome-initial-setup/pages/keyboard/gis-keyboard-page.c (+133/-16) gnome-initial-setup/pages/keyboard/gis-keyboard-page.h (+1/-1) gnome-initial-setup/pages/keyboard/meson.build (+14/-0) gnome-initial-setup/pages/language/Makefile.am (+7/-1) gnome-initial-setup/pages/language/Makefile.in (+75/-52) gnome-initial-setup/pages/language/gis-language-page.c (+25/-7) gnome-initial-setup/pages/language/gis-language-page.h (+1/-1) gnome-initial-setup/pages/language/gis-language-page.ui (+1/-1) gnome-initial-setup/pages/language/language-resources.c (+123/-123) gnome-initial-setup/pages/language/meson.build (+18/-0) gnome-initial-setup/pages/meson.build (+21/-0) gnome-initial-setup/pages/network/Makefile.am (+7/-1) gnome-initial-setup/pages/network/Makefile.in (+63/-49) gnome-initial-setup/pages/network/gis-network-page.c (+4/-5) gnome-initial-setup/pages/network/gis-network-page.h (+1/-1) gnome-initial-setup/pages/network/meson.build (+12/-0) gnome-initial-setup/pages/password/Makefile.am (+5/-1) gnome-initial-setup/pages/password/Makefile.in (+68/-51) gnome-initial-setup/pages/password/gis-password-page.c (+19/-14) gnome-initial-setup/pages/password/gis-password-page.h (+1/-1) gnome-initial-setup/pages/password/meson.build (+13/-0) gnome-initial-setup/pages/password/pw-utils.c (+17/-17) gnome-initial-setup/pages/privacy/Makefile.am (+7/-1) gnome-initial-setup/pages/privacy/Makefile.in (+59/-48) gnome-initial-setup/pages/privacy/gis-privacy-page.c (+4/-5) gnome-initial-setup/pages/privacy/gis-privacy-page.h (+1/-1) gnome-initial-setup/pages/privacy/meson.build (+10/-0) gnome-initial-setup/pages/region/Makefile.am (+7/-1) gnome-initial-setup/pages/region/Makefile.in (+67/-50) gnome-initial-setup/pages/region/cc-region-chooser.c (+1/-2) gnome-initial-setup/pages/region/gis-region-page.c (+4/-5) gnome-initial-setup/pages/region/gis-region-page.h (+1/-1) gnome-initial-setup/pages/region/meson.build (+12/-0) gnome-initial-setup/pages/software/Makefile.am (+7/-1) gnome-initial-setup/pages/software/Makefile.in (+59/-48) gnome-initial-setup/pages/software/gis-software-page.c (+8/-6) gnome-initial-setup/pages/software/gis-software-page.h (+1/-1) gnome-initial-setup/pages/software/meson.build (+10/-0) gnome-initial-setup/pages/summary/Makefile.am (+7/-1) gnome-initial-setup/pages/summary/Makefile.in (+59/-48) gnome-initial-setup/pages/summary/gis-summary-page.c (+4/-5) gnome-initial-setup/pages/summary/gis-summary-page.h (+1/-1) gnome-initial-setup/pages/summary/meson.build (+10/-0) gnome-initial-setup/pages/timezone/Makefile.am (+5/-1) gnome-initial-setup/pages/timezone/Makefile.in (+76/-53) gnome-initial-setup/pages/timezone/gis-timezone-page.c (+4/-5) gnome-initial-setup/pages/timezone/gis-timezone-page.h (+1/-1) gnome-initial-setup/pages/timezone/meson.build (+28/-0) gnome-initial-setup/pages/timezone/timedated.c (+18/-17) gnome-initial-setup/pages/timezone/timedated.h (+3/-2) install-sh (+31/-14) ltmain.sh (+3/-1) m4/gettext.m4 (+420/-0) m4/iconv.m4 (+271/-0) m4/intlmacosx.m4 (+56/-0) m4/lib-ld.m4 (+119/-0) m4/lib-link.m4 (+777/-0) m4/lib-prefix.m4 (+224/-0) m4/nls.m4 (+32/-0) m4/po.m4 (+453/-0) m4/progtest.m4 (+91/-0) meson.build (+60/-0) meson_options.txt (+28/-0) missing (+7/-7) po/Makefile.in.in (+409/-147) po/Makevars (+78/-0) po/POTFILES.in (+17/-16) po/Rules-quot (+58/-0) po/boldquot.sed (+10/-0) po/ca.po (+80/-54) po/cs.po (+68/-48) po/de.po (+94/-67) po/el.po (+240/-194) po/en@boldquot.header (+25/-0) po/en@quot.header (+22/-0) po/es.po (+225/-190) po/fi.po (+5/-5) po/fr.po (+142/-79) po/fur.po (+99/-63) po/gd.po (+164/-139) po/gnome-initial-setup.pot (+599/-0) po/hr.po (+90/-57) po/hu.po (+81/-52) po/id.po (+97/-60) po/insert-header.sin (+23/-0) po/meson.build (+3/-0) po/pt_BR.po (+132/-66) po/quot.sed (+6/-0) po/remove-potcdate.sin (+19/-0) po/ro.po (+125/-115) po/ru.po (+164/-160) po/sl.po (+124/-124) po/stamp-po (+1/-0) po/sv.po (+99/-62) po/tr.po (+93/-65) po/zh_CN.po (+119/-87) po/zh_TW.po (+80/-59) |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Sebastien Bacher | Approve | ||
Review via email: mp+353022@code.launchpad.net |
Commit message
Description of the change
This requires to pull 'pristine-tar' and 'upstream/latest' from Salsa.
To post a comment you must log in.
Revision history for this message
Andrea Azzarone (azzar1) wrote : | # |
Can you take another look now?
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | diff --git a/ABOUT-NLS b/ABOUT-NLS |
2 | new file mode 100644 |
3 | index 0000000..3cc8286 |
4 | --- /dev/null |
5 | +++ b/ABOUT-NLS |
6 | @@ -0,0 +1,1379 @@ |
7 | +1 Notes on the Free Translation Project |
8 | +*************************************** |
9 | + |
10 | +Free software is going international! The Free Translation Project is a |
11 | +way to get maintainers of free software, translators, and users all |
12 | +together, so that free software will gradually become able to speak many |
13 | +languages. A few packages already provide translations for their |
14 | +messages. |
15 | + |
16 | + If you found this 'ABOUT-NLS' file inside a distribution, you may |
17 | +assume that the distributed package does use GNU 'gettext' internally, |
18 | +itself available at your nearest GNU archive site. But you do _not_ |
19 | +need to install GNU 'gettext' prior to configuring, installing or using |
20 | +this package with messages translated. |
21 | + |
22 | + Installers will find here some useful hints. These notes also |
23 | +explain how users should proceed for getting the programs to use the |
24 | +available translations. They tell how people wanting to contribute and |
25 | +work on translations can contact the appropriate team. |
26 | + |
27 | +1.1 INSTALL Matters |
28 | +=================== |
29 | + |
30 | +Some packages are "localizable" when properly installed; the programs |
31 | +they contain can be made to speak your own native language. Most such |
32 | +packages use GNU 'gettext'. Other packages have their own ways to |
33 | +internationalization, predating GNU 'gettext'. |
34 | + |
35 | + By default, this package will be installed to allow translation of |
36 | +messages. It will automatically detect whether the system already |
37 | +provides the GNU 'gettext' functions. Installers may use special |
38 | +options at configuration time for changing the default behaviour. The |
39 | +command: |
40 | + |
41 | + ./configure --disable-nls |
42 | + |
43 | +will _totally_ disable translation of messages. |
44 | + |
45 | + When you already have GNU 'gettext' installed on your system and run |
46 | +configure without an option for your new package, 'configure' will |
47 | +probably detect the previously built and installed 'libintl' library and |
48 | +will decide to use it. If not, you may have to to use the |
49 | +'--with-libintl-prefix' option to tell 'configure' where to look for it. |
50 | + |
51 | + Internationalized packages usually have many 'po/LL.po' files, where |
52 | +LL gives an ISO 639 two-letter code identifying the language. Unless |
53 | +translations have been forbidden at 'configure' time by using the |
54 | +'--disable-nls' switch, all available translations are installed |
55 | +together with the package. However, the environment variable 'LINGUAS' |
56 | +may be set, prior to configuration, to limit the installed set. |
57 | +'LINGUAS' should then contain a space separated list of two-letter |
58 | +codes, stating which languages are allowed. |
59 | + |
60 | +1.2 Using This Package |
61 | +====================== |
62 | + |
63 | +As a user, if your language has been installed for this package, you |
64 | +only have to set the 'LANG' environment variable to the appropriate |
65 | +'LL_CC' combination. If you happen to have the 'LC_ALL' or some other |
66 | +'LC_xxx' environment variables set, you should unset them before setting |
67 | +'LANG', otherwise the setting of 'LANG' will not have the desired |
68 | +effect. Here 'LL' is an ISO 639 two-letter language code, and 'CC' is |
69 | +an ISO 3166 two-letter country code. For example, let's suppose that |
70 | +you speak German and live in Germany. At the shell prompt, merely |
71 | +execute 'setenv LANG de_DE' (in 'csh'), 'export LANG; LANG=de_DE' (in |
72 | +'sh') or 'export LANG=de_DE' (in 'bash'). This can be done from your |
73 | +'.login' or '.profile' file, once and for all. |
74 | + |
75 | + You might think that the country code specification is redundant. |
76 | +But in fact, some languages have dialects in different countries. For |
77 | +example, 'de_AT' is used for Austria, and 'pt_BR' for Brazil. The |
78 | +country code serves to distinguish the dialects. |
79 | + |
80 | + The locale naming convention of 'LL_CC', with 'LL' denoting the |
81 | +language and 'CC' denoting the country, is the one use on systems based |
82 | +on GNU libc. On other systems, some variations of this scheme are used, |
83 | +such as 'LL' or 'LL_CC.ENCODING'. You can get the list of locales |
84 | +supported by your system for your language by running the command |
85 | +'locale -a | grep '^LL''. |
86 | + |
87 | + Not all programs have translations for all languages. By default, an |
88 | +English message is shown in place of a nonexistent translation. If you |
89 | +understand other languages, you can set up a priority list of languages. |
90 | +This is done through a different environment variable, called |
91 | +'LANGUAGE'. GNU 'gettext' gives preference to 'LANGUAGE' over 'LANG' |
92 | +for the purpose of message handling, but you still need to have 'LANG' |
93 | +set to the primary language; this is required by other parts of the |
94 | +system libraries. For example, some Swedish users who would rather read |
95 | +translations in German than English for when Swedish is not available, |
96 | +set 'LANGUAGE' to 'sv:de' while leaving 'LANG' to 'sv_SE'. |
97 | + |
98 | + Special advice for Norwegian users: The language code for Norwegian |
99 | +bokma*l changed from 'no' to 'nb' recently (in 2003). During the |
100 | +transition period, while some message catalogs for this language are |
101 | +installed under 'nb' and some older ones under 'no', it's recommended |
102 | +for Norwegian users to set 'LANGUAGE' to 'nb:no' so that both newer and |
103 | +older translations are used. |
104 | + |
105 | + In the 'LANGUAGE' environment variable, but not in the 'LANG' |
106 | +environment variable, 'LL_CC' combinations can be abbreviated as 'LL' to |
107 | +denote the language's main dialect. For example, 'de' is equivalent to |
108 | +'de_DE' (German as spoken in Germany), and 'pt' to 'pt_PT' (Portuguese |
109 | +as spoken in Portugal) in this context. |
110 | + |
111 | +1.3 Translating Teams |
112 | +===================== |
113 | + |
114 | +For the Free Translation Project to be a success, we need interested |
115 | +people who like their own language and write it well, and who are also |
116 | +able to synergize with other translators speaking the same language. |
117 | +Each translation team has its own mailing list. The up-to-date list of |
118 | +teams can be found at the Free Translation Project's homepage, |
119 | +'http://translationproject.org/', in the "Teams" area. |
120 | + |
121 | + If you'd like to volunteer to _work_ at translating messages, you |
122 | +should become a member of the translating team for your own language. |
123 | +The subscribing address is _not_ the same as the list itself, it has |
124 | +'-request' appended. For example, speakers of Swedish can send a |
125 | +message to 'sv-request@li.org', having this message body: |
126 | + |
127 | + subscribe |
128 | + |
129 | + Keep in mind that team members are expected to participate _actively_ |
130 | +in translations, or at solving translational difficulties, rather than |
131 | +merely lurking around. If your team does not exist yet and you want to |
132 | +start one, or if you are unsure about what to do or how to get started, |
133 | +please write to 'coordinator@translationproject.org' to reach the |
134 | +coordinator for all translator teams. |
135 | + |
136 | + The English team is special. It works at improving and uniformizing |
137 | +the terminology in use. Proven linguistic skills are praised more than |
138 | +programming skills, here. |
139 | + |
140 | +1.4 Available Packages |
141 | +====================== |
142 | + |
143 | +Languages are not equally supported in all packages. The following |
144 | +matrix shows the current state of internationalization, as of Jun 2014. |
145 | +The matrix shows, in regard of each package, for which languages PO |
146 | +files have been submitted to translation coordination, with a |
147 | +translation percentage of at least 50%. |
148 | + |
149 | + Ready PO files af am an ar as ast az be bg bn bn_IN bs ca crh cs |
150 | + +---------------------------------------------------+ |
151 | + a2ps | [] [] [] | |
152 | + aegis | | |
153 | + anubis | | |
154 | + aspell | [] [] [] | |
155 | + bash | [] [] [] | |
156 | + bfd | | |
157 | + binutils | [] | |
158 | + bison | | |
159 | + bison-runtime | [] | |
160 | + buzztrax | [] | |
161 | + ccd2cue | | |
162 | + ccide | | |
163 | + cflow | | |
164 | + clisp | | |
165 | + coreutils | [] [] | |
166 | + cpio | | |
167 | + cppi | | |
168 | + cpplib | [] | |
169 | + cryptsetup | [] | |
170 | + datamash | | |
171 | + denemo | [] [] | |
172 | + dfarc | [] | |
173 | + dialog | [] [] [] | |
174 | + dico | | |
175 | + diffutils | [] | |
176 | + dink | [] | |
177 | + direvent | | |
178 | + doodle | [] | |
179 | + dos2unix | | |
180 | + dos2unix-man | | |
181 | + e2fsprogs | [] [] | |
182 | + enscript | [] | |
183 | + exif | [] | |
184 | + fetchmail | [] [] | |
185 | + findutils | [] | |
186 | + flex | [] | |
187 | + freedink | [] [] | |
188 | + fusionforge | | |
189 | + gas | | |
190 | + gawk | [] | |
191 | + gcal | [] | |
192 | + gcc | | |
193 | + gdbm | | |
194 | + gettext-examples | [] [] [] [] [] | |
195 | + gettext-runtime | [] [] [] | |
196 | + gettext-tools | [] [] | |
197 | + gjay | | |
198 | + glunarclock | [] [] [] | |
199 | + gnubiff | [] | |
200 | + gnubik | [] | |
201 | + gnucash | () () [] | |
202 | + gnuchess | | |
203 | + gnulib | [] | |
204 | + gnunet | | |
205 | + gnunet-gtk | | |
206 | + gold | | |
207 | + gphoto2 | [] | |
208 | + gprof | [] | |
209 | + gramadoir | | |
210 | + grep | [] [] [] | |
211 | + grub | [] | |
212 | + gsasl | | |
213 | + gss | | |
214 | + gst-plugins-bad | [] [] | |
215 | + gst-plugins-base | [] [] [] | |
216 | + gst-plugins-good | [] [] [] | |
217 | + gst-plugins-ugly | [] [] [] | |
218 | + gstreamer | [] [] [] [] | |
219 | + gtick | [] | |
220 | + gtkam | [] [] | |
221 | + gtkspell | [] [] [] [] [] | |
222 | + guix | | |
223 | + guix-packages | | |
224 | + gutenprint | [] | |
225 | + hello | [] | |
226 | + help2man | | |
227 | + help2man-texi | | |
228 | + hylafax | | |
229 | + idutils | | |
230 | + iso_15924 | [] | |
231 | + iso_3166 | [] [] [] [] [] [] [] [] [] [] | |
232 | + iso_3166_2 | | |
233 | + iso_4217 | [] | |
234 | + iso_639 | [] [] [] [] [] [] [] [] [] | |
235 | + iso_639_3 | [] [] | |
236 | + iso_639_5 | | |
237 | + jwhois | | |
238 | + kbd | [] | |
239 | + klavaro | [] [] [] [] [] | |
240 | + ld | [] | |
241 | + leafpad | [] [] [] [] | |
242 | + libc | [] [] [] | |
243 | + libexif | () | |
244 | + libextractor | | |
245 | + libgnutls | [] | |
246 | + libgphoto2 | [] | |
247 | + libgphoto2_port | [] | |
248 | + libgsasl | | |
249 | + libiconv | [] [] | |
250 | + libidn | [] | |
251 | + liferea | [] [] [] [] | |
252 | + lilypond | [] [] | |
253 | + lordsawar | [] | |
254 | + lprng | | |
255 | + lynx | [] [] | |
256 | + m4 | [] | |
257 | + mailfromd | | |
258 | + mailutils | | |
259 | + make | [] | |
260 | + man-db | [] [] | |
261 | + man-db-manpages | | |
262 | + midi-instruments | [] [] [] | |
263 | + minicom | [] | |
264 | + mkisofs | [] | |
265 | + myserver | [] | |
266 | + nano | [] [] [] | |
267 | + opcodes | | |
268 | + parted | [] | |
269 | + pies | | |
270 | + pnmixer | | |
271 | + popt | [] | |
272 | + procps-ng | | |
273 | + procps-ng-man | | |
274 | + psmisc | [] | |
275 | + pspp | [] | |
276 | + pushover | [] | |
277 | + pwdutils | | |
278 | + pyspread | | |
279 | + radius | [] | |
280 | + recode | [] [] [] | |
281 | + recutils | | |
282 | + rpm | | |
283 | + rush | | |
284 | + sarg | | |
285 | + sed | [] [] [] [] | |
286 | + sharutils | [] | |
287 | + shishi | | |
288 | + skribilo | | |
289 | + solfege | [] [] | |
290 | + solfege-manual | | |
291 | + spotmachine | | |
292 | + sudo | [] [] | |
293 | + sudoers | [] [] | |
294 | + sysstat | [] | |
295 | + tar | [] [] [] | |
296 | + texinfo | [] [] | |
297 | + texinfo_document | [] [] | |
298 | + tigervnc | [] | |
299 | + tin | | |
300 | + tin-man | | |
301 | + tracgoogleappsa... | | |
302 | + trader | | |
303 | + util-linux | [] | |
304 | + ve | | |
305 | + vice | | |
306 | + vmm | | |
307 | + vorbis-tools | [] | |
308 | + wastesedge | | |
309 | + wcd | | |
310 | + wcd-man | | |
311 | + wdiff | [] [] | |
312 | + wget | [] | |
313 | + wyslij-po | | |
314 | + xboard | | |
315 | + xdg-user-dirs | [] [] [] [] [] [] [] [] [] [] | |
316 | + xkeyboard-config | [] [] [] | |
317 | + +---------------------------------------------------+ |
318 | + af am an ar as ast az be bg bn bn_IN bs ca crh cs |
319 | + 4 0 2 5 3 11 0 8 25 3 3 1 55 4 74 |
320 | + |
321 | + da de el en en_GB en_ZA eo es et eu fa fi fr |
322 | + +--------------------------------------------------+ |
323 | + a2ps | [] [] [] [] [] [] [] [] [] | |
324 | + aegis | [] [] [] [] | |
325 | + anubis | [] [] [] [] [] | |
326 | + aspell | [] [] [] [] [] [] [] | |
327 | + bash | [] [] [] | |
328 | + bfd | [] [] [] [] | |
329 | + binutils | [] [] [] | |
330 | + bison | [] [] [] [] [] [] [] [] | |
331 | + bison-runtime | [] [] [] [] [] [] [] [] | |
332 | + buzztrax | [] [] [] [] | |
333 | + ccd2cue | [] [] [] [] | |
334 | + ccide | [] [] [] [] [] [] | |
335 | + cflow | [] [] [] [] [] | |
336 | + clisp | [] [] [] [] [] | |
337 | + coreutils | [] [] [] [] [] | |
338 | + cpio | [] [] [] [] [] | |
339 | + cppi | [] [] [] [] [] | |
340 | + cpplib | [] [] [] [] [] [] | |
341 | + cryptsetup | [] [] [] [] [] | |
342 | + datamash | [] [] [] [] | |
343 | + denemo | [] | |
344 | + dfarc | [] [] [] [] [] [] | |
345 | + dialog | [] [] [] [] [] [] [] [] [] | |
346 | + dico | [] [] [] [] | |
347 | + diffutils | [] [] [] [] [] [] | |
348 | + dink | [] [] [] [] [] [] | |
349 | + direvent | [] [] [] [] | |
350 | + doodle | [] [] [] [] | |
351 | + dos2unix | [] [] [] [] [] | |
352 | + dos2unix-man | [] [] [] | |
353 | + e2fsprogs | [] [] [] [] [] | |
354 | + enscript | [] [] [] [] [] [] | |
355 | + exif | [] [] [] [] [] [] | |
356 | + fetchmail | [] () [] [] [] [] [] | |
357 | + findutils | [] [] [] [] [] [] [] [] | |
358 | + flex | [] [] [] [] [] [] | |
359 | + freedink | [] [] [] [] [] [] [] [] | |
360 | + fusionforge | [] [] [] | |
361 | + gas | [] [] [] | |
362 | + gawk | [] [] [] [] [] | |
363 | + gcal | [] [] [] [] | |
364 | + gcc | [] | |
365 | + gdbm | [] [] [] [] [] | |
366 | + gettext-examples | [] [] [] [] [] [] [] | |
367 | + gettext-runtime | [] [] [] [] [] [] | |
368 | + gettext-tools | [] [] [] [] [] | |
369 | + gjay | [] [] [] [] | |
370 | + glunarclock | [] [] [] [] [] | |
371 | + gnubiff | () [] [] () | |
372 | + gnubik | [] [] [] [] [] | |
373 | + gnucash | [] () () () () () () | |
374 | + gnuchess | [] [] [] [] | |
375 | + gnulib | [] [] [] [] [] [] [] | |
376 | + gnunet | [] | |
377 | + gnunet-gtk | [] | |
378 | + gold | [] [] [] | |
379 | + gphoto2 | [] () [] [] | |
380 | + gprof | [] [] [] [] [] [] | |
381 | + gramadoir | [] [] [] [] [] | |
382 | + grep | [] [] [] [] [] [] [] | |
383 | + grub | [] [] [] [] [] | |
384 | + gsasl | [] [] [] [] [] | |
385 | + gss | [] [] [] [] [] | |
386 | + gst-plugins-bad | [] [] [] | |
387 | + gst-plugins-base | [] [] [] [] [] [] | |
388 | + gst-plugins-good | [] [] [] [] [] [] [] | |
389 | + gst-plugins-ugly | [] [] [] [] [] [] [] [] | |
390 | + gstreamer | [] [] [] [] [] [] [] | |
391 | + gtick | [] () [] [] [] | |
392 | + gtkam | [] () [] [] [] [] | |
393 | + gtkspell | [] [] [] [] [] [] [] [] | |
394 | + guix | [] [] | |
395 | + guix-packages | | |
396 | + gutenprint | [] [] [] [] | |
397 | + hello | [] [] [] [] [] [] [] [] | |
398 | + help2man | [] [] [] [] [] [] [] | |
399 | + help2man-texi | [] [] [] | |
400 | + hylafax | [] [] | |
401 | + idutils | [] [] [] [] [] | |
402 | + iso_15924 | [] () [] [] () [] () | |
403 | + iso_3166 | [] () [] [] [] [] () [] () | |
404 | + iso_3166_2 | [] () () () | |
405 | + iso_4217 | [] () [] [] [] () [] () | |
406 | + iso_639 | [] () [] [] () [] () | |
407 | + iso_639_3 | () () () | |
408 | + iso_639_5 | () () () | |
409 | + jwhois | [] [] [] [] [] | |
410 | + kbd | [] [] [] [] [] [] | |
411 | + klavaro | [] [] [] [] [] [] [] | |
412 | + ld | [] [] [] [] | |
413 | + leafpad | [] [] [] [] [] [] [] [] | |
414 | + libc | [] [] [] [] [] | |
415 | + libexif | [] [] () [] [] | |
416 | + libextractor | [] | |
417 | + libgnutls | [] [] [] [] | |
418 | + libgphoto2 | [] () [] | |
419 | + libgphoto2_port | [] () [] [] [] [] | |
420 | + libgsasl | [] [] [] [] [] | |
421 | + libiconv | [] [] [] [] [] [] [] | |
422 | + libidn | [] [] [] [] [] | |
423 | + liferea | [] () [] [] [] [] [] | |
424 | + lilypond | [] [] [] [] [] [] | |
425 | + lordsawar | [] [] | |
426 | + lprng | | |
427 | + lynx | [] [] [] [] [] [] | |
428 | + m4 | [] [] [] [] [] [] | |
429 | + mailfromd | [] | |
430 | + mailutils | [] [] [] [] | |
431 | + make | [] [] [] [] [] | |
432 | + man-db | [] [] [] [] | |
433 | + man-db-manpages | [] [] | |
434 | + midi-instruments | [] [] [] [] [] [] [] [] [] | |
435 | + minicom | [] [] [] [] [] | |
436 | + mkisofs | [] [] [] | |
437 | + myserver | [] [] [] [] | |
438 | + nano | [] [] [] [] [] [] [] | |
439 | + opcodes | [] [] [] [] [] | |
440 | + parted | [] [] [] | |
441 | + pies | [] | |
442 | + pnmixer | [] [] | |
443 | + popt | [] [] [] [] [] [] | |
444 | + procps-ng | [] [] | |
445 | + procps-ng-man | [] [] | |
446 | + psmisc | [] [] [] [] [] [] [] | |
447 | + pspp | [] [] [] | |
448 | + pushover | () [] [] [] | |
449 | + pwdutils | [] [] [] | |
450 | + pyspread | [] [] [] | |
451 | + radius | [] [] | |
452 | + recode | [] [] [] [] [] [] [] | |
453 | + recutils | [] [] [] [] | |
454 | + rpm | [] [] [] [] [] | |
455 | + rush | [] [] [] | |
456 | + sarg | [] [] | |
457 | + sed | [] [] [] [] [] [] [] [] | |
458 | + sharutils | [] [] [] [] | |
459 | + shishi | [] [] [] | |
460 | + skribilo | [] [] [] | |
461 | + solfege | [] [] [] [] [] [] [] [] | |
462 | + solfege-manual | [] [] [] [] [] | |
463 | + spotmachine | [] [] [] [] [] | |
464 | + sudo | [] [] [] [] [] [] | |
465 | + sudoers | [] [] [] [] [] [] | |
466 | + sysstat | [] [] [] [] [] [] | |
467 | + tar | [] [] [] [] [] [] [] | |
468 | + texinfo | [] [] [] [] [] | |
469 | + texinfo_document | [] [] [] [] | |
470 | + tigervnc | [] [] [] [] [] [] | |
471 | + tin | [] [] [] [] | |
472 | + tin-man | [] | |
473 | + tracgoogleappsa... | [] [] [] [] [] | |
474 | + trader | [] [] [] [] [] [] | |
475 | + util-linux | [] [] [] [] | |
476 | + ve | [] [] [] [] [] | |
477 | + vice | () () () | |
478 | + vmm | [] [] | |
479 | + vorbis-tools | [] [] [] [] | |
480 | + wastesedge | [] | |
481 | + wcd | [] [] [] [] | |
482 | + wcd-man | [] | |
483 | + wdiff | [] [] [] [] [] [] [] | |
484 | + wget | [] [] [] [] [] [] | |
485 | + wyslij-po | [] [] [] [] | |
486 | + xboard | [] [] [] [] | |
487 | + xdg-user-dirs | [] [] [] [] [] [] [] [] [] [] | |
488 | + xkeyboard-config | [] [] [] [] [] [] [] | |
489 | + +--------------------------------------------------+ |
490 | + da de el en en_GB en_ZA eo es et eu fa fi fr |
491 | + 119 131 32 1 6 0 94 95 22 13 4 102 139 |
492 | + |
493 | + ga gd gl gu he hi hr hu hy ia id is it ja ka kk |
494 | + +-------------------------------------------------+ |
495 | + a2ps | [] [] [] [] | |
496 | + aegis | [] | |
497 | + anubis | [] [] [] [] | |
498 | + aspell | [] [] [] [] [] | |
499 | + bash | [] [] [] [] | |
500 | + bfd | [] [] | |
501 | + binutils | [] [] [] | |
502 | + bison | [] | |
503 | + bison-runtime | [] [] [] [] [] [] [] [] | |
504 | + buzztrax | | |
505 | + ccd2cue | [] | |
506 | + ccide | [] [] | |
507 | + cflow | [] [] [] | |
508 | + clisp | | |
509 | + coreutils | [] [] | |
510 | + cpio | [] [] [] [] [] [] | |
511 | + cppi | [] [] [] [] [] | |
512 | + cpplib | [] [] | |
513 | + cryptsetup | [] | |
514 | + datamash | | |
515 | + denemo | [] | |
516 | + dfarc | [] [] [] | |
517 | + dialog | [] [] [] [] [] [] [] [] [] [] | |
518 | + dico | | |
519 | + diffutils | [] [] [] [] | |
520 | + dink | [] | |
521 | + direvent | [] | |
522 | + doodle | [] [] | |
523 | + dos2unix | [] [] | |
524 | + dos2unix-man | | |
525 | + e2fsprogs | [] [] | |
526 | + enscript | [] [] [] | |
527 | + exif | [] [] [] [] [] [] | |
528 | + fetchmail | [] [] [] | |
529 | + findutils | [] [] [] [] [] [] [] | |
530 | + flex | [] | |
531 | + freedink | [] [] [] [] | |
532 | + fusionforge | | |
533 | + gas | [] | |
534 | + gawk | [] () [] | |
535 | + gcal | | |
536 | + gcc | | |
537 | + gdbm | | |
538 | + gettext-examples | [] [] [] [] [] [] [] | |
539 | + gettext-runtime | [] [] [] [] [] [] [] | |
540 | + gettext-tools | [] [] [] | |
541 | + gjay | [] | |
542 | + glunarclock | [] [] [] [] [] [] | |
543 | + gnubiff | [] [] () | |
544 | + gnubik | [] [] [] | |
545 | + gnucash | () () () () () | |
546 | + gnuchess | | |
547 | + gnulib | [] [] [] [] [] | |
548 | + gnunet | | |
549 | + gnunet-gtk | | |
550 | + gold | [] [] | |
551 | + gphoto2 | [] [] [] [] | |
552 | + gprof | [] [] [] [] | |
553 | + gramadoir | [] [] [] | |
554 | + grep | [] [] [] [] [] [] [] | |
555 | + grub | [] [] [] | |
556 | + gsasl | [] [] [] [] [] | |
557 | + gss | [] [] [] [] [] | |
558 | + gst-plugins-bad | [] [] [] | |
559 | + gst-plugins-base | [] [] [] [] | |
560 | + gst-plugins-good | [] [] [] [] [] [] | |
561 | + gst-plugins-ugly | [] [] [] [] [] [] | |
562 | + gstreamer | [] [] [] [] [] | |
563 | + gtick | [] [] [] [] [] | |
564 | + gtkam | [] [] [] [] [] | |
565 | + gtkspell | [] [] [] [] [] [] [] [] [] [] | |
566 | + guix | | |
567 | + guix-packages | | |
568 | + gutenprint | [] [] [] | |
569 | + hello | [] [] [] [] [] | |
570 | + help2man | [] [] [] | |
571 | + help2man-texi | | |
572 | + hylafax | [] | |
573 | + idutils | [] [] | |
574 | + iso_15924 | [] [] [] [] [] [] | |
575 | + iso_3166 | [] [] [] [] [] [] [] [] [] [] [] [] [] | |
576 | + iso_3166_2 | [] [] | |
577 | + iso_4217 | [] [] [] [] [] [] | |
578 | + iso_639 | [] [] [] [] [] [] [] [] [] | |
579 | + iso_639_3 | [] [] | |
580 | + iso_639_5 | | |
581 | + jwhois | [] [] [] [] | |
582 | + kbd | [] [] [] | |
583 | + klavaro | [] [] [] [] [] | |
584 | + ld | [] [] [] [] | |
585 | + leafpad | [] [] [] [] [] [] [] () | |
586 | + libc | [] [] [] [] [] | |
587 | + libexif | [] | |
588 | + libextractor | | |
589 | + libgnutls | [] | |
590 | + libgphoto2 | [] [] | |
591 | + libgphoto2_port | [] [] | |
592 | + libgsasl | [] [] [] [] | |
593 | + libiconv | [] [] [] [] [] [] [] | |
594 | + libidn | [] [] [] [] | |
595 | + liferea | [] [] [] [] [] | |
596 | + lilypond | [] | |
597 | + lordsawar | | |
598 | + lprng | [] | |
599 | + lynx | [] [] [] [] | |
600 | + m4 | [] [] [] [] [] | |
601 | + mailfromd | | |
602 | + mailutils | | |
603 | + make | [] [] [] [] | |
604 | + man-db | [] [] | |
605 | + man-db-manpages | [] [] | |
606 | + midi-instruments | [] [] [] [] [] [] [] [] [] | |
607 | + minicom | [] [] [] | |
608 | + mkisofs | [] [] | |
609 | + myserver | [] | |
610 | + nano | [] [] [] [] [] [] | |
611 | + opcodes | [] [] [] | |
612 | + parted | [] [] [] [] [] | |
613 | + pies | | |
614 | + pnmixer | [] [] | |
615 | + popt | [] [] [] [] [] [] [] [] [] [] | |
616 | + procps-ng | | |
617 | + procps-ng-man | | |
618 | + psmisc | [] [] [] [] | |
619 | + pspp | [] [] | |
620 | + pushover | [] | |
621 | + pwdutils | [] | |
622 | + pyspread | | |
623 | + radius | [] | |
624 | + recode | [] [] [] [] [] [] [] | |
625 | + recutils | | |
626 | + rpm | [] | |
627 | + rush | [] | |
628 | + sarg | | |
629 | + sed | [] [] [] [] [] [] [] | |
630 | + sharutils | | |
631 | + shishi | | |
632 | + skribilo | [] | |
633 | + solfege | [] [] | |
634 | + solfege-manual | | |
635 | + spotmachine | | |
636 | + sudo | [] [] [] [] | |
637 | + sudoers | [] [] [] | |
638 | + sysstat | [] [] [] [] | |
639 | + tar | [] [] [] [] [] [] | |
640 | + texinfo | [] [] [] | |
641 | + texinfo_document | [] [] [] | |
642 | + tigervnc | | |
643 | + tin | | |
644 | + tin-man | | |
645 | + tracgoogleappsa... | [] [] [] [] | |
646 | + trader | [] [] | |
647 | + util-linux | [] | |
648 | + ve | [] | |
649 | + vice | () () | |
650 | + vmm | | |
651 | + vorbis-tools | [] [] | |
652 | + wastesedge | [] | |
653 | + wcd | | |
654 | + wcd-man | | |
655 | + wdiff | [] [] [] | |
656 | + wget | [] [] [] [] | |
657 | + wyslij-po | [] [] [] | |
658 | + xboard | | |
659 | + xdg-user-dirs | [] [] [] [] [] [] [] [] [] [] [] [] [] [] | |
660 | + xkeyboard-config | [] [] [] [] [] [] | |
661 | + +-------------------------------------------------+ |
662 | + ga gd gl gu he hi hr hu hy ia id is it ja ka kk |
663 | + 35 2 47 4 8 2 60 71 2 6 81 11 87 57 0 3 |
664 | + |
665 | + kn ko ku ky lg lt lv mk ml mn mr ms mt nb ne nl |
666 | + +--------------------------------------------------+ |
667 | + a2ps | [] [] | |
668 | + aegis | [] | |
669 | + anubis | [] [] [] | |
670 | + aspell | [] [] | |
671 | + bash | [] [] | |
672 | + bfd | | |
673 | + binutils | | |
674 | + bison | [] | |
675 | + bison-runtime | [] [] [] [] [] [] | |
676 | + buzztrax | | |
677 | + ccd2cue | | |
678 | + ccide | [] [] | |
679 | + cflow | [] | |
680 | + clisp | [] | |
681 | + coreutils | [] [] | |
682 | + cpio | [] | |
683 | + cppi | | |
684 | + cpplib | [] | |
685 | + cryptsetup | [] | |
686 | + datamash | [] [] | |
687 | + denemo | | |
688 | + dfarc | [] [] | |
689 | + dialog | [] [] [] [] [] [] | |
690 | + dico | | |
691 | + diffutils | [] [] [] | |
692 | + dink | [] | |
693 | + direvent | [] | |
694 | + doodle | [] | |
695 | + dos2unix | [] [] | |
696 | + dos2unix-man | [] | |
697 | + e2fsprogs | [] | |
698 | + enscript | [] | |
699 | + exif | [] [] [] | |
700 | + fetchmail | [] | |
701 | + findutils | [] [] | |
702 | + flex | [] | |
703 | + freedink | [] [] | |
704 | + fusionforge | | |
705 | + gas | | |
706 | + gawk | [] | |
707 | + gcal | | |
708 | + gcc | | |
709 | + gdbm | | |
710 | + gettext-examples | [] [] [] [] [] [] | |
711 | + gettext-runtime | [] [] [] | |
712 | + gettext-tools | [] | |
713 | + gjay | | |
714 | + glunarclock | [] [] | |
715 | + gnubiff | [] | |
716 | + gnubik | [] [] | |
717 | + gnucash | () () () () () () () [] | |
718 | + gnuchess | [] [] | |
719 | + gnulib | [] | |
720 | + gnunet | | |
721 | + gnunet-gtk | | |
722 | + gold | | |
723 | + gphoto2 | [] | |
724 | + gprof | [] [] | |
725 | + gramadoir | [] | |
726 | + grep | [] [] | |
727 | + grub | [] [] [] | |
728 | + gsasl | [] | |
729 | + gss | | |
730 | + gst-plugins-bad | [] [] [] | |
731 | + gst-plugins-base | [] [] [] | |
732 | + gst-plugins-good | [] [] [] [] | |
733 | + gst-plugins-ugly | [] [] [] [] [] | |
734 | + gstreamer | [] [] [] | |
735 | + gtick | [] | |
736 | + gtkam | [] [] | |
737 | + gtkspell | [] [] [] [] [] [] [] | |
738 | + guix | | |
739 | + guix-packages | | |
740 | + gutenprint | [] | |
741 | + hello | [] [] [] | |
742 | + help2man | [] | |
743 | + help2man-texi | | |
744 | + hylafax | [] | |
745 | + idutils | [] | |
746 | + iso_15924 | () [] [] | |
747 | + iso_3166 | [] [] [] () [] [] [] [] [] [] | |
748 | + iso_3166_2 | () [] | |
749 | + iso_4217 | () [] [] [] | |
750 | + iso_639 | [] [] () [] [] [] [] | |
751 | + iso_639_3 | [] () [] | |
752 | + iso_639_5 | () | |
753 | + jwhois | [] [] | |
754 | + kbd | [] | |
755 | + klavaro | [] [] | |
756 | + ld | | |
757 | + leafpad | [] [] [] [] [] | |
758 | + libc | [] [] | |
759 | + libexif | [] | |
760 | + libextractor | [] | |
761 | + libgnutls | [] [] | |
762 | + libgphoto2 | [] | |
763 | + libgphoto2_port | [] | |
764 | + libgsasl | [] | |
765 | + libiconv | [] [] | |
766 | + libidn | [] | |
767 | + liferea | [] [] [] | |
768 | + lilypond | [] | |
769 | + lordsawar | | |
770 | + lprng | | |
771 | + lynx | [] | |
772 | + m4 | [] | |
773 | + mailfromd | | |
774 | + mailutils | | |
775 | + make | [] [] | |
776 | + man-db | [] | |
777 | + man-db-manpages | [] | |
778 | + midi-instruments | [] [] [] [] [] [] [] | |
779 | + minicom | [] | |
780 | + mkisofs | [] | |
781 | + myserver | | |
782 | + nano | [] [] [] | |
783 | + opcodes | [] | |
784 | + parted | [] [] | |
785 | + pies | | |
786 | + pnmixer | [] | |
787 | + popt | [] [] [] [] [] | |
788 | + procps-ng | | |
789 | + procps-ng-man | | |
790 | + psmisc | [] | |
791 | + pspp | [] [] | |
792 | + pushover | | |
793 | + pwdutils | [] | |
794 | + pyspread | | |
795 | + radius | [] | |
796 | + recode | [] [] | |
797 | + recutils | [] | |
798 | + rpm | [] | |
799 | + rush | [] | |
800 | + sarg | | |
801 | + sed | [] [] | |
802 | + sharutils | [] | |
803 | + shishi | | |
804 | + skribilo | | |
805 | + solfege | [] [] | |
806 | + solfege-manual | [] | |
807 | + spotmachine | [] | |
808 | + sudo | [] [] [] | |
809 | + sudoers | [] [] [] | |
810 | + sysstat | [] [] | |
811 | + tar | [] [] [] | |
812 | + texinfo | [] | |
813 | + texinfo_document | [] | |
814 | + tigervnc | [] | |
815 | + tin | | |
816 | + tin-man | | |
817 | + tracgoogleappsa... | [] [] [] | |
818 | + trader | [] | |
819 | + util-linux | [] | |
820 | + ve | [] | |
821 | + vice | [] | |
822 | + vmm | [] | |
823 | + vorbis-tools | [] | |
824 | + wastesedge | [] | |
825 | + wcd | [] | |
826 | + wcd-man | [] | |
827 | + wdiff | [] | |
828 | + wget | [] [] | |
829 | + wyslij-po | [] | |
830 | + xboard | [] | |
831 | + xdg-user-dirs | [] [] [] [] [] [] [] [] [] [] [] | |
832 | + xkeyboard-config | [] [] [] | |
833 | + +--------------------------------------------------+ |
834 | + kn ko ku ky lg lt lv mk ml mn mr ms mt nb ne nl |
835 | + 5 15 4 6 0 13 23 3 3 3 4 11 2 42 1 125 |
836 | + |
837 | + nn or pa pl ps pt pt_BR ro ru rw sk sl sq sr |
838 | + +------------------------------------------------+ |
839 | + a2ps | [] [] [] [] [] [] [] | |
840 | + aegis | [] [] | |
841 | + anubis | [] [] [] | |
842 | + aspell | [] [] [] [] [] [] [] | |
843 | + bash | [] [] [] [] [] [] | |
844 | + bfd | [] [] | |
845 | + binutils | [] [] | |
846 | + bison | [] [] [] | |
847 | + bison-runtime | [] [] [] [] [] [] [] [] | |
848 | + buzztrax | [] | |
849 | + ccd2cue | [] [] | |
850 | + ccide | [] [] [] | |
851 | + cflow | [] [] [] | |
852 | + clisp | [] | |
853 | + coreutils | [] [] [] [] | |
854 | + cpio | [] [] [] | |
855 | + cppi | [] [] [] | |
856 | + cpplib | [] [] [] | |
857 | + cryptsetup | [] [] [] | |
858 | + datamash | [] [] | |
859 | + denemo | | |
860 | + dfarc | [] [] [] | |
861 | + dialog | [] [] [] [] [] [] [] | |
862 | + dico | [] | |
863 | + diffutils | [] [] [] | |
864 | + dink | | |
865 | + direvent | [] [] [] | |
866 | + doodle | [] [] | |
867 | + dos2unix | [] [] [] [] | |
868 | + dos2unix-man | [] [] | |
869 | + e2fsprogs | [] | |
870 | + enscript | [] [] [] [] [] [] | |
871 | + exif | [] [] [] [] [] [] | |
872 | + fetchmail | [] [] [] | |
873 | + findutils | [] [] [] [] [] [] | |
874 | + flex | [] [] [] [] [] | |
875 | + freedink | [] [] [] [] [] | |
876 | + fusionforge | | |
877 | + gas | | |
878 | + gawk | [] | |
879 | + gcal | | |
880 | + gcc | | |
881 | + gdbm | [] [] [] | |
882 | + gettext-examples | [] [] [] [] [] [] [] [] | |
883 | + gettext-runtime | [] [] [] [] [] [] [] [] [] | |
884 | + gettext-tools | [] [] [] [] [] [] [] | |
885 | + gjay | [] | |
886 | + glunarclock | [] [] [] [] [] [] | |
887 | + gnubiff | [] | |
888 | + gnubik | [] [] [] [] | |
889 | + gnucash | () () () () () [] | |
890 | + gnuchess | [] [] | |
891 | + gnulib | [] [] [] [] [] | |
892 | + gnunet | | |
893 | + gnunet-gtk | | |
894 | + gold | | |
895 | + gphoto2 | [] [] [] [] [] | |
896 | + gprof | [] [] [] [] | |
897 | + gramadoir | [] [] | |
898 | + grep | [] [] [] [] [] [] | |
899 | + grub | [] [] [] [] [] | |
900 | + gsasl | [] [] [] | |
901 | + gss | [] [] [] [] | |
902 | + gst-plugins-bad | [] [] [] [] [] | |
903 | + gst-plugins-base | [] [] [] [] [] [] | |
904 | + gst-plugins-good | [] [] [] [] [] [] [] | |
905 | + gst-plugins-ugly | [] [] [] [] [] [] [] | |
906 | + gstreamer | [] [] [] [] [] [] [] | |
907 | + gtick | [] [] [] [] [] | |
908 | + gtkam | [] [] [] [] [] [] | |
909 | + gtkspell | [] [] [] [] [] [] [] [] [] | |
910 | + guix | | |
911 | + guix-packages | | |
912 | + gutenprint | [] [] | |
913 | + hello | [] [] [] [] [] [] | |
914 | + help2man | [] [] [] [] | |
915 | + help2man-texi | [] | |
916 | + hylafax | | |
917 | + idutils | [] [] [] | |
918 | + iso_15924 | [] () [] [] [] [] | |
919 | + iso_3166 | [] [] [] [] () [] [] [] [] [] [] [] [] | |
920 | + iso_3166_2 | [] () [] | |
921 | + iso_4217 | [] [] () [] [] [] [] [] | |
922 | + iso_639 | [] [] [] () [] [] [] [] [] [] | |
923 | + iso_639_3 | [] () | |
924 | + iso_639_5 | () [] | |
925 | + jwhois | [] [] [] [] | |
926 | + kbd | [] [] | |
927 | + klavaro | [] [] [] [] [] | |
928 | + ld | | |
929 | + leafpad | [] [] [] [] [] [] [] [] | |
930 | + libc | [] [] [] | |
931 | + libexif | [] () [] | |
932 | + libextractor | [] | |
933 | + libgnutls | [] | |
934 | + libgphoto2 | [] | |
935 | + libgphoto2_port | [] [] [] [] [] | |
936 | + libgsasl | [] [] [] [] | |
937 | + libiconv | [] [] [] [] [] | |
938 | + libidn | [] [] [] | |
939 | + liferea | [] [] [] [] () [] [] | |
940 | + lilypond | | |
941 | + lordsawar | | |
942 | + lprng | [] | |
943 | + lynx | [] [] | |
944 | + m4 | [] [] [] [] [] | |
945 | + mailfromd | [] | |
946 | + mailutils | [] | |
947 | + make | [] [] [] | |
948 | + man-db | [] [] [] | |
949 | + man-db-manpages | [] [] [] | |
950 | + midi-instruments | [] [] [] [] [] [] [] [] | |
951 | + minicom | [] [] [] [] | |
952 | + mkisofs | [] [] [] | |
953 | + myserver | [] [] | |
954 | + nano | [] [] [] [] [] [] | |
955 | + opcodes | | |
956 | + parted | [] [] [] [] [] [] | |
957 | + pies | [] | |
958 | + pnmixer | [] | |
959 | + popt | [] [] [] [] [] [] | |
960 | + procps-ng | [] | |
961 | + procps-ng-man | [] | |
962 | + psmisc | [] [] [] [] | |
963 | + pspp | [] [] | |
964 | + pushover | | |
965 | + pwdutils | [] | |
966 | + pyspread | [] [] | |
967 | + radius | [] [] | |
968 | + recode | [] [] [] [] [] [] [] [] | |
969 | + recutils | [] [] | |
970 | + rpm | [] | |
971 | + rush | [] [] [] | |
972 | + sarg | [] [] | |
973 | + sed | [] [] [] [] [] [] [] [] | |
974 | + sharutils | [] [] [] | |
975 | + shishi | [] [] | |
976 | + skribilo | [] | |
977 | + solfege | [] [] [] | |
978 | + solfege-manual | [] [] | |
979 | + spotmachine | [] [] | |
980 | + sudo | [] [] [] [] [] [] | |
981 | + sudoers | [] [] [] [] | |
982 | + sysstat | [] [] [] [] [] | |
983 | + tar | [] [] [] [] [] | |
984 | + texinfo | [] [] [] | |
985 | + texinfo_document | [] [] | |
986 | + tigervnc | [] [] [] | |
987 | + tin | [] | |
988 | + tin-man | | |
989 | + tracgoogleappsa... | [] [] [] [] | |
990 | + trader | [] [] | |
991 | + util-linux | [] [] | |
992 | + ve | [] [] [] | |
993 | + vice | | |
994 | + vmm | | |
995 | + vorbis-tools | [] [] [] | |
996 | + wastesedge | | |
997 | + wcd | | |
998 | + wcd-man | | |
999 | + wdiff | [] [] [] [] [] | |
1000 | + wget | [] [] [] [] [] | |
1001 | + wyslij-po | [] [] [] [] | |
1002 | + xboard | [] [] [] | |
1003 | + xdg-user-dirs | [] [] [] [] [] [] [] [] [] [] [] [] [] | |
1004 | + xkeyboard-config | [] [] [] [] | |
1005 | + +------------------------------------------------+ |
1006 | + nn or pa pl ps pt pt_BR ro ru rw sk sl sq sr |
1007 | + 7 3 6 114 1 12 88 32 82 3 40 45 7 101 |
1008 | + |
1009 | + sv sw ta te tg th tr uk ur vi wa wo zh_CN |
1010 | + +----------------------------------------------+ |
1011 | + a2ps | [] [] [] [] [] | |
1012 | + aegis | [] | |
1013 | + anubis | [] [] [] [] | |
1014 | + aspell | [] [] [] [] [] | |
1015 | + bash | [] [] [] [] | |
1016 | + bfd | [] [] [] | |
1017 | + binutils | [] [] [] | |
1018 | + bison | [] [] [] [] | |
1019 | + bison-runtime | [] [] [] [] [] [] | |
1020 | + buzztrax | [] [] [] | |
1021 | + ccd2cue | [] [] [] | |
1022 | + ccide | [] [] [] [] | |
1023 | + cflow | [] [] [] [] | |
1024 | + clisp | | |
1025 | + coreutils | [] [] [] | |
1026 | + cpio | [] [] [] [] [] | |
1027 | + cppi | [] [] [] [] | |
1028 | + cpplib | [] [] [] [] [] | |
1029 | + cryptsetup | [] [] [] | |
1030 | + datamash | [] [] [] | |
1031 | + denemo | [] | |
1032 | + dfarc | [] [] | |
1033 | + dialog | [] [] [] [] [] [] | |
1034 | + dico | [] | |
1035 | + diffutils | [] [] [] [] [] | |
1036 | + dink | [] | |
1037 | + direvent | [] [] | |
1038 | + doodle | [] [] | |
1039 | + dos2unix | [] [] [] [] | |
1040 | + dos2unix-man | [] [] [] | |
1041 | + e2fsprogs | [] [] [] [] | |
1042 | + enscript | [] [] [] [] | |
1043 | + exif | [] [] [] [] [] | |
1044 | + fetchmail | [] [] [] [] | |
1045 | + findutils | [] [] [] [] [] | |
1046 | + flex | [] [] [] [] | |
1047 | + freedink | [] [] [] | |
1048 | + fusionforge | | |
1049 | + gas | [] | |
1050 | + gawk | [] [] [] | |
1051 | + gcal | [] [] [] | |
1052 | + gcc | [] | |
1053 | + gdbm | [] [] | |
1054 | + gettext-examples | [] [] [] [] [] | |
1055 | + gettext-runtime | [] [] [] [] [] | |
1056 | + gettext-tools | [] [] [] [] [] | |
1057 | + gjay | [] [] [] | |
1058 | + glunarclock | [] [] [] [] | |
1059 | + gnubiff | [] [] | |
1060 | + gnubik | [] [] [] [] | |
1061 | + gnucash | () () () () [] | |
1062 | + gnuchess | [] [] [] | |
1063 | + gnulib | [] [] [] [] | |
1064 | + gnunet | | |
1065 | + gnunet-gtk | | |
1066 | + gold | [] [] | |
1067 | + gphoto2 | [] [] [] [] | |
1068 | + gprof | [] [] [] [] | |
1069 | + gramadoir | [] [] [] | |
1070 | + grep | [] [] [] [] [] | |
1071 | + grub | [] [] [] [] | |
1072 | + gsasl | [] [] [] [] | |
1073 | + gss | [] [] [] | |
1074 | + gst-plugins-bad | [] [] [] [] [] | |
1075 | + gst-plugins-base | [] [] [] [] [] | |
1076 | + gst-plugins-good | [] [] [] [] [] | |
1077 | + gst-plugins-ugly | [] [] [] [] [] | |
1078 | + gstreamer | [] [] [] [] [] | |
1079 | + gtick | [] [] [] | |
1080 | + gtkam | [] [] [] [] | |
1081 | + gtkspell | [] [] [] [] [] [] [] | |
1082 | + guix | | |
1083 | + guix-packages | | |
1084 | + gutenprint | [] [] [] [] | |
1085 | + hello | [] [] [] [] [] [] | |
1086 | + help2man | [] [] [] | |
1087 | + help2man-texi | [] | |
1088 | + hylafax | [] | |
1089 | + idutils | [] [] [] | |
1090 | + iso_15924 | [] () [] [] () [] | |
1091 | + iso_3166 | [] [] () [] [] () [] [] | |
1092 | + iso_3166_2 | () [] [] () [] | |
1093 | + iso_4217 | [] () [] [] () [] | |
1094 | + iso_639 | [] [] [] () [] [] () [] [] | |
1095 | + iso_639_3 | [] () [] [] () | |
1096 | + iso_639_5 | () [] () | |
1097 | + jwhois | [] [] [] [] | |
1098 | + kbd | [] [] [] [] | |
1099 | + klavaro | [] [] [] [] [] [] | |
1100 | + ld | [] [] [] [] [] | |
1101 | + leafpad | [] [] [] [] [] [] | |
1102 | + libc | [] [] [] [] [] | |
1103 | + libexif | [] [] () | |
1104 | + libextractor | [] [] | |
1105 | + libgnutls | [] [] [] [] | |
1106 | + libgphoto2 | [] [] [] | |
1107 | + libgphoto2_port | [] [] [] [] | |
1108 | + libgsasl | [] [] [] [] | |
1109 | + libiconv | [] [] [] [] [] | |
1110 | + libidn | () [] [] [] | |
1111 | + liferea | [] [] [] [] [] | |
1112 | + lilypond | [] | |
1113 | + lordsawar | | |
1114 | + lprng | [] | |
1115 | + lynx | [] [] [] [] | |
1116 | + m4 | [] [] [] | |
1117 | + mailfromd | [] [] | |
1118 | + mailutils | [] | |
1119 | + make | [] [] [] [] | |
1120 | + man-db | [] [] [] | |
1121 | + man-db-manpages | [] [] | |
1122 | + midi-instruments | [] [] [] [] [] [] | |
1123 | + minicom | [] [] | |
1124 | + mkisofs | [] [] [] | |
1125 | + myserver | [] | |
1126 | + nano | [] [] [] [] | |
1127 | + opcodes | [] [] [] | |
1128 | + parted | [] [] [] [] [] | |
1129 | + pies | [] [] | |
1130 | + pnmixer | [] [] [] | |
1131 | + popt | [] [] [] [] [] [] [] | |
1132 | + procps-ng | [] [] | |
1133 | + procps-ng-man | [] | |
1134 | + psmisc | [] [] [] [] | |
1135 | + pspp | [] [] [] | |
1136 | + pushover | [] | |
1137 | + pwdutils | [] [] | |
1138 | + pyspread | [] | |
1139 | + radius | [] [] | |
1140 | + recode | [] [] [] [] | |
1141 | + recutils | [] [] [] | |
1142 | + rpm | [] [] [] [] | |
1143 | + rush | [] [] | |
1144 | + sarg | | |
1145 | + sed | [] [] [] [] [] | |
1146 | + sharutils | [] [] [] [] | |
1147 | + shishi | [] [] | |
1148 | + skribilo | [] [] | |
1149 | + solfege | [] [] [] [] | |
1150 | + solfege-manual | [] | |
1151 | + spotmachine | [] [] [] | |
1152 | + sudo | [] [] [] [] [] | |
1153 | + sudoers | [] [] [] [] | |
1154 | + sysstat | [] [] [] [] [] | |
1155 | + tar | [] [] [] [] [] | |
1156 | + texinfo | [] [] [] | |
1157 | + texinfo_document | [] | |
1158 | + tigervnc | [] [] [] | |
1159 | + tin | [] | |
1160 | + tin-man | | |
1161 | + tracgoogleappsa... | [] [] [] [] [] | |
1162 | + trader | [] | |
1163 | + util-linux | [] [] [] [] | |
1164 | + ve | [] [] [] [] | |
1165 | + vice | () () | |
1166 | + vmm | | |
1167 | + vorbis-tools | [] [] | |
1168 | + wastesedge | | |
1169 | + wcd | [] [] [] | |
1170 | + wcd-man | [] | |
1171 | + wdiff | [] [] [] [] | |
1172 | + wget | [] [] [] | |
1173 | + wyslij-po | [] [] | |
1174 | + xboard | [] [] | |
1175 | + xdg-user-dirs | [] [] [] [] [] [] [] [] | |
1176 | + xkeyboard-config | [] [] [] [] | |
1177 | + +----------------------------------------------+ |
1178 | + sv sw ta te tg th tr uk ur vi wa wo zh_CN |
1179 | + 106 1 4 3 0 13 51 115 1 125 7 1 100 |
1180 | + |
1181 | + zh_HK zh_TW |
1182 | + +-------------+ |
1183 | + a2ps | | 30 |
1184 | + aegis | | 9 |
1185 | + anubis | | 19 |
1186 | + aspell | | 29 |
1187 | + bash | [] | 23 |
1188 | + bfd | | 11 |
1189 | + binutils | | 12 |
1190 | + bison | [] | 18 |
1191 | + bison-runtime | [] | 38 |
1192 | + buzztrax | | 9 |
1193 | + ccd2cue | | 10 |
1194 | + ccide | | 17 |
1195 | + cflow | | 16 |
1196 | + clisp | | 10 |
1197 | + coreutils | | 18 |
1198 | + cpio | | 20 |
1199 | + cppi | | 17 |
1200 | + cpplib | [] | 19 |
1201 | + cryptsetup | | 14 |
1202 | + datamash | | 11 |
1203 | + denemo | | 5 |
1204 | + dfarc | | 17 |
1205 | + dialog | [] | 42 |
1206 | + dico | | 6 |
1207 | + diffutils | | 22 |
1208 | + dink | | 10 |
1209 | + direvent | | 11 |
1210 | + doodle | | 12 |
1211 | + dos2unix | [] | 18 |
1212 | + dos2unix-man | | 9 |
1213 | + e2fsprogs | | 15 |
1214 | + enscript | | 21 |
1215 | + exif | | 27 |
1216 | + fetchmail | | 19 |
1217 | + findutils | | 29 |
1218 | + flex | [] | 19 |
1219 | + freedink | | 24 |
1220 | + fusionforge | | 3 |
1221 | + gas | | 5 |
1222 | + gawk | | 13 |
1223 | + gcal | | 8 |
1224 | + gcc | | 2 |
1225 | + gdbm | | 10 |
1226 | + gettext-examples | [] [] | 40 |
1227 | + gettext-runtime | [] [] | 35 |
1228 | + gettext-tools | [] | 24 |
1229 | + gjay | | 9 |
1230 | + glunarclock | [] | 27 |
1231 | + gnubiff | | 9 |
1232 | + gnubik | | 19 |
1233 | + gnucash | () | 6 |
1234 | + gnuchess | | 11 |
1235 | + gnulib | | 23 |
1236 | + gnunet | | 1 |
1237 | + gnunet-gtk | | 1 |
1238 | + gold | | 7 |
1239 | + gphoto2 | [] | 19 |
1240 | + gprof | | 21 |
1241 | + gramadoir | | 14 |
1242 | + grep | [] | 31 |
1243 | + grub | | 21 |
1244 | + gsasl | [] | 19 |
1245 | + gss | | 17 |
1246 | + gst-plugins-bad | | 21 |
1247 | + gst-plugins-base | | 27 |
1248 | + gst-plugins-good | | 32 |
1249 | + gst-plugins-ugly | | 34 |
1250 | + gstreamer | [] | 32 |
1251 | + gtick | | 19 |
1252 | + gtkam | | 24 |
1253 | + gtkspell | [] [] | 48 |
1254 | + guix | | 2 |
1255 | + guix-packages | | 0 |
1256 | + gutenprint | | 15 |
1257 | + hello | [] | 30 |
1258 | + help2man | | 18 |
1259 | + help2man-texi | | 5 |
1260 | + hylafax | | 5 |
1261 | + idutils | | 14 |
1262 | + iso_15924 | [] | 23 |
1263 | + iso_3166 | [] [] | 58 |
1264 | + iso_3166_2 | | 9 |
1265 | + iso_4217 | [] [] | 28 |
1266 | + iso_639 | [] [] | 46 |
1267 | + iso_639_3 | | 10 |
1268 | + iso_639_5 | | 2 |
1269 | + jwhois | [] | 20 |
1270 | + kbd | | 17 |
1271 | + klavaro | | 30 |
1272 | + ld | [] | 15 |
1273 | + leafpad | [] | 39 |
1274 | + libc | [] | 24 |
1275 | + libexif | | 10 |
1276 | + libextractor | | 5 |
1277 | + libgnutls | | 13 |
1278 | + libgphoto2 | | 10 |
1279 | + libgphoto2_port | [] | 19 |
1280 | + libgsasl | | 18 |
1281 | + libiconv | [] | 29 |
1282 | + libidn | | 17 |
1283 | + liferea | | 29 |
1284 | + lilypond | | 11 |
1285 | + lordsawar | | 3 |
1286 | + lprng | | 3 |
1287 | + lynx | | 19 |
1288 | + m4 | [] | 22 |
1289 | + mailfromd | | 4 |
1290 | + mailutils | | 6 |
1291 | + make | | 19 |
1292 | + man-db | | 15 |
1293 | + man-db-manpages | | 10 |
1294 | + midi-instruments | [] | 43 |
1295 | + minicom | [] | 17 |
1296 | + mkisofs | | 13 |
1297 | + myserver | | 9 |
1298 | + nano | [] | 30 |
1299 | + opcodes | | 12 |
1300 | + parted | [] | 23 |
1301 | + pies | | 4 |
1302 | + pnmixer | | 9 |
1303 | + popt | [] | 36 |
1304 | + procps-ng | | 5 |
1305 | + procps-ng-man | | 4 |
1306 | + psmisc | [] | 22 |
1307 | + pspp | | 13 |
1308 | + pushover | | 6 |
1309 | + pwdutils | | 8 |
1310 | + pyspread | | 6 |
1311 | + radius | | 9 |
1312 | + recode | | 31 |
1313 | + recutils | | 10 |
1314 | + rpm | [] | 13 |
1315 | + rush | | 10 |
1316 | + sarg | | 4 |
1317 | + sed | [] | 35 |
1318 | + sharutils | | 13 |
1319 | + shishi | | 7 |
1320 | + skribilo | | 7 |
1321 | + solfege | | 21 |
1322 | + solfege-manual | | 9 |
1323 | + spotmachine | | 11 |
1324 | + sudo | | 26 |
1325 | + sudoers | | 22 |
1326 | + sysstat | | 23 |
1327 | + tar | [] | 30 |
1328 | + texinfo | | 17 |
1329 | + texinfo_document | | 13 |
1330 | + tigervnc | | 14 |
1331 | + tin | [] | 7 |
1332 | + tin-man | | 1 |
1333 | + tracgoogleappsa... | [] | 22 |
1334 | + trader | | 12 |
1335 | + util-linux | | 13 |
1336 | + ve | | 14 |
1337 | + vice | | 1 |
1338 | + vmm | | 3 |
1339 | + vorbis-tools | | 13 |
1340 | + wastesedge | | 3 |
1341 | + wcd | | 8 |
1342 | + wcd-man | | 3 |
1343 | + wdiff | [] | 23 |
1344 | + wget | | 21 |
1345 | + wyslij-po | | 14 |
1346 | + xboard | | 10 |
1347 | + xdg-user-dirs | [] [] | 68 |
1348 | + xkeyboard-config | [] | 28 |
1349 | + +-------------+ |
1350 | + 89 teams zh_HK zh_TW |
1351 | + 166 domains 7 42 2809 |
1352 | + |
1353 | + Some counters in the preceding matrix are higher than the number of |
1354 | +visible blocks let us expect. This is because a few extra PO files are |
1355 | +used for implementing regional variants of languages, or language |
1356 | +dialects. |
1357 | + |
1358 | + For a PO file in the matrix above to be effective, the package to |
1359 | +which it applies should also have been internationalized and distributed |
1360 | +as such by its maintainer. There might be an observable lag between the |
1361 | +mere existence a PO file and its wide availability in a distribution. |
1362 | + |
1363 | + If Jun 2014 seems to be old, you may fetch a more recent copy of this |
1364 | +'ABOUT-NLS' file on most GNU archive sites. The most up-to-date matrix |
1365 | +with full percentage details can be found at |
1366 | +'http://translationproject.org/extra/matrix.html'. |
1367 | + |
1368 | +1.5 Using 'gettext' in new packages |
1369 | +=================================== |
1370 | + |
1371 | +If you are writing a freely available program and want to |
1372 | +internationalize it you are welcome to use GNU 'gettext' in your |
1373 | +package. Of course you have to respect the GNU Lesser General Public |
1374 | +License which covers the use of the GNU 'gettext' library. This means |
1375 | +in particular that even non-free programs can use 'libintl' as a shared |
1376 | +library, whereas only free software can use 'libintl' as a static |
1377 | +library or use modified versions of 'libintl'. |
1378 | + |
1379 | + Once the sources are changed appropriately and the setup can handle |
1380 | +the use of 'gettext' the only thing missing are the translations. The |
1381 | +Free Translation Project is also available for packages which are not |
1382 | +developed inside the GNU project. Therefore the information given above |
1383 | +applies also for every other Free Software Project. Contact |
1384 | +'coordinator@translationproject.org' to make the '.pot' files available |
1385 | +to the translation teams. |
1386 | diff --git a/Makefile.am b/Makefile.am |
1387 | index d75bd5d..0973336 100644 |
1388 | --- a/Makefile.am |
1389 | +++ b/Makefile.am |
1390 | @@ -9,4 +9,15 @@ EXTRA_DIST = \ |
1391 | COPYING \ |
1392 | AUTHORS \ |
1393 | NEWS \ |
1394 | - gnome-initial-setup.doap |
1395 | + gnome-initial-setup.doap \ |
1396 | + meson.build \ |
1397 | + meson_options.txt \ |
1398 | + po/meson.build \ |
1399 | + $(NULL) |
1400 | + |
1401 | +MAINTAINERCLEANFILES = \ |
1402 | + po/*.header \ |
1403 | + po/Makevars.template \ |
1404 | + po/Rules-quot \ |
1405 | + po/*.sed \ |
1406 | + po/*.sin |
1407 | diff --git a/Makefile.in b/Makefile.in |
1408 | index cad16e3..43651b2 100644 |
1409 | --- a/Makefile.in |
1410 | +++ b/Makefile.in |
1411 | @@ -1,7 +1,7 @@ |
1412 | -# Makefile.in generated by automake 1.15.1 from Makefile.am. |
1413 | +# Makefile.in generated by automake 1.16.1 from Makefile.am. |
1414 | # @configure_input@ |
1415 | |
1416 | -# Copyright (C) 1994-2017 Free Software Foundation, Inc. |
1417 | +# Copyright (C) 1994-2018 Free Software Foundation, Inc. |
1418 | |
1419 | # This Makefile.in is free software; the Free Software Foundation |
1420 | # gives unlimited permission to copy and/or distribute it, |
1421 | @@ -89,10 +89,14 @@ build_triplet = @build@ |
1422 | host_triplet = @host@ |
1423 | subdir = . |
1424 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
1425 | -am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ |
1426 | - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ |
1427 | - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ |
1428 | - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac |
1429 | +am__aclocal_m4_deps = $(top_srcdir)/m4/gettext.m4 \ |
1430 | + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ |
1431 | + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ |
1432 | + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ |
1433 | + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ |
1434 | + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ |
1435 | + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ |
1436 | + $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/configure.ac |
1437 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
1438 | $(ACLOCAL_M4) |
1439 | DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ |
1440 | @@ -137,7 +141,7 @@ am__recursive_targets = \ |
1441 | $(RECURSIVE_CLEAN_TARGETS) \ |
1442 | $(am__extra_recursive_targets) |
1443 | AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ |
1444 | - cscope distdir dist dist-all distcheck |
1445 | + cscope distdir distdir-am dist dist-all distcheck |
1446 | am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ |
1447 | $(LISP)config.h.in |
1448 | # Read a list of newline-separated strings from the standard input, |
1449 | @@ -160,9 +164,10 @@ ETAGS = etags |
1450 | CTAGS = ctags |
1451 | CSCOPE = cscope |
1452 | DIST_SUBDIRS = $(SUBDIRS) |
1453 | -am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in AUTHORS \ |
1454 | - COPYING NEWS README TODO compile config.guess config.sub \ |
1455 | - install-sh ltmain.sh missing |
1456 | +am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \ |
1457 | + ABOUT-NLS AUTHORS COPYING NEWS README TODO compile \ |
1458 | + config.guess config.rpath config.sub install-sh ltmain.sh \ |
1459 | + missing |
1460 | DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) |
1461 | distdir = $(PACKAGE)-$(VERSION) |
1462 | top_distdir = $(distdir) |
1463 | @@ -206,7 +211,6 @@ am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ |
1464 | | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' |
1465 | distcleancheck_listfiles = find . -type f -print |
1466 | ACLOCAL = @ACLOCAL@ |
1467 | -ALL_LINGUAS = @ALL_LINGUAS@ |
1468 | AMTAR = @AMTAR@ |
1469 | AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ |
1470 | AR = @AR@ |
1471 | @@ -214,8 +218,6 @@ AUTOCONF = @AUTOCONF@ |
1472 | AUTOHEADER = @AUTOHEADER@ |
1473 | AUTOMAKE = @AUTOMAKE@ |
1474 | AWK = @AWK@ |
1475 | -CATALOGS = @CATALOGS@ |
1476 | -CATOBJEXT = @CATOBJEXT@ |
1477 | CC = @CC@ |
1478 | CCDEPMODE = @CCDEPMODE@ |
1479 | CFLAGS = @CFLAGS@ |
1480 | @@ -226,7 +228,6 @@ COPY_WORKER_LIBS = @COPY_WORKER_LIBS@ |
1481 | CPP = @CPP@ |
1482 | CPPFLAGS = @CPPFLAGS@ |
1483 | CYGPATH_W = @CYGPATH_W@ |
1484 | -DATADIRNAME = @DATADIRNAME@ |
1485 | DEFS = @DEFS@ |
1486 | DEPDIR = @DEPDIR@ |
1487 | DISABLE_DEPRECATED = @DISABLE_DEPRECATED@ |
1488 | @@ -239,10 +240,11 @@ ECHO_T = @ECHO_T@ |
1489 | EGREP = @EGREP@ |
1490 | EXEEXT = @EXEEXT@ |
1491 | FGREP = @FGREP@ |
1492 | +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ |
1493 | GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ |
1494 | GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@ |
1495 | -GMOFILES = @GMOFILES@ |
1496 | GMSGFMT = @GMSGFMT@ |
1497 | +GMSGFMT_015 = @GMSGFMT_015@ |
1498 | GREP = @GREP@ |
1499 | IBUS_CFLAGS = @IBUS_CFLAGS@ |
1500 | IBUS_LIBS = @IBUS_LIBS@ |
1501 | @@ -253,38 +255,30 @@ INSTALL_DATA = @INSTALL_DATA@ |
1502 | INSTALL_PROGRAM = @INSTALL_PROGRAM@ |
1503 | INSTALL_SCRIPT = @INSTALL_SCRIPT@ |
1504 | INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ |
1505 | -INSTOBJEXT = @INSTOBJEXT@ |
1506 | INTLLIBS = @INTLLIBS@ |
1507 | -INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ |
1508 | -INTLTOOL_MERGE = @INTLTOOL_MERGE@ |
1509 | -INTLTOOL_PERL = @INTLTOOL_PERL@ |
1510 | -INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ |
1511 | -INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ |
1512 | -INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ |
1513 | -INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ |
1514 | -INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ |
1515 | INTL_MACOSX_LIBS = @INTL_MACOSX_LIBS@ |
1516 | -ISOCODES_CFLAGS = @ISOCODES_CFLAGS@ |
1517 | -ISOCODES_LIBS = @ISOCODES_LIBS@ |
1518 | KRB5_CFLAGS = @KRB5_CFLAGS@ |
1519 | KRB5_CONFIG = @KRB5_CONFIG@ |
1520 | KRB5_LIBS = @KRB5_LIBS@ |
1521 | LD = @LD@ |
1522 | LDFLAGS = @LDFLAGS@ |
1523 | +LIBICONV = @LIBICONV@ |
1524 | +LIBINTL = @LIBINTL@ |
1525 | LIBOBJS = @LIBOBJS@ |
1526 | LIBS = @LIBS@ |
1527 | LIBTOOL = @LIBTOOL@ |
1528 | LIPO = @LIPO@ |
1529 | LN_S = @LN_S@ |
1530 | +LTLIBICONV = @LTLIBICONV@ |
1531 | +LTLIBINTL = @LTLIBINTL@ |
1532 | LTLIBOBJS = @LTLIBOBJS@ |
1533 | LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@ |
1534 | MAINT = @MAINT@ |
1535 | MAKEINFO = @MAKEINFO@ |
1536 | MANIFEST_TOOL = @MANIFEST_TOOL@ |
1537 | MKDIR_P = @MKDIR_P@ |
1538 | -MKINSTALLDIRS = @MKINSTALLDIRS@ |
1539 | MSGFMT = @MSGFMT@ |
1540 | -MSGFMT_OPTS = @MSGFMT_OPTS@ |
1541 | +MSGFMT_015 = @MSGFMT_015@ |
1542 | MSGMERGE = @MSGMERGE@ |
1543 | NM = @NM@ |
1544 | NMEDIT = @NMEDIT@ |
1545 | @@ -303,10 +297,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@ |
1546 | PKG_CONFIG = @PKG_CONFIG@ |
1547 | PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@ |
1548 | PKG_CONFIG_PATH = @PKG_CONFIG_PATH@ |
1549 | -POFILES = @POFILES@ |
1550 | POSUB = @POSUB@ |
1551 | -PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@ |
1552 | -PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@ |
1553 | RANLIB = @RANLIB@ |
1554 | SED = @SED@ |
1555 | SET_MAKE = @SET_MAKE@ |
1556 | @@ -319,6 +310,8 @@ VENDOR_CONF_FILE = @VENDOR_CONF_FILE@ |
1557 | VERSION = @VERSION@ |
1558 | WARN_CFLAGS = @WARN_CFLAGS@ |
1559 | XGETTEXT = @XGETTEXT@ |
1560 | +XGETTEXT_015 = @XGETTEXT_015@ |
1561 | +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ |
1562 | abs_builddir = @abs_builddir@ |
1563 | abs_srcdir = @abs_srcdir@ |
1564 | abs_top_builddir = @abs_top_builddir@ |
1565 | @@ -352,8 +345,6 @@ htmldir = @htmldir@ |
1566 | includedir = @includedir@ |
1567 | infodir = @infodir@ |
1568 | install_sh = @install_sh@ |
1569 | -intltool__v_merge_options_ = @intltool__v_merge_options_@ |
1570 | -intltool__v_merge_options_0 = @intltool__v_merge_options_0@ |
1571 | libdir = @libdir@ |
1572 | libexecdir = @libexecdir@ |
1573 | localedir = @localedir@ |
1574 | @@ -381,7 +372,18 @@ EXTRA_DIST = \ |
1575 | COPYING \ |
1576 | AUTHORS \ |
1577 | NEWS \ |
1578 | - gnome-initial-setup.doap |
1579 | + gnome-initial-setup.doap \ |
1580 | + meson.build \ |
1581 | + meson_options.txt \ |
1582 | + po/meson.build \ |
1583 | + $(NULL) |
1584 | + |
1585 | +MAINTAINERCLEANFILES = \ |
1586 | + po/*.header \ |
1587 | + po/Makevars.template \ |
1588 | + po/Rules-quot \ |
1589 | + po/*.sed \ |
1590 | + po/*.sin |
1591 | |
1592 | all: config.h |
1593 | $(MAKE) $(AM_MAKEFLAGS) all-recursive |
1594 | @@ -408,8 +410,8 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status |
1595 | echo ' $(SHELL) ./config.status'; \ |
1596 | $(SHELL) ./config.status;; \ |
1597 | *) \ |
1598 | - echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ |
1599 | - cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ |
1600 | + echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \ |
1601 | + cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \ |
1602 | esac; |
1603 | |
1604 | $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) |
1605 | @@ -551,7 +553,10 @@ distclean-tags: |
1606 | -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags |
1607 | -rm -f cscope.out cscope.in.out cscope.po.out cscope.files |
1608 | |
1609 | -distdir: $(DISTFILES) |
1610 | +distdir: $(BUILT_SOURCES) |
1611 | + $(MAKE) $(AM_MAKEFLAGS) distdir-am |
1612 | + |
1613 | +distdir-am: $(DISTFILES) |
1614 | $(am__remove_distdir) |
1615 | test -d "$(distdir)" || mkdir "$(distdir)" |
1616 | @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ |
1617 | @@ -773,6 +778,7 @@ distclean-generic: |
1618 | maintainer-clean-generic: |
1619 | @echo "This command is intended for maintainers to use" |
1620 | @echo "it deletes files that may require special tools to rebuild." |
1621 | + -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES) |
1622 | clean: clean-recursive |
1623 | |
1624 | clean-am: clean-generic clean-libtool mostlyclean-am |
1625 | diff --git a/NEWS b/NEWS |
1626 | index ecd7ac2..2cb12cb 100644 |
1627 | --- a/NEWS |
1628 | +++ b/NEWS |
1629 | @@ -1,3 +1,16 @@ |
1630 | +3.29.1 |
1631 | + |
1632 | + * Translation updates |
1633 | + * Support more general page skipping |
1634 | + * Show the welcome page if the language page is skipped |
1635 | + * Look for vendor.conf in /usr/share instead of /var |
1636 | + * Go back to allowing weak passwords |
1637 | + * Set keyring password for enterprise accounts |
1638 | + * Use Debian, Ubuntu logos when appropriate |
1639 | + * Fix a crash |
1640 | + * Add meson support |
1641 | + * Uses a new avatar chooser |
1642 | + |
1643 | 3.28.0 |
1644 | |
1645 | * Translation updates |
1646 | diff --git a/aclocal.m4 b/aclocal.m4 |
1647 | index 4614a93..0a489ac 100644 |
1648 | --- a/aclocal.m4 |
1649 | +++ b/aclocal.m4 |
1650 | @@ -1,6 +1,6 @@ |
1651 | -# generated automatically by aclocal 1.15.1 -*- Autoconf -*- |
1652 | +# generated automatically by aclocal 1.16.1 -*- Autoconf -*- |
1653 | |
1654 | -# Copyright (C) 1996-2017 Free Software Foundation, Inc. |
1655 | +# Copyright (C) 1996-2018 Free Software Foundation, Inc. |
1656 | |
1657 | # This file is free software; the Free Software Foundation |
1658 | # gives unlimited permission to copy and/or distribute it, |
1659 | @@ -20,490 +20,6 @@ You have another version of autoconf. It may work, but is not guaranteed to. |
1660 | If you have problems, you may need to regenerate the build system entirely. |
1661 | To do so, use the procedure documented by the package, typically 'autoreconf'.])]) |
1662 | |
1663 | -# Copyright (C) 1995-2002 Free Software Foundation, Inc. |
1664 | -# Copyright (C) 2001-2003,2004 Red Hat, Inc. |
1665 | -# |
1666 | -# This file is free software, distributed under the terms of the GNU |
1667 | -# General Public License. As a special exception to the GNU General |
1668 | -# Public License, this file may be distributed as part of a program |
1669 | -# that contains a configuration script generated by Autoconf, under |
1670 | -# the same distribution terms as the rest of that program. |
1671 | -# |
1672 | -# This file can be copied and used freely without restrictions. It can |
1673 | -# be used in projects which are not available under the GNU Public License |
1674 | -# but which still want to provide support for the GNU gettext functionality. |
1675 | -# |
1676 | -# Macro to add for using GNU gettext. |
1677 | -# Ulrich Drepper <drepper@cygnus.com>, 1995, 1996 |
1678 | -# |
1679 | -# Modified to never use included libintl. |
1680 | -# Owen Taylor <otaylor@redhat.com>, 12/15/1998 |
1681 | -# |
1682 | -# Major rework to remove unused code |
1683 | -# Owen Taylor <otaylor@redhat.com>, 12/11/2002 |
1684 | -# |
1685 | -# Added better handling of ALL_LINGUAS from GNU gettext version |
1686 | -# written by Bruno Haible, Owen Taylor <otaylor.redhat.com> 5/30/3002 |
1687 | -# |
1688 | -# Modified to require ngettext |
1689 | -# Matthias Clasen <mclasen@redhat.com> 08/06/2004 |
1690 | -# |
1691 | -# We need this here as well, since someone might use autoconf-2.5x |
1692 | -# to configure GLib then an older version to configure a package |
1693 | -# using AM_GLIB_GNU_GETTEXT |
1694 | -AC_PREREQ(2.53) |
1695 | - |
1696 | -dnl |
1697 | -dnl We go to great lengths to make sure that aclocal won't |
1698 | -dnl try to pull in the installed version of these macros |
1699 | -dnl when running aclocal in the glib directory. |
1700 | -dnl |
1701 | -m4_copy([AC_DEFUN],[glib_DEFUN]) |
1702 | -m4_copy([AC_REQUIRE],[glib_REQUIRE]) |
1703 | -dnl |
1704 | -dnl At the end, if we're not within glib, we'll define the public |
1705 | -dnl definitions in terms of our private definitions. |
1706 | -dnl |
1707 | - |
1708 | -# GLIB_LC_MESSAGES |
1709 | -#-------------------- |
1710 | -glib_DEFUN([GLIB_LC_MESSAGES], |
1711 | - [AC_CHECK_HEADERS([locale.h]) |
1712 | - if test $ac_cv_header_locale_h = yes; then |
1713 | - AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, |
1714 | - [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES], |
1715 | - am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) |
1716 | - if test $am_cv_val_LC_MESSAGES = yes; then |
1717 | - AC_DEFINE(HAVE_LC_MESSAGES, 1, |
1718 | - [Define if your <locale.h> file defines LC_MESSAGES.]) |
1719 | - fi |
1720 | - fi]) |
1721 | - |
1722 | -# GLIB_PATH_PROG_WITH_TEST |
1723 | -#---------------------------- |
1724 | -dnl GLIB_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, |
1725 | -dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) |
1726 | -glib_DEFUN([GLIB_PATH_PROG_WITH_TEST], |
1727 | -[# Extract the first word of "$2", so it can be a program name with args. |
1728 | -set dummy $2; ac_word=[$]2 |
1729 | -AC_MSG_CHECKING([for $ac_word]) |
1730 | -AC_CACHE_VAL(ac_cv_path_$1, |
1731 | -[case "[$]$1" in |
1732 | - /*) |
1733 | - ac_cv_path_$1="[$]$1" # Let the user override the test with a path. |
1734 | - ;; |
1735 | - *) |
1736 | - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" |
1737 | - for ac_dir in ifelse([$5], , $PATH, [$5]); do |
1738 | - test -z "$ac_dir" && ac_dir=. |
1739 | - if test -f $ac_dir/$ac_word; then |
1740 | - if [$3]; then |
1741 | - ac_cv_path_$1="$ac_dir/$ac_word" |
1742 | - break |
1743 | - fi |
1744 | - fi |
1745 | - done |
1746 | - IFS="$ac_save_ifs" |
1747 | -dnl If no 4th arg is given, leave the cache variable unset, |
1748 | -dnl so AC_PATH_PROGS will keep looking. |
1749 | -ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" |
1750 | -])dnl |
1751 | - ;; |
1752 | -esac])dnl |
1753 | -$1="$ac_cv_path_$1" |
1754 | -if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then |
1755 | - AC_MSG_RESULT([$]$1) |
1756 | -else |
1757 | - AC_MSG_RESULT(no) |
1758 | -fi |
1759 | -AC_SUBST($1)dnl |
1760 | -]) |
1761 | - |
1762 | -dnl Checks for special options needed on Mac OS X. |
1763 | -dnl Defines INTL_MACOSX_LIBS. |
1764 | -dnl |
1765 | -dnl Copied from intlmacosx.m4 in gettext, GPL. |
1766 | -dnl Copyright (C) 2004-2013 Free Software Foundation, Inc. |
1767 | -glib_DEFUN([glib_gt_INTL_MACOSX], |
1768 | -[ |
1769 | - dnl Check for API introduced in Mac OS X 10.2. |
1770 | - AC_CACHE_CHECK([for CFPreferencesCopyAppValue], |
1771 | - [gt_cv_func_CFPreferencesCopyAppValue], |
1772 | - [gt_save_LIBS="$LIBS" |
1773 | - LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" |
1774 | - AC_LINK_IFELSE( |
1775 | - [AC_LANG_PROGRAM( |
1776 | - [[#include <CoreFoundation/CFPreferences.h>]], |
1777 | - [[CFPreferencesCopyAppValue(NULL, NULL)]])], |
1778 | - [gt_cv_func_CFPreferencesCopyAppValue=yes], |
1779 | - [gt_cv_func_CFPreferencesCopyAppValue=no]) |
1780 | - LIBS="$gt_save_LIBS"]) |
1781 | - if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then |
1782 | - AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], [1], |
1783 | - [Define to 1 if you have the Mac OS X function CFPreferencesCopyAppValue in the CoreFoundation framework.]) |
1784 | - fi |
1785 | - dnl Check for API introduced in Mac OS X 10.3. |
1786 | - AC_CACHE_CHECK([for CFLocaleCopyCurrent], [gt_cv_func_CFLocaleCopyCurrent], |
1787 | - [gt_save_LIBS="$LIBS" |
1788 | - LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" |
1789 | - AC_LINK_IFELSE( |
1790 | - [AC_LANG_PROGRAM( |
1791 | - [[#include <CoreFoundation/CFLocale.h>]], |
1792 | - [[CFLocaleCopyCurrent();]])], |
1793 | - [gt_cv_func_CFLocaleCopyCurrent=yes], |
1794 | - [gt_cv_func_CFLocaleCopyCurrent=no]) |
1795 | - LIBS="$gt_save_LIBS"]) |
1796 | - if test $gt_cv_func_CFLocaleCopyCurrent = yes; then |
1797 | - AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], [1], |
1798 | - [Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the CoreFoundation framework.]) |
1799 | - fi |
1800 | - INTL_MACOSX_LIBS= |
1801 | - if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then |
1802 | - INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation" |
1803 | - fi |
1804 | - AC_SUBST([INTL_MACOSX_LIBS]) |
1805 | -]) |
1806 | - |
1807 | -# GLIB_WITH_NLS |
1808 | -#----------------- |
1809 | -glib_DEFUN([GLIB_WITH_NLS], |
1810 | - dnl NLS is obligatory |
1811 | - [USE_NLS=yes |
1812 | - AC_SUBST(USE_NLS) |
1813 | - |
1814 | - gt_cv_have_gettext=no |
1815 | - |
1816 | - CATOBJEXT=NONE |
1817 | - XGETTEXT=: |
1818 | - INTLLIBS= |
1819 | - |
1820 | - glib_gt_INTL_MACOSX |
1821 | - |
1822 | - AC_CHECK_HEADER(libintl.h, |
1823 | - [gt_cv_func_dgettext_libintl="no" |
1824 | - libintl_extra_libs="" |
1825 | - |
1826 | - # |
1827 | - # First check in libc |
1828 | - # |
1829 | - AC_CACHE_CHECK([for ngettext in libc], gt_cv_func_ngettext_libc, |
1830 | - [AC_TRY_LINK([ |
1831 | -#include <libintl.h> |
1832 | -], |
1833 | - [return !ngettext ("","", 1)], |
1834 | - gt_cv_func_ngettext_libc=yes, |
1835 | - gt_cv_func_ngettext_libc=no) |
1836 | - ]) |
1837 | - |
1838 | - if test "$gt_cv_func_ngettext_libc" = "yes" ; then |
1839 | - AC_CACHE_CHECK([for dgettext in libc], gt_cv_func_dgettext_libc, |
1840 | - [AC_TRY_LINK([ |
1841 | -#include <libintl.h> |
1842 | -], |
1843 | - [return !dgettext ("","")], |
1844 | - gt_cv_func_dgettext_libc=yes, |
1845 | - gt_cv_func_dgettext_libc=no) |
1846 | - ]) |
1847 | - fi |
1848 | - |
1849 | - if test "$gt_cv_func_ngettext_libc" = "yes" ; then |
1850 | - AC_CHECK_FUNCS(bind_textdomain_codeset) |
1851 | - fi |
1852 | - |
1853 | - # |
1854 | - # If we don't have everything we want, check in libintl |
1855 | - # |
1856 | - if test "$gt_cv_func_dgettext_libc" != "yes" \ |
1857 | - || test "$gt_cv_func_ngettext_libc" != "yes" \ |
1858 | - || test "$ac_cv_func_bind_textdomain_codeset" != "yes" ; then |
1859 | - |
1860 | - AC_CHECK_LIB(intl, bindtextdomain, |
1861 | - [AC_CHECK_LIB(intl, ngettext, |
1862 | - [AC_CHECK_LIB(intl, dgettext, |
1863 | - gt_cv_func_dgettext_libintl=yes)])]) |
1864 | - |
1865 | - if test "$gt_cv_func_dgettext_libintl" != "yes" ; then |
1866 | - AC_MSG_CHECKING([if -liconv is needed to use gettext]) |
1867 | - AC_MSG_RESULT([]) |
1868 | - AC_CHECK_LIB(intl, ngettext, |
1869 | - [AC_CHECK_LIB(intl, dcgettext, |
1870 | - [gt_cv_func_dgettext_libintl=yes |
1871 | - libintl_extra_libs=-liconv], |
1872 | - :,-liconv)], |
1873 | - :,-liconv) |
1874 | - fi |
1875 | - |
1876 | - # |
1877 | - # If we found libintl, then check in it for bind_textdomain_codeset(); |
1878 | - # we'll prefer libc if neither have bind_textdomain_codeset(), |
1879 | - # and both have dgettext and ngettext |
1880 | - # |
1881 | - if test "$gt_cv_func_dgettext_libintl" = "yes" ; then |
1882 | - glib_save_LIBS="$LIBS" |
1883 | - LIBS="$LIBS -lintl $libintl_extra_libs" |
1884 | - unset ac_cv_func_bind_textdomain_codeset |
1885 | - AC_CHECK_FUNCS(bind_textdomain_codeset) |
1886 | - LIBS="$glib_save_LIBS" |
1887 | - |
1888 | - if test "$ac_cv_func_bind_textdomain_codeset" = "yes" ; then |
1889 | - gt_cv_func_dgettext_libc=no |
1890 | - else |
1891 | - if test "$gt_cv_func_dgettext_libc" = "yes" \ |
1892 | - && test "$gt_cv_func_ngettext_libc" = "yes"; then |
1893 | - gt_cv_func_dgettext_libintl=no |
1894 | - fi |
1895 | - fi |
1896 | - fi |
1897 | - fi |
1898 | - |
1899 | - if test "$gt_cv_func_dgettext_libc" = "yes" \ |
1900 | - || test "$gt_cv_func_dgettext_libintl" = "yes"; then |
1901 | - gt_cv_have_gettext=yes |
1902 | - fi |
1903 | - |
1904 | - if test "$gt_cv_func_dgettext_libintl" = "yes"; then |
1905 | - INTLLIBS="-lintl $libintl_extra_libs $INTL_MACOSX_LIBS" |
1906 | - fi |
1907 | - |
1908 | - if test "$gt_cv_have_gettext" = "yes"; then |
1909 | - AC_DEFINE(HAVE_GETTEXT,1, |
1910 | - [Define if the GNU gettext() function is already present or preinstalled.]) |
1911 | - GLIB_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, |
1912 | - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl |
1913 | - if test "$MSGFMT" != "no"; then |
1914 | - glib_save_LIBS="$LIBS" |
1915 | - LIBS="$LIBS $INTLLIBS" |
1916 | - AC_CHECK_FUNCS(dcgettext) |
1917 | - MSGFMT_OPTS= |
1918 | - AC_MSG_CHECKING([if msgfmt accepts -c]) |
1919 | - GLIB_RUN_PROG([$MSGFMT -c -o /dev/null],[ |
1920 | -msgid "" |
1921 | -msgstr "" |
1922 | -"Content-Type: text/plain; charset=UTF-8\n" |
1923 | -"Project-Id-Version: test 1.0\n" |
1924 | -"PO-Revision-Date: 2007-02-15 12:01+0100\n" |
1925 | -"Last-Translator: test <foo@bar.xx>\n" |
1926 | -"Language-Team: C <LL@li.org>\n" |
1927 | -"MIME-Version: 1.0\n" |
1928 | -"Content-Transfer-Encoding: 8bit\n" |
1929 | -], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])]) |
1930 | - AC_SUBST(MSGFMT_OPTS) |
1931 | - AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) |
1932 | - GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, |
1933 | - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) |
1934 | - AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; |
1935 | - return _nl_msg_cat_cntr], |
1936 | - [CATOBJEXT=.gmo |
1937 | - DATADIRNAME=share], |
1938 | - [case $host in |
1939 | - *-*-solaris*) |
1940 | - dnl On Solaris, if bind_textdomain_codeset is in libc, |
1941 | - dnl GNU format message catalog is always supported, |
1942 | - dnl since both are added to the libc all together. |
1943 | - dnl Hence, we'd like to go with DATADIRNAME=share and |
1944 | - dnl and CATOBJEXT=.gmo in this case. |
1945 | - AC_CHECK_FUNC(bind_textdomain_codeset, |
1946 | - [CATOBJEXT=.gmo |
1947 | - DATADIRNAME=share], |
1948 | - [CATOBJEXT=.mo |
1949 | - DATADIRNAME=lib]) |
1950 | - ;; |
1951 | - *-*-openbsd*) |
1952 | - CATOBJEXT=.mo |
1953 | - DATADIRNAME=share |
1954 | - ;; |
1955 | - *) |
1956 | - CATOBJEXT=.mo |
1957 | - DATADIRNAME=lib |
1958 | - ;; |
1959 | - esac]) |
1960 | - LIBS="$glib_save_LIBS" |
1961 | - INSTOBJEXT=.mo |
1962 | - else |
1963 | - gt_cv_have_gettext=no |
1964 | - fi |
1965 | - fi |
1966 | - ]) |
1967 | - |
1968 | - if test "$gt_cv_have_gettext" = "yes" ; then |
1969 | - AC_DEFINE(ENABLE_NLS, 1, |
1970 | - [always defined to indicate that i18n is enabled]) |
1971 | - fi |
1972 | - |
1973 | - dnl Test whether we really found GNU xgettext. |
1974 | - if test "$XGETTEXT" != ":"; then |
1975 | - dnl If it is not GNU xgettext we define it as : so that the |
1976 | - dnl Makefiles still can work. |
1977 | - if $XGETTEXT --omit-header /dev/null 2> /dev/null; then |
1978 | - : ; |
1979 | - else |
1980 | - AC_MSG_RESULT( |
1981 | - [found xgettext program is not GNU xgettext; ignore it]) |
1982 | - XGETTEXT=":" |
1983 | - fi |
1984 | - fi |
1985 | - |
1986 | - # We need to process the po/ directory. |
1987 | - POSUB=po |
1988 | - |
1989 | - AC_OUTPUT_COMMANDS( |
1990 | - [case "$CONFIG_FILES" in *po/Makefile.in*) |
1991 | - sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile |
1992 | - esac]) |
1993 | - |
1994 | - dnl These rules are solely for the distribution goal. While doing this |
1995 | - dnl we only have to keep exactly one list of the available catalogs |
1996 | - dnl in configure.ac. |
1997 | - for lang in $ALL_LINGUAS; do |
1998 | - GMOFILES="$GMOFILES $lang.gmo" |
1999 | - POFILES="$POFILES $lang.po" |
2000 | - done |
2001 | - |
2002 | - dnl Make all variables we use known to autoconf. |
2003 | - AC_SUBST(CATALOGS) |
2004 | - AC_SUBST(CATOBJEXT) |
2005 | - AC_SUBST(DATADIRNAME) |
2006 | - AC_SUBST(GMOFILES) |
2007 | - AC_SUBST(INSTOBJEXT) |
2008 | - AC_SUBST(INTLLIBS) |
2009 | - AC_SUBST(PO_IN_DATADIR_TRUE) |
2010 | - AC_SUBST(PO_IN_DATADIR_FALSE) |
2011 | - AC_SUBST(POFILES) |
2012 | - AC_SUBST(POSUB) |
2013 | - ]) |
2014 | - |
2015 | -# AM_GLIB_GNU_GETTEXT |
2016 | -# ------------------- |
2017 | -# Do checks necessary for use of gettext. If a suitable implementation |
2018 | -# of gettext is found in either in libintl or in the C library, |
2019 | -# it will set INTLLIBS to the libraries needed for use of gettext |
2020 | -# and AC_DEFINE() HAVE_GETTEXT and ENABLE_NLS. (The shell variable |
2021 | -# gt_cv_have_gettext will be set to "yes".) It will also call AC_SUBST() |
2022 | -# on various variables needed by the Makefile.in.in installed by |
2023 | -# glib-gettextize. |
2024 | -dnl |
2025 | -AU_DEFUN([GLIB_GNU_GETTEXT], |
2026 | - [AC_REQUIRE([AC_PROG_CC])dnl |
2027 | - |
2028 | - GLIB_LC_MESSAGES |
2029 | - GLIB_WITH_NLS |
2030 | - |
2031 | - if test "$gt_cv_have_gettext" = "yes"; then |
2032 | - if test "x$ALL_LINGUAS" = "x"; then |
2033 | - LINGUAS= |
2034 | - else |
2035 | - AC_MSG_CHECKING(for catalogs to be installed) |
2036 | - NEW_LINGUAS= |
2037 | - for presentlang in $ALL_LINGUAS; do |
2038 | - useit=no |
2039 | - if test "%UNSET%" != "${LINGUAS-%UNSET%}"; then |
2040 | - desiredlanguages="$LINGUAS" |
2041 | - else |
2042 | - desiredlanguages="$ALL_LINGUAS" |
2043 | - fi |
2044 | - for desiredlang in $desiredlanguages; do |
2045 | - # Use the presentlang catalog if desiredlang is |
2046 | - # a. equal to presentlang, or |
2047 | - # b. a variant of presentlang (because in this case, |
2048 | - # presentlang can be used as a fallback for messages |
2049 | - # which are not translated in the desiredlang catalog). |
2050 | - case "$desiredlang" in |
2051 | - "$presentlang"*) useit=yes;; |
2052 | - esac |
2053 | - done |
2054 | - if test $useit = yes; then |
2055 | - NEW_LINGUAS="$NEW_LINGUAS $presentlang" |
2056 | - fi |
2057 | - done |
2058 | - LINGUAS=$NEW_LINGUAS |
2059 | - AC_MSG_RESULT($LINGUAS) |
2060 | - fi |
2061 | - |
2062 | - dnl Construct list of names of catalog files to be constructed. |
2063 | - if test -n "$LINGUAS"; then |
2064 | - for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done |
2065 | - fi |
2066 | - fi |
2067 | - |
2068 | - dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly |
2069 | - dnl find the mkinstalldirs script in another subdir but ($top_srcdir). |
2070 | - dnl Try to locate is. |
2071 | - MKINSTALLDIRS= |
2072 | - if test -n "$ac_aux_dir"; then |
2073 | - MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" |
2074 | - fi |
2075 | - if test -z "$MKINSTALLDIRS"; then |
2076 | - MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" |
2077 | - fi |
2078 | - AC_SUBST(MKINSTALLDIRS) |
2079 | - |
2080 | - dnl Generate list of files to be processed by xgettext which will |
2081 | - dnl be included in po/Makefile. |
2082 | - test -d po || mkdir po |
2083 | - if test "x$srcdir" != "x."; then |
2084 | - if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then |
2085 | - posrcprefix="$srcdir/" |
2086 | - else |
2087 | - posrcprefix="../$srcdir/" |
2088 | - fi |
2089 | - else |
2090 | - posrcprefix="../" |
2091 | - fi |
2092 | - rm -f po/POTFILES |
2093 | - sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ |
2094 | - < $srcdir/po/POTFILES.in > po/POTFILES |
2095 | - ], |
2096 | - [[$0: This macro is deprecated. You should use upstream gettext instead.]]) |
2097 | - |
2098 | -# AM_GLIB_DEFINE_LOCALEDIR(VARIABLE) |
2099 | -# ------------------------------- |
2100 | -# Define VARIABLE to the location where catalog files will |
2101 | -# be installed by po/Makefile. |
2102 | -glib_DEFUN([GLIB_DEFINE_LOCALEDIR], |
2103 | -[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl |
2104 | -glib_save_prefix="$prefix" |
2105 | -glib_save_exec_prefix="$exec_prefix" |
2106 | -glib_save_datarootdir="$datarootdir" |
2107 | -test "x$prefix" = xNONE && prefix=$ac_default_prefix |
2108 | -test "x$exec_prefix" = xNONE && exec_prefix=$prefix |
2109 | -datarootdir=`eval echo "${datarootdir}"` |
2110 | -if test "x$CATOBJEXT" = "x.mo" ; then |
2111 | - localedir=`eval echo "${libdir}/locale"` |
2112 | -else |
2113 | - localedir=`eval echo "${datadir}/locale"` |
2114 | -fi |
2115 | -prefix="$glib_save_prefix" |
2116 | -exec_prefix="$glib_save_exec_prefix" |
2117 | -datarootdir="$glib_save_datarootdir" |
2118 | -AC_DEFINE_UNQUOTED($1, "$localedir", |
2119 | - [Define the location where the catalogs will be installed]) |
2120 | -]) |
2121 | - |
2122 | -dnl |
2123 | -dnl Now the definitions that aclocal will find |
2124 | -dnl |
2125 | -ifdef(glib_configure_ac,[],[ |
2126 | -AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)]) |
2127 | -AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)]) |
2128 | -])dnl |
2129 | - |
2130 | -# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL]) |
2131 | -# |
2132 | -# Create a temporary file with TEST-FILE as its contents and pass the |
2133 | -# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with |
2134 | -# 0 and perform ACTION-IF-FAIL for any other exit status. |
2135 | -AC_DEFUN([GLIB_RUN_PROG], |
2136 | -[cat >conftest.foo <<_ACEOF |
2137 | -$2 |
2138 | -_ACEOF |
2139 | -if AC_RUN_LOG([$1 conftest.foo]); then |
2140 | - m4_ifval([$3], [$3], [:]) |
2141 | -m4_ifvaln([$4], [else $4])dnl |
2142 | -echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD |
2143 | -sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD |
2144 | -fi]) |
2145 | - |
2146 | - |
2147 | # gnome-common.m4 |
2148 | # |
2149 | # serial 3 |
2150 | @@ -722,39 +238,6 @@ AU_DEFUN([GNOME_CXX_WARNINGS],[ |
2151 | eliminate use of --enable-iso-cxx. |
2152 | See: http://www.gnu.org/software/autoconf-archive/ax_compiler_flags.html#ax_compiler_flags]]) |
2153 | |
2154 | -# nls.m4 serial 5 (gettext-0.18) |
2155 | -dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014, 2016 Free Software |
2156 | -dnl Foundation, Inc. |
2157 | -dnl This file is free software; the Free Software Foundation |
2158 | -dnl gives unlimited permission to copy and/or distribute it, |
2159 | -dnl with or without modifications, as long as this notice is preserved. |
2160 | -dnl |
2161 | -dnl This file can be used in projects which are not available under |
2162 | -dnl the GNU General Public License or the GNU Library General Public |
2163 | -dnl License but which still want to provide support for the GNU gettext |
2164 | -dnl functionality. |
2165 | -dnl Please note that the actual code of the GNU gettext library is covered |
2166 | -dnl by the GNU Library General Public License, and the rest of the GNU |
2167 | -dnl gettext package is covered by the GNU General Public License. |
2168 | -dnl They are *not* in the public domain. |
2169 | - |
2170 | -dnl Authors: |
2171 | -dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000. |
2172 | -dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003. |
2173 | - |
2174 | -AC_PREREQ([2.50]) |
2175 | - |
2176 | -AC_DEFUN([AM_NLS], |
2177 | -[ |
2178 | - AC_MSG_CHECKING([whether NLS is requested]) |
2179 | - dnl Default is enabled NLS |
2180 | - AC_ARG_ENABLE([nls], |
2181 | - [ --disable-nls do not use Native Language Support], |
2182 | - USE_NLS=$enableval, USE_NLS=yes) |
2183 | - AC_MSG_RESULT([$USE_NLS]) |
2184 | - AC_SUBST([USE_NLS]) |
2185 | -]) |
2186 | - |
2187 | # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- |
2188 | # serial 11 (pkg-config-0.29.1) |
2189 | |
2190 | @@ -1099,7 +582,7 @@ AS_IF([test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"], |
2191 | [AC_DEFINE([HAVE_][$1], 1, [Enable ]m4_tolower([$1])[ support])]) |
2192 | ])dnl PKG_HAVE_DEFINE_WITH_MODULES |
2193 | |
2194 | -# Copyright (C) 2002-2017 Free Software Foundation, Inc. |
2195 | +# Copyright (C) 2002-2018 Free Software Foundation, Inc. |
2196 | # |
2197 | # This file is free software; the Free Software Foundation |
2198 | # gives unlimited permission to copy and/or distribute it, |
2199 | @@ -1111,10 +594,10 @@ AS_IF([test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"], |
2200 | # generated from the m4 files accompanying Automake X.Y. |
2201 | # (This private macro should not be called outside this file.) |
2202 | AC_DEFUN([AM_AUTOMAKE_VERSION], |
2203 | -[am__api_version='1.15' |
2204 | +[am__api_version='1.16' |
2205 | dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to |
2206 | dnl require some minimum version. Point them to the right macro. |
2207 | -m4_if([$1], [1.15.1], [], |
2208 | +m4_if([$1], [1.16.1], [], |
2209 | [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl |
2210 | ]) |
2211 | |
2212 | @@ -1130,14 +613,14 @@ m4_define([_AM_AUTOCONF_VERSION], []) |
2213 | # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. |
2214 | # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. |
2215 | AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], |
2216 | -[AM_AUTOMAKE_VERSION([1.15.1])dnl |
2217 | +[AM_AUTOMAKE_VERSION([1.16.1])dnl |
2218 | m4_ifndef([AC_AUTOCONF_VERSION], |
2219 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl |
2220 | _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) |
2221 | |
2222 | # AM_AUX_DIR_EXPAND -*- Autoconf -*- |
2223 | |
2224 | -# Copyright (C) 2001-2017 Free Software Foundation, Inc. |
2225 | +# Copyright (C) 2001-2018 Free Software Foundation, Inc. |
2226 | # |
2227 | # This file is free software; the Free Software Foundation |
2228 | # gives unlimited permission to copy and/or distribute it, |
2229 | @@ -1189,7 +672,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd` |
2230 | |
2231 | # AM_CONDITIONAL -*- Autoconf -*- |
2232 | |
2233 | -# Copyright (C) 1997-2017 Free Software Foundation, Inc. |
2234 | +# Copyright (C) 1997-2018 Free Software Foundation, Inc. |
2235 | # |
2236 | # This file is free software; the Free Software Foundation |
2237 | # gives unlimited permission to copy and/or distribute it, |
2238 | @@ -1220,7 +703,7 @@ AC_CONFIG_COMMANDS_PRE( |
2239 | Usually this means the macro was only invoked conditionally.]]) |
2240 | fi])]) |
2241 | |
2242 | -# Copyright (C) 1999-2017 Free Software Foundation, Inc. |
2243 | +# Copyright (C) 1999-2018 Free Software Foundation, Inc. |
2244 | # |
2245 | # This file is free software; the Free Software Foundation |
2246 | # gives unlimited permission to copy and/or distribute it, |
2247 | @@ -1411,13 +894,12 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl |
2248 | |
2249 | # Generate code to set up dependency tracking. -*- Autoconf -*- |
2250 | |
2251 | -# Copyright (C) 1999-2017 Free Software Foundation, Inc. |
2252 | +# Copyright (C) 1999-2018 Free Software Foundation, Inc. |
2253 | # |
2254 | # This file is free software; the Free Software Foundation |
2255 | # gives unlimited permission to copy and/or distribute it, |
2256 | # with or without modifications, as long as this notice is preserved. |
2257 | |
2258 | - |
2259 | # _AM_OUTPUT_DEPENDENCY_COMMANDS |
2260 | # ------------------------------ |
2261 | AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], |
2262 | @@ -1425,49 +907,41 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], |
2263 | # Older Autoconf quotes --file arguments for eval, but not when files |
2264 | # are listed without --file. Let's play safe and only enable the eval |
2265 | # if we detect the quoting. |
2266 | - case $CONFIG_FILES in |
2267 | - *\'*) eval set x "$CONFIG_FILES" ;; |
2268 | - *) set x $CONFIG_FILES ;; |
2269 | - esac |
2270 | + # TODO: see whether this extra hack can be removed once we start |
2271 | + # requiring Autoconf 2.70 or later. |
2272 | + AS_CASE([$CONFIG_FILES], |
2273 | + [*\'*], [eval set x "$CONFIG_FILES"], |
2274 | + [*], [set x $CONFIG_FILES]) |
2275 | shift |
2276 | - for mf |
2277 | + # Used to flag and report bootstrapping failures. |
2278 | + am_rc=0 |
2279 | + for am_mf |
2280 | do |
2281 | # Strip MF so we end up with the name of the file. |
2282 | - mf=`echo "$mf" | sed -e 's/:.*$//'` |
2283 | - # Check whether this is an Automake generated Makefile or not. |
2284 | - # We used to match only the files named 'Makefile.in', but |
2285 | - # some people rename them; so instead we look at the file content. |
2286 | - # Grep'ing the first line is not enough: some people post-process |
2287 | - # each Makefile.in and add a new line on top of each file to say so. |
2288 | - # Grep'ing the whole file is not good either: AIX grep has a line |
2289 | + am_mf=`AS_ECHO(["$am_mf"]) | sed -e 's/:.*$//'` |
2290 | + # Check whether this is an Automake generated Makefile which includes |
2291 | + # dependency-tracking related rules and includes. |
2292 | + # Grep'ing the whole file directly is not great: AIX grep has a line |
2293 | # limit of 2048, but all sed's we know have understand at least 4000. |
2294 | - if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then |
2295 | - dirpart=`AS_DIRNAME("$mf")` |
2296 | - else |
2297 | - continue |
2298 | - fi |
2299 | - # Extract the definition of DEPDIR, am__include, and am__quote |
2300 | - # from the Makefile without running 'make'. |
2301 | - DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` |
2302 | - test -z "$DEPDIR" && continue |
2303 | - am__include=`sed -n 's/^am__include = //p' < "$mf"` |
2304 | - test -z "$am__include" && continue |
2305 | - am__quote=`sed -n 's/^am__quote = //p' < "$mf"` |
2306 | - # Find all dependency output files, they are included files with |
2307 | - # $(DEPDIR) in their names. We invoke sed twice because it is the |
2308 | - # simplest approach to changing $(DEPDIR) to its actual value in the |
2309 | - # expansion. |
2310 | - for file in `sed -n " |
2311 | - s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ |
2312 | - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do |
2313 | - # Make sure the directory exists. |
2314 | - test -f "$dirpart/$file" && continue |
2315 | - fdir=`AS_DIRNAME(["$file"])` |
2316 | - AS_MKDIR_P([$dirpart/$fdir]) |
2317 | - # echo "creating $dirpart/$file" |
2318 | - echo '# dummy' > "$dirpart/$file" |
2319 | - done |
2320 | + sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \ |
2321 | + || continue |
2322 | + am_dirpart=`AS_DIRNAME(["$am_mf"])` |
2323 | + am_filepart=`AS_BASENAME(["$am_mf"])` |
2324 | + AM_RUN_LOG([cd "$am_dirpart" \ |
2325 | + && sed -e '/# am--include-marker/d' "$am_filepart" \ |
2326 | + | $MAKE -f - am--depfiles]) || am_rc=$? |
2327 | done |
2328 | + if test $am_rc -ne 0; then |
2329 | + AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments |
2330 | + for automatic dependency tracking. Try re-running configure with the |
2331 | + '--disable-dependency-tracking' option to at least be able to build |
2332 | + the package (albeit without support for automatic dependency tracking).]) |
2333 | + fi |
2334 | + AS_UNSET([am_dirpart]) |
2335 | + AS_UNSET([am_filepart]) |
2336 | + AS_UNSET([am_mf]) |
2337 | + AS_UNSET([am_rc]) |
2338 | + rm -f conftest-deps.mk |
2339 | } |
2340 | ])# _AM_OUTPUT_DEPENDENCY_COMMANDS |
2341 | |
2342 | @@ -1476,18 +950,17 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], |
2343 | # ----------------------------- |
2344 | # This macro should only be invoked once -- use via AC_REQUIRE. |
2345 | # |
2346 | -# This code is only required when automatic dependency tracking |
2347 | -# is enabled. FIXME. This creates each '.P' file that we will |
2348 | -# need in order to bootstrap the dependency handling code. |
2349 | +# This code is only required when automatic dependency tracking is enabled. |
2350 | +# This creates each '.Po' and '.Plo' makefile fragment that we'll need in |
2351 | +# order to bootstrap the dependency handling code. |
2352 | AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], |
2353 | [AC_CONFIG_COMMANDS([depfiles], |
2354 | [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], |
2355 | - [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) |
2356 | -]) |
2357 | + [AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])]) |
2358 | |
2359 | # Do all the work for Automake. -*- Autoconf -*- |
2360 | |
2361 | -# Copyright (C) 1996-2017 Free Software Foundation, Inc. |
2362 | +# Copyright (C) 1996-2018 Free Software Foundation, Inc. |
2363 | # |
2364 | # This file is free software; the Free Software Foundation |
2365 | # gives unlimited permission to copy and/or distribute it, |
2366 | @@ -1574,8 +1047,8 @@ AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl |
2367 | AC_REQUIRE([AC_PROG_MKDIR_P])dnl |
2368 | # For better backward compatibility. To be removed once Automake 1.9.x |
2369 | # dies out for good. For more background, see: |
2370 | -# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> |
2371 | -# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> |
2372 | +# <https://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> |
2373 | +# <https://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> |
2374 | AC_SUBST([mkdir_p], ['$(MKDIR_P)']) |
2375 | # We need awk for the "check" target (and possibly the TAP driver). The |
2376 | # system "awk" is bad on some platforms. |
2377 | @@ -1642,7 +1115,7 @@ END |
2378 | Aborting the configuration process, to ensure you take notice of the issue. |
2379 | |
2380 | You can download and install GNU coreutils to get an 'rm' implementation |
2381 | -that behaves properly: <http://www.gnu.org/software/coreutils/>. |
2382 | +that behaves properly: <https://www.gnu.org/software/coreutils/>. |
2383 | |
2384 | If you want to complete the configuration process using your problematic |
2385 | 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM |
2386 | @@ -1684,7 +1157,7 @@ for _am_header in $config_headers :; do |
2387 | done |
2388 | echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) |
2389 | |
2390 | -# Copyright (C) 2001-2017 Free Software Foundation, Inc. |
2391 | +# Copyright (C) 2001-2018 Free Software Foundation, Inc. |
2392 | # |
2393 | # This file is free software; the Free Software Foundation |
2394 | # gives unlimited permission to copy and/or distribute it, |
2395 | @@ -1705,7 +1178,7 @@ if test x"${install_sh+set}" != xset; then |
2396 | fi |
2397 | AC_SUBST([install_sh])]) |
2398 | |
2399 | -# Copyright (C) 2003-2017 Free Software Foundation, Inc. |
2400 | +# Copyright (C) 2003-2018 Free Software Foundation, Inc. |
2401 | # |
2402 | # This file is free software; the Free Software Foundation |
2403 | # gives unlimited permission to copy and/or distribute it, |
2404 | @@ -1727,7 +1200,7 @@ AC_SUBST([am__leading_dot])]) |
2405 | # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- |
2406 | # From Jim Meyering |
2407 | |
2408 | -# Copyright (C) 1996-2017 Free Software Foundation, Inc. |
2409 | +# Copyright (C) 1996-2018 Free Software Foundation, Inc. |
2410 | # |
2411 | # This file is free software; the Free Software Foundation |
2412 | # gives unlimited permission to copy and/or distribute it, |
2413 | @@ -1762,7 +1235,7 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) |
2414 | |
2415 | # Check to see how 'make' treats includes. -*- Autoconf -*- |
2416 | |
2417 | -# Copyright (C) 2001-2017 Free Software Foundation, Inc. |
2418 | +# Copyright (C) 2001-2018 Free Software Foundation, Inc. |
2419 | # |
2420 | # This file is free software; the Free Software Foundation |
2421 | # gives unlimited permission to copy and/or distribute it, |
2422 | @@ -1770,49 +1243,42 @@ AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) |
2423 | |
2424 | # AM_MAKE_INCLUDE() |
2425 | # ----------------- |
2426 | -# Check to see how make treats includes. |
2427 | +# Check whether make has an 'include' directive that can support all |
2428 | +# the idioms we need for our automatic dependency tracking code. |
2429 | AC_DEFUN([AM_MAKE_INCLUDE], |
2430 | -[am_make=${MAKE-make} |
2431 | -cat > confinc << 'END' |
2432 | +[AC_MSG_CHECKING([whether ${MAKE-make} supports the include directive]) |
2433 | +cat > confinc.mk << 'END' |
2434 | am__doit: |
2435 | - @echo this is the am__doit target |
2436 | + @echo this is the am__doit target >confinc.out |
2437 | .PHONY: am__doit |
2438 | END |
2439 | -# If we don't find an include directive, just comment out the code. |
2440 | -AC_MSG_CHECKING([for style of include used by $am_make]) |
2441 | am__include="#" |
2442 | am__quote= |
2443 | -_am_result=none |
2444 | -# First try GNU make style include. |
2445 | -echo "include confinc" > confmf |
2446 | -# Ignore all kinds of additional output from 'make'. |
2447 | -case `$am_make -s -f confmf 2> /dev/null` in #( |
2448 | -*the\ am__doit\ target*) |
2449 | - am__include=include |
2450 | - am__quote= |
2451 | - _am_result=GNU |
2452 | - ;; |
2453 | -esac |
2454 | -# Now try BSD make style include. |
2455 | -if test "$am__include" = "#"; then |
2456 | - echo '.include "confinc"' > confmf |
2457 | - case `$am_make -s -f confmf 2> /dev/null` in #( |
2458 | - *the\ am__doit\ target*) |
2459 | - am__include=.include |
2460 | - am__quote="\"" |
2461 | - _am_result=BSD |
2462 | - ;; |
2463 | - esac |
2464 | -fi |
2465 | -AC_SUBST([am__include]) |
2466 | -AC_SUBST([am__quote]) |
2467 | -AC_MSG_RESULT([$_am_result]) |
2468 | -rm -f confinc confmf |
2469 | -]) |
2470 | +# BSD make does it like this. |
2471 | +echo '.include "confinc.mk" # ignored' > confmf.BSD |
2472 | +# Other make implementations (GNU, Solaris 10, AIX) do it like this. |
2473 | +echo 'include confinc.mk # ignored' > confmf.GNU |
2474 | +_am_result=no |
2475 | +for s in GNU BSD; do |
2476 | + AM_RUN_LOG([${MAKE-make} -f confmf.$s && cat confinc.out]) |
2477 | + AS_CASE([$?:`cat confinc.out 2>/dev/null`], |
2478 | + ['0:this is the am__doit target'], |
2479 | + [AS_CASE([$s], |
2480 | + [BSD], [am__include='.include' am__quote='"'], |
2481 | + [am__include='include' am__quote=''])]) |
2482 | + if test "$am__include" != "#"; then |
2483 | + _am_result="yes ($s style)" |
2484 | + break |
2485 | + fi |
2486 | +done |
2487 | +rm -f confinc.* confmf.* |
2488 | +AC_MSG_RESULT([${_am_result}]) |
2489 | +AC_SUBST([am__include])]) |
2490 | +AC_SUBST([am__quote])]) |
2491 | |
2492 | # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- |
2493 | |
2494 | -# Copyright (C) 1997-2017 Free Software Foundation, Inc. |
2495 | +# Copyright (C) 1997-2018 Free Software Foundation, Inc. |
2496 | # |
2497 | # This file is free software; the Free Software Foundation |
2498 | # gives unlimited permission to copy and/or distribute it, |
2499 | @@ -1851,7 +1317,7 @@ fi |
2500 | |
2501 | # Helper functions for option handling. -*- Autoconf -*- |
2502 | |
2503 | -# Copyright (C) 2001-2017 Free Software Foundation, Inc. |
2504 | +# Copyright (C) 2001-2018 Free Software Foundation, Inc. |
2505 | # |
2506 | # This file is free software; the Free Software Foundation |
2507 | # gives unlimited permission to copy and/or distribute it, |
2508 | @@ -1880,7 +1346,7 @@ AC_DEFUN([_AM_SET_OPTIONS], |
2509 | AC_DEFUN([_AM_IF_OPTION], |
2510 | [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) |
2511 | |
2512 | -# Copyright (C) 1999-2017 Free Software Foundation, Inc. |
2513 | +# Copyright (C) 1999-2018 Free Software Foundation, Inc. |
2514 | # |
2515 | # This file is free software; the Free Software Foundation |
2516 | # gives unlimited permission to copy and/or distribute it, |
2517 | @@ -1927,7 +1393,7 @@ AC_LANG_POP([C])]) |
2518 | # For backward compatibility. |
2519 | AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) |
2520 | |
2521 | -# Copyright (C) 2001-2017 Free Software Foundation, Inc. |
2522 | +# Copyright (C) 2001-2018 Free Software Foundation, Inc. |
2523 | # |
2524 | # This file is free software; the Free Software Foundation |
2525 | # gives unlimited permission to copy and/or distribute it, |
2526 | @@ -1946,7 +1412,7 @@ AC_DEFUN([AM_RUN_LOG], |
2527 | |
2528 | # Check to make sure that the build environment is sane. -*- Autoconf -*- |
2529 | |
2530 | -# Copyright (C) 1996-2017 Free Software Foundation, Inc. |
2531 | +# Copyright (C) 1996-2018 Free Software Foundation, Inc. |
2532 | # |
2533 | # This file is free software; the Free Software Foundation |
2534 | # gives unlimited permission to copy and/or distribute it, |
2535 | @@ -2027,7 +1493,7 @@ AC_CONFIG_COMMANDS_PRE( |
2536 | rm -f conftest.file |
2537 | ]) |
2538 | |
2539 | -# Copyright (C) 2009-2017 Free Software Foundation, Inc. |
2540 | +# Copyright (C) 2009-2018 Free Software Foundation, Inc. |
2541 | # |
2542 | # This file is free software; the Free Software Foundation |
2543 | # gives unlimited permission to copy and/or distribute it, |
2544 | @@ -2087,7 +1553,7 @@ AC_SUBST([AM_BACKSLASH])dnl |
2545 | _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl |
2546 | ]) |
2547 | |
2548 | -# Copyright (C) 2001-2017 Free Software Foundation, Inc. |
2549 | +# Copyright (C) 2001-2018 Free Software Foundation, Inc. |
2550 | # |
2551 | # This file is free software; the Free Software Foundation |
2552 | # gives unlimited permission to copy and/or distribute it, |
2553 | @@ -2115,7 +1581,7 @@ fi |
2554 | INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" |
2555 | AC_SUBST([INSTALL_STRIP_PROGRAM])]) |
2556 | |
2557 | -# Copyright (C) 2006-2017 Free Software Foundation, Inc. |
2558 | +# Copyright (C) 2006-2018 Free Software Foundation, Inc. |
2559 | # |
2560 | # This file is free software; the Free Software Foundation |
2561 | # gives unlimited permission to copy and/or distribute it, |
2562 | @@ -2134,7 +1600,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) |
2563 | |
2564 | # Check how to create a tarball. -*- Autoconf -*- |
2565 | |
2566 | -# Copyright (C) 2004-2017 Free Software Foundation, Inc. |
2567 | +# Copyright (C) 2004-2018 Free Software Foundation, Inc. |
2568 | # |
2569 | # This file is free software; the Free Software Foundation |
2570 | # gives unlimited permission to copy and/or distribute it, |
2571 | @@ -2265,9 +1731,17 @@ AC_SUBST([am__tar]) |
2572 | AC_SUBST([am__untar]) |
2573 | ]) # _AM_PROG_TAR |
2574 | |
2575 | -m4_include([m4/intltool.m4]) |
2576 | +m4_include([m4/gettext.m4]) |
2577 | +m4_include([m4/iconv.m4]) |
2578 | +m4_include([m4/intlmacosx.m4]) |
2579 | +m4_include([m4/lib-ld.m4]) |
2580 | +m4_include([m4/lib-link.m4]) |
2581 | +m4_include([m4/lib-prefix.m4]) |
2582 | m4_include([m4/libtool.m4]) |
2583 | m4_include([m4/ltoptions.m4]) |
2584 | m4_include([m4/ltsugar.m4]) |
2585 | m4_include([m4/ltversion.m4]) |
2586 | m4_include([m4/lt~obsolete.m4]) |
2587 | +m4_include([m4/nls.m4]) |
2588 | +m4_include([m4/po.m4]) |
2589 | +m4_include([m4/progtest.m4]) |
2590 | diff --git a/compile b/compile |
2591 | index 2ab71e4..99e5052 100755 |
2592 | --- a/compile |
2593 | +++ b/compile |
2594 | @@ -1,9 +1,9 @@ |
2595 | #! /bin/sh |
2596 | # Wrapper for compilers which do not understand '-c -o'. |
2597 | |
2598 | -scriptversion=2016-01-11.22; # UTC |
2599 | +scriptversion=2018-03-07.03; # UTC |
2600 | |
2601 | -# Copyright (C) 1999-2017 Free Software Foundation, Inc. |
2602 | +# Copyright (C) 1999-2018 Free Software Foundation, Inc. |
2603 | # Written by Tom Tromey <tromey@cygnus.com>. |
2604 | # |
2605 | # This program is free software; you can redistribute it and/or modify |
2606 | @@ -17,7 +17,7 @@ scriptversion=2016-01-11.22; # UTC |
2607 | # GNU General Public License for more details. |
2608 | # |
2609 | # You should have received a copy of the GNU General Public License |
2610 | -# along with this program. If not, see <http://www.gnu.org/licenses/>. |
2611 | +# along with this program. If not, see <https://www.gnu.org/licenses/>. |
2612 | |
2613 | # As a special exception to the GNU General Public License, if you |
2614 | # distribute this file as part of a program that contains a |
2615 | @@ -340,7 +340,7 @@ exit $ret |
2616 | # Local Variables: |
2617 | # mode: shell-script |
2618 | # sh-indentation: 2 |
2619 | -# eval: (add-hook 'write-file-hooks 'time-stamp) |
2620 | +# eval: (add-hook 'before-save-hook 'time-stamp) |
2621 | # time-stamp-start: "scriptversion=" |
2622 | # time-stamp-format: "%:y-%02m-%02d.%02H" |
2623 | # time-stamp-time-zone: "UTC0" |
2624 | diff --git a/config.guess b/config.guess |
2625 | index a744844..256083a 100755 |
2626 | --- a/config.guess |
2627 | +++ b/config.guess |
2628 | @@ -1,8 +1,8 @@ |
2629 | #! /bin/sh |
2630 | # Attempt to guess a canonical system name. |
2631 | -# Copyright 1992-2017 Free Software Foundation, Inc. |
2632 | +# Copyright 1992-2018 Free Software Foundation, Inc. |
2633 | |
2634 | -timestamp='2017-08-08' |
2635 | +timestamp='2018-03-08' |
2636 | |
2637 | # This file is free software; you can redistribute it and/or modify it |
2638 | # under the terms of the GNU General Public License as published by |
2639 | @@ -15,7 +15,7 @@ timestamp='2017-08-08' |
2640 | # General Public License for more details. |
2641 | # |
2642 | # You should have received a copy of the GNU General Public License |
2643 | -# along with this program; if not, see <http://www.gnu.org/licenses/>. |
2644 | +# along with this program; if not, see <https://www.gnu.org/licenses/>. |
2645 | # |
2646 | # As a special exception to the GNU General Public License, if you |
2647 | # distribute this file as part of a program that contains a |
2648 | @@ -27,7 +27,7 @@ timestamp='2017-08-08' |
2649 | # Originally written by Per Bothner; maintained since 2000 by Ben Elliston. |
2650 | # |
2651 | # You can get the latest version of this script from: |
2652 | -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess |
2653 | +# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess |
2654 | # |
2655 | # Please send patches to <config-patches@gnu.org>. |
2656 | |
2657 | @@ -39,7 +39,7 @@ Usage: $0 [OPTION] |
2658 | |
2659 | Output the configuration name of the system \`$me' is run on. |
2660 | |
2661 | -Operation modes: |
2662 | +Options: |
2663 | -h, --help print this help, then exit |
2664 | -t, --time-stamp print date of last modification, then exit |
2665 | -v, --version print version number, then exit |
2666 | @@ -50,7 +50,7 @@ version="\ |
2667 | GNU config.guess ($timestamp) |
2668 | |
2669 | Originally written by Per Bothner. |
2670 | -Copyright 1992-2017 Free Software Foundation, Inc. |
2671 | +Copyright 1992-2018 Free Software Foundation, Inc. |
2672 | |
2673 | This is free software; see the source for copying conditions. There is NO |
2674 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." |
2675 | @@ -107,9 +107,9 @@ trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; |
2676 | dummy=$tmp/dummy ; |
2677 | tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; |
2678 | case $CC_FOR_BUILD,$HOST_CC,$CC in |
2679 | - ,,) echo "int x;" > $dummy.c ; |
2680 | + ,,) echo "int x;" > "$dummy.c" ; |
2681 | for c in cc gcc c89 c99 ; do |
2682 | - if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then |
2683 | + if ($c -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then |
2684 | CC_FOR_BUILD="$c"; break ; |
2685 | fi ; |
2686 | done ; |
2687 | @@ -132,14 +132,14 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown |
2688 | UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown |
2689 | UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown |
2690 | |
2691 | -case "${UNAME_SYSTEM}" in |
2692 | +case "$UNAME_SYSTEM" in |
2693 | Linux|GNU|GNU/*) |
2694 | # If the system lacks a compiler, then just pick glibc. |
2695 | # We could probably try harder. |
2696 | LIBC=gnu |
2697 | |
2698 | - eval $set_cc_for_build |
2699 | - cat <<-EOF > $dummy.c |
2700 | + eval "$set_cc_for_build" |
2701 | + cat <<-EOF > "$dummy.c" |
2702 | #include <features.h> |
2703 | #if defined(__UCLIBC__) |
2704 | LIBC=uclibc |
2705 | @@ -149,13 +149,20 @@ Linux|GNU|GNU/*) |
2706 | LIBC=gnu |
2707 | #endif |
2708 | EOF |
2709 | - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` |
2710 | + eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`" |
2711 | + |
2712 | + # If ldd exists, use it to detect musl libc. |
2713 | + if command -v ldd >/dev/null && \ |
2714 | + ldd --version 2>&1 | grep -q ^musl |
2715 | + then |
2716 | + LIBC=musl |
2717 | + fi |
2718 | ;; |
2719 | esac |
2720 | |
2721 | # Note: order is significant - the case branches are not exclusive. |
2722 | |
2723 | -case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in |
2724 | +case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in |
2725 | *:NetBSD:*:*) |
2726 | # NetBSD (nbsd) targets should (where applicable) match one or |
2727 | # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, |
2728 | @@ -169,30 +176,30 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in |
2729 | # portion of the name. We always set it to "unknown". |
2730 | sysctl="sysctl -n hw.machine_arch" |
2731 | UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \ |
2732 | - /sbin/$sysctl 2>/dev/null || \ |
2733 | - /usr/sbin/$sysctl 2>/dev/null || \ |
2734 | + "/sbin/$sysctl" 2>/dev/null || \ |
2735 | + "/usr/sbin/$sysctl" 2>/dev/null || \ |
2736 | echo unknown)` |
2737 | - case "${UNAME_MACHINE_ARCH}" in |
2738 | + case "$UNAME_MACHINE_ARCH" in |
2739 | armeb) machine=armeb-unknown ;; |
2740 | arm*) machine=arm-unknown ;; |
2741 | sh3el) machine=shl-unknown ;; |
2742 | sh3eb) machine=sh-unknown ;; |
2743 | sh5el) machine=sh5le-unknown ;; |
2744 | earmv*) |
2745 | - arch=`echo ${UNAME_MACHINE_ARCH} | sed -e 's,^e\(armv[0-9]\).*$,\1,'` |
2746 | - endian=`echo ${UNAME_MACHINE_ARCH} | sed -ne 's,^.*\(eb\)$,\1,p'` |
2747 | - machine=${arch}${endian}-unknown |
2748 | + arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'` |
2749 | + endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'` |
2750 | + machine="${arch}${endian}"-unknown |
2751 | ;; |
2752 | - *) machine=${UNAME_MACHINE_ARCH}-unknown ;; |
2753 | + *) machine="$UNAME_MACHINE_ARCH"-unknown ;; |
2754 | esac |
2755 | # The Operating System including object format, if it has switched |
2756 | # to ELF recently (or will in the future) and ABI. |
2757 | - case "${UNAME_MACHINE_ARCH}" in |
2758 | + case "$UNAME_MACHINE_ARCH" in |
2759 | earm*) |
2760 | os=netbsdelf |
2761 | ;; |
2762 | arm*|i386|m68k|ns32k|sh3*|sparc|vax) |
2763 | - eval $set_cc_for_build |
2764 | + eval "$set_cc_for_build" |
2765 | if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ |
2766 | | grep -q __ELF__ |
2767 | then |
2768 | @@ -208,10 +215,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in |
2769 | ;; |
2770 | esac |
2771 | # Determine ABI tags. |
2772 | - case "${UNAME_MACHINE_ARCH}" in |
2773 | + case "$UNAME_MACHINE_ARCH" in |
2774 | earm*) |
2775 | expr='s/^earmv[0-9]/-eabi/;s/eb$//' |
2776 | - abi=`echo ${UNAME_MACHINE_ARCH} | sed -e "$expr"` |
2777 | + abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"` |
2778 | ;; |
2779 | esac |
2780 | # The OS release |
2781 | @@ -219,49 +226,55 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in |
2782 | # thus, need a distinct triplet. However, they do not need |
2783 | # kernel version information, so it can be replaced with a |
2784 | # suitable tag, in the style of linux-gnu. |
2785 | - case "${UNAME_VERSION}" in |
2786 | + case "$UNAME_VERSION" in |
2787 | Debian*) |
2788 | release='-gnu' |
2789 | ;; |
2790 | *) |
2791 | - release=`echo ${UNAME_RELEASE} | sed -e 's/[-_].*//' | cut -d. -f1,2` |
2792 | + release=`echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. -f1,2` |
2793 | ;; |
2794 | esac |
2795 | # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: |
2796 | # contains redundant information, the shorter form: |
2797 | # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. |
2798 | - echo "${machine}-${os}${release}${abi}" |
2799 | + echo "$machine-${os}${release}${abi}" |
2800 | exit ;; |
2801 | *:Bitrig:*:*) |
2802 | UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` |
2803 | - echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} |
2804 | + echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE" |
2805 | exit ;; |
2806 | *:OpenBSD:*:*) |
2807 | UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` |
2808 | - echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} |
2809 | + echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE" |
2810 | exit ;; |
2811 | *:LibertyBSD:*:*) |
2812 | UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` |
2813 | - echo ${UNAME_MACHINE_ARCH}-unknown-libertybsd${UNAME_RELEASE} |
2814 | + echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE" |
2815 | + exit ;; |
2816 | + *:MidnightBSD:*:*) |
2817 | + echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE" |
2818 | exit ;; |
2819 | *:ekkoBSD:*:*) |
2820 | - echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} |
2821 | + echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE" |
2822 | exit ;; |
2823 | *:SolidBSD:*:*) |
2824 | - echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} |
2825 | + echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE" |
2826 | exit ;; |
2827 | macppc:MirBSD:*:*) |
2828 | - echo powerpc-unknown-mirbsd${UNAME_RELEASE} |
2829 | + echo powerpc-unknown-mirbsd"$UNAME_RELEASE" |
2830 | exit ;; |
2831 | *:MirBSD:*:*) |
2832 | - echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} |
2833 | + echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE" |
2834 | exit ;; |
2835 | *:Sortix:*:*) |
2836 | - echo ${UNAME_MACHINE}-unknown-sortix |
2837 | + echo "$UNAME_MACHINE"-unknown-sortix |
2838 | exit ;; |
2839 | *:Redox:*:*) |
2840 | - echo ${UNAME_MACHINE}-unknown-redox |
2841 | + echo "$UNAME_MACHINE"-unknown-redox |
2842 | exit ;; |
2843 | + mips:OSF1:*.*) |
2844 | + echo mips-dec-osf1 |
2845 | + exit ;; |
2846 | alpha:OSF1:*:*) |
2847 | case $UNAME_RELEASE in |
2848 | *4.0) |
2849 | @@ -313,28 +326,19 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in |
2850 | # A Tn.n version is a released field test version. |
2851 | # A Xn.n version is an unreleased experimental baselevel. |
2852 | # 1.2 uses "1.2" for uname -r. |
2853 | - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` |
2854 | + echo "$UNAME_MACHINE"-dec-osf"`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`" |
2855 | # Reset EXIT trap before exiting to avoid spurious non-zero exit code. |
2856 | exitcode=$? |
2857 | trap '' 0 |
2858 | exit $exitcode ;; |
2859 | - Alpha\ *:Windows_NT*:*) |
2860 | - # How do we know it's Interix rather than the generic POSIX subsystem? |
2861 | - # Should we change UNAME_MACHINE based on the output of uname instead |
2862 | - # of the specific Alpha model? |
2863 | - echo alpha-pc-interix |
2864 | - exit ;; |
2865 | - 21064:Windows_NT:50:3) |
2866 | - echo alpha-dec-winnt3.5 |
2867 | - exit ;; |
2868 | Amiga*:UNIX_System_V:4.0:*) |
2869 | echo m68k-unknown-sysv4 |
2870 | exit ;; |
2871 | *:[Aa]miga[Oo][Ss]:*:*) |
2872 | - echo ${UNAME_MACHINE}-unknown-amigaos |
2873 | + echo "$UNAME_MACHINE"-unknown-amigaos |
2874 | exit ;; |
2875 | *:[Mm]orph[Oo][Ss]:*:*) |
2876 | - echo ${UNAME_MACHINE}-unknown-morphos |
2877 | + echo "$UNAME_MACHINE"-unknown-morphos |
2878 | exit ;; |
2879 | *:OS/390:*:*) |
2880 | echo i370-ibm-openedition |
2881 | @@ -346,7 +350,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in |
2882 | echo powerpc-ibm-os400 |
2883 | exit ;; |
2884 | arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) |
2885 | - echo arm-acorn-riscix${UNAME_RELEASE} |
2886 | + echo arm-acorn-riscix"$UNAME_RELEASE" |
2887 | exit ;; |
2888 | arm*:riscos:*:*|arm*:RISCOS:*:*) |
2889 | echo arm-unknown-riscos |
2890 | @@ -373,19 +377,19 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in |
2891 | sparc) echo sparc-icl-nx7; exit ;; |
2892 | esac ;; |
2893 | s390x:SunOS:*:*) |
2894 | - echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` |
2895 | + echo "$UNAME_MACHINE"-ibm-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" |
2896 | exit ;; |
2897 | sun4H:SunOS:5.*:*) |
2898 | - echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` |
2899 | + echo sparc-hal-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" |
2900 | exit ;; |
2901 | sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) |
2902 | - echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` |
2903 | + echo sparc-sun-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" |
2904 | exit ;; |
2905 | i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) |
2906 | - echo i386-pc-auroraux${UNAME_RELEASE} |
2907 | + echo i386-pc-auroraux"$UNAME_RELEASE" |
2908 | exit ;; |
2909 | i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) |
2910 | - eval $set_cc_for_build |
2911 | + eval "$set_cc_for_build" |
2912 | SUN_ARCH=i386 |
2913 | # If there is a compiler, see if it is configured for 64-bit objects. |
2914 | # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. |
2915 | @@ -398,13 +402,13 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in |
2916 | SUN_ARCH=x86_64 |
2917 | fi |
2918 | fi |
2919 | - echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` |
2920 | + echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" |
2921 | exit ;; |
2922 | sun4*:SunOS:6*:*) |
2923 | # According to config.sub, this is the proper way to canonicalize |
2924 | # SunOS6. Hard to guess exactly what SunOS6 will be like, but |
2925 | # it's likely to be more like Solaris than SunOS4. |
2926 | - echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` |
2927 | + echo sparc-sun-solaris3"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" |
2928 | exit ;; |
2929 | sun4*:SunOS:*:*) |
2930 | case "`/usr/bin/arch -k`" in |
2931 | @@ -413,25 +417,25 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in |
2932 | ;; |
2933 | esac |
2934 | # Japanese Language versions have a version number like `4.1.3-JL'. |
2935 | - echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` |
2936 | + echo sparc-sun-sunos"`echo "$UNAME_RELEASE"|sed -e 's/-/_/'`" |
2937 | exit ;; |
2938 | sun3*:SunOS:*:*) |
2939 | - echo m68k-sun-sunos${UNAME_RELEASE} |
2940 | + echo m68k-sun-sunos"$UNAME_RELEASE" |
2941 | exit ;; |
2942 | sun*:*:4.2BSD:*) |
2943 | UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` |
2944 | - test "x${UNAME_RELEASE}" = x && UNAME_RELEASE=3 |
2945 | + test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3 |
2946 | case "`/bin/arch`" in |
2947 | sun3) |
2948 | - echo m68k-sun-sunos${UNAME_RELEASE} |
2949 | + echo m68k-sun-sunos"$UNAME_RELEASE" |
2950 | ;; |
2951 | sun4) |
2952 | - echo sparc-sun-sunos${UNAME_RELEASE} |
2953 | + echo sparc-sun-sunos"$UNAME_RELEASE" |
2954 | ;; |
2955 | esac |
2956 | exit ;; |
2957 | aushp:SunOS:*:*) |
2958 | - echo sparc-auspex-sunos${UNAME_RELEASE} |
2959 | + echo sparc-auspex-sunos"$UNAME_RELEASE" |
2960 | exit ;; |
2961 | # The situation for MiNT is a little confusing. The machine name |
2962 | # can be virtually everything (everything which is not |
2963 | @@ -442,44 +446,44 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in |
2964 | # MiNT. But MiNT is downward compatible to TOS, so this should |
2965 | # be no problem. |
2966 | atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) |
2967 | - echo m68k-atari-mint${UNAME_RELEASE} |
2968 | + echo m68k-atari-mint"$UNAME_RELEASE" |
2969 | exit ;; |
2970 | atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) |
2971 | - echo m68k-atari-mint${UNAME_RELEASE} |
2972 | + echo m68k-atari-mint"$UNAME_RELEASE" |
2973 | exit ;; |
2974 | *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) |
2975 | - echo m68k-atari-mint${UNAME_RELEASE} |
2976 | + echo m68k-atari-mint"$UNAME_RELEASE" |
2977 | exit ;; |
2978 | milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) |
2979 | - echo m68k-milan-mint${UNAME_RELEASE} |
2980 | + echo m68k-milan-mint"$UNAME_RELEASE" |
2981 | exit ;; |
2982 | hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) |
2983 | - echo m68k-hades-mint${UNAME_RELEASE} |
2984 | + echo m68k-hades-mint"$UNAME_RELEASE" |
2985 | exit ;; |
2986 | *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) |
2987 | - echo m68k-unknown-mint${UNAME_RELEASE} |
2988 | + echo m68k-unknown-mint"$UNAME_RELEASE" |
2989 | exit ;; |
2990 | m68k:machten:*:*) |
2991 | - echo m68k-apple-machten${UNAME_RELEASE} |
2992 | + echo m68k-apple-machten"$UNAME_RELEASE" |
2993 | exit ;; |
2994 | powerpc:machten:*:*) |
2995 | - echo powerpc-apple-machten${UNAME_RELEASE} |
2996 | + echo powerpc-apple-machten"$UNAME_RELEASE" |
2997 | exit ;; |
2998 | RISC*:Mach:*:*) |
2999 | echo mips-dec-mach_bsd4.3 |
3000 | exit ;; |
3001 | RISC*:ULTRIX:*:*) |
3002 | - echo mips-dec-ultrix${UNAME_RELEASE} |
3003 | + echo mips-dec-ultrix"$UNAME_RELEASE" |
3004 | exit ;; |
3005 | VAX*:ULTRIX*:*:*) |
3006 | - echo vax-dec-ultrix${UNAME_RELEASE} |
3007 | + echo vax-dec-ultrix"$UNAME_RELEASE" |
3008 | exit ;; |
3009 | 2020:CLIX:*:* | 2430:CLIX:*:*) |
3010 | - echo clipper-intergraph-clix${UNAME_RELEASE} |
3011 | + echo clipper-intergraph-clix"$UNAME_RELEASE" |
3012 | exit ;; |
3013 | mips:*:*:UMIPS | mips:*:*:RISCos) |
3014 | - eval $set_cc_for_build |
3015 | - sed 's/^ //' << EOF >$dummy.c |
3016 | + eval "$set_cc_for_build" |
3017 | + sed 's/^ //' << EOF > "$dummy.c" |
3018 | #ifdef __cplusplus |
3019 | #include <stdio.h> /* for printf() prototype */ |
3020 | int main (int argc, char *argv[]) { |
3021 | @@ -488,23 +492,23 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in |
3022 | #endif |
3023 | #if defined (host_mips) && defined (MIPSEB) |
3024 | #if defined (SYSTYPE_SYSV) |
3025 | - printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); |
3026 | + printf ("mips-mips-riscos%ssysv\\n", argv[1]); exit (0); |
3027 | #endif |
3028 | #if defined (SYSTYPE_SVR4) |
3029 | - printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0); |
3030 | + printf ("mips-mips-riscos%ssvr4\\n", argv[1]); exit (0); |
3031 | #endif |
3032 | #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) |
3033 | - printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0); |
3034 | + printf ("mips-mips-riscos%sbsd\\n", argv[1]); exit (0); |
3035 | #endif |
3036 | #endif |
3037 | exit (-1); |
3038 | } |
3039 | EOF |
3040 | - $CC_FOR_BUILD -o $dummy $dummy.c && |
3041 | - dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && |
3042 | - SYSTEM_NAME=`$dummy $dummyarg` && |
3043 | + $CC_FOR_BUILD -o "$dummy" "$dummy.c" && |
3044 | + dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p'` && |
3045 | + SYSTEM_NAME=`"$dummy" "$dummyarg"` && |
3046 | { echo "$SYSTEM_NAME"; exit; } |
3047 | - echo mips-mips-riscos${UNAME_RELEASE} |
3048 | + echo mips-mips-riscos"$UNAME_RELEASE" |
3049 | exit ;; |
3050 | Motorola:PowerMAX_OS:*:*) |
3051 | echo powerpc-motorola-powermax |
3052 | @@ -530,17 +534,17 @@ EOF |
3053 | AViiON:dgux:*:*) |
3054 | # DG/UX returns AViiON for all architectures |
3055 | UNAME_PROCESSOR=`/usr/bin/uname -p` |
3056 | - if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] |
3057 | + if [ "$UNAME_PROCESSOR" = mc88100 ] || [ "$UNAME_PROCESSOR" = mc88110 ] |
3058 | then |
3059 | - if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ |
3060 | - [ ${TARGET_BINARY_INTERFACE}x = x ] |
3061 | + if [ "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx ] || \ |
3062 | + [ "$TARGET_BINARY_INTERFACE"x = x ] |
3063 | then |
3064 | - echo m88k-dg-dgux${UNAME_RELEASE} |
3065 | + echo m88k-dg-dgux"$UNAME_RELEASE" |
3066 | else |
3067 | - echo m88k-dg-dguxbcs${UNAME_RELEASE} |
3068 | + echo m88k-dg-dguxbcs"$UNAME_RELEASE" |
3069 | fi |
3070 | else |
3071 | - echo i586-dg-dgux${UNAME_RELEASE} |
3072 | + echo i586-dg-dgux"$UNAME_RELEASE" |
3073 | fi |
3074 | exit ;; |
3075 | M88*:DolphinOS:*:*) # DolphinOS (SVR3) |
3076 | @@ -557,7 +561,7 @@ EOF |
3077 | echo m68k-tektronix-bsd |
3078 | exit ;; |
3079 | *:IRIX*:*:*) |
3080 | - echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` |
3081 | + echo mips-sgi-irix"`echo "$UNAME_RELEASE"|sed -e 's/-/_/g'`" |
3082 | exit ;; |
3083 | ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. |
3084 | echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id |
3085 | @@ -569,14 +573,14 @@ EOF |
3086 | if [ -x /usr/bin/oslevel ] ; then |
3087 | IBM_REV=`/usr/bin/oslevel` |
3088 | else |
3089 | - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} |
3090 | + IBM_REV="$UNAME_VERSION.$UNAME_RELEASE" |
3091 | fi |
3092 | - echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} |
3093 | + echo "$UNAME_MACHINE"-ibm-aix"$IBM_REV" |
3094 | exit ;; |
3095 | *:AIX:2:3) |
3096 | if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then |
3097 | - eval $set_cc_for_build |
3098 | - sed 's/^ //' << EOF >$dummy.c |
3099 | + eval "$set_cc_for_build" |
3100 | + sed 's/^ //' << EOF > "$dummy.c" |
3101 | #include <sys/systemcfg.h> |
3102 | |
3103 | main() |
3104 | @@ -587,7 +591,7 @@ EOF |
3105 | exit(0); |
3106 | } |
3107 | EOF |
3108 | - if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` |
3109 | + if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` |
3110 | then |
3111 | echo "$SYSTEM_NAME" |
3112 | else |
3113 | @@ -601,7 +605,7 @@ EOF |
3114 | exit ;; |
3115 | *:AIX:*:[4567]) |
3116 | IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` |
3117 | - if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then |
3118 | + if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then |
3119 | IBM_ARCH=rs6000 |
3120 | else |
3121 | IBM_ARCH=powerpc |
3122 | @@ -610,18 +614,18 @@ EOF |
3123 | IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | |
3124 | awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` |
3125 | else |
3126 | - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} |
3127 | + IBM_REV="$UNAME_VERSION.$UNAME_RELEASE" |
3128 | fi |
3129 | - echo ${IBM_ARCH}-ibm-aix${IBM_REV} |
3130 | + echo "$IBM_ARCH"-ibm-aix"$IBM_REV" |
3131 | exit ;; |
3132 | *:AIX:*:*) |
3133 | echo rs6000-ibm-aix |
3134 | exit ;; |
3135 | - ibmrt:4.4BSD:*|romp-ibm:BSD:*) |
3136 | + ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*) |
3137 | echo romp-ibm-bsd4.4 |
3138 | exit ;; |
3139 | ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and |
3140 | - echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to |
3141 | + echo romp-ibm-bsd"$UNAME_RELEASE" # 4.3 with uname added to |
3142 | exit ;; # report: romp-ibm BSD 4.3 |
3143 | *:BOSX:*:*) |
3144 | echo rs6000-bull-bosx |
3145 | @@ -636,28 +640,28 @@ EOF |
3146 | echo m68k-hp-bsd4.4 |
3147 | exit ;; |
3148 | 9000/[34678]??:HP-UX:*:*) |
3149 | - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` |
3150 | - case "${UNAME_MACHINE}" in |
3151 | - 9000/31? ) HP_ARCH=m68000 ;; |
3152 | - 9000/[34]?? ) HP_ARCH=m68k ;; |
3153 | + HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'` |
3154 | + case "$UNAME_MACHINE" in |
3155 | + 9000/31?) HP_ARCH=m68000 ;; |
3156 | + 9000/[34]??) HP_ARCH=m68k ;; |
3157 | 9000/[678][0-9][0-9]) |
3158 | if [ -x /usr/bin/getconf ]; then |
3159 | sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` |
3160 | sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` |
3161 | - case "${sc_cpu_version}" in |
3162 | + case "$sc_cpu_version" in |
3163 | 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0 |
3164 | 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1 |
3165 | 532) # CPU_PA_RISC2_0 |
3166 | - case "${sc_kernel_bits}" in |
3167 | + case "$sc_kernel_bits" in |
3168 | 32) HP_ARCH=hppa2.0n ;; |
3169 | 64) HP_ARCH=hppa2.0w ;; |
3170 | '') HP_ARCH=hppa2.0 ;; # HP-UX 10.20 |
3171 | esac ;; |
3172 | esac |
3173 | fi |
3174 | - if [ "${HP_ARCH}" = "" ]; then |
3175 | - eval $set_cc_for_build |
3176 | - sed 's/^ //' << EOF >$dummy.c |
3177 | + if [ "$HP_ARCH" = "" ]; then |
3178 | + eval "$set_cc_for_build" |
3179 | + sed 's/^ //' << EOF > "$dummy.c" |
3180 | |
3181 | #define _HPUX_SOURCE |
3182 | #include <stdlib.h> |
3183 | @@ -690,13 +694,13 @@ EOF |
3184 | exit (0); |
3185 | } |
3186 | EOF |
3187 | - (CCOPTS="" $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` |
3188 | + (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=`"$dummy"` |
3189 | test -z "$HP_ARCH" && HP_ARCH=hppa |
3190 | fi ;; |
3191 | esac |
3192 | - if [ ${HP_ARCH} = hppa2.0w ] |
3193 | + if [ "$HP_ARCH" = hppa2.0w ] |
3194 | then |
3195 | - eval $set_cc_for_build |
3196 | + eval "$set_cc_for_build" |
3197 | |
3198 | # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating |
3199 | # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler |
3200 | @@ -715,15 +719,15 @@ EOF |
3201 | HP_ARCH=hppa64 |
3202 | fi |
3203 | fi |
3204 | - echo ${HP_ARCH}-hp-hpux${HPUX_REV} |
3205 | + echo "$HP_ARCH"-hp-hpux"$HPUX_REV" |
3206 | exit ;; |
3207 | ia64:HP-UX:*:*) |
3208 | - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` |
3209 | - echo ia64-hp-hpux${HPUX_REV} |
3210 | + HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'` |
3211 | + echo ia64-hp-hpux"$HPUX_REV" |
3212 | exit ;; |
3213 | 3050*:HI-UX:*:*) |
3214 | - eval $set_cc_for_build |
3215 | - sed 's/^ //' << EOF >$dummy.c |
3216 | + eval "$set_cc_for_build" |
3217 | + sed 's/^ //' << EOF > "$dummy.c" |
3218 | #include <unistd.h> |
3219 | int |
3220 | main () |
3221 | @@ -748,11 +752,11 @@ EOF |
3222 | exit (0); |
3223 | } |
3224 | EOF |
3225 | - $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && |
3226 | + $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` && |
3227 | { echo "$SYSTEM_NAME"; exit; } |
3228 | echo unknown-hitachi-hiuxwe2 |
3229 | exit ;; |
3230 | - 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) |
3231 | + 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:*) |
3232 | echo hppa1.1-hp-bsd |
3233 | exit ;; |
3234 | 9000/8??:4.3bsd:*:*) |
3235 | @@ -761,7 +765,7 @@ EOF |
3236 | *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) |
3237 | echo hppa1.0-hp-mpeix |
3238 | exit ;; |
3239 | - hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) |
3240 | + hp7??:OSF1:*:* | hp8?[79]:OSF1:*:*) |
3241 | echo hppa1.1-hp-osf |
3242 | exit ;; |
3243 | hp8??:OSF1:*:*) |
3244 | @@ -769,9 +773,9 @@ EOF |
3245 | exit ;; |
3246 | i*86:OSF1:*:*) |
3247 | if [ -x /usr/sbin/sysversion ] ; then |
3248 | - echo ${UNAME_MACHINE}-unknown-osf1mk |
3249 | + echo "$UNAME_MACHINE"-unknown-osf1mk |
3250 | else |
3251 | - echo ${UNAME_MACHINE}-unknown-osf1 |
3252 | + echo "$UNAME_MACHINE"-unknown-osf1 |
3253 | fi |
3254 | exit ;; |
3255 | parisc*:Lites*:*:*) |
3256 | @@ -796,128 +800,109 @@ EOF |
3257 | echo c4-convex-bsd |
3258 | exit ;; |
3259 | CRAY*Y-MP:*:*:*) |
3260 | - echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' |
3261 | + echo ymp-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' |
3262 | exit ;; |
3263 | CRAY*[A-Z]90:*:*:*) |
3264 | - echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ |
3265 | + echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \ |
3266 | | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ |
3267 | -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ |
3268 | -e 's/\.[^.]*$/.X/' |
3269 | exit ;; |
3270 | CRAY*TS:*:*:*) |
3271 | - echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' |
3272 | + echo t90-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' |
3273 | exit ;; |
3274 | CRAY*T3E:*:*:*) |
3275 | - echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' |
3276 | + echo alphaev5-cray-unicosmk"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' |
3277 | exit ;; |
3278 | CRAY*SV1:*:*:*) |
3279 | - echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' |
3280 | + echo sv1-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' |
3281 | exit ;; |
3282 | *:UNICOS/mp:*:*) |
3283 | - echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' |
3284 | + echo craynv-cray-unicosmp"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' |
3285 | exit ;; |
3286 | F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) |
3287 | FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` |
3288 | FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` |
3289 | - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` |
3290 | + FUJITSU_REL=`echo "$UNAME_RELEASE" | sed -e 's/ /_/'` |
3291 | echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" |
3292 | exit ;; |
3293 | 5000:UNIX_System_V:4.*:*) |
3294 | FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` |
3295 | - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'` |
3296 | + FUJITSU_REL=`echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'` |
3297 | echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" |
3298 | exit ;; |
3299 | i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) |
3300 | - echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} |
3301 | + echo "$UNAME_MACHINE"-pc-bsdi"$UNAME_RELEASE" |
3302 | exit ;; |
3303 | sparc*:BSD/OS:*:*) |
3304 | - echo sparc-unknown-bsdi${UNAME_RELEASE} |
3305 | + echo sparc-unknown-bsdi"$UNAME_RELEASE" |
3306 | exit ;; |
3307 | *:BSD/OS:*:*) |
3308 | - echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} |
3309 | + echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE" |
3310 | exit ;; |
3311 | *:FreeBSD:*:*) |
3312 | UNAME_PROCESSOR=`/usr/bin/uname -p` |
3313 | - case ${UNAME_PROCESSOR} in |
3314 | + case "$UNAME_PROCESSOR" in |
3315 | amd64) |
3316 | UNAME_PROCESSOR=x86_64 ;; |
3317 | i386) |
3318 | UNAME_PROCESSOR=i586 ;; |
3319 | esac |
3320 | - echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` |
3321 | + echo "$UNAME_PROCESSOR"-unknown-freebsd"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`" |
3322 | exit ;; |
3323 | i*:CYGWIN*:*) |
3324 | - echo ${UNAME_MACHINE}-pc-cygwin |
3325 | + echo "$UNAME_MACHINE"-pc-cygwin |
3326 | exit ;; |
3327 | *:MINGW64*:*) |
3328 | - echo ${UNAME_MACHINE}-pc-mingw64 |
3329 | + echo "$UNAME_MACHINE"-pc-mingw64 |
3330 | exit ;; |
3331 | *:MINGW*:*) |
3332 | - echo ${UNAME_MACHINE}-pc-mingw32 |
3333 | + echo "$UNAME_MACHINE"-pc-mingw32 |
3334 | exit ;; |
3335 | *:MSYS*:*) |
3336 | - echo ${UNAME_MACHINE}-pc-msys |
3337 | - exit ;; |
3338 | - i*:windows32*:*) |
3339 | - # uname -m includes "-pc" on this system. |
3340 | - echo ${UNAME_MACHINE}-mingw32 |
3341 | + echo "$UNAME_MACHINE"-pc-msys |
3342 | exit ;; |
3343 | i*:PW*:*) |
3344 | - echo ${UNAME_MACHINE}-pc-pw32 |
3345 | + echo "$UNAME_MACHINE"-pc-pw32 |
3346 | exit ;; |
3347 | *:Interix*:*) |
3348 | - case ${UNAME_MACHINE} in |
3349 | + case "$UNAME_MACHINE" in |
3350 | x86) |
3351 | - echo i586-pc-interix${UNAME_RELEASE} |
3352 | + echo i586-pc-interix"$UNAME_RELEASE" |
3353 | exit ;; |
3354 | authenticamd | genuineintel | EM64T) |
3355 | - echo x86_64-unknown-interix${UNAME_RELEASE} |
3356 | + echo x86_64-unknown-interix"$UNAME_RELEASE" |
3357 | exit ;; |
3358 | IA64) |
3359 | - echo ia64-unknown-interix${UNAME_RELEASE} |
3360 | + echo ia64-unknown-interix"$UNAME_RELEASE" |
3361 | exit ;; |
3362 | esac ;; |
3363 | - [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) |
3364 | - echo i${UNAME_MACHINE}-pc-mks |
3365 | - exit ;; |
3366 | - 8664:Windows_NT:*) |
3367 | - echo x86_64-pc-mks |
3368 | - exit ;; |
3369 | - i*:Windows_NT*:* | Pentium*:Windows_NT*:*) |
3370 | - # How do we know it's Interix rather than the generic POSIX subsystem? |
3371 | - # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we |
3372 | - # UNAME_MACHINE based on the output of uname instead of i386? |
3373 | - echo i586-pc-interix |
3374 | - exit ;; |
3375 | i*:UWIN*:*) |
3376 | - echo ${UNAME_MACHINE}-pc-uwin |
3377 | + echo "$UNAME_MACHINE"-pc-uwin |
3378 | exit ;; |
3379 | amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) |
3380 | echo x86_64-unknown-cygwin |
3381 | exit ;; |
3382 | - p*:CYGWIN*:*) |
3383 | - echo powerpcle-unknown-cygwin |
3384 | - exit ;; |
3385 | prep*:SunOS:5.*:*) |
3386 | - echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` |
3387 | + echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" |
3388 | exit ;; |
3389 | *:GNU:*:*) |
3390 | # the GNU system |
3391 | - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` |
3392 | + echo "`echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,'`-unknown-$LIBC`echo "$UNAME_RELEASE"|sed -e 's,/.*$,,'`" |
3393 | exit ;; |
3394 | *:GNU/*:*:*) |
3395 | # other systems with GNU libc and userland |
3396 | - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC} |
3397 | + echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC" |
3398 | exit ;; |
3399 | i*86:Minix:*:*) |
3400 | - echo ${UNAME_MACHINE}-pc-minix |
3401 | + echo "$UNAME_MACHINE"-pc-minix |
3402 | exit ;; |
3403 | aarch64:Linux:*:*) |
3404 | - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
3405 | + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
3406 | exit ;; |
3407 | aarch64_be:Linux:*:*) |
3408 | UNAME_MACHINE=aarch64_be |
3409 | - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
3410 | + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
3411 | exit ;; |
3412 | alpha:Linux:*:*) |
3413 | case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in |
3414 | @@ -931,63 +916,63 @@ EOF |
3415 | esac |
3416 | objdump --private-headers /bin/sh | grep -q ld.so.1 |
3417 | if test "$?" = 0 ; then LIBC=gnulibc1 ; fi |
3418 | - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
3419 | + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
3420 | exit ;; |
3421 | arc:Linux:*:* | arceb:Linux:*:*) |
3422 | - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
3423 | + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
3424 | exit ;; |
3425 | arm*:Linux:*:*) |
3426 | - eval $set_cc_for_build |
3427 | + eval "$set_cc_for_build" |
3428 | if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ |
3429 | | grep -q __ARM_EABI__ |
3430 | then |
3431 | - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
3432 | + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
3433 | else |
3434 | if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ |
3435 | | grep -q __ARM_PCS_VFP |
3436 | then |
3437 | - echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi |
3438 | + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabi |
3439 | else |
3440 | - echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf |
3441 | + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabihf |
3442 | fi |
3443 | fi |
3444 | exit ;; |
3445 | avr32*:Linux:*:*) |
3446 | - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
3447 | + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
3448 | exit ;; |
3449 | cris:Linux:*:*) |
3450 | - echo ${UNAME_MACHINE}-axis-linux-${LIBC} |
3451 | + echo "$UNAME_MACHINE"-axis-linux-"$LIBC" |
3452 | exit ;; |
3453 | crisv32:Linux:*:*) |
3454 | - echo ${UNAME_MACHINE}-axis-linux-${LIBC} |
3455 | + echo "$UNAME_MACHINE"-axis-linux-"$LIBC" |
3456 | exit ;; |
3457 | e2k:Linux:*:*) |
3458 | - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
3459 | + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
3460 | exit ;; |
3461 | frv:Linux:*:*) |
3462 | - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
3463 | + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
3464 | exit ;; |
3465 | hexagon:Linux:*:*) |
3466 | - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
3467 | + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
3468 | exit ;; |
3469 | i*86:Linux:*:*) |
3470 | - echo ${UNAME_MACHINE}-pc-linux-${LIBC} |
3471 | + echo "$UNAME_MACHINE"-pc-linux-"$LIBC" |
3472 | exit ;; |
3473 | ia64:Linux:*:*) |
3474 | - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
3475 | + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
3476 | exit ;; |
3477 | k1om:Linux:*:*) |
3478 | - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
3479 | + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
3480 | exit ;; |
3481 | m32r*:Linux:*:*) |
3482 | - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
3483 | + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
3484 | exit ;; |
3485 | m68*:Linux:*:*) |
3486 | - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
3487 | + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
3488 | exit ;; |
3489 | mips:Linux:*:* | mips64:Linux:*:*) |
3490 | - eval $set_cc_for_build |
3491 | - sed 's/^ //' << EOF >$dummy.c |
3492 | + eval "$set_cc_for_build" |
3493 | + sed 's/^ //' << EOF > "$dummy.c" |
3494 | #undef CPU |
3495 | #undef ${UNAME_MACHINE} |
3496 | #undef ${UNAME_MACHINE}el |
3497 | @@ -1001,70 +986,70 @@ EOF |
3498 | #endif |
3499 | #endif |
3500 | EOF |
3501 | - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` |
3502 | - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } |
3503 | + eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU'`" |
3504 | + test "x$CPU" != x && { echo "$CPU-unknown-linux-$LIBC"; exit; } |
3505 | ;; |
3506 | mips64el:Linux:*:*) |
3507 | - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
3508 | + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
3509 | exit ;; |
3510 | openrisc*:Linux:*:*) |
3511 | - echo or1k-unknown-linux-${LIBC} |
3512 | + echo or1k-unknown-linux-"$LIBC" |
3513 | exit ;; |
3514 | or32:Linux:*:* | or1k*:Linux:*:*) |
3515 | - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
3516 | + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
3517 | exit ;; |
3518 | padre:Linux:*:*) |
3519 | - echo sparc-unknown-linux-${LIBC} |
3520 | + echo sparc-unknown-linux-"$LIBC" |
3521 | exit ;; |
3522 | parisc64:Linux:*:* | hppa64:Linux:*:*) |
3523 | - echo hppa64-unknown-linux-${LIBC} |
3524 | + echo hppa64-unknown-linux-"$LIBC" |
3525 | exit ;; |
3526 | parisc:Linux:*:* | hppa:Linux:*:*) |
3527 | # Look for CPU level |
3528 | case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in |
3529 | - PA7*) echo hppa1.1-unknown-linux-${LIBC} ;; |
3530 | - PA8*) echo hppa2.0-unknown-linux-${LIBC} ;; |
3531 | - *) echo hppa-unknown-linux-${LIBC} ;; |
3532 | + PA7*) echo hppa1.1-unknown-linux-"$LIBC" ;; |
3533 | + PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;; |
3534 | + *) echo hppa-unknown-linux-"$LIBC" ;; |
3535 | esac |
3536 | exit ;; |
3537 | ppc64:Linux:*:*) |
3538 | - echo powerpc64-unknown-linux-${LIBC} |
3539 | + echo powerpc64-unknown-linux-"$LIBC" |
3540 | exit ;; |
3541 | ppc:Linux:*:*) |
3542 | - echo powerpc-unknown-linux-${LIBC} |
3543 | + echo powerpc-unknown-linux-"$LIBC" |
3544 | exit ;; |
3545 | ppc64le:Linux:*:*) |
3546 | - echo powerpc64le-unknown-linux-${LIBC} |
3547 | + echo powerpc64le-unknown-linux-"$LIBC" |
3548 | exit ;; |
3549 | ppcle:Linux:*:*) |
3550 | - echo powerpcle-unknown-linux-${LIBC} |
3551 | + echo powerpcle-unknown-linux-"$LIBC" |
3552 | exit ;; |
3553 | riscv32:Linux:*:* | riscv64:Linux:*:*) |
3554 | - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
3555 | + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
3556 | exit ;; |
3557 | s390:Linux:*:* | s390x:Linux:*:*) |
3558 | - echo ${UNAME_MACHINE}-ibm-linux-${LIBC} |
3559 | + echo "$UNAME_MACHINE"-ibm-linux-"$LIBC" |
3560 | exit ;; |
3561 | sh64*:Linux:*:*) |
3562 | - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
3563 | + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
3564 | exit ;; |
3565 | sh*:Linux:*:*) |
3566 | - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
3567 | + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
3568 | exit ;; |
3569 | sparc:Linux:*:* | sparc64:Linux:*:*) |
3570 | - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
3571 | + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
3572 | exit ;; |
3573 | tile*:Linux:*:*) |
3574 | - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
3575 | + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
3576 | exit ;; |
3577 | vax:Linux:*:*) |
3578 | - echo ${UNAME_MACHINE}-dec-linux-${LIBC} |
3579 | + echo "$UNAME_MACHINE"-dec-linux-"$LIBC" |
3580 | exit ;; |
3581 | x86_64:Linux:*:*) |
3582 | - echo ${UNAME_MACHINE}-pc-linux-${LIBC} |
3583 | + echo "$UNAME_MACHINE"-pc-linux-"$LIBC" |
3584 | exit ;; |
3585 | xtensa*:Linux:*:*) |
3586 | - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
3587 | + echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" |
3588 | exit ;; |
3589 | i*86:DYNIX/ptx:4*:*) |
3590 | # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. |
3591 | @@ -1078,34 +1063,34 @@ EOF |
3592 | # I am not positive that other SVR4 systems won't match this, |
3593 | # I just have to hope. -- rms. |
3594 | # Use sysv4.2uw... so that sysv4* matches it. |
3595 | - echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} |
3596 | + echo "$UNAME_MACHINE"-pc-sysv4.2uw"$UNAME_VERSION" |
3597 | exit ;; |
3598 | i*86:OS/2:*:*) |
3599 | # If we were able to find `uname', then EMX Unix compatibility |
3600 | # is probably installed. |
3601 | - echo ${UNAME_MACHINE}-pc-os2-emx |
3602 | + echo "$UNAME_MACHINE"-pc-os2-emx |
3603 | exit ;; |
3604 | i*86:XTS-300:*:STOP) |
3605 | - echo ${UNAME_MACHINE}-unknown-stop |
3606 | + echo "$UNAME_MACHINE"-unknown-stop |
3607 | exit ;; |
3608 | i*86:atheos:*:*) |
3609 | - echo ${UNAME_MACHINE}-unknown-atheos |
3610 | + echo "$UNAME_MACHINE"-unknown-atheos |
3611 | exit ;; |
3612 | i*86:syllable:*:*) |
3613 | - echo ${UNAME_MACHINE}-pc-syllable |
3614 | + echo "$UNAME_MACHINE"-pc-syllable |
3615 | exit ;; |
3616 | i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) |
3617 | - echo i386-unknown-lynxos${UNAME_RELEASE} |
3618 | + echo i386-unknown-lynxos"$UNAME_RELEASE" |
3619 | exit ;; |
3620 | i*86:*DOS:*:*) |
3621 | - echo ${UNAME_MACHINE}-pc-msdosdjgpp |
3622 | + echo "$UNAME_MACHINE"-pc-msdosdjgpp |
3623 | exit ;; |
3624 | - i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) |
3625 | - UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` |
3626 | + i*86:*:4.*:*) |
3627 | + UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'` |
3628 | if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then |
3629 | - echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} |
3630 | + echo "$UNAME_MACHINE"-univel-sysv"$UNAME_REL" |
3631 | else |
3632 | - echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} |
3633 | + echo "$UNAME_MACHINE"-pc-sysv"$UNAME_REL" |
3634 | fi |
3635 | exit ;; |
3636 | i*86:*:5:[678]*) |
3637 | @@ -1115,12 +1100,12 @@ EOF |
3638 | *Pentium) UNAME_MACHINE=i586 ;; |
3639 | *Pent*|*Celeron) UNAME_MACHINE=i686 ;; |
3640 | esac |
3641 | - echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} |
3642 | + echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}{$UNAME_VERSION}" |
3643 | exit ;; |
3644 | i*86:*:3.2:*) |
3645 | if test -f /usr/options/cb.name; then |
3646 | UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name` |
3647 | - echo ${UNAME_MACHINE}-pc-isc$UNAME_REL |
3648 | + echo "$UNAME_MACHINE"-pc-isc"$UNAME_REL" |
3649 | elif /bin/uname -X 2>/dev/null >/dev/null ; then |
3650 | UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` |
3651 | (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 |
3652 | @@ -1130,9 +1115,9 @@ EOF |
3653 | && UNAME_MACHINE=i686 |
3654 | (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ |
3655 | && UNAME_MACHINE=i686 |
3656 | - echo ${UNAME_MACHINE}-pc-sco$UNAME_REL |
3657 | + echo "$UNAME_MACHINE"-pc-sco"$UNAME_REL" |
3658 | else |
3659 | - echo ${UNAME_MACHINE}-pc-sysv32 |
3660 | + echo "$UNAME_MACHINE"-pc-sysv32 |
3661 | fi |
3662 | exit ;; |
3663 | pc:*:*:*) |
3664 | @@ -1152,9 +1137,9 @@ EOF |
3665 | exit ;; |
3666 | i860:*:4.*:*) # i860-SVR4 |
3667 | if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then |
3668 | - echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 |
3669 | + echo i860-stardent-sysv"$UNAME_RELEASE" # Stardent Vistra i860-SVR4 |
3670 | else # Add other i860-SVR4 vendors below as they are discovered. |
3671 | - echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 |
3672 | + echo i860-unknown-sysv"$UNAME_RELEASE" # Unknown i860-SVR4 |
3673 | fi |
3674 | exit ;; |
3675 | mini*:CTIX:SYS*5:*) |
3676 | @@ -1174,9 +1159,9 @@ EOF |
3677 | test -r /etc/.relid \ |
3678 | && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` |
3679 | /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ |
3680 | - && { echo i486-ncr-sysv4.3${OS_REL}; exit; } |
3681 | + && { echo i486-ncr-sysv4.3"$OS_REL"; exit; } |
3682 | /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ |
3683 | - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; |
3684 | + && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;; |
3685 | 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) |
3686 | /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ |
3687 | && { echo i486-ncr-sysv4; exit; } ;; |
3688 | @@ -1185,28 +1170,28 @@ EOF |
3689 | test -r /etc/.relid \ |
3690 | && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` |
3691 | /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ |
3692 | - && { echo i486-ncr-sysv4.3${OS_REL}; exit; } |
3693 | + && { echo i486-ncr-sysv4.3"$OS_REL"; exit; } |
3694 | /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ |
3695 | - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } |
3696 | + && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } |
3697 | /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ |
3698 | - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; |
3699 | + && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;; |
3700 | m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) |
3701 | - echo m68k-unknown-lynxos${UNAME_RELEASE} |
3702 | + echo m68k-unknown-lynxos"$UNAME_RELEASE" |
3703 | exit ;; |
3704 | mc68030:UNIX_System_V:4.*:*) |
3705 | echo m68k-atari-sysv4 |
3706 | exit ;; |
3707 | TSUNAMI:LynxOS:2.*:*) |
3708 | - echo sparc-unknown-lynxos${UNAME_RELEASE} |
3709 | + echo sparc-unknown-lynxos"$UNAME_RELEASE" |
3710 | exit ;; |
3711 | rs6000:LynxOS:2.*:*) |
3712 | - echo rs6000-unknown-lynxos${UNAME_RELEASE} |
3713 | + echo rs6000-unknown-lynxos"$UNAME_RELEASE" |
3714 | exit ;; |
3715 | PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) |
3716 | - echo powerpc-unknown-lynxos${UNAME_RELEASE} |
3717 | + echo powerpc-unknown-lynxos"$UNAME_RELEASE" |
3718 | exit ;; |
3719 | SM[BE]S:UNIX_SV:*:*) |
3720 | - echo mips-dde-sysv${UNAME_RELEASE} |
3721 | + echo mips-dde-sysv"$UNAME_RELEASE" |
3722 | exit ;; |
3723 | RM*:ReliantUNIX-*:*:*) |
3724 | echo mips-sni-sysv4 |
3725 | @@ -1217,7 +1202,7 @@ EOF |
3726 | *:SINIX-*:*:*) |
3727 | if uname -p 2>/dev/null >/dev/null ; then |
3728 | UNAME_MACHINE=`(uname -p) 2>/dev/null` |
3729 | - echo ${UNAME_MACHINE}-sni-sysv4 |
3730 | + echo "$UNAME_MACHINE"-sni-sysv4 |
3731 | else |
3732 | echo ns32k-sni-sysv |
3733 | fi |
3734 | @@ -1237,23 +1222,23 @@ EOF |
3735 | exit ;; |
3736 | i*86:VOS:*:*) |
3737 | # From Paul.Green@stratus.com. |
3738 | - echo ${UNAME_MACHINE}-stratus-vos |
3739 | + echo "$UNAME_MACHINE"-stratus-vos |
3740 | exit ;; |
3741 | *:VOS:*:*) |
3742 | # From Paul.Green@stratus.com. |
3743 | echo hppa1.1-stratus-vos |
3744 | exit ;; |
3745 | mc68*:A/UX:*:*) |
3746 | - echo m68k-apple-aux${UNAME_RELEASE} |
3747 | + echo m68k-apple-aux"$UNAME_RELEASE" |
3748 | exit ;; |
3749 | news*:NEWS-OS:6*:*) |
3750 | echo mips-sony-newsos6 |
3751 | exit ;; |
3752 | R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) |
3753 | if [ -d /usr/nec ]; then |
3754 | - echo mips-nec-sysv${UNAME_RELEASE} |
3755 | + echo mips-nec-sysv"$UNAME_RELEASE" |
3756 | else |
3757 | - echo mips-unknown-sysv${UNAME_RELEASE} |
3758 | + echo mips-unknown-sysv"$UNAME_RELEASE" |
3759 | fi |
3760 | exit ;; |
3761 | BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. |
3762 | @@ -1272,39 +1257,39 @@ EOF |
3763 | echo x86_64-unknown-haiku |
3764 | exit ;; |
3765 | SX-4:SUPER-UX:*:*) |
3766 | - echo sx4-nec-superux${UNAME_RELEASE} |
3767 | + echo sx4-nec-superux"$UNAME_RELEASE" |
3768 | exit ;; |
3769 | SX-5:SUPER-UX:*:*) |
3770 | - echo sx5-nec-superux${UNAME_RELEASE} |
3771 | + echo sx5-nec-superux"$UNAME_RELEASE" |
3772 | exit ;; |
3773 | SX-6:SUPER-UX:*:*) |
3774 | - echo sx6-nec-superux${UNAME_RELEASE} |
3775 | + echo sx6-nec-superux"$UNAME_RELEASE" |
3776 | exit ;; |
3777 | SX-7:SUPER-UX:*:*) |
3778 | - echo sx7-nec-superux${UNAME_RELEASE} |
3779 | + echo sx7-nec-superux"$UNAME_RELEASE" |
3780 | exit ;; |
3781 | SX-8:SUPER-UX:*:*) |
3782 | - echo sx8-nec-superux${UNAME_RELEASE} |
3783 | + echo sx8-nec-superux"$UNAME_RELEASE" |
3784 | exit ;; |
3785 | SX-8R:SUPER-UX:*:*) |
3786 | - echo sx8r-nec-superux${UNAME_RELEASE} |
3787 | + echo sx8r-nec-superux"$UNAME_RELEASE" |
3788 | exit ;; |
3789 | SX-ACE:SUPER-UX:*:*) |
3790 | - echo sxace-nec-superux${UNAME_RELEASE} |
3791 | + echo sxace-nec-superux"$UNAME_RELEASE" |
3792 | exit ;; |
3793 | Power*:Rhapsody:*:*) |
3794 | - echo powerpc-apple-rhapsody${UNAME_RELEASE} |
3795 | + echo powerpc-apple-rhapsody"$UNAME_RELEASE" |
3796 | exit ;; |
3797 | *:Rhapsody:*:*) |
3798 | - echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} |
3799 | + echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE" |
3800 | exit ;; |
3801 | *:Darwin:*:*) |
3802 | UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown |
3803 | - eval $set_cc_for_build |
3804 | + eval "$set_cc_for_build" |
3805 | if test "$UNAME_PROCESSOR" = unknown ; then |
3806 | UNAME_PROCESSOR=powerpc |
3807 | fi |
3808 | - if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then |
3809 | + if test "`echo "$UNAME_RELEASE" | sed -e 's/\..*//'`" -le 10 ; then |
3810 | if [ "$CC_FOR_BUILD" != no_compiler_found ]; then |
3811 | if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ |
3812 | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ |
3813 | @@ -1332,7 +1317,7 @@ EOF |
3814 | # that Apple uses in portable devices. |
3815 | UNAME_PROCESSOR=x86_64 |
3816 | fi |
3817 | - echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} |
3818 | + echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE" |
3819 | exit ;; |
3820 | *:procnto*:*:* | *:QNX:[0123456789]*:*) |
3821 | UNAME_PROCESSOR=`uname -p` |
3822 | @@ -1340,22 +1325,25 @@ EOF |
3823 | UNAME_PROCESSOR=i386 |
3824 | UNAME_MACHINE=pc |
3825 | fi |
3826 | - echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} |
3827 | + echo "$UNAME_PROCESSOR"-"$UNAME_MACHINE"-nto-qnx"$UNAME_RELEASE" |
3828 | exit ;; |
3829 | *:QNX:*:4*) |
3830 | echo i386-pc-qnx |
3831 | exit ;; |
3832 | NEO-*:NONSTOP_KERNEL:*:*) |
3833 | - echo neo-tandem-nsk${UNAME_RELEASE} |
3834 | + echo neo-tandem-nsk"$UNAME_RELEASE" |
3835 | exit ;; |
3836 | NSE-*:NONSTOP_KERNEL:*:*) |
3837 | - echo nse-tandem-nsk${UNAME_RELEASE} |
3838 | + echo nse-tandem-nsk"$UNAME_RELEASE" |
3839 | exit ;; |
3840 | NSR-*:NONSTOP_KERNEL:*:*) |
3841 | - echo nsr-tandem-nsk${UNAME_RELEASE} |
3842 | + echo nsr-tandem-nsk"$UNAME_RELEASE" |
3843 | + exit ;; |
3844 | + NSV-*:NONSTOP_KERNEL:*:*) |
3845 | + echo nsv-tandem-nsk"$UNAME_RELEASE" |
3846 | exit ;; |
3847 | NSX-*:NONSTOP_KERNEL:*:*) |
3848 | - echo nsx-tandem-nsk${UNAME_RELEASE} |
3849 | + echo nsx-tandem-nsk"$UNAME_RELEASE" |
3850 | exit ;; |
3851 | *:NonStop-UX:*:*) |
3852 | echo mips-compaq-nonstopux |
3853 | @@ -1364,7 +1352,7 @@ EOF |
3854 | echo bs2000-siemens-sysv |
3855 | exit ;; |
3856 | DS/*:UNIX_System_V:*:*) |
3857 | - echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} |
3858 | + echo "$UNAME_MACHINE"-"$UNAME_SYSTEM"-"$UNAME_RELEASE" |
3859 | exit ;; |
3860 | *:Plan9:*:*) |
3861 | # "uname -m" is not consistent, so use $cputype instead. 386 |
3862 | @@ -1375,7 +1363,7 @@ EOF |
3863 | else |
3864 | UNAME_MACHINE="$cputype" |
3865 | fi |
3866 | - echo ${UNAME_MACHINE}-unknown-plan9 |
3867 | + echo "$UNAME_MACHINE"-unknown-plan9 |
3868 | exit ;; |
3869 | *:TOPS-10:*:*) |
3870 | echo pdp10-unknown-tops10 |
3871 | @@ -1396,14 +1384,14 @@ EOF |
3872 | echo pdp10-unknown-its |
3873 | exit ;; |
3874 | SEI:*:*:SEIUX) |
3875 | - echo mips-sei-seiux${UNAME_RELEASE} |
3876 | + echo mips-sei-seiux"$UNAME_RELEASE" |
3877 | exit ;; |
3878 | *:DragonFly:*:*) |
3879 | - echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` |
3880 | + echo "$UNAME_MACHINE"-unknown-dragonfly"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`" |
3881 | exit ;; |
3882 | *:*VMS:*:*) |
3883 | UNAME_MACHINE=`(uname -p) 2>/dev/null` |
3884 | - case "${UNAME_MACHINE}" in |
3885 | + case "$UNAME_MACHINE" in |
3886 | A*) echo alpha-dec-vms ; exit ;; |
3887 | I*) echo ia64-dec-vms ; exit ;; |
3888 | V*) echo vax-dec-vms ; exit ;; |
3889 | @@ -1412,32 +1400,44 @@ EOF |
3890 | echo i386-pc-xenix |
3891 | exit ;; |
3892 | i*86:skyos:*:*) |
3893 | - echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE} | sed -e 's/ .*$//'` |
3894 | + echo "$UNAME_MACHINE"-pc-skyos"`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'`" |
3895 | exit ;; |
3896 | i*86:rdos:*:*) |
3897 | - echo ${UNAME_MACHINE}-pc-rdos |
3898 | + echo "$UNAME_MACHINE"-pc-rdos |
3899 | exit ;; |
3900 | i*86:AROS:*:*) |
3901 | - echo ${UNAME_MACHINE}-pc-aros |
3902 | + echo "$UNAME_MACHINE"-pc-aros |
3903 | exit ;; |
3904 | x86_64:VMkernel:*:*) |
3905 | - echo ${UNAME_MACHINE}-unknown-esx |
3906 | + echo "$UNAME_MACHINE"-unknown-esx |
3907 | exit ;; |
3908 | amd64:Isilon\ OneFS:*:*) |
3909 | echo x86_64-unknown-onefs |
3910 | exit ;; |
3911 | esac |
3912 | |
3913 | +echo "$0: unable to guess system type" >&2 |
3914 | + |
3915 | +case "$UNAME_MACHINE:$UNAME_SYSTEM" in |
3916 | + mips:Linux | mips64:Linux) |
3917 | + # If we got here on MIPS GNU/Linux, output extra information. |
3918 | + cat >&2 <<EOF |
3919 | + |
3920 | +NOTE: MIPS GNU/Linux systems require a C compiler to fully recognize |
3921 | +the system type. Please install a C compiler and try again. |
3922 | +EOF |
3923 | + ;; |
3924 | +esac |
3925 | + |
3926 | cat >&2 <<EOF |
3927 | -$0: unable to guess system type |
3928 | |
3929 | This script (version $timestamp), has failed to recognize the |
3930 | operating system you are using. If your script is old, overwrite *all* |
3931 | copies of config.guess and config.sub with the latest versions from: |
3932 | |
3933 | - http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess |
3934 | + https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess |
3935 | and |
3936 | - http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub |
3937 | + https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub |
3938 | |
3939 | If $0 has already been updated, send the following data and any |
3940 | information you think might be pertinent to config-patches@gnu.org to |
3941 | @@ -1460,16 +1460,16 @@ hostinfo = `(hostinfo) 2>/dev/null` |
3942 | /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` |
3943 | /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` |
3944 | |
3945 | -UNAME_MACHINE = ${UNAME_MACHINE} |
3946 | -UNAME_RELEASE = ${UNAME_RELEASE} |
3947 | -UNAME_SYSTEM = ${UNAME_SYSTEM} |
3948 | -UNAME_VERSION = ${UNAME_VERSION} |
3949 | +UNAME_MACHINE = "$UNAME_MACHINE" |
3950 | +UNAME_RELEASE = "$UNAME_RELEASE" |
3951 | +UNAME_SYSTEM = "$UNAME_SYSTEM" |
3952 | +UNAME_VERSION = "$UNAME_VERSION" |
3953 | EOF |
3954 | |
3955 | exit 1 |
3956 | |
3957 | # Local variables: |
3958 | -# eval: (add-hook 'write-file-hooks 'time-stamp) |
3959 | +# eval: (add-hook 'before-save-hook 'time-stamp) |
3960 | # time-stamp-start: "timestamp='" |
3961 | # time-stamp-format: "%:y-%02m-%02d" |
3962 | # time-stamp-end: "'" |
3963 | diff --git a/config.h.in b/config.h.in |
3964 | index cb0b381..20dbb81 100644 |
3965 | --- a/config.h.in |
3966 | +++ b/config.h.in |
3967 | @@ -1,6 +1,7 @@ |
3968 | /* config.h.in. Generated from configure.ac by autoheader. */ |
3969 | |
3970 | -/* always defined to indicate that i18n is enabled */ |
3971 | +/* Define to 1 if translation of program messages to the user's native |
3972 | + language is requested. */ |
3973 | #undef ENABLE_NLS |
3974 | |
3975 | /* Enable software sources page */ |
3976 | @@ -9,9 +10,6 @@ |
3977 | /* gettext package */ |
3978 | #undef GETTEXT_PACKAGE |
3979 | |
3980 | -/* Define to 1 if you have the `bind_textdomain_codeset' function. */ |
3981 | -#undef HAVE_BIND_TEXTDOMAIN_CODESET |
3982 | - |
3983 | /* Define to 1 if you have the Mac OS X function CFLocaleCopyCurrent in the |
3984 | CoreFoundation framework. */ |
3985 | #undef HAVE_CFLOCALECOPYCURRENT |
3986 | @@ -23,7 +21,8 @@ |
3987 | /* Build with Cheese support? */ |
3988 | #undef HAVE_CHEESE |
3989 | |
3990 | -/* Define to 1 if you have the `dcgettext' function. */ |
3991 | +/* Define if the GNU dcgettext() function is already present or preinstalled. |
3992 | + */ |
3993 | #undef HAVE_DCGETTEXT |
3994 | |
3995 | /* Define to 1 if you have the <dlfcn.h> header file. */ |
3996 | @@ -35,15 +34,12 @@ |
3997 | /* Build with IBus support? */ |
3998 | #undef HAVE_IBUS |
3999 | |
4000 | +/* Define if you have the iconv() function and it works. */ |
4001 | +#undef HAVE_ICONV |
4002 | + |
4003 | /* Define to 1 if you have the <inttypes.h> header file. */ |
4004 | #undef HAVE_INTTYPES_H |
4005 | |
4006 | -/* Define if your <locale.h> file defines LC_MESSAGES. */ |
4007 | -#undef HAVE_LC_MESSAGES |
4008 | - |
4009 | -/* Define to 1 if you have the <locale.h> header file. */ |
4010 | -#undef HAVE_LOCALE_H |
4011 | - |
4012 | /* Define to 1 if you have the <memory.h> header file. */ |
4013 | #undef HAVE_MEMORY_H |
4014 | |
4015 | @@ -68,9 +64,6 @@ |
4016 | /* Define to 1 if you have the <unistd.h> header file. */ |
4017 | #undef HAVE_UNISTD_H |
4018 | |
4019 | -/* ISO codes prefix */ |
4020 | -#undef ISO_CODES_PREFIX |
4021 | - |
4022 | /* Define to the sub-directory where libtool stores uninstalled libraries. */ |
4023 | #undef LT_OBJDIR |
4024 | |
4025 | diff --git a/config.rpath b/config.rpath |
4026 | new file mode 100755 |
4027 | index 0000000..98183ff |
4028 | --- /dev/null |
4029 | +++ b/config.rpath |
4030 | @@ -0,0 +1,684 @@ |
4031 | +#! /bin/sh |
4032 | +# Output a system dependent set of variables, describing how to set the |
4033 | +# run time search path of shared libraries in an executable. |
4034 | +# |
4035 | +# Copyright 1996-2016 Free Software Foundation, Inc. |
4036 | +# Taken from GNU libtool, 2001 |
4037 | +# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 |
4038 | +# |
4039 | +# This file is free software; the Free Software Foundation gives |
4040 | +# unlimited permission to copy and/or distribute it, with or without |
4041 | +# modifications, as long as this notice is preserved. |
4042 | +# |
4043 | +# The first argument passed to this file is the canonical host specification, |
4044 | +# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM |
4045 | +# or |
4046 | +# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM |
4047 | +# The environment variables CC, GCC, LDFLAGS, LD, with_gnu_ld |
4048 | +# should be set by the caller. |
4049 | +# |
4050 | +# The set of defined variables is at the end of this script. |
4051 | + |
4052 | +# Known limitations: |
4053 | +# - On IRIX 6.5 with CC="cc", the run time search patch must not be longer |
4054 | +# than 256 bytes, otherwise the compiler driver will dump core. The only |
4055 | +# known workaround is to choose shorter directory names for the build |
4056 | +# directory and/or the installation directory. |
4057 | + |
4058 | +# All known linkers require a '.a' archive for static linking (except MSVC, |
4059 | +# which needs '.lib'). |
4060 | +libext=a |
4061 | +shrext=.so |
4062 | + |
4063 | +host="$1" |
4064 | +host_cpu=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` |
4065 | +host_vendor=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` |
4066 | +host_os=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` |
4067 | + |
4068 | +# Code taken from libtool.m4's _LT_CC_BASENAME. |
4069 | + |
4070 | +for cc_temp in $CC""; do |
4071 | + case $cc_temp in |
4072 | + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; |
4073 | + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; |
4074 | + \-*) ;; |
4075 | + *) break;; |
4076 | + esac |
4077 | +done |
4078 | +cc_basename=`echo "$cc_temp" | sed -e 's%^.*/%%'` |
4079 | + |
4080 | +# Code taken from libtool.m4's _LT_COMPILER_PIC. |
4081 | + |
4082 | +wl= |
4083 | +if test "$GCC" = yes; then |
4084 | + wl='-Wl,' |
4085 | +else |
4086 | + case "$host_os" in |
4087 | + aix*) |
4088 | + wl='-Wl,' |
4089 | + ;; |
4090 | + mingw* | cygwin* | pw32* | os2* | cegcc*) |
4091 | + ;; |
4092 | + hpux9* | hpux10* | hpux11*) |
4093 | + wl='-Wl,' |
4094 | + ;; |
4095 | + irix5* | irix6* | nonstopux*) |
4096 | + wl='-Wl,' |
4097 | + ;; |
4098 | + linux* | k*bsd*-gnu | kopensolaris*-gnu) |
4099 | + case $cc_basename in |
4100 | + ecc*) |
4101 | + wl='-Wl,' |
4102 | + ;; |
4103 | + icc* | ifort*) |
4104 | + wl='-Wl,' |
4105 | + ;; |
4106 | + lf95*) |
4107 | + wl='-Wl,' |
4108 | + ;; |
4109 | + nagfor*) |
4110 | + wl='-Wl,-Wl,,' |
4111 | + ;; |
4112 | + pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*) |
4113 | + wl='-Wl,' |
4114 | + ;; |
4115 | + ccc*) |
4116 | + wl='-Wl,' |
4117 | + ;; |
4118 | + xl* | bgxl* | bgf* | mpixl*) |
4119 | + wl='-Wl,' |
4120 | + ;; |
4121 | + como) |
4122 | + wl='-lopt=' |
4123 | + ;; |
4124 | + *) |
4125 | + case `$CC -V 2>&1 | sed 5q` in |
4126 | + *Sun\ F* | *Sun*Fortran*) |
4127 | + wl= |
4128 | + ;; |
4129 | + *Sun\ C*) |
4130 | + wl='-Wl,' |
4131 | + ;; |
4132 | + esac |
4133 | + ;; |
4134 | + esac |
4135 | + ;; |
4136 | + newsos6) |
4137 | + ;; |
4138 | + *nto* | *qnx*) |
4139 | + ;; |
4140 | + osf3* | osf4* | osf5*) |
4141 | + wl='-Wl,' |
4142 | + ;; |
4143 | + rdos*) |
4144 | + ;; |
4145 | + solaris*) |
4146 | + case $cc_basename in |
4147 | + f77* | f90* | f95* | sunf77* | sunf90* | sunf95*) |
4148 | + wl='-Qoption ld ' |
4149 | + ;; |
4150 | + *) |
4151 | + wl='-Wl,' |
4152 | + ;; |
4153 | + esac |
4154 | + ;; |
4155 | + sunos4*) |
4156 | + wl='-Qoption ld ' |
4157 | + ;; |
4158 | + sysv4 | sysv4.2uw2* | sysv4.3*) |
4159 | + wl='-Wl,' |
4160 | + ;; |
4161 | + sysv4*MP*) |
4162 | + ;; |
4163 | + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) |
4164 | + wl='-Wl,' |
4165 | + ;; |
4166 | + unicos*) |
4167 | + wl='-Wl,' |
4168 | + ;; |
4169 | + uts4*) |
4170 | + ;; |
4171 | + esac |
4172 | +fi |
4173 | + |
4174 | +# Code taken from libtool.m4's _LT_LINKER_SHLIBS. |
4175 | + |
4176 | +hardcode_libdir_flag_spec= |
4177 | +hardcode_libdir_separator= |
4178 | +hardcode_direct=no |
4179 | +hardcode_minus_L=no |
4180 | + |
4181 | +case "$host_os" in |
4182 | + cygwin* | mingw* | pw32* | cegcc*) |
4183 | + # FIXME: the MSVC++ port hasn't been tested in a loooong time |
4184 | + # When not using gcc, we currently assume that we are using |
4185 | + # Microsoft Visual C++. |
4186 | + if test "$GCC" != yes; then |
4187 | + with_gnu_ld=no |
4188 | + fi |
4189 | + ;; |
4190 | + interix*) |
4191 | + # we just hope/assume this is gcc and not c89 (= MSVC++) |
4192 | + with_gnu_ld=yes |
4193 | + ;; |
4194 | + openbsd*) |
4195 | + with_gnu_ld=no |
4196 | + ;; |
4197 | +esac |
4198 | + |
4199 | +ld_shlibs=yes |
4200 | +if test "$with_gnu_ld" = yes; then |
4201 | + # Set some defaults for GNU ld with shared library support. These |
4202 | + # are reset later if shared libraries are not supported. Putting them |
4203 | + # here allows them to be overridden if necessary. |
4204 | + # Unlike libtool, we use -rpath here, not --rpath, since the documented |
4205 | + # option of GNU ld is called -rpath, not --rpath. |
4206 | + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
4207 | + case "$host_os" in |
4208 | + aix[3-9]*) |
4209 | + # On AIX/PPC, the GNU linker is very broken |
4210 | + if test "$host_cpu" != ia64; then |
4211 | + ld_shlibs=no |
4212 | + fi |
4213 | + ;; |
4214 | + amigaos*) |
4215 | + case "$host_cpu" in |
4216 | + powerpc) |
4217 | + ;; |
4218 | + m68k) |
4219 | + hardcode_libdir_flag_spec='-L$libdir' |
4220 | + hardcode_minus_L=yes |
4221 | + ;; |
4222 | + esac |
4223 | + ;; |
4224 | + beos*) |
4225 | + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then |
4226 | + : |
4227 | + else |
4228 | + ld_shlibs=no |
4229 | + fi |
4230 | + ;; |
4231 | + cygwin* | mingw* | pw32* | cegcc*) |
4232 | + # hardcode_libdir_flag_spec is actually meaningless, as there is |
4233 | + # no search path for DLLs. |
4234 | + hardcode_libdir_flag_spec='-L$libdir' |
4235 | + if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then |
4236 | + : |
4237 | + else |
4238 | + ld_shlibs=no |
4239 | + fi |
4240 | + ;; |
4241 | + haiku*) |
4242 | + ;; |
4243 | + interix[3-9]*) |
4244 | + hardcode_direct=no |
4245 | + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' |
4246 | + ;; |
4247 | + gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) |
4248 | + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then |
4249 | + : |
4250 | + else |
4251 | + ld_shlibs=no |
4252 | + fi |
4253 | + ;; |
4254 | + netbsd*) |
4255 | + ;; |
4256 | + solaris*) |
4257 | + if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then |
4258 | + ld_shlibs=no |
4259 | + elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then |
4260 | + : |
4261 | + else |
4262 | + ld_shlibs=no |
4263 | + fi |
4264 | + ;; |
4265 | + sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) |
4266 | + case `$LD -v 2>&1` in |
4267 | + *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) |
4268 | + ld_shlibs=no |
4269 | + ;; |
4270 | + *) |
4271 | + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then |
4272 | + hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' |
4273 | + else |
4274 | + ld_shlibs=no |
4275 | + fi |
4276 | + ;; |
4277 | + esac |
4278 | + ;; |
4279 | + sunos4*) |
4280 | + hardcode_direct=yes |
4281 | + ;; |
4282 | + *) |
4283 | + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then |
4284 | + : |
4285 | + else |
4286 | + ld_shlibs=no |
4287 | + fi |
4288 | + ;; |
4289 | + esac |
4290 | + if test "$ld_shlibs" = no; then |
4291 | + hardcode_libdir_flag_spec= |
4292 | + fi |
4293 | +else |
4294 | + case "$host_os" in |
4295 | + aix3*) |
4296 | + # Note: this linker hardcodes the directories in LIBPATH if there |
4297 | + # are no directories specified by -L. |
4298 | + hardcode_minus_L=yes |
4299 | + if test "$GCC" = yes; then |
4300 | + # Neither direct hardcoding nor static linking is supported with a |
4301 | + # broken collect2. |
4302 | + hardcode_direct=unsupported |
4303 | + fi |
4304 | + ;; |
4305 | + aix[4-9]*) |
4306 | + if test "$host_cpu" = ia64; then |
4307 | + # On IA64, the linker does run time linking by default, so we don't |
4308 | + # have to do anything special. |
4309 | + aix_use_runtimelinking=no |
4310 | + else |
4311 | + aix_use_runtimelinking=no |
4312 | + # Test if we are trying to use run time linking or normal |
4313 | + # AIX style linking. If -brtl is somewhere in LDFLAGS, we |
4314 | + # need to do runtime linking. |
4315 | + case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) |
4316 | + for ld_flag in $LDFLAGS; do |
4317 | + if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then |
4318 | + aix_use_runtimelinking=yes |
4319 | + break |
4320 | + fi |
4321 | + done |
4322 | + ;; |
4323 | + esac |
4324 | + fi |
4325 | + hardcode_direct=yes |
4326 | + hardcode_libdir_separator=':' |
4327 | + if test "$GCC" = yes; then |
4328 | + case $host_os in aix4.[012]|aix4.[012].*) |
4329 | + collect2name=`${CC} -print-prog-name=collect2` |
4330 | + if test -f "$collect2name" && \ |
4331 | + strings "$collect2name" | grep resolve_lib_name >/dev/null |
4332 | + then |
4333 | + # We have reworked collect2 |
4334 | + : |
4335 | + else |
4336 | + # We have old collect2 |
4337 | + hardcode_direct=unsupported |
4338 | + hardcode_minus_L=yes |
4339 | + hardcode_libdir_flag_spec='-L$libdir' |
4340 | + hardcode_libdir_separator= |
4341 | + fi |
4342 | + ;; |
4343 | + esac |
4344 | + fi |
4345 | + # Begin _LT_AC_SYS_LIBPATH_AIX. |
4346 | + echo 'int main () { return 0; }' > conftest.c |
4347 | + ${CC} ${LDFLAGS} conftest.c -o conftest |
4348 | + aix_libpath=`dump -H conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } |
4349 | +}'` |
4350 | + if test -z "$aix_libpath"; then |
4351 | + aix_libpath=`dump -HX64 conftest 2>/dev/null | sed -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } |
4352 | +}'` |
4353 | + fi |
4354 | + if test -z "$aix_libpath"; then |
4355 | + aix_libpath="/usr/lib:/lib" |
4356 | + fi |
4357 | + rm -f conftest.c conftest |
4358 | + # End _LT_AC_SYS_LIBPATH_AIX. |
4359 | + if test "$aix_use_runtimelinking" = yes; then |
4360 | + hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
4361 | + else |
4362 | + if test "$host_cpu" = ia64; then |
4363 | + hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib' |
4364 | + else |
4365 | + hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" |
4366 | + fi |
4367 | + fi |
4368 | + ;; |
4369 | + amigaos*) |
4370 | + case "$host_cpu" in |
4371 | + powerpc) |
4372 | + ;; |
4373 | + m68k) |
4374 | + hardcode_libdir_flag_spec='-L$libdir' |
4375 | + hardcode_minus_L=yes |
4376 | + ;; |
4377 | + esac |
4378 | + ;; |
4379 | + bsdi[45]*) |
4380 | + ;; |
4381 | + cygwin* | mingw* | pw32* | cegcc*) |
4382 | + # When not using gcc, we currently assume that we are using |
4383 | + # Microsoft Visual C++. |
4384 | + # hardcode_libdir_flag_spec is actually meaningless, as there is |
4385 | + # no search path for DLLs. |
4386 | + hardcode_libdir_flag_spec=' ' |
4387 | + libext=lib |
4388 | + ;; |
4389 | + darwin* | rhapsody*) |
4390 | + hardcode_direct=no |
4391 | + if { case $cc_basename in ifort*) true;; *) test "$GCC" = yes;; esac; }; then |
4392 | + : |
4393 | + else |
4394 | + ld_shlibs=no |
4395 | + fi |
4396 | + ;; |
4397 | + dgux*) |
4398 | + hardcode_libdir_flag_spec='-L$libdir' |
4399 | + ;; |
4400 | + freebsd2.[01]*) |
4401 | + hardcode_direct=yes |
4402 | + hardcode_minus_L=yes |
4403 | + ;; |
4404 | + freebsd* | dragonfly*) |
4405 | + hardcode_libdir_flag_spec='-R$libdir' |
4406 | + hardcode_direct=yes |
4407 | + ;; |
4408 | + hpux9*) |
4409 | + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' |
4410 | + hardcode_libdir_separator=: |
4411 | + hardcode_direct=yes |
4412 | + # hardcode_minus_L: Not really in the search PATH, |
4413 | + # but as the default location of the library. |
4414 | + hardcode_minus_L=yes |
4415 | + ;; |
4416 | + hpux10*) |
4417 | + if test "$with_gnu_ld" = no; then |
4418 | + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' |
4419 | + hardcode_libdir_separator=: |
4420 | + hardcode_direct=yes |
4421 | + # hardcode_minus_L: Not really in the search PATH, |
4422 | + # but as the default location of the library. |
4423 | + hardcode_minus_L=yes |
4424 | + fi |
4425 | + ;; |
4426 | + hpux11*) |
4427 | + if test "$with_gnu_ld" = no; then |
4428 | + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' |
4429 | + hardcode_libdir_separator=: |
4430 | + case $host_cpu in |
4431 | + hppa*64*|ia64*) |
4432 | + hardcode_direct=no |
4433 | + ;; |
4434 | + *) |
4435 | + hardcode_direct=yes |
4436 | + # hardcode_minus_L: Not really in the search PATH, |
4437 | + # but as the default location of the library. |
4438 | + hardcode_minus_L=yes |
4439 | + ;; |
4440 | + esac |
4441 | + fi |
4442 | + ;; |
4443 | + irix5* | irix6* | nonstopux*) |
4444 | + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
4445 | + hardcode_libdir_separator=: |
4446 | + ;; |
4447 | + netbsd*) |
4448 | + hardcode_libdir_flag_spec='-R$libdir' |
4449 | + hardcode_direct=yes |
4450 | + ;; |
4451 | + newsos6) |
4452 | + hardcode_direct=yes |
4453 | + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
4454 | + hardcode_libdir_separator=: |
4455 | + ;; |
4456 | + *nto* | *qnx*) |
4457 | + ;; |
4458 | + openbsd*) |
4459 | + if test -f /usr/libexec/ld.so; then |
4460 | + hardcode_direct=yes |
4461 | + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then |
4462 | + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' |
4463 | + else |
4464 | + case "$host_os" in |
4465 | + openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) |
4466 | + hardcode_libdir_flag_spec='-R$libdir' |
4467 | + ;; |
4468 | + *) |
4469 | + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' |
4470 | + ;; |
4471 | + esac |
4472 | + fi |
4473 | + else |
4474 | + ld_shlibs=no |
4475 | + fi |
4476 | + ;; |
4477 | + os2*) |
4478 | + hardcode_libdir_flag_spec='-L$libdir' |
4479 | + hardcode_minus_L=yes |
4480 | + ;; |
4481 | + osf3*) |
4482 | + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
4483 | + hardcode_libdir_separator=: |
4484 | + ;; |
4485 | + osf4* | osf5*) |
4486 | + if test "$GCC" = yes; then |
4487 | + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' |
4488 | + else |
4489 | + # Both cc and cxx compiler support -rpath directly |
4490 | + hardcode_libdir_flag_spec='-rpath $libdir' |
4491 | + fi |
4492 | + hardcode_libdir_separator=: |
4493 | + ;; |
4494 | + solaris*) |
4495 | + hardcode_libdir_flag_spec='-R$libdir' |
4496 | + ;; |
4497 | + sunos4*) |
4498 | + hardcode_libdir_flag_spec='-L$libdir' |
4499 | + hardcode_direct=yes |
4500 | + hardcode_minus_L=yes |
4501 | + ;; |
4502 | + sysv4) |
4503 | + case $host_vendor in |
4504 | + sni) |
4505 | + hardcode_direct=yes # is this really true??? |
4506 | + ;; |
4507 | + siemens) |
4508 | + hardcode_direct=no |
4509 | + ;; |
4510 | + motorola) |
4511 | + hardcode_direct=no #Motorola manual says yes, but my tests say they lie |
4512 | + ;; |
4513 | + esac |
4514 | + ;; |
4515 | + sysv4.3*) |
4516 | + ;; |
4517 | + sysv4*MP*) |
4518 | + if test -d /usr/nec; then |
4519 | + ld_shlibs=yes |
4520 | + fi |
4521 | + ;; |
4522 | + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) |
4523 | + ;; |
4524 | + sysv5* | sco3.2v5* | sco5v6*) |
4525 | + hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' |
4526 | + hardcode_libdir_separator=':' |
4527 | + ;; |
4528 | + uts4*) |
4529 | + hardcode_libdir_flag_spec='-L$libdir' |
4530 | + ;; |
4531 | + *) |
4532 | + ld_shlibs=no |
4533 | + ;; |
4534 | + esac |
4535 | +fi |
4536 | + |
4537 | +# Check dynamic linker characteristics |
4538 | +# Code taken from libtool.m4's _LT_SYS_DYNAMIC_LINKER. |
4539 | +# Unlike libtool.m4, here we don't care about _all_ names of the library, but |
4540 | +# only about the one the linker finds when passed -lNAME. This is the last |
4541 | +# element of library_names_spec in libtool.m4, or possibly two of them if the |
4542 | +# linker has special search rules. |
4543 | +library_names_spec= # the last element of library_names_spec in libtool.m4 |
4544 | +libname_spec='lib$name' |
4545 | +case "$host_os" in |
4546 | + aix3*) |
4547 | + library_names_spec='$libname.a' |
4548 | + ;; |
4549 | + aix[4-9]*) |
4550 | + library_names_spec='$libname$shrext' |
4551 | + ;; |
4552 | + amigaos*) |
4553 | + case "$host_cpu" in |
4554 | + powerpc*) |
4555 | + library_names_spec='$libname$shrext' ;; |
4556 | + m68k) |
4557 | + library_names_spec='$libname.a' ;; |
4558 | + esac |
4559 | + ;; |
4560 | + beos*) |
4561 | + library_names_spec='$libname$shrext' |
4562 | + ;; |
4563 | + bsdi[45]*) |
4564 | + library_names_spec='$libname$shrext' |
4565 | + ;; |
4566 | + cygwin* | mingw* | pw32* | cegcc*) |
4567 | + shrext=.dll |
4568 | + library_names_spec='$libname.dll.a $libname.lib' |
4569 | + ;; |
4570 | + darwin* | rhapsody*) |
4571 | + shrext=.dylib |
4572 | + library_names_spec='$libname$shrext' |
4573 | + ;; |
4574 | + dgux*) |
4575 | + library_names_spec='$libname$shrext' |
4576 | + ;; |
4577 | + freebsd[23].*) |
4578 | + library_names_spec='$libname$shrext$versuffix' |
4579 | + ;; |
4580 | + freebsd* | dragonfly*) |
4581 | + library_names_spec='$libname$shrext' |
4582 | + ;; |
4583 | + gnu*) |
4584 | + library_names_spec='$libname$shrext' |
4585 | + ;; |
4586 | + haiku*) |
4587 | + library_names_spec='$libname$shrext' |
4588 | + ;; |
4589 | + hpux9* | hpux10* | hpux11*) |
4590 | + case $host_cpu in |
4591 | + ia64*) |
4592 | + shrext=.so |
4593 | + ;; |
4594 | + hppa*64*) |
4595 | + shrext=.sl |
4596 | + ;; |
4597 | + *) |
4598 | + shrext=.sl |
4599 | + ;; |
4600 | + esac |
4601 | + library_names_spec='$libname$shrext' |
4602 | + ;; |
4603 | + interix[3-9]*) |
4604 | + library_names_spec='$libname$shrext' |
4605 | + ;; |
4606 | + irix5* | irix6* | nonstopux*) |
4607 | + library_names_spec='$libname$shrext' |
4608 | + case "$host_os" in |
4609 | + irix5* | nonstopux*) |
4610 | + libsuff= shlibsuff= |
4611 | + ;; |
4612 | + *) |
4613 | + case $LD in |
4614 | + *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") libsuff= shlibsuff= ;; |
4615 | + *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") libsuff=32 shlibsuff=N32 ;; |
4616 | + *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") libsuff=64 shlibsuff=64 ;; |
4617 | + *) libsuff= shlibsuff= ;; |
4618 | + esac |
4619 | + ;; |
4620 | + esac |
4621 | + ;; |
4622 | + linux*oldld* | linux*aout* | linux*coff*) |
4623 | + ;; |
4624 | + linux* | k*bsd*-gnu | kopensolaris*-gnu) |
4625 | + library_names_spec='$libname$shrext' |
4626 | + ;; |
4627 | + knetbsd*-gnu) |
4628 | + library_names_spec='$libname$shrext' |
4629 | + ;; |
4630 | + netbsd*) |
4631 | + library_names_spec='$libname$shrext' |
4632 | + ;; |
4633 | + newsos6) |
4634 | + library_names_spec='$libname$shrext' |
4635 | + ;; |
4636 | + *nto* | *qnx*) |
4637 | + library_names_spec='$libname$shrext' |
4638 | + ;; |
4639 | + openbsd*) |
4640 | + library_names_spec='$libname$shrext$versuffix' |
4641 | + ;; |
4642 | + os2*) |
4643 | + libname_spec='$name' |
4644 | + shrext=.dll |
4645 | + library_names_spec='$libname.a' |
4646 | + ;; |
4647 | + osf3* | osf4* | osf5*) |
4648 | + library_names_spec='$libname$shrext' |
4649 | + ;; |
4650 | + rdos*) |
4651 | + ;; |
4652 | + solaris*) |
4653 | + library_names_spec='$libname$shrext' |
4654 | + ;; |
4655 | + sunos4*) |
4656 | + library_names_spec='$libname$shrext$versuffix' |
4657 | + ;; |
4658 | + sysv4 | sysv4.3*) |
4659 | + library_names_spec='$libname$shrext' |
4660 | + ;; |
4661 | + sysv4*MP*) |
4662 | + library_names_spec='$libname$shrext' |
4663 | + ;; |
4664 | + sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) |
4665 | + library_names_spec='$libname$shrext' |
4666 | + ;; |
4667 | + tpf*) |
4668 | + library_names_spec='$libname$shrext' |
4669 | + ;; |
4670 | + uts4*) |
4671 | + library_names_spec='$libname$shrext' |
4672 | + ;; |
4673 | +esac |
4674 | + |
4675 | +sed_quote_subst='s/\(["`$\\]\)/\\\1/g' |
4676 | +escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"` |
4677 | +shlibext=`echo "$shrext" | sed -e 's,^\.,,'` |
4678 | +escaped_libname_spec=`echo "X$libname_spec" | sed -e 's/^X//' -e "$sed_quote_subst"` |
4679 | +escaped_library_names_spec=`echo "X$library_names_spec" | sed -e 's/^X//' -e "$sed_quote_subst"` |
4680 | +escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"` |
4681 | + |
4682 | +LC_ALL=C sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <<EOF |
4683 | + |
4684 | +# How to pass a linker flag through the compiler. |
4685 | +wl="$escaped_wl" |
4686 | + |
4687 | +# Static library suffix (normally "a"). |
4688 | +libext="$libext" |
4689 | + |
4690 | +# Shared library suffix (normally "so"). |
4691 | +shlibext="$shlibext" |
4692 | + |
4693 | +# Format of library name prefix. |
4694 | +libname_spec="$escaped_libname_spec" |
4695 | + |
4696 | +# Library names that the linker finds when passed -lNAME. |
4697 | +library_names_spec="$escaped_library_names_spec" |
4698 | + |
4699 | +# Flag to hardcode \$libdir into a binary during linking. |
4700 | +# This must work even if \$libdir does not exist. |
4701 | +hardcode_libdir_flag_spec="$escaped_hardcode_libdir_flag_spec" |
4702 | + |
4703 | +# Whether we need a single -rpath flag with a separated argument. |
4704 | +hardcode_libdir_separator="$hardcode_libdir_separator" |
4705 | + |
4706 | +# Set to yes if using DIR/libNAME.so during linking hardcodes DIR into the |
4707 | +# resulting binary. |
4708 | +hardcode_direct="$hardcode_direct" |
4709 | + |
4710 | +# Set to yes if using the -LDIR flag during linking hardcodes DIR into the |
4711 | +# resulting binary. |
4712 | +hardcode_minus_L="$hardcode_minus_L" |
4713 | + |
4714 | +EOF |
4715 | diff --git a/config.sub b/config.sub |
4716 | index 932128b..20f7cf2 100755 |
4717 | --- a/config.sub |
4718 | +++ b/config.sub |
4719 | @@ -1,8 +1,8 @@ |
4720 | #! /bin/sh |
4721 | # Configuration validation subroutine script. |
4722 | -# Copyright 1992-2017 Free Software Foundation, Inc. |
4723 | +# Copyright 1992-2018 Free Software Foundation, Inc. |
4724 | |
4725 | -timestamp='2017-04-02' |
4726 | +timestamp='2018-05-05' |
4727 | |
4728 | # This file is free software; you can redistribute it and/or modify it |
4729 | # under the terms of the GNU General Public License as published by |
4730 | @@ -15,7 +15,7 @@ timestamp='2017-04-02' |
4731 | # General Public License for more details. |
4732 | # |
4733 | # You should have received a copy of the GNU General Public License |
4734 | -# along with this program; if not, see <http://www.gnu.org/licenses/>. |
4735 | +# along with this program; if not, see <https://www.gnu.org/licenses/>. |
4736 | # |
4737 | # As a special exception to the GNU General Public License, if you |
4738 | # distribute this file as part of a program that contains a |
4739 | @@ -33,7 +33,7 @@ timestamp='2017-04-02' |
4740 | # Otherwise, we print the canonical config type on stdout and succeed. |
4741 | |
4742 | # You can get the latest version of this script from: |
4743 | -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub |
4744 | +# https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub |
4745 | |
4746 | # This file is supposed to be the same for all GNU packages |
4747 | # and recognize all the CPU types, system types and aliases |
4748 | @@ -57,7 +57,7 @@ Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS |
4749 | |
4750 | Canonicalize a configuration name. |
4751 | |
4752 | -Operation modes: |
4753 | +Options: |
4754 | -h, --help print this help, then exit |
4755 | -t, --time-stamp print date of last modification, then exit |
4756 | -v, --version print version number, then exit |
4757 | @@ -67,7 +67,7 @@ Report bugs and patches to <config-patches@gnu.org>." |
4758 | version="\ |
4759 | GNU config.sub ($timestamp) |
4760 | |
4761 | -Copyright 1992-2017 Free Software Foundation, Inc. |
4762 | +Copyright 1992-2018 Free Software Foundation, Inc. |
4763 | |
4764 | This is free software; see the source for copying conditions. There is NO |
4765 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." |
4766 | @@ -94,7 +94,7 @@ while test $# -gt 0 ; do |
4767 | |
4768 | *local*) |
4769 | # First pass through any local machine types. |
4770 | - echo $1 |
4771 | + echo "$1" |
4772 | exit ;; |
4773 | |
4774 | * ) |
4775 | @@ -110,28 +110,48 @@ case $# in |
4776 | exit 1;; |
4777 | esac |
4778 | |
4779 | -# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). |
4780 | -# Here we must recognize all the valid KERNEL-OS combinations. |
4781 | -maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` |
4782 | -case $maybe_os in |
4783 | - nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ |
4784 | - linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ |
4785 | - knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \ |
4786 | - kopensolaris*-gnu* | cloudabi*-eabi* | \ |
4787 | - storm-chaos* | os2-emx* | rtmk-nova*) |
4788 | - os=-$maybe_os |
4789 | - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` |
4790 | - ;; |
4791 | - android-linux) |
4792 | - os=-linux-android |
4793 | - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown |
4794 | - ;; |
4795 | - *) |
4796 | - basic_machine=`echo $1 | sed 's/-[^-]*$//'` |
4797 | - if [ $basic_machine != $1 ] |
4798 | - then os=`echo $1 | sed 's/.*-/-/'` |
4799 | - else os=; fi |
4800 | - ;; |
4801 | +# Spilt fields of configuration type |
4802 | +IFS="-" read -r field1 field2 field3 field4 <<EOF |
4803 | +$1 |
4804 | +EOF |
4805 | + |
4806 | +# Separate into logical components for further validation |
4807 | +case $1 in |
4808 | + *-*-*-*) |
4809 | + basic_machine=$field1-$field2 |
4810 | + os=-$field3-$field4 |
4811 | + ;; |
4812 | + *-*-*) |
4813 | + # Ambiguous whether COMPANY is present, or skipped and KERNEL-OS is two |
4814 | + # parts |
4815 | + maybe_os=$field2-$field3 |
4816 | + case $maybe_os in |
4817 | + nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc \ |
4818 | + | linux-newlib* | linux-musl* | linux-uclibc* | uclinux-uclibc* \ |
4819 | + | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \ |
4820 | + | netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \ |
4821 | + | storm-chaos* | os2-emx* | rtmk-nova*) |
4822 | + basic_machine=$field1 |
4823 | + os=-$maybe_os |
4824 | + ;; |
4825 | + android-linux) |
4826 | + basic_machine=$field1-unknown |
4827 | + os=-linux-android |
4828 | + ;; |
4829 | + *) |
4830 | + basic_machine=$field1-$field2 |
4831 | + os=-$field3 |
4832 | + ;; |
4833 | + esac |
4834 | + ;; |
4835 | + *-*) |
4836 | + basic_machine=$field1 |
4837 | + os=-$field2 |
4838 | + ;; |
4839 | + *) |
4840 | + basic_machine=$1 |
4841 | + os= |
4842 | + ;; |
4843 | esac |
4844 | |
4845 | ### Let's recognize common machines as not being operating systems so |
4846 | @@ -178,44 +198,44 @@ case $os in |
4847 | ;; |
4848 | -sco6) |
4849 | os=-sco5v6 |
4850 | - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` |
4851 | + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` |
4852 | ;; |
4853 | -sco5) |
4854 | os=-sco3.2v5 |
4855 | - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` |
4856 | + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` |
4857 | ;; |
4858 | -sco4) |
4859 | os=-sco3.2v4 |
4860 | - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` |
4861 | + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` |
4862 | ;; |
4863 | -sco3.2.[4-9]*) |
4864 | os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` |
4865 | - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` |
4866 | + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` |
4867 | ;; |
4868 | -sco3.2v[4-9]*) |
4869 | # Don't forget version if it is 3.2v4 or newer. |
4870 | - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` |
4871 | + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` |
4872 | ;; |
4873 | -sco5v6*) |
4874 | # Don't forget version if it is 3.2v4 or newer. |
4875 | - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` |
4876 | + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` |
4877 | ;; |
4878 | -sco*) |
4879 | os=-sco3.2v2 |
4880 | - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` |
4881 | + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` |
4882 | ;; |
4883 | -udk*) |
4884 | - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` |
4885 | + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` |
4886 | ;; |
4887 | -isc) |
4888 | os=-isc2.2 |
4889 | - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` |
4890 | + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` |
4891 | ;; |
4892 | -clix*) |
4893 | basic_machine=clipper-intergraph |
4894 | ;; |
4895 | -isc*) |
4896 | - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` |
4897 | + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` |
4898 | ;; |
4899 | -lynx*178) |
4900 | os=-lynxos178 |
4901 | @@ -227,10 +247,7 @@ case $os in |
4902 | os=-lynxos |
4903 | ;; |
4904 | -ptx*) |
4905 | - basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'` |
4906 | - ;; |
4907 | - -windowsnt*) |
4908 | - os=`echo $os | sed -e 's/windowsnt/winnt/'` |
4909 | + basic_machine=`echo "$1" | sed -e 's/86-.*/86-sequent/'` |
4910 | ;; |
4911 | -psos*) |
4912 | os=-psos |
4913 | @@ -252,12 +269,12 @@ case $basic_machine in |
4914 | | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ |
4915 | | am33_2.0 \ |
4916 | | arc | arceb \ |
4917 | - | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ |
4918 | + | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv6m | armv[78][arm] \ |
4919 | | avr | avr32 \ |
4920 | | ba \ |
4921 | | be32 | be64 \ |
4922 | | bfin \ |
4923 | - | c4x | c8051 | clipper \ |
4924 | + | c4x | c8051 | clipper | csky \ |
4925 | | d10v | d30v | dlx | dsp16xx \ |
4926 | | e2k | epiphany \ |
4927 | | fido | fr30 | frv | ft32 \ |
4928 | @@ -296,10 +313,11 @@ case $basic_machine in |
4929 | | mt \ |
4930 | | msp430 \ |
4931 | | nds32 | nds32le | nds32be \ |
4932 | + | nfp \ |
4933 | | nios | nios2 | nios2eb | nios2el \ |
4934 | | ns16k | ns32k \ |
4935 | | open8 | or1k | or1knd | or32 \ |
4936 | - | pdp10 | pdp11 | pj | pjl \ |
4937 | + | pdp10 | pj | pjl \ |
4938 | | powerpc | powerpc64 | powerpc64le | powerpcle \ |
4939 | | pru \ |
4940 | | pyramid \ |
4941 | @@ -316,7 +334,6 @@ case $basic_machine in |
4942 | | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ |
4943 | | visium \ |
4944 | | wasm32 \ |
4945 | - | we32k \ |
4946 | | x86 | xc16x | xstormy16 | xtensa \ |
4947 | | z8k | z80) |
4948 | basic_machine=$basic_machine-unknown |
4949 | @@ -337,7 +354,11 @@ case $basic_machine in |
4950 | basic_machine=$basic_machine-unknown |
4951 | os=-none |
4952 | ;; |
4953 | - m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) |
4954 | + m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65) |
4955 | + ;; |
4956 | + m9s12z | m68hcs12z | hcs12z | s12z) |
4957 | + basic_machine=s12z-unknown |
4958 | + os=-none |
4959 | ;; |
4960 | ms1) |
4961 | basic_machine=mt-unknown |
4962 | @@ -366,7 +387,7 @@ case $basic_machine in |
4963 | ;; |
4964 | # Object if more than one company name word. |
4965 | *-*-*) |
4966 | - echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 |
4967 | + echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2 |
4968 | exit 1 |
4969 | ;; |
4970 | # Recognize the basic CPU types with company name. |
4971 | @@ -382,7 +403,7 @@ case $basic_machine in |
4972 | | be32-* | be64-* \ |
4973 | | bfin-* | bs2000-* \ |
4974 | | c[123]* | c30-* | [cjt]90-* | c4x-* \ |
4975 | - | c8051-* | clipper-* | craynv-* | cydra-* \ |
4976 | + | c8051-* | clipper-* | craynv-* | csky-* | cydra-* \ |
4977 | | d10v-* | d30v-* | dlx-* \ |
4978 | | e2k-* | elxsi-* \ |
4979 | | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ |
4980 | @@ -423,6 +444,7 @@ case $basic_machine in |
4981 | | mt-* \ |
4982 | | msp430-* \ |
4983 | | nds32-* | nds32le-* | nds32be-* \ |
4984 | + | nfp-* \ |
4985 | | nios-* | nios2-* | nios2eb-* | nios2el-* \ |
4986 | | none-* | np1-* | ns16k-* | ns32k-* \ |
4987 | | open8-* \ |
4988 | @@ -461,7 +483,7 @@ case $basic_machine in |
4989 | # Recognize the various machine names and aliases which stand |
4990 | # for a CPU type and a company and sometimes even an OS. |
4991 | 386bsd) |
4992 | - basic_machine=i386-unknown |
4993 | + basic_machine=i386-pc |
4994 | os=-bsd |
4995 | ;; |
4996 | 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) |
4997 | @@ -495,7 +517,7 @@ case $basic_machine in |
4998 | basic_machine=x86_64-pc |
4999 | ;; |
5000 | amd64-*) |
The diff has been truncated for viewing.
Thanks, it looks fine, one small changelog nitpicks Add-Ubuntu- Single- Sign-On- to-the- list.patch" be listed in the Ubuntu specific patches section?
- can you list lp:#1784617 to close, that's the bug about the new version
- shouldn't "0006-goa-
Looks fine otherwise, I can sponsor once the changelog is updated