Merge lp:~noskcaj/ubuntu/vivid/xfce4-fsguard-plugin/1.0.2 into lp:ubuntu/vivid/xfce4-fsguard-plugin

Proposed by Jackson Doak on 2015-03-03
Status: Merged
Merged at revision: 14
Proposed branch: lp:~noskcaj/ubuntu/vivid/xfce4-fsguard-plugin/1.0.2
Merge into: lp:ubuntu/vivid/xfce4-fsguard-plugin
Diff against target: 27552 lines
To merge this branch: bzr merge lp:~noskcaj/ubuntu/vivid/xfce4-fsguard-plugin/1.0.2
Reviewer Review Type Date Requested Status
Didier Roche 2015-03-03 Approve on 2015-03-06
Review via email: mp+251660@code.launchpad.net

Description of the change

New upstream bugfix release

To post a comment you must log in.
Didier Roche (didrocks) wrote :

Looking good, sponsoring :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ChangeLog'
2--- ChangeLog 2012-06-30 15:30:45 +0000
3+++ ChangeLog 2015-03-03 21:10:45 +0000
4@@ -1,3 +1,235 @@
5+commit 8ca95f3142258f97e555c224f27ba4dc274abb75
6+Author: Landry Breuil <landry@xfce.org>
7+Date: Tue Mar 3 21:25:28 2015 +0100
8+
9+ updates for release
10+
11+commit 47b0d3f3e5eba7adec284e46458157145f1f5f08
12+Author: Pablo Roberto Francisco Lezaeta Reyes <prflr88@gmail.com>
13+Date: Fri Dec 26 06:31:50 2014 +0100
14+
15+ I18n: Update translation es (100%).
16+
17+ 19 translated messages.
18+
19+ Transifex (https://www.transifex.com/projects/p/xfce/).
20+
21+commit 1975300fa1234144d380dd5dcbc5868661d68e61
22+Author: Anonymous <noreply@xfce.org>
23+Date: Wed Jul 30 18:31:27 2014 +0200
24+
25+ I18n: Update translation de (100%).
26+
27+ 19 translated messages.
28+
29+ Transifex (https://www.transifex.com/projects/p/xfce/).
30+
31+commit 19e949ceb8eb38583e9cea312665afe72841efc3
32+Author: k3lt01 <keltoiboy@gmail.com>
33+Date: Fri Apr 25 12:31:18 2014 +0200
34+
35+ I18n: Update translation en_AU (100%).
36+
37+ 19 translated messages.
38+
39+ Transifex (https://www.transifex.com/projects/p/xfce/).
40+
41+commit 53dc23dff0083393f9e3162705f5fec53c955e38
42+Author: Tornes Llume <l.lumex03.tornes@gmail.com>
43+Date: Mon Apr 14 06:31:26 2014 +0200
44+
45+ I18n: Update translation ast (100%).
46+
47+ 19 translated messages.
48+
49+ Transifex (https://www.transifex.com/projects/p/xfce/).
50+
51+commit 3e49cb8f0e75a22868abc6e1d21d3e51388d91d6
52+Author: theppitak <theppitak@gmail.com>
53+Date: Thu Apr 10 18:31:26 2014 +0200
54+
55+ I18n: Add new translation th (100%).
56+
57+ 19 translated messages.
58+
59+ Transifex (https://www.transifex.com/projects/p/xfce/).
60+
61+commit c358ea19d06038c2c5f6f1057dc2407502c23024
62+Author: abuyop <abuyop@gmail.com>
63+Date: Sat Mar 15 06:31:36 2014 +0100
64+
65+ I18n: Add new translation ms (100%).
66+
67+ 19 translated messages.
68+
69+ Transifex (https://www.transifex.com/projects/p/xfce/).
70+
71+commit 209d0250ef537400204572cf18a522b6ad1bdbf9
72+Author: schizo <eveskovic@gmail.com>
73+Date: Sun Feb 16 12:31:30 2014 +0100
74+
75+ I18n: Update translation hr (100%).
76+
77+ 19 translated messages.
78+
79+ Transifex (https://www.transifex.com/projects/p/xfce/).
80+
81+commit cc608ff1971af70bb782bc706a27c210e2dcf2fb
82+Author: RacerBG <georgiev_1994@abv.bg>
83+Date: Sat Feb 8 18:31:26 2014 +0100
84+
85+ I18n: Add new translation bg (100%).
86+
87+ 19 translated messages.
88+
89+ Transifex (https://www.transifex.com/projects/p/xfce/).
90+
91+commit 173b7bc5c01060ef6dee4a0625d9f6aca90e8949
92+Author: Cedric31 <cvalmary@yahoo.fr>
93+Date: Thu Dec 5 12:31:18 2013 +0100
94+
95+ I18n: Add new translation oc (100%).
96+
97+ 19 translated messages.
98+
99+ Transifex (https://www.transifex.com/projects/p/xfce/).
100+
101+commit a4bc36876f8ee723daa0bb450dd16fb83ea7d845
102+Author: Sveinn í Felli <sveinki@nett.is>
103+Date: Tue Dec 3 12:31:28 2013 +0100
104+
105+ I18n: Add new translation is (100%).
106+
107+ 19 translated messages.
108+
109+ Transifex (https://www.transifex.com/projects/p/xfce/).
110+
111+commit 174467eaf8bd52c5cf2598e79729712d64357e6c
112+Author: anthonmanix <anthon.manix@gmail.com>
113+Date: Tue Dec 3 00:31:17 2013 +0100
114+
115+ I18n: Add new translation sl (100%).
116+
117+ 19 translated messages.
118+
119+ Transifex (https://www.transifex.com/projects/p/xfce/).
120+
121+commit 0caffc13c0e7cc41f869656595281493b4e5fca8
122+Author: Ivica Kolić <ikoli@yahoo.com>
123+Date: Mon Sep 23 12:31:15 2013 +0200
124+
125+ I18n: Update translation hr (89%).
126+
127+ 17 translated messages, 2 untranslated messages.
128+
129+ Transifex (https://www.transifex.com/projects/p/xfce/).
130+
131+commit d37ca66cccbf5b41f9c0f65b91a5c2080a1ac94a
132+Author: Pjotr123 <pjotrvertaalt@gmail.com>
133+Date: Thu Sep 19 18:31:53 2013 +0200
134+
135+ I18n: Update translation nl (100%).
136+
137+ 19 translated messages.
138+
139+ Transifex (https://www.transifex.com/projects/p/xfce/).
140+
141+commit 305dfd736f41d90a8022caccda78d2a4c3f6b78c
142+Author: Necdet Yücel <necdetyucel@gmail.com>
143+Date: Fri Sep 6 18:31:39 2013 +0200
144+
145+ I18n: Update translation tr (100%).
146+
147+ 19 translated messages.
148+
149+ Transifex (https://www.transifex.com/projects/p/xfce/).
150+
151+commit 9b7ee609343297a7a0eea3154827c2e34ebdc131
152+Author: cri <cri.penta@gmail.com>
153+Date: Tue Sep 3 06:31:28 2013 +0200
154+
155+ I18n: Update translation it (100%).
156+
157+ 19 translated messages.
158+
159+ Transifex (https://www.transifex.com/projects/p/xfce/).
160+
161+commit 6b672ac250fcdc7e5b73333c4b73fb1f5fbd2d87
162+Author: jc1 <jc1.quebecos@gmail.com>
163+Date: Sat Aug 3 18:31:34 2013 +0200
164+
165+ I18n: Update translation fr (100%).
166+
167+ 19 translated messages.
168+
169+ Transifex (https://www.transifex.com/projects/p/xfce/).
170+
171+commit 5b65c4ae5ff58d5c464bdcea7341a5dd9bdc48b8
172+Author: k3lt01 <keltoiboy@gmail.com>
173+Date: Mon Jul 29 12:33:02 2013 +0200
174+
175+ I18n: Add new translation en_AU (100%).
176+
177+ 19 translated messages.
178+
179+ Transifex (https://www.transifex.com/projects/p/xfce/).
180+
181+commit fc8cab7f54595f28fff6a9313c06f466459eb1ed
182+Author: Nick Schermer <nick@xfce.org>
183+Date: Sat Jul 13 22:09:33 2013 +0200
184+
185+ Remove unneeded files.
186+
187+commit acb1bb5a489499aabe675e2efda816cf6b4b1ede
188+Author: Pjotr vertaalt <pjotrvertaalt@gmail.com>
189+Date: Fri Apr 26 22:32:46 2013 +0200
190+
191+ l10n: Updated Dutch (Flemish) (nl) translation to 100%
192+
193+ New status: 19 messages complete with 0 fuzzies and 0 untranslated.
194+
195+ Transmitted-via: Transifex (translations.xfce.org).
196+
197+commit d250813bb496632a925afd835be2aec1af111ce9
198+Author: Саша Петровић <salepetronije@gmail.com>
199+Date: Thu Nov 1 20:10:42 2012 +0100
200+
201+ l10n: Serbian translation
202+
203+ New status: 19 messages complete with 0 fuzzies and 0 untranslated.
204+
205+ Transmitted-via: Transifex (translations.xfce.org).
206+
207+commit d6f32e9ae96955b4f47169f50d2149f9eda54298
208+Author: Gheyret Kenji <gheyret@yahoo.com>
209+Date: Thu Oct 25 10:55:53 2012 +0200
210+
211+ l10n: Updated Uyghur (ug) translation to 100%
212+
213+ New status: 19 messages complete with 0 fuzzies and 0 untranslated.
214+
215+ Transmitted-via: Transifex (translations.xfce.org).
216+
217+commit ba7b4cd1cdd2bf8e5613c4b98873adbcaa7cb73e
218+Author: Piotr Strębski <strebski@o2.pl>
219+Date: Mon Sep 24 19:39:09 2012 +0200
220+
221+ l10n: Updated Polish (pl) translation to 100%
222+
223+ New status: 19 messages complete with 0 fuzzies and 0 untranslated.
224+
225+ Transmitted-via: Transifex (translations.xfce.org).
226+
227+commit c93b3a48fa8b81b33782832e4445af669a298109
228+Author: Piotr Strębski <strebski@o2.pl>
229+Date: Mon Sep 24 19:38:16 2012 +0200
230+
231+ l10n: Updated Polish (pl) translation to 94%
232+
233+ New status: 18 messages complete with 0 fuzzies and 1 untranslated.
234+
235+ Transmitted-via: Transifex (translations.xfce.org).
236+
237 commit f3b0e9a1d8c1cf0c6ce841f45a84e1bc0f136744
238 Author: Landry Breuil <landry@xfce.org>
239 Date: Sat Jun 30 11:10:05 2012 +0200
240
241=== modified file 'INSTALL'
242--- INSTALL 2012-06-30 15:30:45 +0000
243+++ INSTALL 2015-03-03 21:10:45 +0000
244@@ -1,16 +1,25 @@
245 Installation Instructions
246 *************************
247
248-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
249-Software Foundation, Inc.
250+Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation,
251+Inc.
252
253-This file is free documentation; the Free Software Foundation gives
254-unlimited permission to copy, distribute and modify it.
255+ Copying and distribution of this file, with or without modification,
256+are permitted in any medium without royalty provided the copyright
257+notice and this notice are preserved. This file is offered as-is,
258+without warranty of any kind.
259
260 Basic Installation
261 ==================
262
263-These are generic installation instructions.
264+ Briefly, the shell commands `./configure; make; make install' should
265+configure, build, and install this package. The following
266+more-detailed instructions are generic; see the `README' file for
267+instructions specific to this package. Some packages provide this
268+`INSTALL' file but do not implement all of the features documented
269+below. The lack of an optional feature in a given package is not
270+necessarily a bug. More recommendations for GNU packages can be found
271+in *note Makefile Conventions: (standards)Makefile Conventions.
272
273 The `configure' shell script attempts to guess correct values for
274 various system-dependent variables used during compilation. It uses
275@@ -23,9 +32,9 @@
276
277 It can also use an optional file (typically called `config.cache'
278 and enabled with `--cache-file=config.cache' or simply `-C') that saves
279-the results of its tests to speed up reconfiguring. (Caching is
280+the results of its tests to speed up reconfiguring. Caching is
281 disabled by default to prevent problems with accidental use of stale
282-cache files.)
283+cache files.
284
285 If you need to do unusual things to compile the package, please try
286 to figure out how `configure' could check whether to do them, and mail
287@@ -35,30 +44,37 @@
288 may remove or edit it.
289
290 The file `configure.ac' (or `configure.in') is used to create
291-`configure' by a program called `autoconf'. You only need
292-`configure.ac' if you want to change it or regenerate `configure' using
293-a newer version of `autoconf'.
294+`configure' by a program called `autoconf'. You need `configure.ac' if
295+you want to change it or regenerate `configure' using a newer version
296+of `autoconf'.
297
298-The simplest way to compile this package is:
299+ The simplest way to compile this package is:
300
301 1. `cd' to the directory containing the package's source code and type
302- `./configure' to configure the package for your system. If you're
303- using `csh' on an old version of System V, you might need to type
304- `sh ./configure' instead to prevent `csh' from trying to execute
305- `configure' itself.
306+ `./configure' to configure the package for your system.
307
308- Running `configure' takes awhile. While running, it prints some
309- messages telling which features it is checking for.
310+ Running `configure' might take a while. While running, it prints
311+ some messages telling which features it is checking for.
312
313 2. Type `make' to compile the package.
314
315 3. Optionally, type `make check' to run any self-tests that come with
316- the package.
317+ the package, generally using the just-built uninstalled binaries.
318
319 4. Type `make install' to install the programs and any data files and
320- documentation.
321-
322- 5. You can remove the program binaries and object files from the
323+ documentation. When installing into a prefix owned by root, it is
324+ recommended that the package be configured and built as a regular
325+ user, and only the `make install' phase executed with root
326+ privileges.
327+
328+ 5. Optionally, type `make installcheck' to repeat any self-tests, but
329+ this time using the binaries in their final installed location.
330+ This target does not install anything. Running this target as a
331+ regular user, particularly if the prior `make install' required
332+ root privileges, verifies that the installation completed
333+ correctly.
334+
335+ 6. You can remove the program binaries and object files from the
336 source code directory by typing `make clean'. To also remove the
337 files that `configure' created (so you can compile the package for
338 a different kind of computer), type `make distclean'. There is
339@@ -67,45 +83,69 @@
340 all sorts of other programs in order to regenerate files that came
341 with the distribution.
342
343+ 7. Often, you can also type `make uninstall' to remove the installed
344+ files again. In practice, not all packages have tested that
345+ uninstallation works correctly, even though it is required by the
346+ GNU Coding Standards.
347+
348+ 8. Some packages, particularly those that use Automake, provide `make
349+ distcheck', which can by used by developers to test that all other
350+ targets like `make install' and `make uninstall' work correctly.
351+ This target is generally not run by end users.
352+
353 Compilers and Options
354 =====================
355
356-Some systems require unusual options for compilation or linking that the
357-`configure' script does not know about. Run `./configure --help' for
358-details on some of the pertinent environment variables.
359+ Some systems require unusual options for compilation or linking that
360+the `configure' script does not know about. Run `./configure --help'
361+for details on some of the pertinent environment variables.
362
363 You can give `configure' initial values for configuration parameters
364 by setting variables in the command line or in the environment. Here
365 is an example:
366
367- ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
368+ ./configure CC=c99 CFLAGS=-g LIBS=-lposix
369
370 *Note Defining Variables::, for more details.
371
372 Compiling For Multiple Architectures
373 ====================================
374
375-You can compile the package for more than one kind of computer at the
376+ You can compile the package for more than one kind of computer at the
377 same time, by placing the object files for each architecture in their
378-own directory. To do this, you must use a version of `make' that
379-supports the `VPATH' variable, such as GNU `make'. `cd' to the
380+own directory. To do this, you can use GNU `make'. `cd' to the
381 directory where you want the object files and executables to go and run
382 the `configure' script. `configure' automatically checks for the
383-source code in the directory that `configure' is in and in `..'.
384-
385- If you have to use a `make' that does not support the `VPATH'
386-variable, you have to compile the package for one architecture at a
387-time in the source code directory. After you have installed the
388-package for one architecture, use `make distclean' before reconfiguring
389-for another architecture.
390+source code in the directory that `configure' is in and in `..'. This
391+is known as a "VPATH" build.
392+
393+ With a non-GNU `make', it is safer to compile the package for one
394+architecture at a time in the source code directory. After you have
395+installed the package for one architecture, use `make distclean' before
396+reconfiguring for another architecture.
397+
398+ On MacOS X 10.5 and later systems, you can create libraries and
399+executables that work on multiple system types--known as "fat" or
400+"universal" binaries--by specifying multiple `-arch' options to the
401+compiler but only a single `-arch' option to the preprocessor. Like
402+this:
403+
404+ ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
405+ CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
406+ CPP="gcc -E" CXXCPP="g++ -E"
407+
408+ This is not guaranteed to produce working output in all cases, you
409+may have to build one architecture at a time and combine the results
410+using the `lipo' tool if you have problems.
411
412 Installation Names
413 ==================
414
415-By default, `make install' installs the package's commands under
416+ By default, `make install' installs the package's commands under
417 `/usr/local/bin', include files under `/usr/local/include', etc. You
418 can specify an installation prefix other than `/usr/local' by giving
419-`configure' the option `--prefix=PREFIX'.
420+`configure' the option `--prefix=PREFIX', where PREFIX must be an
421+absolute file name.
422
423 You can specify separate installation prefixes for
424 architecture-specific files and architecture-independent files. If you
425@@ -116,16 +156,47 @@
426 In addition, if you use an unusual directory layout you can give
427 options like `--bindir=DIR' to specify different values for particular
428 kinds of files. Run `configure --help' for a list of the directories
429-you can set and what kinds of files go in them.
430+you can set and what kinds of files go in them. In general, the
431+default for these options is expressed in terms of `${prefix}', so that
432+specifying just `--prefix' will affect all of the other directory
433+specifications that were not explicitly provided.
434+
435+ The most portable way to affect installation locations is to pass the
436+correct locations to `configure'; however, many packages provide one or
437+both of the following shortcuts of passing variable assignments to the
438+`make install' command line to change installation locations without
439+having to reconfigure or recompile.
440+
441+ The first method involves providing an override variable for each
442+affected directory. For example, `make install
443+prefix=/alternate/directory' will choose an alternate location for all
444+directory configuration variables that were expressed in terms of
445+`${prefix}'. Any directories that were specified during `configure',
446+but not in terms of `${prefix}', must each be overridden at install
447+time for the entire installation to be relocated. The approach of
448+makefile variable overrides for each directory variable is required by
449+the GNU Coding Standards, and ideally causes no recompilation.
450+However, some platforms have known limitations with the semantics of
451+shared libraries that end up requiring recompilation when using this
452+method, particularly noticeable in packages that use GNU Libtool.
453+
454+ The second method involves providing the `DESTDIR' variable. For
455+example, `make install DESTDIR=/alternate/directory' will prepend
456+`/alternate/directory' before all installation names. The approach of
457+`DESTDIR' overrides is not required by the GNU Coding Standards, and
458+does not work on platforms that have drive letters. On the other hand,
459+it does better at avoiding recompilation issues, and works well even
460+when some directory options were not specified in terms of `${prefix}'
461+at `configure' time.
462+
463+Optional Features
464+=================
465
466 If the package supports it, you can cause programs to be installed
467 with an extra prefix or suffix on their names by giving `configure' the
468 option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
469
470-Optional Features
471-=================
472-
473-Some packages pay attention to `--enable-FEATURE' options to
474+ Some packages pay attention to `--enable-FEATURE' options to
475 `configure', where FEATURE indicates an optional part of the package.
476 They may also pay attention to `--with-PACKAGE' options, where PACKAGE
477 is something like `gnu-as' or `x' (for the X Window System). The
478@@ -137,14 +208,58 @@
479 you can use the `configure' options `--x-includes=DIR' and
480 `--x-libraries=DIR' to specify their locations.
481
482+ Some packages offer the ability to configure how verbose the
483+execution of `make' will be. For these packages, running `./configure
484+--enable-silent-rules' sets the default to minimal output, which can be
485+overridden with `make V=1'; while running `./configure
486+--disable-silent-rules' sets the default to verbose, which can be
487+overridden with `make V=0'.
488+
489+Particular systems
490+==================
491+
492+ On HP-UX, the default C compiler is not ANSI C compatible. If GNU
493+CC is not installed, it is recommended to use the following options in
494+order to use an ANSI C compiler:
495+
496+ ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
497+
498+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
499+
500+ HP-UX `make' updates targets which have the same time stamps as
501+their prerequisites, which makes it generally unusable when shipped
502+generated files such as `configure' are involved. Use GNU `make'
503+instead.
504+
505+ On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
506+parse its `<wchar.h>' header file. The option `-nodtk' can be used as
507+a workaround. If GNU CC is not installed, it is therefore recommended
508+to try
509+
510+ ./configure CC="cc"
511+
512+and if that doesn't work, try
513+
514+ ./configure CC="cc -nodtk"
515+
516+ On Solaris, don't put `/usr/ucb' early in your `PATH'. This
517+directory contains several dysfunctional programs; working variants of
518+these programs are available in `/usr/bin'. So, if you need `/usr/ucb'
519+in your `PATH', put it _after_ `/usr/bin'.
520+
521+ On Haiku, software installed for all users goes in `/boot/common',
522+not `/usr/local'. It is recommended to use the following options:
523+
524+ ./configure --prefix=/boot/common
525+
526 Specifying the System Type
527 ==========================
528
529-There may be some features `configure' cannot figure out automatically,
530-but needs to determine by the type of machine the package will run on.
531-Usually, assuming the package is built to be run on the _same_
532-architectures, `configure' can figure that out, but if it prints a
533-message saying it cannot guess the machine type, give it the
534+ There may be some features `configure' cannot figure out
535+automatically, but needs to determine by the type of machine the package
536+will run on. Usually, assuming the package is built to be run on the
537+_same_ architectures, `configure' can figure that out, but if it prints
538+a message saying it cannot guess the machine type, give it the
539 `--build=TYPE' option. TYPE can either be a short name for the system
540 type, such as `sun4', or a canonical name which has the form:
541
542@@ -152,7 +267,8 @@
543
544 where SYSTEM can have one of these forms:
545
546- OS KERNEL-OS
547+ OS
548+ KERNEL-OS
549
550 See the file `config.sub' for the possible values of each field. If
551 `config.sub' isn't included in this package, then this package doesn't
552@@ -170,9 +286,9 @@
553 Sharing Defaults
554 ================
555
556-If you want to set default values for `configure' scripts to share, you
557-can create a site shell script called `config.site' that gives default
558-values for variables like `CC', `cache_file', and `prefix'.
559+ If you want to set default values for `configure' scripts to share,
560+you can create a site shell script called `config.site' that gives
561+default values for variables like `CC', `cache_file', and `prefix'.
562 `configure' looks for `PREFIX/share/config.site' if it exists, then
563 `PREFIX/etc/config.site' if it exists. Or, you can set the
564 `CONFIG_SITE' environment variable to the location of the site script.
565@@ -181,7 +297,7 @@
566 Defining Variables
567 ==================
568
569-Variables not defined in a site shell script can be set in the
570+ Variables not defined in a site shell script can be set in the
571 environment passed to `configure'. However, some packages may run
572 configure again during the build, and the customized values of these
573 variables may be lost. In order to avoid this problem, you should set
574@@ -190,21 +306,29 @@
575 ./configure CC=/usr/local2/bin/gcc
576
577 causes the specified `gcc' to be used as the C compiler (unless it is
578-overridden in the site shell script). Here is a another example:
579-
580- /bin/bash ./configure CONFIG_SHELL=/bin/bash
581-
582-Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
583-configuration-related scripts to be executed by `/bin/bash'.
584+overridden in the site shell script).
585+
586+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
587+an Autoconf bug. Until the bug is fixed you can use this workaround:
588+
589+ CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
590
591 `configure' Invocation
592 ======================
593
594-`configure' recognizes the following options to control how it operates.
595+ `configure' recognizes the following options to control how it
596+operates.
597
598 `--help'
599 `-h'
600- Print a summary of the options to `configure', and exit.
601+ Print a summary of all of the options to `configure', and exit.
602+
603+`--help=short'
604+`--help=recursive'
605+ Print a summary of the options unique to this package's
606+ `configure', and exit. The `short' variant lists options used
607+ only in the top level, while the `recursive' variant lists options
608+ also present in any nested packages.
609
610 `--version'
611 `-V'
612@@ -231,6 +355,16 @@
613 Look for the package's source code in directory DIR. Usually
614 `configure' can determine that directory automatically.
615
616+`--prefix=DIR'
617+ Use DIR as the installation prefix. *note Installation Names::
618+ for more details, including other options available for fine-tuning
619+ the installation locations.
620+
621+`--no-create'
622+`-n'
623+ Run the configure checks, but stop before creating any output
624+ files.
625+
626 `configure' also accepts some other, not widely useful, options. Run
627 `configure --help' for more details.
628
629
630=== modified file 'Makefile.am'
631--- Makefile.am 2012-06-30 15:30:45 +0000
632+++ Makefile.am 2015-03-03 21:10:45 +0000
633@@ -8,12 +8,6 @@
634 distclean-local:
635 rm -rf *.cache *~
636
637-dist-bz2: dist
638- zcat $(PACKAGE)-$(VERSION).tar.gz | bzip2 --best -c > $(PACKAGE)-$(VERSION).tar.bz2
639-
640-distcheck-bz2: distcheck
641- zcat $(PACKAGE)-$(VERSION).tar.gz | bzip2 --best -c > $(PACKAGE)-$(VERSION).tar.bz2
642-
643 .PHONY: ChangeLog
644
645 ChangeLog: Makefile
646
647=== modified file 'Makefile.in'
648--- Makefile.in 2012-06-30 15:30:45 +0000
649+++ Makefile.in 2015-03-03 21:10:45 +0000
650@@ -1,8 +1,9 @@
651-# Makefile.in generated by automake 1.9.6 from Makefile.am.
652+# Makefile.in generated by automake 1.11.6 from Makefile.am.
653 # @configure_input@
654
655 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
656-# 2003, 2004, 2005 Free Software Foundation, Inc.
657+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
658+# Foundation, Inc.
659 # This Makefile.in is free software; the Free Software Foundation
660 # gives unlimited permission to copy and/or distribute it,
661 # with or without modifications, as long as this notice is preserved.
662@@ -13,18 +14,32 @@
663 # PARTICULAR PURPOSE.
664
665 @SET_MAKE@
666-srcdir = @srcdir@
667-top_srcdir = @top_srcdir@
668 VPATH = @srcdir@
669+am__make_dryrun = \
670+ { \
671+ am__dry=no; \
672+ case $$MAKEFLAGS in \
673+ *\\[\ \ ]*) \
674+ echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
675+ | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
676+ *) \
677+ for am__flg in $$MAKEFLAGS; do \
678+ case $$am__flg in \
679+ *=*|--*) ;; \
680+ *n*) am__dry=yes; break;; \
681+ esac; \
682+ done;; \
683+ esac; \
684+ test $$am__dry = yes; \
685+ }
686 pkgdatadir = $(datadir)/@PACKAGE@
687+pkgincludedir = $(includedir)/@PACKAGE@
688 pkglibdir = $(libdir)/@PACKAGE@
689-pkgincludedir = $(includedir)/@PACKAGE@
690-top_builddir = .
691+pkglibexecdir = $(libexecdir)/@PACKAGE@
692 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
693-INSTALL = @INSTALL@
694-install_sh_DATA = ${SHELL} $(install_sh) -c -m 644
695-install_sh_PROGRAM = ${SHELL} $(install_sh) -c
696-install_sh_SCRIPT = ${SHELL} $(install_sh) -c
697+install_sh_DATA = $(install_sh) -c -m 644
698+install_sh_PROGRAM = $(install_sh) -c
699+install_sh_SCRIPT = $(install_sh) -c
700 INSTALL_HEADER = $(INSTALL_DATA)
701 transform = $(program_transform_name)
702 NORMAL_INSTALL = :
703@@ -35,29 +50,41 @@
704 POST_UNINSTALL = :
705 build_triplet = @build@
706 host_triplet = @host@
707+subdir = .
708 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
709 $(srcdir)/Makefile.in $(srcdir)/config.h.in \
710 $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
711 compile config.guess config.sub depcomp install-sh ltmain.sh \
712 missing mkinstalldirs
713-subdir = .
714 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
715 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
716 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
717 $(ACLOCAL_M4)
718 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
719- configure.lineno configure.status.lineno
720+ configure.lineno config.status.lineno
721 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
722 CONFIG_HEADER = config.h
723 CONFIG_CLEAN_FILES =
724+CONFIG_CLEAN_VPATH_FILES =
725 SOURCES =
726 DIST_SOURCES =
727 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
728 html-recursive info-recursive install-data-recursive \
729- install-exec-recursive install-info-recursive \
730- install-recursive installcheck-recursive installdirs-recursive \
731- pdf-recursive ps-recursive uninstall-info-recursive \
732- uninstall-recursive
733+ install-dvi-recursive install-exec-recursive \
734+ install-html-recursive install-info-recursive \
735+ install-pdf-recursive install-ps-recursive install-recursive \
736+ installcheck-recursive installdirs-recursive pdf-recursive \
737+ ps-recursive uninstall-recursive
738+am__can_run_installinfo = \
739+ case $$AM_UPDATE_INFO_DIR in \
740+ n|no|NO) false;; \
741+ *) (install-info --version) >/dev/null 2>&1;; \
742+ esac
743+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
744+ distclean-recursive maintainer-clean-recursive
745+AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
746+ $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
747+ distdir dist dist-all distcheck
748 ETAGS = etags
749 CTAGS = ctags
750 DIST_SUBDIRS = $(SUBDIRS)
751@@ -65,17 +92,44 @@
752 distdir = $(PACKAGE)-$(VERSION)
753 top_distdir = $(distdir)
754 am__remove_distdir = \
755- { test ! -d $(distdir) \
756- || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
757- && rm -fr $(distdir); }; }
758-DIST_ARCHIVES = $(distdir).tar.gz
759+ if test -d "$(distdir)"; then \
760+ find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
761+ && rm -rf "$(distdir)" \
762+ || { sleep 5 && rm -rf "$(distdir)"; }; \
763+ else :; fi
764+am__relativize = \
765+ dir0=`pwd`; \
766+ sed_first='s,^\([^/]*\)/.*$$,\1,'; \
767+ sed_rest='s,^[^/]*/*,,'; \
768+ sed_last='s,^.*/\([^/]*\)$$,\1,'; \
769+ sed_butlast='s,/*[^/]*$$,,'; \
770+ while test -n "$$dir1"; do \
771+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \
772+ if test "$$first" != "."; then \
773+ if test "$$first" = ".."; then \
774+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
775+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
776+ else \
777+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
778+ if test "$$first2" = "$$first"; then \
779+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
780+ else \
781+ dir2="../$$dir2"; \
782+ fi; \
783+ dir0="$$dir0"/"$$first"; \
784+ fi; \
785+ fi; \
786+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
787+ done; \
788+ reldir="$$dir2"
789+DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
790 GZIP_ENV = --best
791 distuninstallcheck_listfiles = find . -type f -print
792+am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
793+ | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
794 distcleancheck_listfiles = find . -type f -print
795 ACLOCAL = @ACLOCAL@
796 ALL_LINGUAS = @ALL_LINGUAS@
797-AMDEP_FALSE = @AMDEP_FALSE@
798-AMDEP_TRUE = @AMDEP_TRUE@
799 AMTAR = @AMTAR@
800 AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
801 AR = @AR@
802@@ -111,37 +165,19 @@
803 GTK_LIBS = @GTK_LIBS@
804 GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@
805 GTK_VERSION = @GTK_VERSION@
806+INSTALL = @INSTALL@
807 INSTALL_DATA = @INSTALL_DATA@
808 INSTALL_PROGRAM = @INSTALL_PROGRAM@
809 INSTALL_SCRIPT = @INSTALL_SCRIPT@
810 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
811 INSTOBJEXT = @INSTOBJEXT@
812 INTLLIBS = @INTLLIBS@
813-INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
814-INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
815-INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
816 INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
817-INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
818-INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
819 INTLTOOL_MERGE = @INTLTOOL_MERGE@
820-INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
821 INTLTOOL_PERL = @INTLTOOL_PERL@
822-INTLTOOL_POLICY_RULE = @INTLTOOL_POLICY_RULE@
823-INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
824-INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
825-INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
826-INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
827-INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
828-INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
829-INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
830-INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
831-INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
832 INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
833 INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@
834 INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@
835-INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
836-INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
837-INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
838 INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@
839 INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@
840 LD = @LD@
841@@ -168,10 +204,9 @@
842 LN_S = @LN_S@
843 LTLIBOBJS = @LTLIBOBJS@
844 MAINT = @MAINT@
845-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
846-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
847 MAKEINFO = @MAKEINFO@
848 MANIFEST_TOOL = @MANIFEST_TOOL@
849+MKDIR_P = @MKDIR_P@
850 MKINSTALLDIRS = @MKINSTALLDIRS@
851 MSGFMT = @MSGFMT@
852 MSGFMT_OPTS = @MSGFMT_OPTS@
853@@ -190,6 +225,8 @@
854 PACKAGE_VERSION = @PACKAGE_VERSION@
855 PATH_SEPARATOR = @PATH_SEPARATOR@
856 PKG_CONFIG = @PKG_CONFIG@
857+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
858+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
859 POFILES = @POFILES@
860 POSUB = @POSUB@
861 PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
862@@ -208,11 +245,13 @@
863 X_EXTRA_LIBS = @X_EXTRA_LIBS@
864 X_LIBS = @X_LIBS@
865 X_PRE_LIBS = @X_PRE_LIBS@
866+abs_builddir = @abs_builddir@
867+abs_srcdir = @abs_srcdir@
868+abs_top_builddir = @abs_top_builddir@
869+abs_top_srcdir = @abs_top_srcdir@
870 ac_ct_AR = @ac_ct_AR@
871 ac_ct_CC = @ac_ct_CC@
872 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
873-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
874-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
875 am__include = @am__include@
876 am__leading_dot = @am__leading_dot@
877 am__quote = @am__quote@
878@@ -224,6 +263,7 @@
879 build_cpu = @build_cpu@
880 build_os = @build_os@
881 build_vendor = @build_vendor@
882+builddir = @builddir@
883 datadir = @datadir@
884 datarootdir = @datarootdir@
885 docdir = @docdir@
886@@ -253,8 +293,12 @@
887 psdir = @psdir@
888 sbindir = @sbindir@
889 sharedstatedir = @sharedstatedir@
890+srcdir = @srcdir@
891 sysconfdir = @sysconfdir@
892 target_alias = @target_alias@
893+top_build_prefix = @top_build_prefix@
894+top_builddir = @top_builddir@
895+top_srcdir = @top_srcdir@
896 SUBDIRS = \
897 icons \
898 panel-plugin \
899@@ -275,21 +319,21 @@
900 $(MAKE) $(AM_MAKEFLAGS) all-recursive
901
902 .SUFFIXES:
903-am--refresh:
904+am--refresh: Makefile
905 @:
906 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
907 @for dep in $?; do \
908 case '$(am__configure_deps)' in \
909 *$$dep*) \
910- echo ' cd $(srcdir) && $(AUTOMAKE) --gnu '; \
911- cd $(srcdir) && $(AUTOMAKE) --gnu \
912+ echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \
913+ $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \
914 && exit 0; \
915 exit 1;; \
916 esac; \
917 done; \
918- echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
919- cd $(top_srcdir) && \
920- $(AUTOMAKE) --gnu Makefile
921+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
922+ $(am__cd) $(top_srcdir) && \
923+ $(AUTOMAKE) --gnu Makefile
924 .PRECIOUS: Makefile
925 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
926 @case '$?' in \
927@@ -305,21 +349,20 @@
928 $(SHELL) ./config.status --recheck
929
930 $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
931- cd $(srcdir) && $(AUTOCONF)
932+ $(am__cd) $(srcdir) && $(AUTOCONF)
933 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
934- cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
935+ $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
936+$(am__aclocal_m4_deps):
937
938 config.h: stamp-h1
939- @if test ! -f $@; then \
940- rm -f stamp-h1; \
941- $(MAKE) stamp-h1; \
942- else :; fi
943+ @if test ! -f $@; then rm -f stamp-h1; else :; fi
944+ @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
945
946 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
947 @rm -f stamp-h1
948 cd $(top_builddir) && $(SHELL) ./config.status config.h
949 $(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
950- cd $(top_srcdir) && $(AUTOHEADER)
951+ ($(am__cd) $(top_srcdir) && $(AUTOHEADER))
952 rm -f stamp-h1
953 touch $@
954
955@@ -333,8 +376,7 @@
956 -rm -rf .libs _libs
957
958 distclean-libtool:
959- -rm -f libtool
960-uninstall-info-am:
961+ -rm -f libtool config.lt
962
963 # This directory's subdirectories are mostly independent; you can cd
964 # into them and run `make' without going through this Makefile.
965@@ -343,7 +385,7 @@
966 # (which will cause the Makefiles to be regenerated when you run `make');
967 # (2) otherwise, pass the desired values on the `make' command line.
968 $(RECURSIVE_TARGETS):
969- @failcom='exit 1'; \
970+ @fail= failcom='exit 1'; \
971 for f in x $$MAKEFLAGS; do \
972 case $$f in \
973 *=* | --[!k]*);; \
974@@ -360,16 +402,15 @@
975 else \
976 local_target="$$target"; \
977 fi; \
978- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
979+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
980 || eval $$failcom; \
981 done; \
982 if test "$$dot_seen" = "no"; then \
983 $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
984 fi; test -z "$$fail"
985
986-mostlyclean-recursive clean-recursive distclean-recursive \
987-maintainer-clean-recursive:
988- @failcom='exit 1'; \
989+$(RECURSIVE_CLEAN_TARGETS):
990+ @fail= failcom='exit 1'; \
991 for f in x $$MAKEFLAGS; do \
992 case $$f in \
993 *=* | --[!k]*);; \
994@@ -395,16 +436,16 @@
995 else \
996 local_target="$$target"; \
997 fi; \
998- (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
999+ ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
1000 || eval $$failcom; \
1001 done && test -z "$$fail"
1002 tags-recursive:
1003 list='$(SUBDIRS)'; for subdir in $$list; do \
1004- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
1005+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
1006 done
1007 ctags-recursive:
1008 list='$(SUBDIRS)'; for subdir in $$list; do \
1009- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
1010+ test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
1011 done
1012
1013 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
1014@@ -412,14 +453,14 @@
1015 unique=`for i in $$list; do \
1016 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
1017 done | \
1018- $(AWK) ' { files[$$0] = 1; } \
1019- END { for (i in files) print i; }'`; \
1020+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
1021+ END { if (nonempty) { for (i in files) print i; }; }'`; \
1022 mkid -fID $$unique
1023 tags: TAGS
1024
1025 TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
1026 $(TAGS_FILES) $(LISP)
1027- tags=; \
1028+ set x; \
1029 here=`pwd`; \
1030 if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
1031 include_option=--etags-include; \
1032@@ -431,84 +472,100 @@
1033 list='$(SUBDIRS)'; for subdir in $$list; do \
1034 if test "$$subdir" = .; then :; else \
1035 test ! -f $$subdir/TAGS || \
1036- tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
1037+ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
1038 fi; \
1039 done; \
1040 list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
1041 unique=`for i in $$list; do \
1042 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
1043 done | \
1044- $(AWK) ' { files[$$0] = 1; } \
1045- END { for (i in files) print i; }'`; \
1046- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
1047+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
1048+ END { if (nonempty) { for (i in files) print i; }; }'`; \
1049+ shift; \
1050+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
1051 test -n "$$unique" || unique=$$empty_fix; \
1052- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
1053- $$tags $$unique; \
1054+ if test $$# -gt 0; then \
1055+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
1056+ "$$@" $$unique; \
1057+ else \
1058+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
1059+ $$unique; \
1060+ fi; \
1061 fi
1062 ctags: CTAGS
1063 CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
1064 $(TAGS_FILES) $(LISP)
1065- tags=; \
1066- here=`pwd`; \
1067 list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
1068 unique=`for i in $$list; do \
1069 if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
1070 done | \
1071- $(AWK) ' { files[$$0] = 1; } \
1072- END { for (i in files) print i; }'`; \
1073- test -z "$(CTAGS_ARGS)$$tags$$unique" \
1074+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
1075+ END { if (nonempty) { for (i in files) print i; }; }'`; \
1076+ test -z "$(CTAGS_ARGS)$$unique" \
1077 || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
1078- $$tags $$unique
1079+ $$unique
1080
1081 GTAGS:
1082 here=`$(am__cd) $(top_builddir) && pwd` \
1083- && cd $(top_srcdir) \
1084- && gtags -i $(GTAGS_ARGS) $$here
1085+ && $(am__cd) $(top_srcdir) \
1086+ && gtags -i $(GTAGS_ARGS) "$$here"
1087
1088 distclean-tags:
1089 -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
1090
1091 distdir: $(DISTFILES)
1092 $(am__remove_distdir)
1093- mkdir $(distdir)
1094- $(mkdir_p) $(distdir)/po
1095- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
1096- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
1097- list='$(DISTFILES)'; for file in $$list; do \
1098- case $$file in \
1099- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
1100- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
1101- esac; \
1102+ test -d "$(distdir)" || mkdir "$(distdir)"
1103+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
1104+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
1105+ list='$(DISTFILES)'; \
1106+ dist_files=`for file in $$list; do echo $$file; done | \
1107+ sed -e "s|^$$srcdirstrip/||;t" \
1108+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
1109+ case $$dist_files in \
1110+ */*) $(MKDIR_P) `echo "$$dist_files" | \
1111+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
1112+ sort -u` ;; \
1113+ esac; \
1114+ for file in $$dist_files; do \
1115 if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
1116- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
1117- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
1118- dir="/$$dir"; \
1119- $(mkdir_p) "$(distdir)$$dir"; \
1120- else \
1121- dir=''; \
1122- fi; \
1123 if test -d $$d/$$file; then \
1124+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
1125+ if test -d "$(distdir)/$$file"; then \
1126+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
1127+ fi; \
1128 if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
1129- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
1130+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
1131+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
1132 fi; \
1133- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
1134+ cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
1135 else \
1136- test -f $(distdir)/$$file \
1137- || cp -p $$d/$$file $(distdir)/$$file \
1138+ test -f "$(distdir)/$$file" \
1139+ || cp -p $$d/$$file "$(distdir)/$$file" \
1140 || exit 1; \
1141 fi; \
1142 done
1143- list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
1144+ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
1145 if test "$$subdir" = .; then :; else \
1146- test -d "$(distdir)/$$subdir" \
1147- || $(mkdir_p) "$(distdir)/$$subdir" \
1148- || exit 1; \
1149- distdir=`$(am__cd) $(distdir) && pwd`; \
1150- top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
1151- (cd $$subdir && \
1152+ $(am__make_dryrun) \
1153+ || test -d "$(distdir)/$$subdir" \
1154+ || $(MKDIR_P) "$(distdir)/$$subdir" \
1155+ || exit 1; \
1156+ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
1157+ $(am__relativize); \
1158+ new_distdir=$$reldir; \
1159+ dir1=$$subdir; dir2="$(top_distdir)"; \
1160+ $(am__relativize); \
1161+ new_top_distdir=$$reldir; \
1162+ echo " (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir="$$new_top_distdir" distdir="$$new_distdir" \\"; \
1163+ echo " am__remove_distdir=: am__skip_length_check=: am__skip_mode_fix=: distdir)"; \
1164+ ($(am__cd) $$subdir && \
1165 $(MAKE) $(AM_MAKEFLAGS) \
1166- top_distdir="$$top_distdir" \
1167- distdir="$$distdir/$$subdir" \
1168+ top_distdir="$$new_top_distdir" \
1169+ distdir="$$new_distdir" \
1170+ am__remove_distdir=: \
1171+ am__skip_length_check=: \
1172+ am__skip_mode_fix=: \
1173 distdir) \
1174 || exit 1; \
1175 fi; \
1176@@ -516,17 +573,30 @@
1177 $(MAKE) $(AM_MAKEFLAGS) \
1178 top_distdir="$(top_distdir)" distdir="$(distdir)" \
1179 dist-hook
1180- -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
1181+ -test -n "$(am__skip_mode_fix)" \
1182+ || find "$(distdir)" -type d ! -perm -755 \
1183+ -exec chmod u+rwx,go+rx {} \; -o \
1184 ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
1185 ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
1186- ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
1187- || chmod -R a+r $(distdir)
1188+ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
1189+ || chmod -R a+r "$(distdir)"
1190 dist-gzip: distdir
1191 tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
1192 $(am__remove_distdir)
1193-
1194 dist-bzip2: distdir
1195- tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
1196+ tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
1197+ $(am__remove_distdir)
1198+
1199+dist-lzip: distdir
1200+ tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
1201+ $(am__remove_distdir)
1202+
1203+dist-lzma: distdir
1204+ tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
1205+ $(am__remove_distdir)
1206+
1207+dist-xz: distdir
1208+ tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
1209 $(am__remove_distdir)
1210
1211 dist-tarZ: distdir
1212@@ -544,6 +614,7 @@
1213
1214 dist dist-all: distdir
1215 tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
1216+ tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
1217 $(am__remove_distdir)
1218
1219 # This target untars the dist file and tries a VPATH configuration. Then
1220@@ -552,24 +623,33 @@
1221 distcheck: dist
1222 case '$(DIST_ARCHIVES)' in \
1223 *.tar.gz*) \
1224- GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
1225+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
1226 *.tar.bz2*) \
1227- bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
1228+ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
1229+ *.tar.lzma*) \
1230+ lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
1231+ *.tar.lz*) \
1232+ lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
1233+ *.tar.xz*) \
1234+ xz -dc $(distdir).tar.xz | $(am__untar) ;;\
1235 *.tar.Z*) \
1236 uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
1237 *.shar.gz*) \
1238- GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
1239+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
1240 *.zip*) \
1241 unzip $(distdir).zip ;;\
1242 esac
1243- chmod -R a-w $(distdir); chmod a+w $(distdir)
1244+ chmod -R a-w $(distdir); chmod u+w $(distdir)
1245 mkdir $(distdir)/_build
1246 mkdir $(distdir)/_inst
1247 chmod a-w $(distdir)
1248+ test -d $(distdir)/_build || exit 0; \
1249 dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
1250 && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
1251- && cd $(distdir)/_build \
1252+ && am__cwd=`pwd` \
1253+ && $(am__cd) $(distdir)/_build \
1254 && ../configure --srcdir=.. --prefix="$$dc_install_base" \
1255+ $(AM_DISTCHECK_CONFIGURE_FLAGS) \
1256 $(DISTCHECK_CONFIGURE_FLAGS) \
1257 && $(MAKE) $(AM_MAKEFLAGS) \
1258 && $(MAKE) $(AM_MAKEFLAGS) dvi \
1259@@ -590,14 +670,24 @@
1260 && rm -rf "$$dc_destdir" \
1261 && $(MAKE) $(AM_MAKEFLAGS) dist \
1262 && rm -rf $(DIST_ARCHIVES) \
1263- && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
1264+ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
1265+ && cd "$$am__cwd" \
1266+ || exit 1
1267 $(am__remove_distdir)
1268 @(echo "$(distdir) archives ready for distribution: "; \
1269 list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
1270- sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
1271+ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
1272 distuninstallcheck:
1273- @cd $(distuninstallcheck_dir) \
1274- && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
1275+ @test -n '$(distuninstallcheck_dir)' || { \
1276+ echo 'ERROR: trying to run $@ with an empty' \
1277+ '$$(distuninstallcheck_dir)' >&2; \
1278+ exit 1; \
1279+ }; \
1280+ $(am__cd) '$(distuninstallcheck_dir)' || { \
1281+ echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
1282+ exit 1; \
1283+ }; \
1284+ test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
1285 || { echo "ERROR: files left after uninstall:" ; \
1286 if test -n "$(DESTDIR)"; then \
1287 echo " (check DESTDIR support)"; \
1288@@ -628,16 +718,22 @@
1289
1290 installcheck: installcheck-recursive
1291 install-strip:
1292- $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
1293- install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
1294- `test -z '$(STRIP)' || \
1295- echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
1296+ if test -z '$(STRIP)'; then \
1297+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
1298+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
1299+ install; \
1300+ else \
1301+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
1302+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
1303+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
1304+ fi
1305 mostlyclean-generic:
1306
1307 clean-generic:
1308
1309 distclean-generic:
1310 -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
1311+ -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
1312 -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)
1313
1314 maintainer-clean-generic:
1315@@ -659,18 +755,38 @@
1316
1317 html: html-recursive
1318
1319+html-am:
1320+
1321 info: info-recursive
1322
1323 info-am:
1324
1325 install-data-am:
1326
1327+install-dvi: install-dvi-recursive
1328+
1329+install-dvi-am:
1330+
1331 install-exec-am:
1332
1333+install-html: install-html-recursive
1334+
1335+install-html-am:
1336+
1337 install-info: install-info-recursive
1338
1339+install-info-am:
1340+
1341 install-man:
1342
1343+install-pdf: install-pdf-recursive
1344+
1345+install-pdf-am:
1346+
1347+install-ps: install-ps-recursive
1348+
1349+install-ps-am:
1350+
1351 installcheck-am:
1352
1353 maintainer-clean: maintainer-clean-recursive
1354@@ -691,37 +807,33 @@
1355
1356 ps-am:
1357
1358-uninstall-am: uninstall-info-am
1359-
1360-uninstall-info: uninstall-info-recursive
1361-
1362-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
1363- check-am clean clean-generic clean-libtool clean-recursive \
1364- ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
1365- dist-hook dist-shar dist-tarZ dist-zip distcheck distclean \
1366- distclean-generic distclean-hdr distclean-libtool \
1367- distclean-local distclean-recursive distclean-tags \
1368+uninstall-am:
1369+
1370+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
1371+ ctags-recursive install-am install-strip tags-recursive
1372+
1373+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
1374+ all all-am am--refresh check check-am clean clean-generic \
1375+ clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
1376+ dist-gzip dist-hook dist-lzip dist-lzma dist-shar dist-tarZ \
1377+ dist-xz dist-zip distcheck distclean distclean-generic \
1378+ distclean-hdr distclean-libtool distclean-local distclean-tags \
1379 distcleancheck distdir distuninstallcheck dvi dvi-am html \
1380 html-am info info-am install install-am install-data \
1381- install-data-am install-exec install-exec-am install-info \
1382- install-info-am install-man install-strip installcheck \
1383+ install-data-am install-dvi install-dvi-am install-exec \
1384+ install-exec-am install-html install-html-am install-info \
1385+ install-info-am install-man install-pdf install-pdf-am \
1386+ install-ps install-ps-am install-strip installcheck \
1387 installcheck-am installdirs installdirs-am maintainer-clean \
1388- maintainer-clean-generic maintainer-clean-recursive \
1389- mostlyclean mostlyclean-generic mostlyclean-libtool \
1390- mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
1391- uninstall uninstall-am uninstall-info-am
1392+ maintainer-clean-generic mostlyclean mostlyclean-generic \
1393+ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
1394+ uninstall uninstall-am
1395
1396 @SET_MAKE@
1397
1398 distclean-local:
1399 rm -rf *.cache *~
1400
1401-dist-bz2: dist
1402- zcat $(PACKAGE)-$(VERSION).tar.gz | bzip2 --best -c > $(PACKAGE)-$(VERSION).tar.bz2
1403-
1404-distcheck-bz2: distcheck
1405- zcat $(PACKAGE)-$(VERSION).tar.gz | bzip2 --best -c > $(PACKAGE)-$(VERSION).tar.bz2
1406-
1407 .PHONY: ChangeLog
1408
1409 ChangeLog: Makefile
1410@@ -730,6 +842,7 @@
1411 || (touch ChangeLog; echo 'Git directory not found: installing possibly empty changelog.' >&2)
1412
1413 dist-hook: ChangeLog
1414+
1415 # Tell versions [3.59,3.63) of GNU make to not export all variables.
1416 # Otherwise a system limit (for SysV at least) may be exceeded.
1417 .NOEXPORT:
1418
1419=== modified file 'NEWS'
1420--- NEWS 2012-06-30 15:30:45 +0000
1421+++ NEWS 2015-03-03 21:10:45 +0000
1422@@ -1,3 +1,10 @@
1423+20150303 (1.0.2):
1424+-----------------
1425+
1426+ * Properly resize image _and_ btn so that the image is not shrinked
1427+ * New translations: th, ms, bg, oc, is, sl, en_AU
1428+ * Updated translations: ast, de, es, fr, it, hr, nl, pl, tr, ug
1429+
1430 20120630 (1.0.1):
1431 -----------------
1432
1433
1434=== modified file 'aclocal.m4'
1435--- aclocal.m4 2012-06-30 15:30:45 +0000
1436+++ aclocal.m4 2015-03-03 21:10:45 +0000
1437@@ -1,7 +1,8 @@
1438-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
1439+# generated automatically by aclocal 1.11.6 -*- Autoconf -*-
1440
1441 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
1442-# 2005 Free Software Foundation, Inc.
1443+# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
1444+# Inc.
1445 # This file is free software; the Free Software Foundation
1446 # gives unlimited permission to copy and/or distribute it,
1447 # with or without modifications, as long as this notice is preserved.
1448@@ -11,6 +12,14 @@
1449 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
1450 # PARTICULAR PURPOSE.
1451
1452+m4_ifndef([AC_AUTOCONF_VERSION],
1453+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
1454+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.63],,
1455+[m4_warning([this file was generated for autoconf 2.63.
1456+You have another version of autoconf. It may work, but is not guaranteed to.
1457+If you have problems, you may need to regenerate the build system entirely.
1458+To do so, use the procedure documented by the package, typically `autoreconf'.])])
1459+
1460 # Copyright (C) 1995-2002 Free Software Foundation, Inc.
1461 # Copyright (C) 2001-2003,2004 Red Hat, Inc.
1462 #
1463@@ -328,7 +337,6 @@
1464 dnl
1465 glib_DEFUN([GLIB_GNU_GETTEXT],
1466 [AC_REQUIRE([AC_PROG_CC])dnl
1467- AC_REQUIRE([AC_HEADER_STDC])dnl
1468
1469 GLIB_LC_MESSAGES
1470 GLIB_WITH_NLS
1471@@ -9254,7 +9262,7 @@
1472 m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])])
1473
1474 # nls.m4 serial 5 (gettext-0.18)
1475-dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation,
1476+dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014 Free Software Foundation,
1477 dnl Inc.
1478 dnl This file is free software; the Free Software Foundation
1479 dnl gives unlimited permission to copy and/or distribute it,
1480@@ -9287,6 +9295,7 @@
1481 ])
1482
1483 # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
1484+# serial 1 (pkg-config-0.24)
1485 #
1486 # Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
1487 #
1488@@ -9313,8 +9322,12 @@
1489 # ----------------------------------
1490 AC_DEFUN([PKG_PROG_PKG_CONFIG],
1491 [m4_pattern_forbid([^_?PKG_[A-Z_]+$])
1492-m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
1493-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
1494+m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
1495+m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
1496+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
1497+AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
1498+AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
1499+
1500 if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
1501 AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
1502 fi
1503@@ -9327,7 +9340,6 @@
1504 AC_MSG_RESULT([no])
1505 PKG_CONFIG=""
1506 fi
1507-
1508 fi[]dnl
1509 ])# PKG_PROG_PKG_CONFIG
1510
1511@@ -9336,34 +9348,32 @@
1512 # Check to see whether a particular set of modules exists. Similar
1513 # to PKG_CHECK_MODULES(), but does not set variables or print errors.
1514 #
1515-#
1516-# Similar to PKG_CHECK_MODULES, make sure that the first instance of
1517-# this or PKG_CHECK_MODULES is called, or make sure to call
1518-# PKG_CHECK_EXISTS manually
1519+# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
1520+# only at the first occurence in configure.ac, so if the first place
1521+# it's called might be skipped (such as if it is within an "if", you
1522+# have to call PKG_CHECK_EXISTS manually
1523 # --------------------------------------------------------------
1524 AC_DEFUN([PKG_CHECK_EXISTS],
1525 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
1526 if test -n "$PKG_CONFIG" && \
1527 AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
1528- m4_ifval([$2], [$2], [:])
1529+ m4_default([$2], [:])
1530 m4_ifvaln([$3], [else
1531 $3])dnl
1532 fi])
1533
1534-
1535 # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
1536 # ---------------------------------------------
1537 m4_define([_PKG_CONFIG],
1538-[if test -n "$PKG_CONFIG"; then
1539- if test -n "$$1"; then
1540- pkg_cv_[]$1="$$1"
1541- else
1542- PKG_CHECK_EXISTS([$3],
1543- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
1544- [pkg_failed=yes])
1545- fi
1546-else
1547- pkg_failed=untried
1548+[if test -n "$$1"; then
1549+ pkg_cv_[]$1="$$1"
1550+ elif test -n "$PKG_CONFIG"; then
1551+ PKG_CHECK_EXISTS([$3],
1552+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
1553+ test "x$?" != "x0" && pkg_failed=yes ],
1554+ [pkg_failed=yes])
1555+ else
1556+ pkg_failed=untried
1557 fi[]dnl
1558 ])# _PKG_CONFIG
1559
1560@@ -9405,16 +9415,17 @@
1561 See the pkg-config man page for more details.])
1562
1563 if test $pkg_failed = yes; then
1564+ AC_MSG_RESULT([no])
1565 _PKG_SHORT_ERRORS_SUPPORTED
1566 if test $_pkg_short_errors_supported = yes; then
1567- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
1568+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
1569 else
1570- $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
1571+ $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
1572 fi
1573 # Put the nasty error message in config.log where it belongs
1574 echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
1575
1576- ifelse([$4], , [AC_MSG_ERROR(dnl
1577+ m4_default([$4], [AC_MSG_ERROR(
1578 [Package requirements ($2) were not met:
1579
1580 $$1_PKG_ERRORS
1581@@ -9422,55 +9433,116 @@
1582 Consider adjusting the PKG_CONFIG_PATH environment variable if you
1583 installed software in a non-standard prefix.
1584
1585-_PKG_TEXT
1586-])],
1587- [AC_MSG_RESULT([no])
1588- $4])
1589+_PKG_TEXT])[]dnl
1590+ ])
1591 elif test $pkg_failed = untried; then
1592- ifelse([$4], , [AC_MSG_FAILURE(dnl
1593+ AC_MSG_RESULT([no])
1594+ m4_default([$4], [AC_MSG_FAILURE(
1595 [The pkg-config script could not be found or is too old. Make sure it
1596 is in your PATH or set the PKG_CONFIG environment variable to the full
1597 path to pkg-config.
1598
1599 _PKG_TEXT
1600
1601-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
1602- [$4])
1603+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
1604+ ])
1605 else
1606 $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
1607 $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
1608 AC_MSG_RESULT([yes])
1609- ifelse([$3], , :, [$3])
1610+ $3
1611 fi[]dnl
1612 ])# PKG_CHECK_MODULES
1613
1614-# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
1615+
1616+# PKG_INSTALLDIR(DIRECTORY)
1617+# -------------------------
1618+# Substitutes the variable pkgconfigdir as the location where a module
1619+# should install pkg-config .pc files. By default the directory is
1620+# $libdir/pkgconfig, but the default can be changed by passing
1621+# DIRECTORY. The user can override through the --with-pkgconfigdir
1622+# parameter.
1623+AC_DEFUN([PKG_INSTALLDIR],
1624+[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
1625+m4_pushdef([pkg_description],
1626+ [pkg-config installation directory @<:@]pkg_default[@:>@])
1627+AC_ARG_WITH([pkgconfigdir],
1628+ [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
1629+ [with_pkgconfigdir=]pkg_default)
1630+AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
1631+m4_popdef([pkg_default])
1632+m4_popdef([pkg_description])
1633+]) dnl PKG_INSTALLDIR
1634+
1635+
1636+# PKG_NOARCH_INSTALLDIR(DIRECTORY)
1637+# -------------------------
1638+# Substitutes the variable noarch_pkgconfigdir as the location where a
1639+# module should install arch-independent pkg-config .pc files. By
1640+# default the directory is $datadir/pkgconfig, but the default can be
1641+# changed by passing DIRECTORY. The user can override through the
1642+# --with-noarch-pkgconfigdir parameter.
1643+AC_DEFUN([PKG_NOARCH_INSTALLDIR],
1644+[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
1645+m4_pushdef([pkg_description],
1646+ [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])
1647+AC_ARG_WITH([noarch-pkgconfigdir],
1648+ [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
1649+ [with_noarch_pkgconfigdir=]pkg_default)
1650+AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
1651+m4_popdef([pkg_default])
1652+m4_popdef([pkg_description])
1653+]) dnl PKG_NOARCH_INSTALLDIR
1654+
1655+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
1656+# Foundation, Inc.
1657 #
1658 # This file is free software; the Free Software Foundation
1659 # gives unlimited permission to copy and/or distribute it,
1660 # with or without modifications, as long as this notice is preserved.
1661
1662+# serial 1
1663+
1664 # AM_AUTOMAKE_VERSION(VERSION)
1665 # ----------------------------
1666 # Automake X.Y traces this macro to ensure aclocal.m4 has been
1667 # generated from the m4 files accompanying Automake X.Y.
1668-AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
1669+# (This private macro should not be called outside this file.)
1670+AC_DEFUN([AM_AUTOMAKE_VERSION],
1671+[am__api_version='1.11'
1672+dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
1673+dnl require some minimum version. Point them to the right macro.
1674+m4_if([$1], [1.11.6], [],
1675+ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
1676+])
1677+
1678+# _AM_AUTOCONF_VERSION(VERSION)
1679+# -----------------------------
1680+# aclocal traces this macro to find the Autoconf version.
1681+# This is a private macro too. Using m4_define simplifies
1682+# the logic in aclocal, which can simply ignore this definition.
1683+m4_define([_AM_AUTOCONF_VERSION], [])
1684
1685 # AM_SET_CURRENT_AUTOMAKE_VERSION
1686 # -------------------------------
1687-# Call AM_AUTOMAKE_VERSION so it can be traced.
1688-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
1689+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
1690+# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
1691 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
1692- [AM_AUTOMAKE_VERSION([1.9.6])])
1693+[AM_AUTOMAKE_VERSION([1.11.6])dnl
1694+m4_ifndef([AC_AUTOCONF_VERSION],
1695+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
1696+_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
1697
1698 # AM_AUX_DIR_EXPAND -*- Autoconf -*-
1699
1700-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
1701+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
1702 #
1703 # This file is free software; the Free Software Foundation
1704 # gives unlimited permission to copy and/or distribute it,
1705 # with or without modifications, as long as this notice is preserved.
1706
1707+# serial 1
1708+
1709 # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
1710 # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
1711 # `$srcdir', `$srcdir/..', or `$srcdir/../..'.
1712@@ -9518,14 +9590,14 @@
1713
1714 # AM_CONDITIONAL -*- Autoconf -*-
1715
1716-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
1717+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
1718 # Free Software Foundation, Inc.
1719 #
1720 # This file is free software; the Free Software Foundation
1721 # gives unlimited permission to copy and/or distribute it,
1722 # with or without modifications, as long as this notice is preserved.
1723
1724-# serial 7
1725+# serial 9
1726
1727 # AM_CONDITIONAL(NAME, SHELL-CONDITION)
1728 # -------------------------------------
1729@@ -9534,8 +9606,11 @@
1730 [AC_PREREQ(2.52)dnl
1731 ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
1732 [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
1733-AC_SUBST([$1_TRUE])
1734-AC_SUBST([$1_FALSE])
1735+AC_SUBST([$1_TRUE])dnl
1736+AC_SUBST([$1_FALSE])dnl
1737+_AM_SUBST_NOTMAKE([$1_TRUE])dnl
1738+_AM_SUBST_NOTMAKE([$1_FALSE])dnl
1739+m4_define([_AM_COND_VALUE_$1], [$2])dnl
1740 if $2; then
1741 $1_TRUE=
1742 $1_FALSE='#'
1743@@ -9549,15 +9624,14 @@
1744 Usually this means the macro was only invoked conditionally.]])
1745 fi])])
1746
1747-
1748-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
1749-# Free Software Foundation, Inc.
1750+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
1751+# 2010, 2011 Free Software Foundation, Inc.
1752 #
1753 # This file is free software; the Free Software Foundation
1754 # gives unlimited permission to copy and/or distribute it,
1755 # with or without modifications, as long as this notice is preserved.
1756
1757-# serial 8
1758+# serial 12
1759
1760 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
1761 # written in clear, in which case automake, when reading aclocal.m4,
1762@@ -9585,6 +9659,7 @@
1763 ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
1764 [$1], CXX, [depcc="$CXX" am_compiler_list=],
1765 [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
1766+ [$1], UPC, [depcc="$UPC" am_compiler_list=],
1767 [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
1768 [depcc="$$1" am_compiler_list=])
1769
1770@@ -9596,6 +9671,7 @@
1771 # instance it was reported that on HP-UX the gcc test will end up
1772 # making a dummy file named `D' -- because `-MD' means `put the output
1773 # in D'.
1774+ rm -rf conftest.dir
1775 mkdir conftest.dir
1776 # Copy depcomp to subdir because otherwise we won't find it if we're
1777 # using a relative directory.
1778@@ -9613,6 +9689,16 @@
1779 if test "$am_compiler_list" = ""; then
1780 am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
1781 fi
1782+ am__universal=false
1783+ m4_case([$1], [CC],
1784+ [case " $depcc " in #(
1785+ *\ -arch\ *\ -arch\ *) am__universal=true ;;
1786+ esac],
1787+ [CXX],
1788+ [case " $depcc " in #(
1789+ *\ -arch\ *\ -arch\ *) am__universal=true ;;
1790+ esac])
1791+
1792 for depmode in $am_compiler_list; do
1793 # Setup a source with many dependencies, because some compilers
1794 # like to wrap large dependency lists on column 80 (with \), and
1795@@ -9630,7 +9716,17 @@
1796 done
1797 echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
1798
1799+ # We check with `-c' and `-o' for the sake of the "dashmstdout"
1800+ # mode. It turns out that the SunPro C++ compiler does not properly
1801+ # handle `-M -o', and we need to detect this. Also, some Intel
1802+ # versions had trouble with output in subdirs
1803+ am__obj=sub/conftest.${OBJEXT-o}
1804+ am__minus_obj="-o $am__obj"
1805 case $depmode in
1806+ gcc)
1807+ # This depmode causes a compiler race in universal mode.
1808+ test "$am__universal" = false || continue
1809+ ;;
1810 nosideeffect)
1811 # after this tag, mechanisms are not by side-effect, so they'll
1812 # only be used when explicitly requested
1813@@ -9640,18 +9736,23 @@
1814 break
1815 fi
1816 ;;
1817+ msvc7 | msvc7msys | msvisualcpp | msvcmsys)
1818+ # This compiler won't grok `-c -o', but also, the minuso test has
1819+ # not run yet. These depmodes are late enough in the game, and
1820+ # so weak that their functioning should not be impacted.
1821+ am__obj=conftest.${OBJEXT-o}
1822+ am__minus_obj=
1823+ ;;
1824 none) break ;;
1825 esac
1826- # We check with `-c' and `-o' for the sake of the "dashmstdout"
1827- # mode. It turns out that the SunPro C++ compiler does not properly
1828- # handle `-M -o', and we need to detect this.
1829 if depmode=$depmode \
1830- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
1831+ source=sub/conftest.c object=$am__obj \
1832 depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
1833- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
1834+ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
1835 >/dev/null 2>conftest.err &&
1836+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
1837 grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
1838- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
1839+ grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
1840 ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
1841 # icc doesn't choke on unknown options, it will just issue warnings
1842 # or remarks (even with -Werror). So we grep stderr for any message
1843@@ -9700,63 +9801,79 @@
1844 if test "x$enable_dependency_tracking" != xno; then
1845 am_depcomp="$ac_aux_dir/depcomp"
1846 AMDEPBACKSLASH='\'
1847+ am__nodep='_no'
1848 fi
1849 AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
1850-AC_SUBST([AMDEPBACKSLASH])
1851+AC_SUBST([AMDEPBACKSLASH])dnl
1852+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
1853+AC_SUBST([am__nodep])dnl
1854+_AM_SUBST_NOTMAKE([am__nodep])dnl
1855 ])
1856
1857 # Generate code to set up dependency tracking. -*- Autoconf -*-
1858
1859-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
1860+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
1861 # Free Software Foundation, Inc.
1862 #
1863 # This file is free software; the Free Software Foundation
1864 # gives unlimited permission to copy and/or distribute it,
1865 # with or without modifications, as long as this notice is preserved.
1866
1867-#serial 3
1868+#serial 5
1869
1870 # _AM_OUTPUT_DEPENDENCY_COMMANDS
1871 # ------------------------------
1872 AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
1873-[for mf in $CONFIG_FILES; do
1874- # Strip MF so we end up with the name of the file.
1875- mf=`echo "$mf" | sed -e 's/:.*$//'`
1876- # Check whether this is an Automake generated Makefile or not.
1877- # We used to match only the files named `Makefile.in', but
1878- # some people rename them; so instead we look at the file content.
1879- # Grep'ing the first line is not enough: some people post-process
1880- # each Makefile.in and add a new line on top of each file to say so.
1881- # So let's grep whole file.
1882- if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
1883- dirpart=`AS_DIRNAME("$mf")`
1884- else
1885- continue
1886- fi
1887- # Extract the definition of DEPDIR, am__include, and am__quote
1888- # from the Makefile without running `make'.
1889- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
1890- test -z "$DEPDIR" && continue
1891- am__include=`sed -n 's/^am__include = //p' < "$mf"`
1892- test -z "am__include" && continue
1893- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
1894- # When using ansi2knr, U may be empty or an underscore; expand it
1895- U=`sed -n 's/^U = //p' < "$mf"`
1896- # Find all dependency output files, they are included files with
1897- # $(DEPDIR) in their names. We invoke sed twice because it is the
1898- # simplest approach to changing $(DEPDIR) to its actual value in the
1899- # expansion.
1900- for file in `sed -n "
1901- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
1902- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
1903- # Make sure the directory exists.
1904- test -f "$dirpart/$file" && continue
1905- fdir=`AS_DIRNAME(["$file"])`
1906- AS_MKDIR_P([$dirpart/$fdir])
1907- # echo "creating $dirpart/$file"
1908- echo '# dummy' > "$dirpart/$file"
1909+[{
1910+ # Autoconf 2.62 quotes --file arguments for eval, but not when files
1911+ # are listed without --file. Let's play safe and only enable the eval
1912+ # if we detect the quoting.
1913+ case $CONFIG_FILES in
1914+ *\'*) eval set x "$CONFIG_FILES" ;;
1915+ *) set x $CONFIG_FILES ;;
1916+ esac
1917+ shift
1918+ for mf
1919+ do
1920+ # Strip MF so we end up with the name of the file.
1921+ mf=`echo "$mf" | sed -e 's/:.*$//'`
1922+ # Check whether this is an Automake generated Makefile or not.
1923+ # We used to match only the files named `Makefile.in', but
1924+ # some people rename them; so instead we look at the file content.
1925+ # Grep'ing the first line is not enough: some people post-process
1926+ # each Makefile.in and add a new line on top of each file to say so.
1927+ # Grep'ing the whole file is not good either: AIX grep has a line
1928+ # limit of 2048, but all sed's we know have understand at least 4000.
1929+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
1930+ dirpart=`AS_DIRNAME("$mf")`
1931+ else
1932+ continue
1933+ fi
1934+ # Extract the definition of DEPDIR, am__include, and am__quote
1935+ # from the Makefile without running `make'.
1936+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
1937+ test -z "$DEPDIR" && continue
1938+ am__include=`sed -n 's/^am__include = //p' < "$mf"`
1939+ test -z "am__include" && continue
1940+ am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
1941+ # When using ansi2knr, U may be empty or an underscore; expand it
1942+ U=`sed -n 's/^U = //p' < "$mf"`
1943+ # Find all dependency output files, they are included files with
1944+ # $(DEPDIR) in their names. We invoke sed twice because it is the
1945+ # simplest approach to changing $(DEPDIR) to its actual value in the
1946+ # expansion.
1947+ for file in `sed -n "
1948+ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
1949+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
1950+ # Make sure the directory exists.
1951+ test -f "$dirpart/$file" && continue
1952+ fdir=`AS_DIRNAME(["$file"])`
1953+ AS_MKDIR_P([$dirpart/$fdir])
1954+ # echo "creating $dirpart/$file"
1955+ echo '# dummy' > "$dirpart/$file"
1956+ done
1957 done
1958-done
1959+}
1960 ])# _AM_OUTPUT_DEPENDENCY_COMMANDS
1961
1962
1963@@ -9787,14 +9904,14 @@
1964
1965 # Do all the work for Automake. -*- Autoconf -*-
1966
1967-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
1968-# Free Software Foundation, Inc.
1969+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
1970+# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
1971 #
1972 # This file is free software; the Free Software Foundation
1973 # gives unlimited permission to copy and/or distribute it,
1974 # with or without modifications, as long as this notice is preserved.
1975
1976-# serial 12
1977+# serial 16
1978
1979 # This macro actually does too much. Some checks are only needed if
1980 # your package does certain things. But this isn't really a big deal.
1981@@ -9811,16 +9928,20 @@
1982 # arguments mandatory, and then we can depend on a new Autoconf
1983 # release and drop the old call support.
1984 AC_DEFUN([AM_INIT_AUTOMAKE],
1985-[AC_PREREQ([2.58])dnl
1986+[AC_PREREQ([2.62])dnl
1987 dnl Autoconf wants to disallow AM_ names. We explicitly allow
1988 dnl the ones we care about.
1989 m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
1990 AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
1991 AC_REQUIRE([AC_PROG_INSTALL])dnl
1992-# test to see if srcdir already configured
1993-if test "`cd $srcdir && pwd`" != "`pwd`" &&
1994- test -f $srcdir/config.status; then
1995- AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
1996+if test "`cd $srcdir && pwd`" != "`pwd`"; then
1997+ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
1998+ # is not polluted with repeated "-I."
1999+ AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
2000+ # test to see if srcdir already configured
2001+ if test -f $srcdir/config.status; then
2002+ AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
2003+ fi
2004 fi
2005
2006 # test whether we have cygpath
2007@@ -9840,6 +9961,9 @@
2008 AC_SUBST([PACKAGE], [$1])dnl
2009 AC_SUBST([VERSION], [$2])],
2010 [_AM_SET_OPTIONS([$1])dnl
2011+dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
2012+m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
2013+ [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
2014 AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
2015 AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
2016
2017@@ -9855,8 +9979,8 @@
2018 AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
2019 AM_MISSING_PROG(AUTOHEADER, autoheader)
2020 AM_MISSING_PROG(MAKEINFO, makeinfo)
2021-AM_PROG_INSTALL_SH
2022-AM_PROG_INSTALL_STRIP
2023+AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
2024+AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
2025 AC_REQUIRE([AM_PROG_MKDIR_P])dnl
2026 # We need awk for the "check" target. The system "awk" is bad on
2027 # some platforms.
2028@@ -9864,19 +9988,36 @@
2029 AC_REQUIRE([AC_PROG_MAKE_SET])dnl
2030 AC_REQUIRE([AM_SET_LEADING_DOT])dnl
2031 _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
2032- [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
2033- [_AM_PROG_TAR([v7])])])
2034+ [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
2035+ [_AM_PROG_TAR([v7])])])
2036 _AM_IF_OPTION([no-dependencies],,
2037 [AC_PROVIDE_IFELSE([AC_PROG_CC],
2038- [_AM_DEPENDENCIES(CC)],
2039- [define([AC_PROG_CC],
2040- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
2041+ [_AM_DEPENDENCIES(CC)],
2042+ [define([AC_PROG_CC],
2043+ defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
2044 AC_PROVIDE_IFELSE([AC_PROG_CXX],
2045- [_AM_DEPENDENCIES(CXX)],
2046- [define([AC_PROG_CXX],
2047- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
2048-])
2049-])
2050+ [_AM_DEPENDENCIES(CXX)],
2051+ [define([AC_PROG_CXX],
2052+ defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
2053+AC_PROVIDE_IFELSE([AC_PROG_OBJC],
2054+ [_AM_DEPENDENCIES(OBJC)],
2055+ [define([AC_PROG_OBJC],
2056+ defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
2057+])
2058+_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
2059+dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
2060+dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro
2061+dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
2062+AC_CONFIG_COMMANDS_PRE(dnl
2063+[m4_provide_if([_AM_COMPILER_EXEEXT],
2064+ [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
2065+])
2066+
2067+dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
2068+dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
2069+dnl mangled by Autoconf and run in a shell conditional statement.
2070+m4_define([_AC_COMPILER_EXEEXT],
2071+m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
2072
2073
2074 # When config.status generates a header, we must update the stamp-h file.
2075@@ -9888,29 +10029,40 @@
2076 # our stamp files there.
2077 AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
2078 [# Compute $1's index in $config_headers.
2079+_am_arg=$1
2080 _am_stamp_count=1
2081 for _am_header in $config_headers :; do
2082 case $_am_header in
2083- $1 | $1:* )
2084+ $_am_arg | $_am_arg:* )
2085 break ;;
2086 * )
2087 _am_stamp_count=`expr $_am_stamp_count + 1` ;;
2088 esac
2089 done
2090-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
2091+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
2092
2093-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
2094+# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation,
2095+# Inc.
2096 #
2097 # This file is free software; the Free Software Foundation
2098 # gives unlimited permission to copy and/or distribute it,
2099 # with or without modifications, as long as this notice is preserved.
2100
2101+# serial 1
2102+
2103 # AM_PROG_INSTALL_SH
2104 # ------------------
2105 # Define $install_sh.
2106 AC_DEFUN([AM_PROG_INSTALL_SH],
2107 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
2108-install_sh=${install_sh-"$am_aux_dir/install-sh"}
2109+if test x"${install_sh}" != xset; then
2110+ case $am_aux_dir in
2111+ *\ * | *\ *)
2112+ install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
2113+ *)
2114+ install_sh="\${SHELL} $am_aux_dir/install-sh"
2115+ esac
2116+fi
2117 AC_SUBST(install_sh)])
2118
2119 # Copyright (C) 2003, 2005 Free Software Foundation, Inc.
2120@@ -9937,27 +10089,38 @@
2121 # Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
2122 # From Jim Meyering
2123
2124-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
2125-# Free Software Foundation, Inc.
2126+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008,
2127+# 2011 Free Software Foundation, Inc.
2128 #
2129 # This file is free software; the Free Software Foundation
2130 # gives unlimited permission to copy and/or distribute it,
2131 # with or without modifications, as long as this notice is preserved.
2132
2133-# serial 4
2134+# serial 5
2135
2136+# AM_MAINTAINER_MODE([DEFAULT-MODE])
2137+# ----------------------------------
2138+# Control maintainer-specific portions of Makefiles.
2139+# Default is to disable them, unless `enable' is passed literally.
2140+# For symmetry, `disable' may be passed as well. Anyway, the user
2141+# can override the default with the --enable/--disable switch.
2142 AC_DEFUN([AM_MAINTAINER_MODE],
2143-[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
2144- dnl maintainer-mode is disabled by default
2145- AC_ARG_ENABLE(maintainer-mode,
2146-[ --enable-maintainer-mode enable make rules and dependencies not useful
2147+[m4_case(m4_default([$1], [disable]),
2148+ [enable], [m4_define([am_maintainer_other], [disable])],
2149+ [disable], [m4_define([am_maintainer_other], [enable])],
2150+ [m4_define([am_maintainer_other], [enable])
2151+ m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])])
2152+AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
2153+ dnl maintainer-mode's default is 'disable' unless 'enable' is passed
2154+ AC_ARG_ENABLE([maintainer-mode],
2155+[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful
2156 (and sometimes confusing) to the casual installer],
2157- USE_MAINTAINER_MODE=$enableval,
2158- USE_MAINTAINER_MODE=no)
2159+ [USE_MAINTAINER_MODE=$enableval],
2160+ [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
2161 AC_MSG_RESULT([$USE_MAINTAINER_MODE])
2162- AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
2163+ AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
2164 MAINT=$MAINTAINER_MODE_TRUE
2165- AC_SUBST(MAINT)dnl
2166+ AC_SUBST([MAINT])dnl
2167 ]
2168 )
2169
2170@@ -9965,13 +10128,13 @@
2171
2172 # Check to see how 'make' treats includes. -*- Autoconf -*-
2173
2174-# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
2175+# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc.
2176 #
2177 # This file is free software; the Free Software Foundation
2178 # gives unlimited permission to copy and/or distribute it,
2179 # with or without modifications, as long as this notice is preserved.
2180
2181-# serial 3
2182+# serial 4
2183
2184 # AM_MAKE_INCLUDE()
2185 # -----------------
2186@@ -9980,7 +10143,7 @@
2187 [am_make=${MAKE-make}
2188 cat > confinc << 'END'
2189 am__doit:
2190- @echo done
2191+ @echo this is the am__doit target
2192 .PHONY: am__doit
2193 END
2194 # If we don't find an include directive, just comment out the code.
2195@@ -9990,24 +10153,24 @@
2196 _am_result=none
2197 # First try GNU make style include.
2198 echo "include confinc" > confmf
2199-# We grep out `Entering directory' and `Leaving directory'
2200-# messages which can occur if `w' ends up in MAKEFLAGS.
2201-# In particular we don't look at `^make:' because GNU make might
2202-# be invoked under some other name (usually "gmake"), in which
2203-# case it prints its new name instead of `make'.
2204-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
2205- am__include=include
2206- am__quote=
2207- _am_result=GNU
2208-fi
2209+# Ignore all kinds of additional output from `make'.
2210+case `$am_make -s -f confmf 2> /dev/null` in #(
2211+*the\ am__doit\ target*)
2212+ am__include=include
2213+ am__quote=
2214+ _am_result=GNU
2215+ ;;
2216+esac
2217 # Now try BSD make style include.
2218 if test "$am__include" = "#"; then
2219 echo '.include "confinc"' > confmf
2220- if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
2221- am__include=.include
2222- am__quote="\""
2223- _am_result=BSD
2224- fi
2225+ case `$am_make -s -f confmf 2> /dev/null` in #(
2226+ *the\ am__doit\ target*)
2227+ am__include=.include
2228+ am__quote="\""
2229+ _am_result=BSD
2230+ ;;
2231+ esac
2232 fi
2233 AC_SUBST([am__include])
2234 AC_SUBST([am__quote])
2235@@ -10017,14 +10180,14 @@
2236
2237 # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
2238
2239-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
2240+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
2241 # Free Software Foundation, Inc.
2242 #
2243 # This file is free software; the Free Software Foundation
2244 # gives unlimited permission to copy and/or distribute it,
2245 # with or without modifications, as long as this notice is preserved.
2246
2247-# serial 4
2248+# serial 6
2249
2250 # AM_MISSING_PROG(NAME, PROGRAM)
2251 # ------------------------------
2252@@ -10040,7 +10203,15 @@
2253 # If it does, set am_missing_run to use it, otherwise, to nothing.
2254 AC_DEFUN([AM_MISSING_HAS_RUN],
2255 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
2256-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
2257+AC_REQUIRE_AUX_FILE([missing])dnl
2258+if test x"${MISSING+set}" != xset; then
2259+ case $am_aux_dir in
2260+ *\ * | *\ *)
2261+ MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
2262+ *)
2263+ MISSING="\${SHELL} $am_aux_dir/missing" ;;
2264+ esac
2265+fi
2266 # Use eval to expand $SHELL
2267 if eval "$MISSING --run true"; then
2268 am_missing_run="$MISSING --run "
2269@@ -10050,78 +10221,45 @@
2270 fi
2271 ])
2272
2273-# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
2274+# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
2275+# Inc.
2276 #
2277 # This file is free software; the Free Software Foundation
2278 # gives unlimited permission to copy and/or distribute it,
2279 # with or without modifications, as long as this notice is preserved.
2280
2281+# serial 1
2282+
2283 # AM_PROG_MKDIR_P
2284 # ---------------
2285-# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
2286-#
2287-# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
2288-# created by `make install' are always world readable, even if the
2289-# installer happens to have an overly restrictive umask (e.g. 077).
2290-# This was a mistake. There are at least two reasons why we must not
2291-# use `-m 0755':
2292-# - it causes special bits like SGID to be ignored,
2293-# - it may be too restrictive (some setups expect 775 directories).
2294-#
2295-# Do not use -m 0755 and let people choose whatever they expect by
2296-# setting umask.
2297-#
2298-# We cannot accept any implementation of `mkdir' that recognizes `-p'.
2299-# Some implementations (such as Solaris 8's) are not thread-safe: if a
2300-# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
2301-# concurrently, both version can detect that a/ is missing, but only
2302-# one can create it and the other will error out. Consequently we
2303-# restrict ourselves to GNU make (using the --version option ensures
2304-# this.)
2305+# Check for `mkdir -p'.
2306 AC_DEFUN([AM_PROG_MKDIR_P],
2307-[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
2308- # We used to keeping the `.' as first argument, in order to
2309- # allow $(mkdir_p) to be used without argument. As in
2310- # $(mkdir_p) $(somedir)
2311- # where $(somedir) is conditionally defined. However this is wrong
2312- # for two reasons:
2313- # 1. if the package is installed by a user who cannot write `.'
2314- # make install will fail,
2315- # 2. the above comment should most certainly read
2316- # $(mkdir_p) $(DESTDIR)$(somedir)
2317- # so it does not work when $(somedir) is undefined and
2318- # $(DESTDIR) is not.
2319- # To support the latter case, we have to write
2320- # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
2321- # so the `.' trick is pointless.
2322- mkdir_p='mkdir -p --'
2323-else
2324- # On NextStep and OpenStep, the `mkdir' command does not
2325- # recognize any option. It will interpret all options as
2326- # directories to create, and then abort because `.' already
2327- # exists.
2328- for d in ./-p ./--version;
2329- do
2330- test -d $d && rmdir $d
2331- done
2332- # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
2333- if test -f "$ac_aux_dir/mkinstalldirs"; then
2334- mkdir_p='$(mkinstalldirs)'
2335- else
2336- mkdir_p='$(SHELL) $(install_sh) -d'
2337- fi
2338-fi
2339-AC_SUBST([mkdir_p])])
2340+[AC_PREREQ([2.60])dnl
2341+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
2342+dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
2343+dnl while keeping a definition of mkdir_p for backward compatibility.
2344+dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
2345+dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
2346+dnl Makefile.ins that do not define MKDIR_P, so we do our own
2347+dnl adjustment using top_builddir (which is defined more often than
2348+dnl MKDIR_P).
2349+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
2350+case $mkdir_p in
2351+ [[\\/$]]* | ?:[[\\/]]*) ;;
2352+ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
2353+esac
2354+])
2355
2356 # Helper functions for option handling. -*- Autoconf -*-
2357
2358-# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc.
2359+# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
2360+# Foundation, Inc.
2361 #
2362 # This file is free software; the Free Software Foundation
2363 # gives unlimited permission to copy and/or distribute it,
2364 # with or without modifications, as long as this notice is preserved.
2365
2366-# serial 3
2367+# serial 5
2368
2369 # _AM_MANGLE_OPTION(NAME)
2370 # -----------------------
2371@@ -10129,16 +10267,16 @@
2372 [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
2373
2374 # _AM_SET_OPTION(NAME)
2375-# ------------------------------
2376+# --------------------
2377 # Set option NAME. Presently that only means defining a flag for this option.
2378 AC_DEFUN([_AM_SET_OPTION],
2379 [m4_define(_AM_MANGLE_OPTION([$1]), 1)])
2380
2381 # _AM_SET_OPTIONS(OPTIONS)
2382-# ----------------------------------
2383+# ------------------------
2384 # OPTIONS is a space-separated list of Automake options.
2385 AC_DEFUN([_AM_SET_OPTIONS],
2386-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
2387+[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
2388
2389 # _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
2390 # -------------------------------------------
2391@@ -10146,11 +10284,32 @@
2392 AC_DEFUN([_AM_IF_OPTION],
2393 [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
2394
2395-# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc.
2396-#
2397-# This file is free software; the Free Software Foundation
2398-# gives unlimited permission to copy and/or distribute it,
2399-# with or without modifications, as long as this notice is preserved.
2400+# Copyright (C) 2001, 2003, 2005, 2011 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+# with or without modifications, as long as this notice is preserved.
2405+
2406+# serial 1
2407+
2408+# AM_RUN_LOG(COMMAND)
2409+# -------------------
2410+# Run COMMAND, save the exit status in ac_status, and log it.
2411+# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
2412+AC_DEFUN([AM_RUN_LOG],
2413+[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
2414+ ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
2415+ ac_status=$?
2416+ echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
2417+ (exit $ac_status); }])
2418+
2419+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
2420+#
2421+# This file is free software; the Free Software Foundation
2422+# gives unlimited permission to copy and/or distribute it,
2423+# with or without modifications, as long as this notice is preserved.
2424+
2425+# serial 1
2426
2427 # AM_PROG_INSTALL_STRIP
2428 # ---------------------
2429@@ -10171,12 +10330,31 @@
2430 if test "$cross_compiling" != no; then
2431 AC_CHECK_TOOL([STRIP], [strip], :)
2432 fi
2433-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
2434+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
2435 AC_SUBST([INSTALL_STRIP_PROGRAM])])
2436
2437+# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
2438+#
2439+# This file is free software; the Free Software Foundation
2440+# gives unlimited permission to copy and/or distribute it,
2441+# with or without modifications, as long as this notice is preserved.
2442+
2443+# serial 3
2444+
2445+# _AM_SUBST_NOTMAKE(VARIABLE)
2446+# ---------------------------
2447+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
2448+# This macro is traced by Automake.
2449+AC_DEFUN([_AM_SUBST_NOTMAKE])
2450+
2451+# AM_SUBST_NOTMAKE(VARIABLE)
2452+# --------------------------
2453+# Public sister of _AM_SUBST_NOTMAKE.
2454+AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
2455+
2456 # Check how to create a tarball. -*- Autoconf -*-
2457
2458-# Copyright (C) 2004, 2005 Free Software Foundation, Inc.
2459+# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc.
2460 #
2461 # This file is free software; the Free Software Foundation
2462 # gives unlimited permission to copy and/or distribute it,
2463@@ -10198,10 +10376,11 @@
2464 # a tarball read from stdin.
2465 # $(am__untar) < result.tar
2466 AC_DEFUN([_AM_PROG_TAR],
2467-[# Always define AMTAR for backward compatibility.
2468-AM_MISSING_PROG([AMTAR], [tar])
2469+[# Always define AMTAR for backward compatibility. Yes, it's still used
2470+# in the wild :-( We should find a proper way to deprecate it ...
2471+AC_SUBST([AMTAR], ['$${TAR-tar}'])
2472 m4_if([$1], [v7],
2473- [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
2474+ [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
2475 [m4_case([$1], [ustar],, [pax],,
2476 [m4_fatal([Unknown tar format])])
2477 AC_MSG_CHECKING([how to create a $1 tar archive])
2478@@ -10270,9 +10449,7 @@
2479 AC_SUBST([am__untar])
2480 ]) # _AM_PROG_TAR
2481
2482-dnl $Id$
2483-dnl
2484-dnl Copyright (c) 2002-2006
2485+dnl Copyright (c) 2002-2015
2486 dnl The Xfce development team. All rights reserved.
2487 dnl
2488 dnl Written for Xfce by Benedikt Meurer <benny@xfce.org>.
2489@@ -10300,7 +10477,7 @@
2490
2491
2492 dnl We need recent a autoconf version
2493-AC_PREREQ([2.53])
2494+AC_PREREQ([2.60])
2495
2496
2497
2498@@ -10610,9 +10787,7 @@
2499 ])
2500
2501
2502-dnl $Id$
2503-dnl
2504-dnl Copyright (c) 2002-2006
2505+dnl Copyright (c) 2002-2015
2506 dnl The Xfce development team. All rights reserved.
2507 dnl
2508 dnl Written for Xfce by Benedikt Meurer <benny@xfce.org>.
2509@@ -10640,7 +10815,7 @@
2510
2511
2512 dnl We need recent a autoconf version
2513-AC_PREREQ([2.53])
2514+AC_PREREQ([2.60])
2515
2516
2517 dnl XDT_SUPPORTED_FLAGS(VAR, FLAGS)
2518@@ -10654,7 +10829,7 @@
2519 AC_MSG_CHECKING([if $CC supports $flag])
2520 saved_CFLAGS="$CFLAGS"
2521 CFLAGS="$CFLAGS $flag"
2522- AC_COMPILE_IFELSE([ ], [flag_supported=yes], [flag_supported=no])
2523+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([ ])], [flag_supported=yes], [flag_supported=no])
2524 CFLAGS="$saved_CFLAGS"
2525 AC_MSG_RESULT([$flag_supported])
2526
2527@@ -10688,10 +10863,10 @@
2528 -Wdeclaration-after-statement \
2529 -Wmissing-declarations \
2530 -Wmissing-noreturn -Wshadow -Wpointer-arith \
2531- -Wcast-align -Wformat-security \
2532+ -Wcast-align -Wformat -Wformat-security -Wformat-y2k \
2533 -Winit-self -Wmissing-include-dirs -Wundef \
2534- -Wmissing-format-attribute -Wnested-externs"
2535- CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2"
2536+ -Wnested-externs"
2537+ CPPFLAGS="$CPPFLAGS"
2538
2539 if test x`uname` = x"Linux"; then
2540 xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -fstack-protector"
2541@@ -10758,7 +10933,7 @@
2542 saved_CFLAGS="$CFLAGS"
2543 CFLAGS="$CFLAGS $xdt_vis_test_cflags"
2544 AC_MSG_CHECKING([whether $CC supports the GNUC visibility attribute])
2545- AC_COMPILE_IFELSE(AC_LANG_SOURCE(
2546+ AC_COMPILE_IFELSE([AC_LANG_SOURCE(
2547 [
2548 void test_default (void);
2549 void test_hidden (void);
2550@@ -10771,7 +10946,7 @@
2551 test_hidden ();
2552 return 0;
2553 }
2554- ]),
2555+ ])],
2556 [
2557 have_gnuc_visibility=yes
2558 AC_MSG_RESULT([yes])
2559@@ -10832,9 +11007,7 @@
2560 fi
2561 ])
2562
2563-dnl $Id$
2564-dnl
2565-dnl Copyright (c) 2002-2006
2566+dnl Copyright (c) 2002-2015
2567 dnl The Xfce development team. All rights reserved.
2568 dnl
2569 dnl Written for Xfce by Benedikt Meurer <benny@xfce.org>.
2570
2571=== modified file 'config.guess'
2572--- config.guess 2012-06-30 15:30:45 +0000
2573+++ config.guess 2015-03-03 21:10:45 +0000
2574@@ -1,9 +1,10 @@
2575 #! /bin/sh
2576 # Attempt to guess a canonical system name.
2577 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
2578-# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
2579+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
2580+# 2011, 2012 Free Software Foundation, Inc.
2581
2582-timestamp='2005-07-08'
2583+timestamp='2012-02-10'
2584
2585 # This file is free software; you can redistribute it and/or modify it
2586 # under the terms of the GNU General Public License as published by
2587@@ -16,9 +17,7 @@
2588 # General Public License for more details.
2589 #
2590 # You should have received a copy of the GNU General Public License
2591-# along with this program; if not, write to the Free Software
2592-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
2593-# 02110-1301, USA.
2594+# along with this program; if not, see <http://www.gnu.org/licenses/>.
2595 #
2596 # As a special exception to the GNU General Public License, if you
2597 # distribute this file as part of a program that contains a
2598@@ -26,16 +25,16 @@
2599 # the same distribution terms that you use for the rest of that program.
2600
2601
2602-# Originally written by Per Bothner <per@bothner.com>.
2603-# Please send patches to <config-patches@gnu.org>. Submit a context
2604-# diff and a properly formatted ChangeLog entry.
2605+# Originally written by Per Bothner. Please send patches (context
2606+# diff format) to <config-patches@gnu.org> and include a ChangeLog
2607+# entry.
2608 #
2609 # This script attempts to guess a canonical system name similar to
2610 # config.sub. If it succeeds, it prints the system name on stdout, and
2611 # exits with 0. Otherwise, it exits with 1.
2612 #
2613-# The plan is that this can be called by configure scripts if you
2614-# don't specify an explicit build system type.
2615+# You can get the latest version of this script from:
2616+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
2617
2618 me=`echo "$0" | sed -e 's,.*/,,'`
2619
2620@@ -55,7 +54,8 @@
2621 GNU config.guess ($timestamp)
2622
2623 Originally written by Per Bothner.
2624-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
2625+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
2626+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
2627 Free Software Foundation, Inc.
2628
2629 This is free software; see the source for copying conditions. There is NO
2630@@ -106,7 +106,7 @@
2631 trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
2632 trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
2633 : ${TMPDIR=/tmp} ;
2634- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
2635+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
2636 { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
2637 { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
2638 { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
2639@@ -143,7 +143,7 @@
2640 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
2641 *:NetBSD:*:*)
2642 # NetBSD (nbsd) targets should (where applicable) match one or
2643- # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
2644+ # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
2645 # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently
2646 # switched to ELF, *-*-netbsd* would select the old
2647 # object file format. This provides both forward
2648@@ -160,6 +160,7 @@
2649 arm*) machine=arm-unknown ;;
2650 sh3el) machine=shl-unknown ;;
2651 sh3eb) machine=sh-unknown ;;
2652+ sh5el) machine=sh5le-unknown ;;
2653 *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
2654 esac
2655 # The Operating System including object format, if it has switched
2656@@ -168,7 +169,7 @@
2657 arm*|i386|m68k|ns32k|sh3*|sparc|vax)
2658 eval $set_cc_for_build
2659 if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
2660- | grep __ELF__ >/dev/null
2661+ | grep -q __ELF__
2662 then
2663 # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
2664 # Return netbsd for either. FIX?
2665@@ -178,7 +179,7 @@
2666 fi
2667 ;;
2668 *)
2669- os=netbsd
2670+ os=netbsd
2671 ;;
2672 esac
2673 # The OS release
2674@@ -206,8 +207,11 @@
2675 *:ekkoBSD:*:*)
2676 echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
2677 exit ;;
2678+ *:SolidBSD:*:*)
2679+ echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
2680+ exit ;;
2681 macppc:MirBSD:*:*)
2682- echo powerppc-unknown-mirbsd${UNAME_RELEASE}
2683+ echo powerpc-unknown-mirbsd${UNAME_RELEASE}
2684 exit ;;
2685 *:MirBSD:*:*)
2686 echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
2687@@ -218,7 +222,7 @@
2688 UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
2689 ;;
2690 *5.*)
2691- UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
2692+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
2693 ;;
2694 esac
2695 # According to Compaq, /usr/sbin/psrinfo has been available on
2696@@ -264,7 +268,10 @@
2697 # A Xn.n version is an unreleased experimental baselevel.
2698 # 1.2 uses "1.2" for uname -r.
2699 echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
2700- exit ;;
2701+ # Reset EXIT trap before exiting to avoid spurious non-zero exit code.
2702+ exitcode=$?
2703+ trap '' 0
2704+ exit $exitcode ;;
2705 Alpha\ *:Windows_NT*:*)
2706 # How do we know it's Interix rather than the generic POSIX subsystem?
2707 # Should we change UNAME_MACHINE based on the output of uname instead
2708@@ -290,7 +297,7 @@
2709 echo s390-ibm-zvmoe
2710 exit ;;
2711 *:OS400:*:*)
2712- echo powerpc-ibm-os400
2713+ echo powerpc-ibm-os400
2714 exit ;;
2715 arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
2716 echo arm-acorn-riscix${UNAME_RELEASE}
2717@@ -319,14 +326,33 @@
2718 case `/usr/bin/uname -p` in
2719 sparc) echo sparc-icl-nx7; exit ;;
2720 esac ;;
2721+ s390x:SunOS:*:*)
2722+ echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
2723+ exit ;;
2724 sun4H:SunOS:5.*:*)
2725 echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
2726 exit ;;
2727 sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
2728 echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
2729 exit ;;
2730- i86pc:SunOS:5.*:*)
2731- echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
2732+ i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*)
2733+ echo i386-pc-auroraux${UNAME_RELEASE}
2734+ exit ;;
2735+ i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
2736+ eval $set_cc_for_build
2737+ SUN_ARCH="i386"
2738+ # If there is a compiler, see if it is configured for 64-bit objects.
2739+ # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
2740+ # This test works for both compilers.
2741+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
2742+ if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \
2743+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
2744+ grep IS_64BIT_ARCH >/dev/null
2745+ then
2746+ SUN_ARCH="x86_64"
2747+ fi
2748+ fi
2749+ echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
2750 exit ;;
2751 sun4*:SunOS:6*:*)
2752 # According to config.sub, this is the proper way to canonicalize
2753@@ -370,23 +396,23 @@
2754 # MiNT. But MiNT is downward compatible to TOS, so this should
2755 # be no problem.
2756 atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
2757- echo m68k-atari-mint${UNAME_RELEASE}
2758+ echo m68k-atari-mint${UNAME_RELEASE}
2759 exit ;;
2760 atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
2761 echo m68k-atari-mint${UNAME_RELEASE}
2762- exit ;;
2763+ exit ;;
2764 *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
2765- echo m68k-atari-mint${UNAME_RELEASE}
2766+ echo m68k-atari-mint${UNAME_RELEASE}
2767 exit ;;
2768 milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
2769- echo m68k-milan-mint${UNAME_RELEASE}
2770- exit ;;
2771+ echo m68k-milan-mint${UNAME_RELEASE}
2772+ exit ;;
2773 hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
2774- echo m68k-hades-mint${UNAME_RELEASE}
2775- exit ;;
2776+ echo m68k-hades-mint${UNAME_RELEASE}
2777+ exit ;;
2778 *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
2779- echo m68k-unknown-mint${UNAME_RELEASE}
2780- exit ;;
2781+ echo m68k-unknown-mint${UNAME_RELEASE}
2782+ exit ;;
2783 m68k:machten:*:*)
2784 echo m68k-apple-machten${UNAME_RELEASE}
2785 exit ;;
2786@@ -456,8 +482,8 @@
2787 echo m88k-motorola-sysv3
2788 exit ;;
2789 AViiON:dgux:*:*)
2790- # DG/UX returns AViiON for all architectures
2791- UNAME_PROCESSOR=`/usr/bin/uname -p`
2792+ # DG/UX returns AViiON for all architectures
2793+ UNAME_PROCESSOR=`/usr/bin/uname -p`
2794 if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
2795 then
2796 if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
2797@@ -470,7 +496,7 @@
2798 else
2799 echo i586-dg-dgux${UNAME_RELEASE}
2800 fi
2801- exit ;;
2802+ exit ;;
2803 M88*:DolphinOS:*:*) # DolphinOS (SVR3)
2804 echo m88k-dolphin-sysv3
2805 exit ;;
2806@@ -527,7 +553,7 @@
2807 echo rs6000-ibm-aix3.2
2808 fi
2809 exit ;;
2810- *:AIX:*:[45])
2811+ *:AIX:*:[4567])
2812 IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
2813 if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
2814 IBM_ARCH=rs6000
2815@@ -570,52 +596,52 @@
2816 9000/[678][0-9][0-9])
2817 if [ -x /usr/bin/getconf ]; then
2818 sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
2819- sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
2820- case "${sc_cpu_version}" in
2821- 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
2822- 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
2823- 532) # CPU_PA_RISC2_0
2824- case "${sc_kernel_bits}" in
2825- 32) HP_ARCH="hppa2.0n" ;;
2826- 64) HP_ARCH="hppa2.0w" ;;
2827+ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
2828+ case "${sc_cpu_version}" in
2829+ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
2830+ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
2831+ 532) # CPU_PA_RISC2_0
2832+ case "${sc_kernel_bits}" in
2833+ 32) HP_ARCH="hppa2.0n" ;;
2834+ 64) HP_ARCH="hppa2.0w" ;;
2835 '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
2836- esac ;;
2837- esac
2838+ esac ;;
2839+ esac
2840 fi
2841 if [ "${HP_ARCH}" = "" ]; then
2842 eval $set_cc_for_build
2843- sed 's/^ //' << EOF >$dummy.c
2844-
2845- #define _HPUX_SOURCE
2846- #include <stdlib.h>
2847- #include <unistd.h>
2848-
2849- int main ()
2850- {
2851- #if defined(_SC_KERNEL_BITS)
2852- long bits = sysconf(_SC_KERNEL_BITS);
2853- #endif
2854- long cpu = sysconf (_SC_CPU_VERSION);
2855-
2856- switch (cpu)
2857- {
2858- case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
2859- case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
2860- case CPU_PA_RISC2_0:
2861- #if defined(_SC_KERNEL_BITS)
2862- switch (bits)
2863- {
2864- case 64: puts ("hppa2.0w"); break;
2865- case 32: puts ("hppa2.0n"); break;
2866- default: puts ("hppa2.0"); break;
2867- } break;
2868- #else /* !defined(_SC_KERNEL_BITS) */
2869- puts ("hppa2.0"); break;
2870- #endif
2871- default: puts ("hppa1.0"); break;
2872- }
2873- exit (0);
2874- }
2875+ sed 's/^ //' << EOF >$dummy.c
2876+
2877+ #define _HPUX_SOURCE
2878+ #include <stdlib.h>
2879+ #include <unistd.h>
2880+
2881+ int main ()
2882+ {
2883+ #if defined(_SC_KERNEL_BITS)
2884+ long bits = sysconf(_SC_KERNEL_BITS);
2885+ #endif
2886+ long cpu = sysconf (_SC_CPU_VERSION);
2887+
2888+ switch (cpu)
2889+ {
2890+ case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
2891+ case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
2892+ case CPU_PA_RISC2_0:
2893+ #if defined(_SC_KERNEL_BITS)
2894+ switch (bits)
2895+ {
2896+ case 64: puts ("hppa2.0w"); break;
2897+ case 32: puts ("hppa2.0n"); break;
2898+ default: puts ("hppa2.0"); break;
2899+ } break;
2900+ #else /* !defined(_SC_KERNEL_BITS) */
2901+ puts ("hppa2.0"); break;
2902+ #endif
2903+ default: puts ("hppa1.0"); break;
2904+ }
2905+ exit (0);
2906+ }
2907 EOF
2908 (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
2909 test -z "$HP_ARCH" && HP_ARCH=hppa
2910@@ -635,7 +661,7 @@
2911 # => hppa64-hp-hpux11.23
2912
2913 if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
2914- grep __LP64__ >/dev/null
2915+ grep -q __LP64__
2916 then
2917 HP_ARCH="hppa2.0w"
2918 else
2919@@ -706,22 +732,22 @@
2920 exit ;;
2921 C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
2922 echo c1-convex-bsd
2923- exit ;;
2924+ exit ;;
2925 C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
2926 if getsysinfo -f scalar_acc
2927 then echo c32-convex-bsd
2928 else echo c2-convex-bsd
2929 fi
2930- exit ;;
2931+ exit ;;
2932 C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
2933 echo c34-convex-bsd
2934- exit ;;
2935+ exit ;;
2936 C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
2937 echo c38-convex-bsd
2938- exit ;;
2939+ exit ;;
2940 C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
2941 echo c4-convex-bsd
2942- exit ;;
2943+ exit ;;
2944 CRAY*Y-MP:*:*:*)
2945 echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
2946 exit ;;
2947@@ -745,14 +771,14 @@
2948 exit ;;
2949 F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
2950 FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
2951- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
2952- FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
2953- echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
2954- exit ;;
2955+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
2956+ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
2957+ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
2958+ exit ;;
2959 5000:UNIX_System_V:4.*:*)
2960- FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
2961- FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
2962- echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
2963+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
2964+ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
2965+ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
2966 exit ;;
2967 i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
2968 echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
2969@@ -764,27 +790,48 @@
2970 echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
2971 exit ;;
2972 *:FreeBSD:*:*)
2973- echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
2974+ UNAME_PROCESSOR=`/usr/bin/uname -p`
2975+ case ${UNAME_PROCESSOR} in
2976+ amd64)
2977+ echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
2978+ *)
2979+ echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
2980+ esac
2981 exit ;;
2982 i*:CYGWIN*:*)
2983 echo ${UNAME_MACHINE}-pc-cygwin
2984 exit ;;
2985- i*:MINGW*:*)
2986+ *:MINGW*:*)
2987 echo ${UNAME_MACHINE}-pc-mingw32
2988 exit ;;
2989+ i*:MSYS*:*)
2990+ echo ${UNAME_MACHINE}-pc-msys
2991+ exit ;;
2992 i*:windows32*:*)
2993- # uname -m includes "-pc" on this system.
2994- echo ${UNAME_MACHINE}-mingw32
2995+ # uname -m includes "-pc" on this system.
2996+ echo ${UNAME_MACHINE}-mingw32
2997 exit ;;
2998 i*:PW*:*)
2999 echo ${UNAME_MACHINE}-pc-pw32
3000 exit ;;
3001- x86:Interix*:[34]*)
3002- echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
3003- exit ;;
3004+ *:Interix*:*)
3005+ case ${UNAME_MACHINE} in
3006+ x86)
3007+ echo i586-pc-interix${UNAME_RELEASE}
3008+ exit ;;
3009+ authenticamd | genuineintel | EM64T)
3010+ echo x86_64-unknown-interix${UNAME_RELEASE}
3011+ exit ;;
3012+ IA64)
3013+ echo ia64-unknown-interix${UNAME_RELEASE}
3014+ exit ;;
3015+ esac ;;
3016 [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
3017 echo i${UNAME_MACHINE}-pc-mks
3018 exit ;;
3019+ 8664:Windows_NT:*)
3020+ echo x86_64-pc-mks
3021+ exit ;;
3022 i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
3023 # How do we know it's Interix rather than the generic POSIX subsystem?
3024 # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
3025@@ -794,7 +841,7 @@
3026 i*:UWIN*:*)
3027 echo ${UNAME_MACHINE}-pc-uwin
3028 exit ;;
3029- amd64:CYGWIN*:*:*)
3030+ amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
3031 echo x86_64-unknown-cygwin
3032 exit ;;
3033 p*:CYGWIN*:*)
3034@@ -814,70 +861,12 @@
3035 i*86:Minix:*:*)
3036 echo ${UNAME_MACHINE}-pc-minix
3037 exit ;;
3038- arm*:Linux:*:*)
3039- echo ${UNAME_MACHINE}-unknown-linux-gnu
3040- exit ;;
3041- cris:Linux:*:*)
3042- echo cris-axis-linux-gnu
3043- exit ;;
3044- crisv32:Linux:*:*)
3045- echo crisv32-axis-linux-gnu
3046- exit ;;
3047- frv:Linux:*:*)
3048- echo frv-unknown-linux-gnu
3049- exit ;;
3050- ia64:Linux:*:*)
3051- echo ${UNAME_MACHINE}-unknown-linux-gnu
3052- exit ;;
3053- m32r*:Linux:*:*)
3054- echo ${UNAME_MACHINE}-unknown-linux-gnu
3055- exit ;;
3056- m68*:Linux:*:*)
3057- echo ${UNAME_MACHINE}-unknown-linux-gnu
3058- exit ;;
3059- mips:Linux:*:*)
3060- eval $set_cc_for_build
3061- sed 's/^ //' << EOF >$dummy.c
3062- #undef CPU
3063- #undef mips
3064- #undef mipsel
3065- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
3066- CPU=mipsel
3067- #else
3068- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
3069- CPU=mips
3070- #else
3071- CPU=
3072- #endif
3073- #endif
3074-EOF
3075- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
3076- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
3077- ;;
3078- mips64:Linux:*:*)
3079- eval $set_cc_for_build
3080- sed 's/^ //' << EOF >$dummy.c
3081- #undef CPU
3082- #undef mips64
3083- #undef mips64el
3084- #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
3085- CPU=mips64el
3086- #else
3087- #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
3088- CPU=mips64
3089- #else
3090- CPU=
3091- #endif
3092- #endif
3093-EOF
3094- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
3095- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
3096- ;;
3097- ppc:Linux:*:*)
3098- echo powerpc-unknown-linux-gnu
3099- exit ;;
3100- ppc64:Linux:*:*)
3101- echo powerpc64-unknown-linux-gnu
3102+ aarch64:Linux:*:*)
3103+ echo ${UNAME_MACHINE}-unknown-linux-gnu
3104+ exit ;;
3105+ aarch64_be:Linux:*:*)
3106+ UNAME_MACHINE=aarch64_be
3107+ echo ${UNAME_MACHINE}-unknown-linux-gnu
3108 exit ;;
3109 alpha:Linux:*:*)
3110 case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
3111@@ -888,11 +877,90 @@
3112 EV6) UNAME_MACHINE=alphaev6 ;;
3113 EV67) UNAME_MACHINE=alphaev67 ;;
3114 EV68*) UNAME_MACHINE=alphaev68 ;;
3115- esac
3116- objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
3117+ esac
3118+ objdump --private-headers /bin/sh | grep -q ld.so.1
3119 if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
3120 echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
3121 exit ;;
3122+ arm*:Linux:*:*)
3123+ eval $set_cc_for_build
3124+ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
3125+ | grep -q __ARM_EABI__
3126+ then
3127+ echo ${UNAME_MACHINE}-unknown-linux-gnu
3128+ else
3129+ if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
3130+ | grep -q __ARM_PCS_VFP
3131+ then
3132+ echo ${UNAME_MACHINE}-unknown-linux-gnueabi
3133+ else
3134+ echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
3135+ fi
3136+ fi
3137+ exit ;;
3138+ avr32*:Linux:*:*)
3139+ echo ${UNAME_MACHINE}-unknown-linux-gnu
3140+ exit ;;
3141+ cris:Linux:*:*)
3142+ echo ${UNAME_MACHINE}-axis-linux-gnu
3143+ exit ;;
3144+ crisv32:Linux:*:*)
3145+ echo ${UNAME_MACHINE}-axis-linux-gnu
3146+ exit ;;
3147+ frv:Linux:*:*)
3148+ echo ${UNAME_MACHINE}-unknown-linux-gnu
3149+ exit ;;
3150+ hexagon:Linux:*:*)
3151+ echo ${UNAME_MACHINE}-unknown-linux-gnu
3152+ exit ;;
3153+ i*86:Linux:*:*)
3154+ LIBC=gnu
3155+ eval $set_cc_for_build
3156+ sed 's/^ //' << EOF >$dummy.c
3157+ #ifdef __dietlibc__
3158+ LIBC=dietlibc
3159+ #endif
3160+EOF
3161+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
3162+ echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
3163+ exit ;;
3164+ ia64:Linux:*:*)
3165+ echo ${UNAME_MACHINE}-unknown-linux-gnu
3166+ exit ;;
3167+ m32r*:Linux:*:*)
3168+ echo ${UNAME_MACHINE}-unknown-linux-gnu
3169+ exit ;;
3170+ m68*:Linux:*:*)
3171+ echo ${UNAME_MACHINE}-unknown-linux-gnu
3172+ exit ;;
3173+ mips:Linux:*:* | mips64:Linux:*:*)
3174+ eval $set_cc_for_build
3175+ sed 's/^ //' << EOF >$dummy.c
3176+ #undef CPU
3177+ #undef ${UNAME_MACHINE}
3178+ #undef ${UNAME_MACHINE}el
3179+ #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
3180+ CPU=${UNAME_MACHINE}el
3181+ #else
3182+ #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
3183+ CPU=${UNAME_MACHINE}
3184+ #else
3185+ CPU=
3186+ #endif
3187+ #endif
3188+EOF
3189+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
3190+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
3191+ ;;
3192+ or32:Linux:*:*)
3193+ echo ${UNAME_MACHINE}-unknown-linux-gnu
3194+ exit ;;
3195+ padre:Linux:*:*)
3196+ echo sparc-unknown-linux-gnu
3197+ exit ;;
3198+ parisc64:Linux:*:* | hppa64:Linux:*:*)
3199+ echo hppa64-unknown-linux-gnu
3200+ exit ;;
3201 parisc:Linux:*:* | hppa:Linux:*:*)
3202 # Look for CPU level
3203 case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
3204@@ -901,14 +969,17 @@
3205 *) echo hppa-unknown-linux-gnu ;;
3206 esac
3207 exit ;;
3208- parisc64:Linux:*:* | hppa64:Linux:*:*)
3209- echo hppa64-unknown-linux-gnu
3210+ ppc64:Linux:*:*)
3211+ echo powerpc64-unknown-linux-gnu
3212+ exit ;;
3213+ ppc:Linux:*:*)
3214+ echo powerpc-unknown-linux-gnu
3215 exit ;;
3216 s390:Linux:*:* | s390x:Linux:*:*)
3217 echo ${UNAME_MACHINE}-ibm-linux
3218 exit ;;
3219 sh64*:Linux:*:*)
3220- echo ${UNAME_MACHINE}-unknown-linux-gnu
3221+ echo ${UNAME_MACHINE}-unknown-linux-gnu
3222 exit ;;
3223 sh*:Linux:*:*)
3224 echo ${UNAME_MACHINE}-unknown-linux-gnu
3225@@ -916,68 +987,18 @@
3226 sparc:Linux:*:* | sparc64:Linux:*:*)
3227 echo ${UNAME_MACHINE}-unknown-linux-gnu
3228 exit ;;
3229+ tile*:Linux:*:*)
3230+ echo ${UNAME_MACHINE}-unknown-linux-gnu
3231+ exit ;;
3232+ vax:Linux:*:*)
3233+ echo ${UNAME_MACHINE}-dec-linux-gnu
3234+ exit ;;
3235 x86_64:Linux:*:*)
3236- echo x86_64-unknown-linux-gnu
3237- exit ;;
3238- i*86:Linux:*:*)
3239- # The BFD linker knows what the default object file format is, so
3240- # first see if it will tell us. cd to the root directory to prevent
3241- # problems with other programs or directories called `ld' in the path.
3242- # Set LC_ALL=C to ensure ld outputs messages in English.
3243- ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
3244- | sed -ne '/supported targets:/!d
3245- s/[ ][ ]*/ /g
3246- s/.*supported targets: *//
3247- s/ .*//
3248- p'`
3249- case "$ld_supported_targets" in
3250- elf32-i386)
3251- TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
3252- ;;
3253- a.out-i386-linux)
3254- echo "${UNAME_MACHINE}-pc-linux-gnuaout"
3255- exit ;;
3256- coff-i386)
3257- echo "${UNAME_MACHINE}-pc-linux-gnucoff"
3258- exit ;;
3259- "")
3260- # Either a pre-BFD a.out linker (linux-gnuoldld) or
3261- # one that does not give us useful --help.
3262- echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
3263- exit ;;
3264- esac
3265- # Determine whether the default compiler is a.out or elf
3266- eval $set_cc_for_build
3267- sed 's/^ //' << EOF >$dummy.c
3268- #include <features.h>
3269- #ifdef __ELF__
3270- # ifdef __GLIBC__
3271- # if __GLIBC__ >= 2
3272- LIBC=gnu
3273- # else
3274- LIBC=gnulibc1
3275- # endif
3276- # else
3277- LIBC=gnulibc1
3278- # endif
3279- #else
3280- #ifdef __INTEL_COMPILER
3281- LIBC=gnu
3282- #else
3283- LIBC=gnuaout
3284- #endif
3285- #endif
3286- #ifdef __dietlibc__
3287- LIBC=dietlibc
3288- #endif
3289-EOF
3290- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
3291- test x"${LIBC}" != x && {
3292- echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
3293- exit
3294- }
3295- test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
3296- ;;
3297+ echo ${UNAME_MACHINE}-unknown-linux-gnu
3298+ exit ;;
3299+ xtensa*:Linux:*:*)
3300+ echo ${UNAME_MACHINE}-unknown-linux-gnu
3301+ exit ;;
3302 i*86:DYNIX/ptx:4*:*)
3303 # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
3304 # earlier versions are messed up and put the nodename in both
3305@@ -985,11 +1006,11 @@
3306 echo i386-sequent-sysv4
3307 exit ;;
3308 i*86:UNIX_SV:4.2MP:2.*)
3309- # Unixware is an offshoot of SVR4, but it has its own version
3310- # number series starting with 2...
3311- # I am not positive that other SVR4 systems won't match this,
3312+ # Unixware is an offshoot of SVR4, but it has its own version
3313+ # number series starting with 2...
3314+ # I am not positive that other SVR4 systems won't match this,
3315 # I just have to hope. -- rms.
3316- # Use sysv4.2uw... so that sysv4* matches it.
3317+ # Use sysv4.2uw... so that sysv4* matches it.
3318 echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
3319 exit ;;
3320 i*86:OS/2:*:*)
3321@@ -1006,7 +1027,7 @@
3322 i*86:syllable:*:*)
3323 echo ${UNAME_MACHINE}-pc-syllable
3324 exit ;;
3325- i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
3326+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*)
3327 echo i386-unknown-lynxos${UNAME_RELEASE}
3328 exit ;;
3329 i*86:*DOS:*:*)
3330@@ -1021,7 +1042,7 @@
3331 fi
3332 exit ;;
3333 i*86:*:5:[678]*)
3334- # UnixWare 7.x, OpenUNIX and OpenServer 6.
3335+ # UnixWare 7.x, OpenUNIX and OpenServer 6.
3336 case `/bin/uname -X | grep "^Machine"` in
3337 *486*) UNAME_MACHINE=i486 ;;
3338 *Pentium) UNAME_MACHINE=i586 ;;
3339@@ -1049,10 +1070,13 @@
3340 exit ;;
3341 pc:*:*:*)
3342 # Left here for compatibility:
3343- # uname -m prints for DJGPP always 'pc', but it prints nothing about
3344- # the processor, so we play safe by assuming i386.
3345- echo i386-pc-msdosdjgpp
3346- exit ;;
3347+ # uname -m prints for DJGPP always 'pc', but it prints nothing about
3348+ # the processor, so we play safe by assuming i586.
3349+ # Note: whatever this is, it MUST be the same as what config.sub
3350+ # prints for the "djgpp" host, or else GDB configury will decide that
3351+ # this is a cross-build.
3352+ echo i586-pc-msdosdjgpp
3353+ exit ;;
3354 Intel:Mach:3*:*)
3355 echo i386-pc-mach3
3356 exit ;;
3357@@ -1087,8 +1111,18 @@
3358 /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
3359 && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
3360 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
3361- /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
3362- && { echo i486-ncr-sysv4; exit; } ;;
3363+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
3364+ && { echo i486-ncr-sysv4; exit; } ;;
3365+ NCR*:*:4.2:* | MPRAS*:*:4.2:*)
3366+ OS_REL='.3'
3367+ test -r /etc/.relid \
3368+ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
3369+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
3370+ && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
3371+ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
3372+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
3373+ /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \
3374+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
3375 m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
3376 echo m68k-unknown-lynxos${UNAME_RELEASE}
3377 exit ;;
3378@@ -1101,7 +1135,7 @@
3379 rs6000:LynxOS:2.*:*)
3380 echo rs6000-unknown-lynxos${UNAME_RELEASE}
3381 exit ;;
3382- PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
3383+ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*)
3384 echo powerpc-unknown-lynxos${UNAME_RELEASE}
3385 exit ;;
3386 SM[BE]S:UNIX_SV:*:*)
3387@@ -1121,10 +1155,10 @@
3388 echo ns32k-sni-sysv
3389 fi
3390 exit ;;
3391- PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
3392- # says <Richard.M.Bartel@ccMail.Census.GOV>
3393- echo i586-unisys-sysv4
3394- exit ;;
3395+ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
3396+ # says <Richard.M.Bartel@ccMail.Census.GOV>
3397+ echo i586-unisys-sysv4
3398+ exit ;;
3399 *:UNIX_System_V:4*:FTX*)
3400 # From Gerald Hewes <hewes@openmarket.com>.
3401 # How about differentiating between stratus architectures? -djm
3402@@ -1150,11 +1184,11 @@
3403 exit ;;
3404 R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
3405 if [ -d /usr/nec ]; then
3406- echo mips-nec-sysv${UNAME_RELEASE}
3407+ echo mips-nec-sysv${UNAME_RELEASE}
3408 else
3409- echo mips-unknown-sysv${UNAME_RELEASE}
3410+ echo mips-unknown-sysv${UNAME_RELEASE}
3411 fi
3412- exit ;;
3413+ exit ;;
3414 BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
3415 echo powerpc-be-beos
3416 exit ;;
3417@@ -1164,6 +1198,9 @@
3418 BePC:BeOS:*:*) # BeOS running on Intel PC compatible.
3419 echo i586-pc-beos
3420 exit ;;
3421+ BePC:Haiku:*:*) # Haiku running on Intel PC compatible.
3422+ echo i586-pc-haiku
3423+ exit ;;
3424 SX-4:SUPER-UX:*:*)
3425 echo sx4-nec-superux${UNAME_RELEASE}
3426 exit ;;
3427@@ -1173,6 +1210,15 @@
3428 SX-6:SUPER-UX:*:*)
3429 echo sx6-nec-superux${UNAME_RELEASE}
3430 exit ;;
3431+ SX-7:SUPER-UX:*:*)
3432+ echo sx7-nec-superux${UNAME_RELEASE}
3433+ exit ;;
3434+ SX-8:SUPER-UX:*:*)
3435+ echo sx8-nec-superux${UNAME_RELEASE}
3436+ exit ;;
3437+ SX-8R:SUPER-UX:*:*)
3438+ echo sx8r-nec-superux${UNAME_RELEASE}
3439+ exit ;;
3440 Power*:Rhapsody:*:*)
3441 echo powerpc-apple-rhapsody${UNAME_RELEASE}
3442 exit ;;
3443@@ -1182,7 +1228,16 @@
3444 *:Darwin:*:*)
3445 UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
3446 case $UNAME_PROCESSOR in
3447- *86) UNAME_PROCESSOR=i686 ;;
3448+ i386)
3449+ eval $set_cc_for_build
3450+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
3451+ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
3452+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
3453+ grep IS_64BIT_ARCH >/dev/null
3454+ then
3455+ UNAME_PROCESSOR="x86_64"
3456+ fi
3457+ fi ;;
3458 unknown) UNAME_PROCESSOR=powerpc ;;
3459 esac
3460 echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
3461@@ -1198,6 +1253,9 @@
3462 *:QNX:*:4*)
3463 echo i386-pc-qnx
3464 exit ;;
3465+ NEO-?:NONSTOP_KERNEL:*:*)
3466+ echo neo-tandem-nsk${UNAME_RELEASE}
3467+ exit ;;
3468 NSE-?:NONSTOP_KERNEL:*:*)
3469 echo nse-tandem-nsk${UNAME_RELEASE}
3470 exit ;;
3471@@ -1243,13 +1301,13 @@
3472 echo pdp10-unknown-its
3473 exit ;;
3474 SEI:*:*:SEIUX)
3475- echo mips-sei-seiux${UNAME_RELEASE}
3476+ echo mips-sei-seiux${UNAME_RELEASE}
3477 exit ;;
3478 *:DragonFly:*:*)
3479 echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
3480 exit ;;
3481 *:*VMS:*:*)
3482- UNAME_MACHINE=`(uname -p) 2>/dev/null`
3483+ UNAME_MACHINE=`(uname -p) 2>/dev/null`
3484 case "${UNAME_MACHINE}" in
3485 A*) echo alpha-dec-vms ; exit ;;
3486 I*) echo ia64-dec-vms ; exit ;;
3487@@ -1261,6 +1319,15 @@
3488 i*86:skyos:*:*)
3489 echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
3490 exit ;;
3491+ i*86:rdos:*:*)
3492+ echo ${UNAME_MACHINE}-pc-rdos
3493+ exit ;;
3494+ i*86:AROS:*:*)
3495+ echo ${UNAME_MACHINE}-pc-aros
3496+ exit ;;
3497+ x86_64:VMkernel:*:*)
3498+ echo ${UNAME_MACHINE}-unknown-esx
3499+ exit ;;
3500 esac
3501
3502 #echo '(No uname command or uname output not recognized.)' 1>&2
3503@@ -1283,11 +1350,11 @@
3504 #include <sys/param.h>
3505 printf ("m68k-sony-newsos%s\n",
3506 #ifdef NEWSOS4
3507- "4"
3508+ "4"
3509 #else
3510- ""
3511+ ""
3512 #endif
3513- ); exit (0);
3514+ ); exit (0);
3515 #endif
3516 #endif
3517
3518@@ -1421,9 +1488,9 @@
3519 the operating system you are using. It is advised that you
3520 download the most up to date version of the config scripts from
3521
3522- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
3523+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
3524 and
3525- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
3526+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
3527
3528 If the version you run ($0) is already up to date, please
3529 send the following data and any information you think might be
3530
3531=== modified file 'config.h.in'
3532--- config.h.in 2012-06-30 15:30:45 +0000
3533+++ config.h.in 2015-03-03 21:10:45 +0000
3534@@ -90,20 +90,3 @@
3535
3536 /* Define to 1 if the X Window System is missing or not being used. */
3537 #undef X_DISPLAY_MISSING
3538-
3539-/* Define to 1 if on AIX 3.
3540- System headers sometimes define this.
3541- We just want to avoid a redefinition error message. */
3542-#ifndef _ALL_SOURCE
3543-# undef _ALL_SOURCE
3544-#endif
3545-
3546-/* Define to 1 if on MINIX. */
3547-#undef _MINIX
3548-
3549-/* Define to 2 if the system does not provide POSIX.1 features except with
3550- this defined. */
3551-#undef _POSIX_1_SOURCE
3552-
3553-/* Define to 1 if you need to in order for `stat' and other things to work. */
3554-#undef _POSIX_SOURCE
3555
3556=== modified file 'config.sub'
3557--- config.sub 2012-06-30 15:30:45 +0000
3558+++ config.sub 2015-03-03 21:10:45 +0000
3559@@ -1,9 +1,10 @@
3560 #! /bin/sh
3561 # Configuration validation subroutine script.
3562 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
3563-# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
3564+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
3565+# 2011, 2012 Free Software Foundation, Inc.
3566
3567-timestamp='2005-07-08'
3568+timestamp='2012-02-10'
3569
3570 # This file is (in principle) common to ALL GNU software.
3571 # The presence of a machine in this file suggests that SOME GNU software
3572@@ -20,9 +21,7 @@
3573 # GNU General Public License for more details.
3574 #
3575 # You should have received a copy of the GNU General Public License
3576-# along with this program; if not, write to the Free Software
3577-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
3578-# 02110-1301, USA.
3579+# along with this program; if not, see <http://www.gnu.org/licenses/>.
3580 #
3581 # As a special exception to the GNU General Public License, if you
3582 # distribute this file as part of a program that contains a
3583@@ -31,13 +30,16 @@
3584
3585
3586 # Please send patches to <config-patches@gnu.org>. Submit a context
3587-# diff and a properly formatted ChangeLog entry.
3588+# diff and a properly formatted GNU ChangeLog entry.
3589 #
3590 # Configuration subroutine to validate and canonicalize a configuration type.
3591 # Supply the specified configuration type as an argument.
3592 # If it is invalid, we print an error message on stderr and exit with code 1.
3593 # Otherwise, we print the canonical config type on stdout and succeed.
3594
3595+# You can get the latest version of this script from:
3596+# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
3597+
3598 # This file is supposed to be the same for all GNU packages
3599 # and recognize all the CPU types, system types and aliases
3600 # that are meaningful with *any* GNU software.
3601@@ -71,7 +73,8 @@
3602 version="\
3603 GNU config.sub ($timestamp)
3604
3605-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
3606+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
3607+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
3608 Free Software Foundation, Inc.
3609
3610 This is free software; see the source for copying conditions. There is NO
3611@@ -119,11 +122,18 @@
3612 # Here we must recognize all the valid KERNEL-OS combinations.
3613 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
3614 case $maybe_os in
3615- nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
3616- kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
3617+ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
3618+ linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
3619+ knetbsd*-gnu* | netbsd*-gnu* | \
3620+ kopensolaris*-gnu* | \
3621+ storm-chaos* | os2-emx* | rtmk-nova*)
3622 os=-$maybe_os
3623 basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
3624 ;;
3625+ android-linux)
3626+ os=-linux-android
3627+ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
3628+ ;;
3629 *)
3630 basic_machine=`echo $1 | sed 's/-[^-]*$//'`
3631 if [ $basic_machine != $1 ]
3632@@ -146,10 +156,13 @@
3633 -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
3634 -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
3635 -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
3636- -apple | -axis | -knuth | -cray)
3637+ -apple | -axis | -knuth | -cray | -microblaze)
3638 os=
3639 basic_machine=$1
3640 ;;
3641+ -bluegene*)
3642+ os=-cnk
3643+ ;;
3644 -sim | -cisco | -oki | -wec | -winbond)
3645 os=
3646 basic_machine=$1
3647@@ -164,13 +177,17 @@
3648 os=-chorusos
3649 basic_machine=$1
3650 ;;
3651- -chorusrdb)
3652- os=-chorusrdb
3653+ -chorusrdb)
3654+ os=-chorusrdb
3655 basic_machine=$1
3656- ;;
3657+ ;;
3658 -hiux*)
3659 os=-hiuxwe2
3660 ;;
3661+ -sco6)
3662+ os=-sco5v6
3663+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
3664+ ;;
3665 -sco5)
3666 os=-sco3.2v5
3667 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
3668@@ -187,6 +204,10 @@
3669 # Don't forget version if it is 3.2v4 or newer.
3670 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
3671 ;;
3672+ -sco5v6*)
3673+ # Don't forget version if it is 3.2v4 or newer.
3674+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
3675+ ;;
3676 -sco*)
3677 os=-sco3.2v2
3678 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
3679@@ -228,23 +249,32 @@
3680 # Some are omitted here because they have special meanings below.
3681 1750a | 580 \
3682 | a29k \
3683+ | aarch64 | aarch64_be \
3684 | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
3685 | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
3686 | am33_2.0 \
3687- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
3688+ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
3689+ | be32 | be64 \
3690 | bfin \
3691 | c4x | clipper \
3692 | d10v | d30v | dlx | dsp16xx \
3693- | fr30 | frv \
3694+ | epiphany \
3695+ | fido | fr30 | frv \
3696 | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
3697+ | hexagon \
3698 | i370 | i860 | i960 | ia64 \
3699 | ip2k | iq2000 \
3700- | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
3701+ | le32 | le64 \
3702+ | lm32 \
3703+ | m32c | m32r | m32rle | m68000 | m68k | m88k \
3704+ | maxq | mb | microblaze | mcore | mep | metag \
3705 | mips | mipsbe | mipseb | mipsel | mipsle \
3706 | mips16 \
3707 | mips64 | mips64el \
3708+ | mips64octeon | mips64octeonel \
3709+ | mips64orion | mips64orionel \
3710+ | mips64r5900 | mips64r5900el \
3711 | mips64vr | mips64vrel \
3712- | mips64orion | mips64orionel \
3713 | mips64vr4100 | mips64vr4100el \
3714 | mips64vr4300 | mips64vr4300el \
3715 | mips64vr5000 | mips64vr5000el \
3716@@ -257,35 +287,65 @@
3717 | mipsisa64sr71k | mipsisa64sr71kel \
3718 | mipstx39 | mipstx39el \
3719 | mn10200 | mn10300 \
3720- | ms1 \
3721+ | moxie \
3722+ | mt \
3723 | msp430 \
3724+ | nds32 | nds32le | nds32be \
3725+ | nios | nios2 \
3726 | ns16k | ns32k \
3727+ | open8 \
3728 | or32 \
3729 | pdp10 | pdp11 | pj | pjl \
3730- | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
3731+ | powerpc | powerpc64 | powerpc64le | powerpcle \
3732 | pyramid \
3733- | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
3734+ | rl78 | rx \
3735+ | score \
3736+ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
3737 | sh64 | sh64le \
3738- | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
3739- | sparcv8 | sparcv9 | sparcv9b \
3740- | strongarm \
3741- | tahoe | thumb | tic4x | tic80 | tron \
3742- | v850 | v850e \
3743+ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
3744+ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
3745+ | spu \
3746+ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
3747+ | ubicom32 \
3748+ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
3749 | we32k \
3750- | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
3751- | z8k)
3752- basic_machine=$basic_machine-unknown
3753- ;;
3754- m32c)
3755- basic_machine=$basic_machine-unknown
3756- ;;
3757- m6811 | m68hc11 | m6812 | m68hc12)
3758- # Motorola 68HC11/12.
3759+ | x86 | xc16x | xstormy16 | xtensa \
3760+ | z8k | z80)
3761+ basic_machine=$basic_machine-unknown
3762+ ;;
3763+ c54x)
3764+ basic_machine=tic54x-unknown
3765+ ;;
3766+ c55x)
3767+ basic_machine=tic55x-unknown
3768+ ;;
3769+ c6x)
3770+ basic_machine=tic6x-unknown
3771+ ;;
3772+ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
3773 basic_machine=$basic_machine-unknown
3774 os=-none
3775 ;;
3776 m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
3777 ;;
3778+ ms1)
3779+ basic_machine=mt-unknown
3780+ ;;
3781+
3782+ strongarm | thumb | xscale)
3783+ basic_machine=arm-unknown
3784+ ;;
3785+ xgate)
3786+ basic_machine=$basic_machine-unknown
3787+ os=-none
3788+ ;;
3789+ xscaleeb)
3790+ basic_machine=armeb-unknown
3791+ ;;
3792+
3793+ xscaleel)
3794+ basic_machine=armel-unknown
3795+ ;;
3796
3797 # We use `pc' rather than `unknown'
3798 # because (1) that's what they normally are, and
3799@@ -301,29 +361,36 @@
3800 # Recognize the basic CPU types with company name.
3801 580-* \
3802 | a29k-* \
3803+ | aarch64-* | aarch64_be-* \
3804 | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
3805 | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
3806 | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
3807 | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
3808- | avr-* \
3809+ | avr-* | avr32-* \
3810+ | be32-* | be64-* \
3811 | bfin-* | bs2000-* \
3812- | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
3813+ | c[123]* | c30-* | [cjt]90-* | c4x-* \
3814 | clipper-* | craynv-* | cydra-* \
3815 | d10v-* | d30v-* | dlx-* \
3816 | elxsi-* \
3817- | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
3818+ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
3819 | h8300-* | h8500-* \
3820 | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
3821+ | hexagon-* \
3822 | i*86-* | i860-* | i960-* | ia64-* \
3823 | ip2k-* | iq2000-* \
3824- | m32r-* | m32rle-* \
3825+ | le32-* | le64-* \
3826+ | lm32-* \
3827+ | m32c-* | m32r-* | m32rle-* \
3828 | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
3829- | m88110-* | m88k-* | maxq-* | mcore-* \
3830+ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \
3831 | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
3832 | mips16-* \
3833 | mips64-* | mips64el-* \
3834+ | mips64octeon-* | mips64octeonel-* \
3835+ | mips64orion-* | mips64orionel-* \
3836+ | mips64r5900-* | mips64r5900el-* \
3837 | mips64vr-* | mips64vrel-* \
3838- | mips64orion-* | mips64orionel-* \
3839 | mips64vr4100-* | mips64vr4100el-* \
3840 | mips64vr4300-* | mips64vr4300el-* \
3841 | mips64vr5000-* | mips64vr5000el-* \
3842@@ -336,30 +403,38 @@
3843 | mipsisa64sr71k-* | mipsisa64sr71kel-* \
3844 | mipstx39-* | mipstx39el-* \
3845 | mmix-* \
3846- | ms1-* \
3847+ | mt-* \
3848 | msp430-* \
3849+ | nds32-* | nds32le-* | nds32be-* \
3850+ | nios-* | nios2-* \
3851 | none-* | np1-* | ns16k-* | ns32k-* \
3852+ | open8-* \
3853 | orion-* \
3854 | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
3855- | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
3856+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
3857 | pyramid-* \
3858- | romp-* | rs6000-* \
3859- | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
3860+ | rl78-* | romp-* | rs6000-* | rx-* \
3861+ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
3862 | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
3863- | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
3864+ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
3865 | sparclite-* \
3866- | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
3867- | tahoe-* | thumb-* \
3868+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
3869+ | tahoe-* \
3870 | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
3871+ | tile*-* \
3872 | tron-* \
3873- | v850-* | v850e-* | vax-* \
3874+ | ubicom32-* \
3875+ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
3876+ | vax-* \
3877 | we32k-* \
3878- | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
3879- | xstormy16-* | xtensa-* \
3880+ | x86-* | x86_64-* | xc16x-* | xps100-* \
3881+ | xstormy16-* | xtensa*-* \
3882 | ymp-* \
3883- | z8k-*)
3884+ | z8k-* | z80-*)
3885 ;;
3886- m32c-*)
3887+ # Recognize the basic CPU types without company name, with glob match.
3888+ xtensa*)
3889+ basic_machine=$basic_machine-unknown
3890 ;;
3891 # Recognize the various machine names and aliases which stand
3892 # for a CPU type and a company and sometimes even an OS.
3893@@ -377,7 +452,7 @@
3894 basic_machine=a29k-amd
3895 os=-udi
3896 ;;
3897- abacus)
3898+ abacus)
3899 basic_machine=abacus-unknown
3900 ;;
3901 adobe68k)
3902@@ -423,6 +498,10 @@
3903 basic_machine=m68k-apollo
3904 os=-bsd
3905 ;;
3906+ aros)
3907+ basic_machine=i386-pc
3908+ os=-aros
3909+ ;;
3910 aux)
3911 basic_machine=m68k-apple
3912 os=-aux
3913@@ -431,10 +510,35 @@
3914 basic_machine=ns32k-sequent
3915 os=-dynix
3916 ;;
3917+ blackfin)
3918+ basic_machine=bfin-unknown
3919+ os=-linux
3920+ ;;
3921+ blackfin-*)
3922+ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
3923+ os=-linux
3924+ ;;
3925+ bluegene*)
3926+ basic_machine=powerpc-ibm
3927+ os=-cnk
3928+ ;;
3929+ c54x-*)
3930+ basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
3931+ ;;
3932+ c55x-*)
3933+ basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
3934+ ;;
3935+ c6x-*)
3936+ basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
3937+ ;;
3938 c90)
3939 basic_machine=c90-cray
3940 os=-unicos
3941 ;;
3942+ cegcc)
3943+ basic_machine=arm-unknown
3944+ os=-cegcc
3945+ ;;
3946 convex-c1)
3947 basic_machine=c1-convex
3948 os=-bsd
3949@@ -463,8 +567,8 @@
3950 basic_machine=craynv-cray
3951 os=-unicosmp
3952 ;;
3953- cr16c)
3954- basic_machine=cr16c-unknown
3955+ cr16 | cr16-*)
3956+ basic_machine=cr16-unknown
3957 os=-elf
3958 ;;
3959 crds | unos)
3960@@ -502,6 +606,10 @@
3961 basic_machine=m88k-motorola
3962 os=-sysv3
3963 ;;
3964+ dicos)
3965+ basic_machine=i686-pc
3966+ os=-dicos
3967+ ;;
3968 djgpp)
3969 basic_machine=i586-pc
3970 os=-msdosdjgpp
3971@@ -617,7 +725,6 @@
3972 i370-ibm* | ibm*)
3973 basic_machine=i370-ibm
3974 ;;
3975-# I'm not sure what "Sysv32" means. Should this be sysv3.2?
3976 i*86v32)
3977 basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
3978 os=-sysv32
3979@@ -656,6 +763,14 @@
3980 basic_machine=m68k-isi
3981 os=-sysv
3982 ;;
3983+ m68knommu)
3984+ basic_machine=m68k-unknown
3985+ os=-linux
3986+ ;;
3987+ m68knommu-*)
3988+ basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
3989+ os=-linux
3990+ ;;
3991 m88k-omron*)
3992 basic_machine=m88k-omron
3993 ;;
3994@@ -667,10 +782,17 @@
3995 basic_machine=ns32k-utek
3996 os=-sysv
3997 ;;
3998+ microblaze)
3999+ basic_machine=microblaze-xilinx
4000+ ;;
4001 mingw32)
4002 basic_machine=i386-pc
4003 os=-mingw32
4004 ;;
4005+ mingw32ce)
4006+ basic_machine=arm-unknown
4007+ os=-mingw32ce
4008+ ;;
4009 miniframe)
4010 basic_machine=m68000-convergent
4011 ;;
4012@@ -696,10 +818,21 @@
4013 basic_machine=i386-pc
4014 os=-msdos
4015 ;;
4016+ ms1-*)
4017+ basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
4018+ ;;
4019+ msys)
4020+ basic_machine=i386-pc
4021+ os=-msys
4022+ ;;
4023 mvs)
4024 basic_machine=i370-ibm
4025 os=-mvs
4026 ;;
4027+ nacl)
4028+ basic_machine=le32-unknown
4029+ os=-nacl
4030+ ;;
4031 ncr3000)
4032 basic_machine=i486-ncr
4033 os=-sysv4
4034@@ -764,6 +897,12 @@
4035 np1)
4036 basic_machine=np1-gould
4037 ;;
4038+ neo-tandem)
4039+ basic_machine=neo-tandem
4040+ ;;
4041+ nse-tandem)
4042+ basic_machine=nse-tandem
4043+ ;;
4044 nsr-tandem)
4045 basic_machine=nsr-tandem
4046 ;;
4047@@ -794,6 +933,14 @@
4048 basic_machine=i860-intel
4049 os=-osf
4050 ;;
4051+ parisc)
4052+ basic_machine=hppa-unknown
4053+ os=-linux
4054+ ;;
4055+ parisc-*)
4056+ basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
4057+ os=-linux
4058+ ;;
4059 pbd)
4060 basic_machine=sparc-tti
4061 ;;
4062@@ -803,6 +950,12 @@
4063 pc532 | pc532-*)
4064 basic_machine=ns32k-pc532
4065 ;;
4066+ pc98)
4067+ basic_machine=i386-pc
4068+ ;;
4069+ pc98-*)
4070+ basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
4071+ ;;
4072 pentium | p5 | k5 | k6 | nexgen | viac3)
4073 basic_machine=i586-pc
4074 ;;
4075@@ -832,9 +985,10 @@
4076 ;;
4077 power) basic_machine=power-ibm
4078 ;;
4079- ppc) basic_machine=powerpc-unknown
4080+ ppc | ppcbe) basic_machine=powerpc-unknown
4081 ;;
4082- ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
4083+ ppc-* | ppcbe-*)
4084+ basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
4085 ;;
4086 ppcle | powerpclittle | ppc-le | powerpc-little)
4087 basic_machine=powerpcle-unknown
4088@@ -859,6 +1013,10 @@
4089 basic_machine=i586-unknown
4090 os=-pw32
4091 ;;
4092+ rdos)
4093+ basic_machine=i386-pc
4094+ os=-rdos
4095+ ;;
4096 rom68k)
4097 basic_machine=m68k-rom68k
4098 os=-coff
4099@@ -885,6 +1043,10 @@
4100 sb1el)
4101 basic_machine=mipsisa64sb1el-unknown
4102 ;;
4103+ sde)
4104+ basic_machine=mipsisa32-sde
4105+ os=-elf
4106+ ;;
4107 sei)
4108 basic_machine=mips-sei
4109 os=-seiux
4110@@ -896,6 +1058,9 @@
4111 basic_machine=sh-hitachi
4112 os=-hms
4113 ;;
4114+ sh5el)
4115+ basic_machine=sh5le-unknown
4116+ ;;
4117 sh64)
4118 basic_machine=sh64-unknown
4119 ;;
4120@@ -917,6 +1082,9 @@
4121 basic_machine=i860-stratus
4122 os=-sysv4
4123 ;;
4124+ strongarm-* | thumb-*)
4125+ basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
4126+ ;;
4127 sun2)
4128 basic_machine=m68000-sun
4129 ;;
4130@@ -973,17 +1141,9 @@
4131 basic_machine=t90-cray
4132 os=-unicos
4133 ;;
4134- tic54x | c54x*)
4135- basic_machine=tic54x-unknown
4136- os=-coff
4137- ;;
4138- tic55x | c55x*)
4139- basic_machine=tic55x-unknown
4140- os=-coff
4141- ;;
4142- tic6x | c6x*)
4143- basic_machine=tic6x-unknown
4144- os=-coff
4145+ tile*)
4146+ basic_machine=$basic_machine-unknown
4147+ os=-linux-gnu
4148 ;;
4149 tx39)
4150 basic_machine=mipstx39-unknown
4151@@ -1052,6 +1212,9 @@
4152 xps | xps100)
4153 basic_machine=xps100-honeywell
4154 ;;
4155+ xscale-* | xscalee[bl]-*)
4156+ basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
4157+ ;;
4158 ymp)
4159 basic_machine=ymp-cray
4160 os=-unicos
4161@@ -1060,6 +1223,10 @@
4162 basic_machine=z8k-unknown
4163 os=-sim
4164 ;;
4165+ z80-*-coff)
4166+ basic_machine=z80-unknown
4167+ os=-sim
4168+ ;;
4169 none)
4170 basic_machine=none-none
4171 os=-none
4172@@ -1098,10 +1265,10 @@
4173 we32k)
4174 basic_machine=we32k-att
4175 ;;
4176- sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
4177+ sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele)
4178 basic_machine=sh-unknown
4179 ;;
4180- sparc | sparcv8 | sparcv9 | sparcv9b)
4181+ sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
4182 basic_machine=sparc-sun
4183 ;;
4184 cydra)
4185@@ -1145,9 +1312,12 @@
4186 if [ x"$os" != x"" ]
4187 then
4188 case $os in
4189- # First match some system type aliases
4190- # that might get confused with valid system types.
4191+ # First match some system type aliases
4192+ # that might get confused with valid system types.
4193 # -solaris* is a basic system type, with this one exception.
4194+ -auroraux)
4195+ os=-auroraux
4196+ ;;
4197 -solaris1 | -solaris1.*)
4198 os=`echo $os | sed -e 's|solaris1|sunos4|'`
4199 ;;
4200@@ -1168,27 +1338,31 @@
4201 # Each alternative MUST END IN A *, to match a version number.
4202 # -sysv* is not here because it comes later, after sysvr4.
4203 -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
4204- | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
4205- | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
4206+ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\
4207+ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
4208+ | -sym* | -kopensolaris* \
4209 | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
4210- | -aos* \
4211+ | -aos* | -aros* \
4212 | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
4213 | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
4214- | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
4215+ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
4216+ | -openbsd* | -solidbsd* \
4217 | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
4218 | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
4219 | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
4220 | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
4221- | -chorusos* | -chorusrdb* \
4222- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
4223- | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
4224+ | -chorusos* | -chorusrdb* | -cegcc* \
4225+ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
4226+ | -mingw32* | -linux-gnu* | -linux-android* \
4227+ | -linux-newlib* | -linux-uclibc* \
4228+ | -uxpv* | -beos* | -mpeix* | -udk* \
4229 | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
4230 | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
4231 | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
4232 | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
4233 | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
4234 | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
4235- | -skyos* | -haiku*)
4236+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
4237 # Remember, each alternative MUST END IN *, to match a version number.
4238 ;;
4239 -qnx*)
4240@@ -1227,7 +1401,7 @@
4241 -opened*)
4242 os=-openedition
4243 ;;
4244- -os400*)
4245+ -os400*)
4246 os=-os400
4247 ;;
4248 -wince*)
4249@@ -1276,7 +1450,7 @@
4250 -sinix*)
4251 os=-sysv4
4252 ;;
4253- -tpf*)
4254+ -tpf*)
4255 os=-tpf
4256 ;;
4257 -triton*)
4258@@ -1318,6 +1492,11 @@
4259 -zvmoe)
4260 os=-zvmoe
4261 ;;
4262+ -dicos*)
4263+ os=-dicos
4264+ ;;
4265+ -nacl*)
4266+ ;;
4267 -none)
4268 ;;
4269 *)
4270@@ -1340,6 +1519,12 @@
4271 # system, and we'll never get to this point.
4272
4273 case $basic_machine in
4274+ score-*)
4275+ os=-elf
4276+ ;;
4277+ spu-*)
4278+ os=-elf
4279+ ;;
4280 *-acorn)
4281 os=-riscix1.2
4282 ;;
4283@@ -1349,9 +1534,18 @@
4284 arm*-semi)
4285 os=-aout
4286 ;;
4287- c4x-* | tic4x-*)
4288- os=-coff
4289- ;;
4290+ c4x-* | tic4x-*)
4291+ os=-coff
4292+ ;;
4293+ tic54x-*)
4294+ os=-coff
4295+ ;;
4296+ tic55x-*)
4297+ os=-coff
4298+ ;;
4299+ tic6x-*)
4300+ os=-coff
4301+ ;;
4302 # This must come before the *-dec entry.
4303 pdp10-*)
4304 os=-tops20
4305@@ -1370,13 +1564,13 @@
4306 ;;
4307 m68000-sun)
4308 os=-sunos3
4309- # This also exists in the configure program, but was not the
4310- # default.
4311- # os=-sunos4
4312 ;;
4313 m68*-cisco)
4314 os=-aout
4315 ;;
4316+ mep-*)
4317+ os=-elf
4318+ ;;
4319 mips*-cisco)
4320 os=-elf
4321 ;;
4322@@ -1401,7 +1595,7 @@
4323 *-ibm)
4324 os=-aix
4325 ;;
4326- *-knuth)
4327+ *-knuth)
4328 os=-mmixware
4329 ;;
4330 *-wec)
4331@@ -1506,7 +1700,7 @@
4332 -sunos*)
4333 vendor=sun
4334 ;;
4335- -aix*)
4336+ -cnk*|-aix*)
4337 vendor=ibm
4338 ;;
4339 -beos*)
4340
4341=== modified file 'configure'
4342--- configure 2012-06-30 15:30:45 +0000
4343+++ configure 2015-03-03 21:10:45 +0000
4344@@ -1,11 +1,11 @@
4345 #! /bin/sh
4346 # Guess values for system-dependent variables and create Makefiles.
4347-# Generated by GNU Autoconf 2.61 for Free Space Checker 1.0.1.
4348+# Generated by GNU Autoconf 2.63 for Free Space Checker 1.0.2.
4349 #
4350 # Report bugs to <http://bugzilla.xfce.org/>.
4351 #
4352 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
4353-# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
4354+# 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
4355 # This configure script is free software; the Free Software Foundation
4356 # gives unlimited permission to copy, distribute and modify it.
4357 ## --------------------- ##
4358@@ -17,7 +17,7 @@
4359 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
4360 emulate sh
4361 NULLCMD=:
4362- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
4363+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
4364 # is contrary to our usage. Disable this feature.
4365 alias -g '${1+"$@"}'='"$@"'
4366 setopt NO_GLOB_SUBST
4367@@ -39,17 +39,45 @@
4368 as_cr_digits='0123456789'
4369 as_cr_alnum=$as_cr_Letters$as_cr_digits
4370
4371+as_nl='
4372+'
4373+export as_nl
4374+# Printing a long string crashes Solaris 7 /usr/bin/printf.
4375+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
4376+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
4377+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
4378+if (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
4379+ as_echo='printf %s\n'
4380+ as_echo_n='printf %s'
4381+else
4382+ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
4383+ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
4384+ as_echo_n='/usr/ucb/echo -n'
4385+ else
4386+ as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
4387+ as_echo_n_body='eval
4388+ arg=$1;
4389+ case $arg in
4390+ *"$as_nl"*)
4391+ expr "X$arg" : "X\\(.*\\)$as_nl";
4392+ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
4393+ esac;
4394+ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
4395+ '
4396+ export as_echo_n_body
4397+ as_echo_n='sh -c $as_echo_n_body as_echo'
4398+ fi
4399+ export as_echo_body
4400+ as_echo='sh -c $as_echo_body as_echo'
4401+fi
4402+
4403 # The user is always right.
4404 if test "${PATH_SEPARATOR+set}" != set; then
4405- echo "#! /bin/sh" >conf$$.sh
4406- echo "exit 0" >>conf$$.sh
4407- chmod +x conf$$.sh
4408- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
4409- PATH_SEPARATOR=';'
4410- else
4411- PATH_SEPARATOR=:
4412- fi
4413- rm -f conf$$.sh
4414+ PATH_SEPARATOR=:
4415+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
4416+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
4417+ PATH_SEPARATOR=';'
4418+ }
4419 fi
4420
4421 # Support unset when possible.
4422@@ -65,8 +93,6 @@
4423 # there to prevent editors from complaining about space-tab.
4424 # (If _AS_PATH_WALK were called with IFS unset, it would disable word
4425 # splitting by setting IFS to empty value.)
4426-as_nl='
4427-'
4428 IFS=" "" $as_nl"
4429
4430 # Find who we are. Look in the path if we contain no directory separator.
4431@@ -89,7 +115,7 @@
4432 as_myself=$0
4433 fi
4434 if test ! -f "$as_myself"; then
4435- echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
4436+ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
4437 { (exit 1); exit 1; }
4438 fi
4439
4440@@ -102,17 +128,10 @@
4441 PS4='+ '
4442
4443 # NLS nuisances.
4444-for as_var in \
4445- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
4446- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
4447- LC_TELEPHONE LC_TIME
4448-do
4449- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
4450- eval $as_var=C; export $as_var
4451- else
4452- ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
4453- fi
4454-done
4455+LC_ALL=C
4456+export LC_ALL
4457+LANGUAGE=C
4458+export LANGUAGE
4459
4460 # Required to use basename.
4461 if expr a : '\(a\)' >/dev/null 2>&1 &&
4462@@ -134,7 +153,7 @@
4463 $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
4464 X"$0" : 'X\(//\)$' \| \
4465 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
4466-echo X/"$0" |
4467+$as_echo X/"$0" |
4468 sed '/^.*\/\([^/][^/]*\)\/*$/{
4469 s//\1/
4470 q
4471@@ -160,7 +179,7 @@
4472 as_have_required=no
4473 fi
4474
4475- if test $as_have_required = yes && (eval ":
4476+ if test $as_have_required = yes && (eval ":
4477 (as_func_return () {
4478 (exit \$1)
4479 }
4480@@ -251,7 +270,7 @@
4481 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
4482 emulate sh
4483 NULLCMD=:
4484- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
4485+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
4486 # is contrary to our usage. Disable this feature.
4487 alias -g '${1+"$@"}'='"$@"'
4488 setopt NO_GLOB_SUBST
4489@@ -272,7 +291,7 @@
4490 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
4491 emulate sh
4492 NULLCMD=:
4493- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
4494+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
4495 # is contrary to our usage. Disable this feature.
4496 alias -g '${1+"$@"}'='"$@"'
4497 setopt NO_GLOB_SUBST
4498@@ -361,10 +380,10 @@
4499
4500 if test "x$CONFIG_SHELL" != x; then
4501 for as_var in BASH_ENV ENV
4502- do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
4503- done
4504- export CONFIG_SHELL
4505- exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
4506+ do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
4507+ done
4508+ export CONFIG_SHELL
4509+ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
4510 fi
4511
4512
4513@@ -433,9 +452,10 @@
4514
4515 test \$exitcode = 0") || {
4516 echo No shell found that supports shell functions.
4517- echo Please tell autoconf@gnu.org about your system,
4518- echo including any error possibly output before this
4519- echo message
4520+ echo Please tell bug-autoconf@gnu.org about your system,
4521+ echo including any error possibly output before this message.
4522+ echo This can help us improve future autoconf versions.
4523+ echo Configuration will now proceed without shell functions.
4524 }
4525
4526
4527@@ -471,7 +491,7 @@
4528 s/-\n.*//
4529 ' >$as_me.lineno &&
4530 chmod +x "$as_me.lineno" ||
4531- { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
4532+ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
4533 { (exit 1); exit 1; }; }
4534
4535 # Don't try to exec as it changes $[0], causing all sort of problems
4536@@ -499,7 +519,6 @@
4537 *)
4538 ECHO_N='-n';;
4539 esac
4540-
4541 if expr a : '\(a\)' >/dev/null 2>&1 &&
4542 test "X`expr 00001 : '.*\(...\)'`" = X001; then
4543 as_expr=expr
4544@@ -512,19 +531,22 @@
4545 rm -f conf$$.dir/conf$$.file
4546 else
4547 rm -f conf$$.dir
4548- mkdir conf$$.dir
4549+ mkdir conf$$.dir 2>/dev/null
4550 fi
4551-echo >conf$$.file
4552-if ln -s conf$$.file conf$$ 2>/dev/null; then
4553- as_ln_s='ln -s'
4554- # ... but there are two gotchas:
4555- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
4556- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
4557- # In both cases, we have to default to `cp -p'.
4558- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
4559+if (echo >conf$$.file) 2>/dev/null; then
4560+ if ln -s conf$$.file conf$$ 2>/dev/null; then
4561+ as_ln_s='ln -s'
4562+ # ... but there are two gotchas:
4563+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
4564+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
4565+ # In both cases, we have to default to `cp -p'.
4566+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
4567+ as_ln_s='cp -p'
4568+ elif ln conf$$.file conf$$ 2>/dev/null; then
4569+ as_ln_s=ln
4570+ else
4571 as_ln_s='cp -p'
4572-elif ln conf$$.file conf$$ 2>/dev/null; then
4573- as_ln_s=ln
4574+ fi
4575 else
4576 as_ln_s='cp -p'
4577 fi
4578@@ -549,10 +571,10 @@
4579 as_test_x='
4580 eval sh -c '\''
4581 if test -d "$1"; then
4582- test -d "$1/.";
4583+ test -d "$1/.";
4584 else
4585 case $1 in
4586- -*)set "./$1";;
4587+ -*)set "./$1";;
4588 esac;
4589 case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
4590 ???[sx]*):;;*)false;;esac;fi
4591@@ -594,8 +616,8 @@
4592 # Identity of this package.
4593 PACKAGE_NAME='Free Space Checker'
4594 PACKAGE_TARNAME='xfce4-fsguard-plugin'
4595-PACKAGE_VERSION='1.0.1'
4596-PACKAGE_STRING='Free Space Checker 1.0.1'
4597+PACKAGE_VERSION='1.0.2'
4598+PACKAGE_STRING='Free Space Checker 1.0.2'
4599 PACKAGE_BUGREPORT='http://bugzilla.xfce.org/'
4600
4601 # Factoring default headers for most tests.
4602@@ -634,191 +656,214 @@
4603 # include <unistd.h>
4604 #endif"
4605
4606-ac_subst_vars='SHELL
4607-PATH_SEPARATOR
4608-PACKAGE_NAME
4609-PACKAGE_TARNAME
4610-PACKAGE_VERSION
4611-PACKAGE_STRING
4612-PACKAGE_BUGREPORT
4613-exec_prefix
4614-prefix
4615-program_transform_name
4616-bindir
4617-sbindir
4618-libexecdir
4619-datarootdir
4620-datadir
4621-sysconfdir
4622-sharedstatedir
4623-localstatedir
4624-includedir
4625-oldincludedir
4626-docdir
4627-infodir
4628-htmldir
4629-dvidir
4630-pdfdir
4631-psdir
4632-libdir
4633-localedir
4634-mandir
4635-DEFS
4636-ECHO_C
4637-ECHO_N
4638-ECHO_T
4639-LIBS
4640-build_alias
4641-host_alias
4642-target_alias
4643-INSTALL_PROGRAM
4644-INSTALL_SCRIPT
4645-INSTALL_DATA
4646-CYGPATH_W
4647-PACKAGE
4648-VERSION
4649-ACLOCAL
4650-AUTOCONF
4651-AUTOMAKE
4652-AUTOHEADER
4653-MAKEINFO
4654-install_sh
4655-STRIP
4656-INSTALL_STRIP_PROGRAM
4657-mkdir_p
4658-AWK
4659-SET_MAKE
4660-am__leading_dot
4661-AMTAR
4662-am__tar
4663-am__untar
4664-MAINTAINER_MODE_TRUE
4665-MAINTAINER_MODE_FALSE
4666-MAINT
4667-CC
4668-CFLAGS
4669-LDFLAGS
4670-CPPFLAGS
4671-ac_ct_CC
4672-EXEEXT
4673-OBJEXT
4674-DEPDIR
4675-am__include
4676-am__quote
4677-AMDEP_TRUE
4678-AMDEP_FALSE
4679-AMDEPBACKSLASH
4680-CCDEPMODE
4681-am__fastdepCC_TRUE
4682-am__fastdepCC_FALSE
4683+ac_subst_vars='am__EXEEXT_FALSE
4684+am__EXEEXT_TRUE
4685+LTLIBOBJS
4686+LIBOBJS
4687+XGETTEXT_ARGS
4688+MKINSTALLDIRS
4689+POSUB
4690+POFILES
4691+PO_IN_DATADIR_FALSE
4692+PO_IN_DATADIR_TRUE
4693+INTLLIBS
4694+INSTOBJEXT
4695+GMOFILES
4696+CATOBJEXT
4697+CATALOGS
4698+MSGFMT_OPTS
4699+GETTEXT_PACKAGE
4700+LIBXFCE4PANEL_REQUIRED_VERSION
4701+LIBXFCE4PANEL_LIBS
4702+LIBXFCE4PANEL_CFLAGS
4703+LIBXFCE4PANEL_VERSION
4704+LIBXFCE4UTIL_REQUIRED_VERSION
4705+LIBXFCE4UTIL_LIBS
4706+LIBXFCE4UTIL_CFLAGS
4707+LIBXFCE4UTIL_VERSION
4708+LIBXFCE4UI_REQUIRED_VERSION
4709+LIBXFCE4UI_LIBS
4710+LIBXFCE4UI_CFLAGS
4711+LIBXFCE4UI_VERSION
4712+GTK_REQUIRED_VERSION
4713+GTK_LIBS
4714+GTK_CFLAGS
4715+GTK_VERSION
4716+PKG_CONFIG_LIBDIR
4717+PKG_CONFIG_PATH
4718+PKG_CONFIG
4719+LIBX11_LIBS
4720+LIBX11_LDFLAGS
4721+LIBX11_CFLAGS
4722+X_EXTRA_LIBS
4723+X_LIBS
4724+X_PRE_LIBS
4725+X_CFLAGS
4726+XMKMF
4727 CPP
4728+OTOOL64
4729+OTOOL
4730+LIPO
4731+NMEDIT
4732+DSYMUTIL
4733+MANIFEST_TOOL
4734+RANLIB
4735+ac_ct_AR
4736+AR
4737+DLLTOOL
4738+OBJDUMP
4739+LN_S
4740+NM
4741+ac_ct_DUMPBIN
4742+DUMPBIN
4743+LD
4744+FGREP
4745+EGREP
4746 GREP
4747-EGREP
4748+SED
4749+host_os
4750+host_vendor
4751+host_cpu
4752+host
4753+build_os
4754+build_vendor
4755+build_cpu
4756+build
4757+LIBTOOL
4758+DATADIRNAME
4759+ALL_LINGUAS
4760+INTLTOOL_PERL
4761+GMSGFMT
4762+MSGFMT
4763+MSGMERGE
4764+XGETTEXT
4765+INTLTOOL_POLICY_RULE
4766+INTLTOOL_SERVICE_RULE
4767+INTLTOOL_THEME_RULE
4768+INTLTOOL_SCHEMAS_RULE
4769+INTLTOOL_CAVES_RULE
4770+INTLTOOL_XML_NOMERGE_RULE
4771+INTLTOOL_XML_RULE
4772+INTLTOOL_KBD_RULE
4773+INTLTOOL_XAM_RULE
4774+INTLTOOL_UI_RULE
4775+INTLTOOL_SOUNDLIST_RULE
4776+INTLTOOL_SHEET_RULE
4777+INTLTOOL_SERVER_RULE
4778+INTLTOOL_PONG_RULE
4779+INTLTOOL_OAF_RULE
4780+INTLTOOL_PROP_RULE
4781+INTLTOOL_KEYS_RULE
4782+INTLTOOL_DIRECTORY_RULE
4783+INTLTOOL_DESKTOP_RULE
4784+intltool__v_merge_options_0
4785+intltool__v_merge_options_
4786+INTLTOOL_V_MERGE_OPTIONS
4787+INTLTOOL__v_MERGE_0
4788+INTLTOOL__v_MERGE_
4789+INTLTOOL_V_MERGE
4790+AM_DEFAULT_VERBOSITY
4791+INTLTOOL_EXTRACT
4792+INTLTOOL_MERGE
4793+INTLTOOL_UPDATE
4794 USE_NLS
4795-INTLTOOL_UPDATE
4796-INTLTOOL_MERGE
4797-INTLTOOL_EXTRACT
4798-AM_DEFAULT_VERBOSITY
4799-INTLTOOL_V_MERGE
4800-INTLTOOL__v_MERGE_
4801-INTLTOOL__v_MERGE_0
4802-INTLTOOL_V_MERGE_OPTIONS
4803-intltool__v_merge_options_
4804-intltool__v_merge_options_0
4805-INTLTOOL_DESKTOP_RULE
4806-INTLTOOL_DIRECTORY_RULE
4807-INTLTOOL_KEYS_RULE
4808-INTLTOOL_PROP_RULE
4809-INTLTOOL_OAF_RULE
4810-INTLTOOL_PONG_RULE
4811-INTLTOOL_SERVER_RULE
4812-INTLTOOL_SHEET_RULE
4813-INTLTOOL_SOUNDLIST_RULE
4814-INTLTOOL_UI_RULE
4815-INTLTOOL_XAM_RULE
4816-INTLTOOL_KBD_RULE
4817-INTLTOOL_XML_RULE
4818-INTLTOOL_XML_NOMERGE_RULE
4819-INTLTOOL_CAVES_RULE
4820-INTLTOOL_SCHEMAS_RULE
4821-INTLTOOL_THEME_RULE
4822-INTLTOOL_SERVICE_RULE
4823-INTLTOOL_POLICY_RULE
4824-XGETTEXT
4825-MSGMERGE
4826-MSGFMT
4827-GMSGFMT
4828-INTLTOOL_PERL
4829-ALL_LINGUAS
4830-DATADIRNAME
4831-LIBTOOL
4832-build
4833-build_cpu
4834-build_vendor
4835-build_os
4836-host
4837-host_cpu
4838-host_vendor
4839-host_os
4840-SED
4841-FGREP
4842-LD
4843-DUMPBIN
4844-ac_ct_DUMPBIN
4845-NM
4846-LN_S
4847-OBJDUMP
4848-DLLTOOL
4849-AR
4850-ac_ct_AR
4851-RANLIB
4852-MANIFEST_TOOL
4853-DSYMUTIL
4854-NMEDIT
4855-LIPO
4856-OTOOL
4857-OTOOL64
4858-XMKMF
4859-X_CFLAGS
4860-X_PRE_LIBS
4861-X_LIBS
4862-X_EXTRA_LIBS
4863-LIBX11_CFLAGS
4864-LIBX11_LDFLAGS
4865-LIBX11_LIBS
4866-PKG_CONFIG
4867-GTK_VERSION
4868-GTK_CFLAGS
4869-GTK_LIBS
4870-GTK_REQUIRED_VERSION
4871-LIBXFCE4UI_VERSION
4872-LIBXFCE4UI_CFLAGS
4873-LIBXFCE4UI_LIBS
4874-LIBXFCE4UI_REQUIRED_VERSION
4875-LIBXFCE4UTIL_VERSION
4876-LIBXFCE4UTIL_CFLAGS
4877-LIBXFCE4UTIL_LIBS
4878-LIBXFCE4UTIL_REQUIRED_VERSION
4879-LIBXFCE4PANEL_VERSION
4880-LIBXFCE4PANEL_CFLAGS
4881-LIBXFCE4PANEL_LIBS
4882-LIBXFCE4PANEL_REQUIRED_VERSION
4883-GETTEXT_PACKAGE
4884-MSGFMT_OPTS
4885-CATALOGS
4886-CATOBJEXT
4887-GMOFILES
4888-INSTOBJEXT
4889-INTLLIBS
4890-PO_IN_DATADIR_TRUE
4891-PO_IN_DATADIR_FALSE
4892-POFILES
4893-POSUB
4894-MKINSTALLDIRS
4895-XGETTEXT_ARGS
4896-LIBOBJS
4897-LTLIBOBJS'
4898+am__fastdepCC_FALSE
4899+am__fastdepCC_TRUE
4900+CCDEPMODE
4901+am__nodep
4902+AMDEPBACKSLASH
4903+AMDEP_FALSE
4904+AMDEP_TRUE
4905+am__quote
4906+am__include
4907+DEPDIR
4908+OBJEXT
4909+EXEEXT
4910+ac_ct_CC
4911+CPPFLAGS
4912+LDFLAGS
4913+CFLAGS
4914+CC
4915+MAINT
4916+MAINTAINER_MODE_FALSE
4917+MAINTAINER_MODE_TRUE
4918+am__untar
4919+am__tar
4920+AMTAR
4921+am__leading_dot
4922+SET_MAKE
4923+AWK
4924+mkdir_p
4925+MKDIR_P
4926+INSTALL_STRIP_PROGRAM
4927+STRIP
4928+install_sh
4929+MAKEINFO
4930+AUTOHEADER
4931+AUTOMAKE
4932+AUTOCONF
4933+ACLOCAL
4934+VERSION
4935+PACKAGE
4936+CYGPATH_W
4937+am__isrc
4938+INSTALL_DATA
4939+INSTALL_SCRIPT
4940+INSTALL_PROGRAM
4941+target_alias
4942+host_alias
4943+build_alias
4944+LIBS
4945+ECHO_T
4946+ECHO_N
4947+ECHO_C
4948+DEFS
4949+mandir
4950+localedir
4951+libdir
4952+psdir
4953+pdfdir
4954+dvidir
4955+htmldir
4956+infodir
4957+docdir
4958+oldincludedir
4959+includedir
4960+localstatedir
4961+sharedstatedir
4962+sysconfdir
4963+datadir
4964+datarootdir
4965+libexecdir
4966+sbindir
4967+bindir
4968+program_transform_name
4969+prefix
4970+exec_prefix
4971+PACKAGE_BUGREPORT
4972+PACKAGE_STRING
4973+PACKAGE_VERSION
4974+PACKAGE_TARNAME
4975+PACKAGE_NAME
4976+PATH_SEPARATOR
4977+SHELL'
4978 ac_subst_files=''
4979+ac_user_opts='
4980+enable_option_checking
4981+enable_maintainer_mode
4982+enable_dependency_tracking
4983+enable_nls
4984+enable_static
4985+enable_shared
4986+with_pic
4987+enable_fast_install
4988+with_gnu_ld
4989+with_sysroot
4990+enable_libtool_lock
4991+with_x
4992+with_locales_dir
4993+enable_debug
4994+'
4995 ac_precious_vars='build_alias
4996 host_alias
4997 target_alias
4998@@ -829,12 +874,16 @@
4999 CPPFLAGS
5000 CPP
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches

to all changes: