Merge lp:~noskcaj/ubuntu/vivid/xfce4-sensors-plugin/1.2.6 into lp:ubuntu/vivid/xfce4-sensors-plugin

Proposed by Jackson Doak on 2015-02-27
Status: Needs review
Proposed branch: lp:~noskcaj/ubuntu/vivid/xfce4-sensors-plugin/1.2.6
Merge into: lp:ubuntu/vivid/xfce4-sensors-plugin
Diff against target: 28085 lines (+10928/-6974)
86 files modified
.pc/applied-patches (+0/-1)
.pc/fix_typo_in_fr.po.diff/po/fr.po (+0/-432)
INSTALL (+6/-6)
Makefile.in (+184/-149)
NEWS (+16/-1)
NOTES (+1/-2)
README (+2/-3)
aclocal.m4 (+1529/-1513)
compile (+7/-3)
config.guess (+118/-228)
config.h.in (+1/-4)
config.sub (+78/-52)
configure (+556/-437)
configure.ac (+440/-0)
configure.in (+0/-439)
debian/changelog (+7/-0)
debian/control (+2/-1)
debian/patches/fix_typo_in_fr.po.diff (+0/-17)
debian/patches/series (+0/-1)
depcomp (+269/-186)
icons/Makefile.in (+82/-40)
include/Makefile.in (+77/-35)
include/sensors-interface-common.h (+1/-0)
include/sensors-interface-plugin.h (+3/-1)
include/types.h (+2/-2)
install-sh (+7/-7)
lib/Makefile.am (+1/-6)
lib/Makefile.in (+201/-130)
lib/acpi.c (+56/-7)
lib/configuration.c (+20/-10)
lib/cpu.c (+25/-6)
lib/hddtemp.c (+14/-6)
lib/sensors-interface-common.c (+4/-4)
ltmain.sh (+2/-2)
missing (+159/-275)
mkinstalldirs (+2/-2)
panel-plugin/Makefile.am (+1/-2)
panel-plugin/Makefile.in (+169/-95)
panel-plugin/sensors-plugin.c (+93/-34)
po/ar.po (+104/-92)
po/ast.po (+118/-119)
po/bg.po (+437/-0)
po/ca.po (+57/-45)
po/cs.po (+63/-100)
po/da.po (+69/-70)
po/de.po (+88/-128)
po/el.po (+71/-57)
po/en_AU.po (+434/-0)
po/en_GB.po (+57/-45)
po/es.po (+95/-90)
po/eu.po (+57/-45)
po/fi.po (+70/-70)
po/fr.po (+125/-113)
po/gl.po (+57/-45)
po/hr.po (+435/-0)
po/hu.po (+57/-45)
po/id.po (+66/-78)
po/is.po (+396/-0)
po/it.po (+66/-64)
po/ja.po (+66/-66)
po/ko.po (+70/-60)
po/lt.po (+57/-45)
po/lv.po (+57/-45)
po/ms.po (+434/-0)
po/nb.po (+436/-0)
po/nl.po (+88/-123)
po/oc.po (+440/-0)
po/pl.po (+120/-147)
po/pt.po (+65/-53)
po/pt_BR.po (+67/-92)
po/ru.po (+110/-125)
po/sk.po (+57/-45)
po/sq.po (+57/-45)
po/sr.po (+435/-0)
po/sv.po (+122/-78)
po/th.po (+432/-0)
po/tr.po (+86/-77)
po/ug.po (+109/-106)
po/uk.po (+67/-64)
po/ur.po (+57/-45)
po/ur_PK.po (+57/-45)
po/vi.po (+53/-45)
po/zh_CN.po (+67/-56)
po/zh_TW.po (+69/-101)
src/Makefile.am (+1/-25)
src/Makefile.in (+192/-141)
To merge this branch: bzr merge lp:~noskcaj/ubuntu/vivid/xfce4-sensors-plugin/1.2.6
Reviewer Review Type Date Requested Status
Sean Davis (community) xubuntu technical lead 2015-02-27 Approve on 2015-02-28
Review via email: mp+251215@code.launchpad.net

Description of the change

New upstream bugfix release

To post a comment you must log in.
Sean Davis (bluesabre) wrote :

Package looks good to me, but is not in the xubuntu packageset. I approve for upload, if any MOTUs or archive admins are able to sponsor.

review: Approve (xubuntu technical lead)

Unmerged revisions

15. By Jackson Doak on 2015-02-27

* New upstream bugfix release.
* Drop fix_typo_in_fr.po.diff, fixed upstream.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== removed file '.pc/applied-patches'
2--- .pc/applied-patches 2013-05-26 13:18:22 +0000
3+++ .pc/applied-patches 1970-01-01 00:00:00 +0000
4@@ -1,1 +0,0 @@
5-fix_typo_in_fr.po.diff
6
7=== removed directory '.pc/fix_typo_in_fr.po.diff'
8=== removed directory '.pc/fix_typo_in_fr.po.diff/po'
9=== removed file '.pc/fix_typo_in_fr.po.diff/po/fr.po'
10--- .pc/fix_typo_in_fr.po.diff/po/fr.po 2013-05-26 13:18:22 +0000
11+++ .pc/fix_typo_in_fr.po.diff/po/fr.po 1970-01-01 00:00:00 +0000
12@@ -1,432 +0,0 @@
13-# French translations for xfce4-sensors-plugin package.
14-# Copyright (C) 2004-2005 Fabian Nowak.
15-# This file is distributed under the same license as the xfce4-sensors-plugin package.
16-# Stephane Roy <sroy@j2n.net>, 2005.
17-# Fabian Nowak <timystery@arcor.de>, 2005.
18-# Maximilian Schleiss <maximilian@xfce.org>, 2006.
19-#
20-msgid ""
21-msgstr ""
22-"Project-Id-Version: xfce4-sensors-plugin 0.9.0\n"
23-"Report-Msgid-Bugs-To: \n"
24-"POT-Creation-Date: 2012-05-14 14:26+0200\n"
25-"PO-Revision-Date: 2009-03-19 21:00+0100\n"
26-"Last-Translator: Mike Massonnet <mmassonnet@gmail.com>\n"
27-"Language-Team: French <xfce-i18n@xfce.org>\n"
28-"Language: fr\n"
29-"MIME-Version: 1.0\n"
30-"Content-Type: text/plain; charset=UTF-8\n"
31-"Content-Transfer-Encoding: 8bit\n"
32-
33-#: ../panel-plugin/sensors-plugin.c:287 ../panel-plugin/sensors-plugin.c:384
34-#: ../panel-plugin/sensors-plugin.c:977
35-msgid "<span foreground=\"#000000\"><b>Sensors</b></span>"
36-msgstr "<span foreground=\"#000000\"><b>Capteurs</b></span>"
37-
38-#. widget = sensors->eventbox;
39-#: ../panel-plugin/sensors-plugin.c:783
40-msgid "No sensors selected!"
41-msgstr "Aucun capteur sélectionné !"
42-
43-#. FIXME: either print nothing, or undertake appropriate action,
44-#. * or pop up a message box.
45-#: ../panel-plugin/sensors-plugin.c:823
46-#, c-format
47-msgid ""
48-"Sensors Plugin:\n"
49-"Seems like there was a problem reading a sensor feature value.\n"
50-"Proper proceeding cannot be guaranteed.\n"
51-msgstr ""
52-"Greffon de Capteurs :\n"
53-"Il semblerait qu'il y ait un problème de lecture de valeur sur un capteur.\n"
54-"L'exécution normale ne peut pas être garantie.\n"
55-
56-#: ../panel-plugin/sensors-plugin.c:1684
57-msgid "UI style:"
58-msgstr "Style de l'interface :"
59-
60-#: ../panel-plugin/sensors-plugin.c:1685
61-msgid "_text"
62-msgstr "_texte"
63-
64-#: ../panel-plugin/sensors-plugin.c:1687
65-msgid "_progress bars"
66-msgstr "_barres de progression"
67-
68-#: ../panel-plugin/sensors-plugin.c:1689
69-msgid "_tachos"
70-msgstr "_tachys"
71-
72-#: ../panel-plugin/sensors-plugin.c:1734
73-msgid "Show _labels"
74-msgstr "Affi_cher les étiquettes"
75-
76-#: ../panel-plugin/sensors-plugin.c:1764
77-msgid "Show colored _bars"
78-msgstr "Afficher les _barres en couleur"
79-
80-#: ../panel-plugin/sensors-plugin.c:1792
81-msgid "_Show title"
82-msgstr "Affi_cher le titre"
83-
84-#: ../panel-plugin/sensors-plugin.c:1816
85-msgid "_Number of text lines:"
86-msgstr "_Nombre de lignes de texte :"
87-
88-#: ../panel-plugin/sensors-plugin.c:1851
89-msgid "F_ont size:"
90-msgstr "Taille de la _police :"
91-
92-#. gtk_widget_set_sensitive(myFontBox, !sd->sensors->display_values_graphically);
93-#: ../panel-plugin/sensors-plugin.c:1858
94-msgid "x-small"
95-msgstr "très petite"
96-
97-#: ../panel-plugin/sensors-plugin.c:1859
98-msgid "small"
99-msgstr "petite"
100-
101-#: ../panel-plugin/sensors-plugin.c:1860
102-msgid "medium"
103-msgstr "normale"
104-
105-#: ../panel-plugin/sensors-plugin.c:1861
106-msgid "large"
107-msgstr "grande"
108-
109-#: ../panel-plugin/sensors-plugin.c:1862
110-msgid "x-large"
111-msgstr "très grande"
112-
113-#: ../panel-plugin/sensors-plugin.c:1893
114-msgid "F_ont:"
115-msgstr "Taille de la _police :"
116-
117-#: ../panel-plugin/sensors-plugin.c:1927
118-msgid "Show _Units"
119-msgstr "Afficher les _unités"
120-
121-#: ../panel-plugin/sensors-plugin.c:1948
122-msgid "Small horizontal s_pacing"
123-msgstr "E_space horizontal petit"
124-
125-#: ../panel-plugin/sensors-plugin.c:1970
126-msgid "Suppress messages"
127-msgstr "Supprimer les messages"
128-
129-#: ../panel-plugin/sensors-plugin.c:1995
130-msgid "E_xecute on double click:"
131-msgstr "E_xécute après un double clic :"
132-
133-#: ../panel-plugin/sensors-plugin.c:2038
134-msgid "_View"
135-msgstr "_Afficher"
136-
137-#: ../panel-plugin/sensors-plugin.c:2072
138-msgid "_Miscellaneous"
139-msgstr "_Divers"
140-
141-#: ../panel-plugin/sensors-plugin.c:2145 ../panel-plugin/sensors-plugin.h:30
142-#: ../lib/hddtemp.c:180
143-msgid "Sensors Plugin"
144-msgstr "Greffon de Capteurs"
145-
146-#. gtk_cpu_paint(sensors->tachos [i][index_feature]);
147-#. gtk_cpu_expose(sensors->tachos [i][index_feature], NULL);
148-#. #if GTK_VERSION < 2.11
149-#: ../panel-plugin/sensors-plugin.c:2184 ../src/actions.c:205
150-msgid ""
151-"You can change a feature's properties such as name, colours, min/max value "
152-"by double-clicking the entry, editing the content, and pressing \"Return\" "
153-"or selecting a different field."
154-msgstr ""
155-"Vous pouvez changez les propriétés d'un aspect tel que le nom, les couleurs, "
156-"la valeur min/max en double-cliquant sur l'entrée, éditer le contenu et "
157-"presser \"Entrée\" ou sélectionner un autre champ."
158-
159-#. only use this if no hddtemp sensor
160-#. or do only use this , if it is an lmsensors device. whatever.
161-#. FIXME: compare strings, or also have hddtmep and acpi store numeric values
162-#. assert correctly saved file
163-#: ../lib/configuration.c:160 ../lib/configuration.c:358
164-#: ../lib/configuration.c:365 ../lib/hddtemp.c:362 ../lib/hddtemp.c:411
165-msgid "Hard disks"
166-msgstr "Disques dur"
167-
168-#: ../lib/acpi.c:521 ../lib/acpi.c:529
169-msgid "ACPI"
170-msgstr "ACPI"
171-
172-#. to be displayed
173-#. chip->description = g_strdup(_("Advanced Configuration and Power Interface"));
174-#: ../lib/acpi.c:523
175-#, c-format
176-msgid "ACPI v%s zones"
177-msgstr "Zones ACPI v%s"
178-
179-#. who knows, if we obtain non-NULL version at all...
180-#. || g_strisempty(version))
181-#: ../lib/acpi.c:661
182-msgid "<Unknown>"
183-msgstr "<Inconnu>"
184-
185-#: ../lib/nvidia.c:60
186-msgid "NVidia GPU core temperature"
187-msgstr "Température du GPU NVidia"
188-
189-#: ../lib/nvidia.c:61
190-msgid "nvidia"
191-msgstr "nvidia"
192-
193-#. if (scale == FAHRENHEIT) {
194-#. cf->formatted_value = g_strdup_printf(_("%.1f °F"), (float) (value * 9/5 + 32) );
195-#. } else { // Celsius
196-#. Celsius
197-#: ../lib/nvidia.c:126 ../lib/hddtemp.c:720
198-#: ../lib/sensors-interface-common.c:147
199-#, c-format
200-msgid "%.1f °C"
201-msgstr "%.1f °C"
202-
203-#: ../lib/hddtemp.c:410
204-msgid "S.M.A.R.T. harddisk temperatures"
205-msgstr "Sondes de température du disque dur S.M.A.R.T."
206-
207-#: ../lib/hddtemp.c:605
208-#, c-format
209-msgid ""
210-"\"hddtemp\" was not executed correctly, although it is executable. This is "
211-"most probably due to the disks requiring root privileges to read their "
212-"temperatures, and \"hddtemp\" not being setuid root.\n"
213-"\n"
214-"An easy but dirty solution is to run \"chmod u+s %s\" as root user and "
215-"restart this plugin or its panel.\n"
216-"\n"
217-"Calling \"%s\" gave the following error:\n"
218-"%s\n"
219-"with a return value of %d.\n"
220-msgstr ""
221-"\"hddtemp\" n'a pas été exécuté correctement bien qu'il soit exécutable. Il "
222-"se pourrait bien que ce soit dû à des privilèges restreint pour la lecture "
223-"des températures et que \"hddtemp\" ne soit pas fixé avec un setuid root.\n"
224-"\n"
225-"Une solution simple mais radicale consiste à lancer la commande \"chmod u+s "
226-"%s\" en tant que root et de relancer le greffon ou le panneau.\n"
227-"\n"
228-"L'appel à \"%s\" a donné l'erreur suivante :\n"
229-"%s\n"
230-"avec le code retour %d.\n"
231-
232-#: ../lib/hddtemp.c:621 ../lib/hddtemp.c:651
233-msgid "Suppress this message in future"
234-msgstr "Ne plus afficher ce message"
235-
236-#: ../lib/hddtemp.c:645
237-#, c-format
238-msgid ""
239-"An error occurred when executing \"%s\":\n"
240-"%s"
241-msgstr ""
242-"Une erreur est survenue lors de l'exécution de \"%s\" :\n"
243-"%s"
244-
245-#: ../lib/lmsensors.c:110
246-msgid "LM Sensors"
247-msgstr "LM Capteurs"
248-
249-#: ../lib/lmsensors.c:370 ../lib/lmsensors.c:417
250-#, c-format
251-msgid "Error: Could not connect to sensors!"
252-msgstr "Erreur : ne peut pas se connecter aux capteurs !"
253-
254-#: ../lib/sensors-interface.c:84
255-msgid "Sensors Plugin Failure"
256-msgstr "Erreur dans le greffon de capteurs"
257-
258-#: ../lib/sensors-interface.c:85
259-msgid ""
260-"Seems like there was a problem reading a sensor feature value.\n"
261-"Proper proceeding cannot be guaranteed."
262-msgstr ""
263-"Il semblerait qu'il y ait un problème de lecture de valeur sur un capteur.\n"
264-"L'exécution normale ne peut pas être garantie."
265-
266-#: ../lib/sensors-interface.c:172
267-msgid "Sensors t_ype:"
268-msgstr "T_ype de capteurs :"
269-
270-#: ../lib/sensors-interface.c:198
271-msgid "Description:"
272-msgstr "Description :"
273-
274-#: ../lib/sensors-interface.c:231
275-msgid "U_pdate interval (seconds):"
276-msgstr "_Intervalle de mise-à-jour (secondes) :"
277-
278-#: ../lib/sensors-interface.c:271
279-msgid "Name"
280-msgstr "Nom"
281-
282-#: ../lib/sensors-interface.c:283
283-msgid "Value"
284-msgstr "Valeur"
285-
286-#: ../lib/sensors-interface.c:291
287-msgid "Show"
288-msgstr "Afficher"
289-
290-#: ../lib/sensors-interface.c:300
291-msgid "Color"
292-msgstr "Couleur"
293-
294-#: ../lib/sensors-interface.c:313
295-msgid "Min"
296-msgstr "Min"
297-
298-#: ../lib/sensors-interface.c:330
299-msgid "Max"
300-msgstr "Max"
301-
302-#: ../lib/sensors-interface.c:371
303-msgid "Temperature scale:"
304-msgstr "Échelle de température :"
305-
306-#: ../lib/sensors-interface.c:373
307-msgid "_Celsius"
308-msgstr "_Celsius"
309-
310-#: ../lib/sensors-interface.c:375
311-msgid "_Fahrenheit"
312-msgstr "_Fahrenheit"
313-
314-#: ../lib/sensors-interface.c:411
315-msgid "_Sensors"
316-msgstr "_Senseurs"
317-
318-#: ../lib/sensors-interface-common.c:73 ../lib/sensors-interface-common.c:74
319-msgid "No sensors found!"
320-msgstr "Aucun capteur trouvé !"
321-
322-#: ../lib/sensors-interface-common.c:144
323-#, c-format
324-msgid "%.1f °F"
325-msgstr "%.1f °F"
326-
327-#: ../lib/sensors-interface-common.c:152
328-#, c-format
329-msgid "%+.2f V"
330-msgstr "%+.2f V"
331-
332-#: ../lib/sensors-interface-common.c:156
333-#, c-format
334-msgid "%.0f mWh"
335-msgstr "%.0f mWh"
336-
337-#: ../lib/sensors-interface-common.c:161
338-msgid "off"
339-msgstr "inactif"
340-
341-#: ../lib/sensors-interface-common.c:163
342-msgid "on"
343-msgstr "actif"
344-
345-#: ../lib/sensors-interface-common.c:167
346-#, c-format
347-msgid "%.0f rpm"
348-msgstr "%.0f tr/mn"
349-
350-#: ../src/main.c:52
351-#, c-format
352-msgid ""
353-"Xfce4 Sensors %s\n"
354-"This program is published under the GPL v2.\n"
355-"The license text can be found inside the program's source archive or under /"
356-"usr/share/apps/LICENSES/GPL_V2 or at http://www.gnu.org/licenses/old-"
357-"licenses/gpl-2.0.txt\n"
358-msgstr ""
359-"Capteurs Xfce4 %s\n"
360-"Ce programme est publié sous la licence GPL v2.\n"
361-"Le texte de la licence est disponible à l'intérieur de l'archive source du "
362-"programme ou sur http://www.gun.org/licenses/\n"
363-
364-#: ../src/main.c:64
365-#, c-format
366-msgid ""
367-"Xfce4 Sensors %s\n"
368-"Displays information about your hardware sensors, ACPI status, harddisk "
369-"temperatures and Nvidia GPU's temperature.\n"
370-"Synopsis: \n"
371-" xfce4-sensors options\n"
372-"where options are one or more of the following:\n"
373-" -h, --help Print this help dialog.\n"
374-" -l, --license Print license information.\n"
375-" -V, --version Print version information.\n"
376-"\n"
377-"This program is published under the GPL v2.\n"
378-msgstr ""
379-"Capteurs Xfce4 %s\n"
380-"Affiche des informations à propos des capteurs et ACPI.\n"
381-"Usage :\n"
382-" options xfce4-sensors\n"
383-"où options sont l'une où plusieurs des suivantes :\n"
384-" -h, --help Affiche l'aide.\n"
385-" -l, --license Affiche les informations de licence.\n"
386-" -V, --version Affiche les informations de version.\n"
387-"\n"
388-"Ce programme est publié sous la licence GPL v2.\n"
389-
390-#: ../src/main.c:82
391-#, c-format
392-msgid "Xfce4 Sensors %s\n"
393-msgstr "Capteurs Xfce4 %s\n"
394-
395-#: ../src/interface.c:78
396-msgid "_Overview"
397-msgstr "_Apercu"
398-
399-#: ../src/interface.c:99
400-msgid "_Tachometers"
401-msgstr "_Tachymètres"
402-
403-#: ../src/interface.c:116
404-msgid "Sensors Viewer"
405-msgstr "Afficheur de captures"
406-
407-#. FIXME: either print nothing, or undertake appropriate action,
408-#. * or pop up a message box.
409-#: ../src/actions.c:80
410-#, c-format
411-msgid ""
412-"Sensors Viewer:\n"
413-"Seems like there was a problem reading a sensor feature value.\n"
414-"Proper proceeding cannot be guaranteed.\n"
415-msgstr ""
416-"Greffon de Capteurs :\n"
417-"Il semblerait qu'il y ait un problème de lecture de valeur sur un capteur.\n"
418-"L'exécution normale ne peut pas être garantie.\n"
419-
420-#: ../src/xfce4-sensors.desktop.in.h:1
421-msgid "Sensor Viewer"
422-msgstr "Afficheur de capteur"
423-
424-#: ../src/xfce4-sensors.desktop.in.h:2
425-#: ../panel-plugin/xfce4-sensors-plugin.desktop.in.in.h:2
426-msgid "Show sensor values."
427-msgstr "Afficher les valeurs du capteur."
428-
429-#: ../src/xfce4-sensors.desktop.in.h:3
430-msgid "Sensor Values Viewer"
431-msgstr "Afficheur des valeurs des capteurs"
432-
433-#: ../panel-plugin/xfce4-sensors-plugin.desktop.in.in.h:1
434-msgid "Sensor plugin "
435-msgstr "Greffon de capteurs"
436-
437-#~ msgid "No concrete error detected.\n"
438-#~ msgstr "Aucune erreur concrète détectée.\n"
439-
440-#~ msgid "g_raphical"
441-#~ msgstr "g_raphique"
442-
443-#~ msgid "Show _labels in graphical UI"
444-#~ msgstr "Affic_her les étiquettes dans l'interface graphique"
445
446=== modified file 'INSTALL'
447--- INSTALL 2012-05-15 23:20:16 +0000
448+++ INSTALL 2015-02-27 07:38:45 +0000
449@@ -1,7 +1,7 @@
450 Installation Instructions
451 *************************
452
453-Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation,
454+Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation,
455 Inc.
456
457 Copying and distribution of this file, with or without modification,
458@@ -12,8 +12,8 @@
459 Basic Installation
460 ==================
461
462- Briefly, the shell commands `./configure; make; make install' should
463-configure, build, and install this package. The following
464+ Briefly, the shell command `./configure && make && make install'
465+should configure, build, and install this package. The following
466 more-detailed instructions are generic; see the `README' file for
467 instructions specific to this package. Some packages provide this
468 `INSTALL' file but do not implement all of the features documented
469@@ -309,9 +309,10 @@
470 overridden in the site shell script).
471
472 Unfortunately, this technique does not work for `CONFIG_SHELL' due to
473-an Autoconf bug. Until the bug is fixed you can use this workaround:
474+an Autoconf limitation. Until the limitation is lifted, you can use
475+this workaround:
476
477- CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
478+ CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash
479
480 `configure' Invocation
481 ======================
482@@ -367,4 +368,3 @@
483
484 `configure' also accepts some other, not widely useful, options. Run
485 `configure --help' for more details.
486-
487
488=== modified file 'Makefile.in'
489--- Makefile.in 2012-05-15 23:20:16 +0000
490+++ Makefile.in 2015-02-27 07:38:45 +0000
491@@ -1,9 +1,8 @@
492-# Makefile.in generated by automake 1.11.5 from Makefile.am.
493+# Makefile.in generated by automake 1.14.1 from Makefile.am.
494 # @configure_input@
495
496-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
497-# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
498-# Foundation, Inc.
499+# Copyright (C) 1994-2013 Free Software Foundation, Inc.
500+
501 # This Makefile.in is free software; the Free Software Foundation
502 # gives unlimited permission to copy and/or distribute it,
503 # with or without modifications, as long as this notice is preserved.
504@@ -17,23 +16,51 @@
505
506 # $Id$
507 VPATH = @srcdir@
508-am__make_dryrun = \
509- { \
510- am__dry=no; \
511+am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
512+am__make_running_with_option = \
513+ case $${target_option-} in \
514+ ?) ;; \
515+ *) echo "am__make_running_with_option: internal error: invalid" \
516+ "target option '$${target_option-}' specified" >&2; \
517+ exit 1;; \
518+ esac; \
519+ has_opt=no; \
520+ sane_makeflags=$$MAKEFLAGS; \
521+ if $(am__is_gnu_make); then \
522+ sane_makeflags=$$MFLAGS; \
523+ else \
524 case $$MAKEFLAGS in \
525 *\\[\ \ ]*) \
526- echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
527- | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
528- *) \
529- for am__flg in $$MAKEFLAGS; do \
530- case $$am__flg in \
531- *=*|--*) ;; \
532- *n*) am__dry=yes; break;; \
533- esac; \
534- done;; \
535- esac; \
536- test $$am__dry = yes; \
537- }
538+ bs=\\; \
539+ sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
540+ | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \
541+ esac; \
542+ fi; \
543+ skip_next=no; \
544+ strip_trailopt () \
545+ { \
546+ flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
547+ }; \
548+ for flg in $$sane_makeflags; do \
549+ test $$skip_next = yes && { skip_next=no; continue; }; \
550+ case $$flg in \
551+ *=*|--*) continue;; \
552+ -*I) strip_trailopt 'I'; skip_next=yes;; \
553+ -*I?*) strip_trailopt 'I';; \
554+ -*O) strip_trailopt 'O'; skip_next=yes;; \
555+ -*O?*) strip_trailopt 'O';; \
556+ -*l) strip_trailopt 'l'; skip_next=yes;; \
557+ -*l?*) strip_trailopt 'l';; \
558+ -[dEDm]) skip_next=yes;; \
559+ -[JT]) skip_next=yes;; \
560+ esac; \
561+ case $$flg in \
562+ *$$target_option*) has_opt=yes; break;; \
563+ esac; \
564+ done; \
565+ test $$has_opt = yes
566+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
567+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
568 pkgdatadir = $(datadir)/@PACKAGE@
569 pkgincludedir = $(includedir)/@PACKAGE@
570 pkglibdir = $(libdir)/@PACKAGE@
571@@ -54,14 +81,14 @@
572 host_triplet = @host@
573 target_triplet = @target@
574 subdir = .
575-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
576- $(srcdir)/Makefile.in $(srcdir)/config.h.in \
577- $(srcdir)/xfce4-sensors-plugin.spec.in $(top_srcdir)/configure \
578- AUTHORS COPYING ChangeLog INSTALL NEWS TODO compile \
579- config.guess config.sub depcomp install-sh ltmain.sh missing \
580- mkinstalldirs
581+DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \
582+ $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
583+ $(top_srcdir)/configure $(am__configure_deps) \
584+ $(srcdir)/config.h.in mkinstalldirs \
585+ $(srcdir)/xfce4-sensors-plugin.spec.in COPYING TODO compile \
586+ config.guess config.sub depcomp install-sh missing ltmain.sh
587 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
588-am__aclocal_m4_deps = $(top_srcdir)/configure.in
589+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
590 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
591 $(ACLOCAL_M4)
592 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
593@@ -70,15 +97,28 @@
594 CONFIG_HEADER = config.h
595 CONFIG_CLEAN_FILES = xfce4-sensors-plugin.spec
596 CONFIG_CLEAN_VPATH_FILES =
597+AM_V_P = $(am__v_P_@AM_V@)
598+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
599+am__v_P_0 = false
600+am__v_P_1 = :
601+AM_V_GEN = $(am__v_GEN_@AM_V@)
602+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
603+am__v_GEN_0 = @echo " GEN " $@;
604+am__v_GEN_1 =
605+AM_V_at = $(am__v_at_@AM_V@)
606+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
607+am__v_at_0 = @
608+am__v_at_1 =
609 SOURCES =
610 DIST_SOURCES =
611-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
612- html-recursive info-recursive install-data-recursive \
613- install-dvi-recursive install-exec-recursive \
614- install-html-recursive install-info-recursive \
615- install-pdf-recursive install-ps-recursive install-recursive \
616- installcheck-recursive installdirs-recursive pdf-recursive \
617- ps-recursive uninstall-recursive
618+RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \
619+ ctags-recursive dvi-recursive html-recursive info-recursive \
620+ install-data-recursive install-dvi-recursive \
621+ install-exec-recursive install-html-recursive \
622+ install-info-recursive install-pdf-recursive \
623+ install-ps-recursive install-recursive installcheck-recursive \
624+ installdirs-recursive pdf-recursive ps-recursive \
625+ tags-recursive uninstall-recursive
626 am__can_run_installinfo = \
627 case $$AM_UPDATE_INFO_DIR in \
628 n|no|NO) false;; \
629@@ -86,11 +126,33 @@
630 esac
631 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
632 distclean-recursive maintainer-clean-recursive
633-AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
634- $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
635- distdir dist dist-all distcheck
636+am__recursive_targets = \
637+ $(RECURSIVE_TARGETS) \
638+ $(RECURSIVE_CLEAN_TARGETS) \
639+ $(am__extra_recursive_targets)
640+AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \
641+ cscope distdir dist dist-all distcheck
642+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \
643+ $(LISP)config.h.in
644+# Read a list of newline-separated strings from the standard input,
645+# and print each of them once, without duplicates. Input order is
646+# *not* preserved.
647+am__uniquify_input = $(AWK) '\
648+ BEGIN { nonempty = 0; } \
649+ { items[$$0] = 1; nonempty = 1; } \
650+ END { if (nonempty) { for (i in items) print i; }; } \
651+'
652+# Make sure the list of sources is unique. This is necessary because,
653+# e.g., the same source file might be shared among _SOURCES variables
654+# for different programs/libraries.
655+am__define_uniq_tagged_files = \
656+ list='$(am__tagged_files)'; \
657+ unique=`for i in $$list; do \
658+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
659+ done | $(am__uniquify_input)`
660 ETAGS = etags
661 CTAGS = ctags
662+CSCOPE = cscope
663 DIST_SUBDIRS = $(SUBDIRS)
664 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
665 distdir = $(PACKAGE)-$(VERSION)
666@@ -101,6 +163,7 @@
667 && rm -rf "$(distdir)" \
668 || { sleep 5 && rm -rf "$(distdir)"; }; \
669 else :; fi
670+am__post_remove_distdir = $(am__remove_distdir)
671 am__relativize = \
672 dir0=`pwd`; \
673 sed_first='s,^\([^/]*\)/.*$$,\1,'; \
674@@ -128,6 +191,7 @@
675 reldir="$$dir2"
676 DIST_ARCHIVES = $(distdir).tar.gz
677 GZIP_ENV = --best
678+DIST_TARGETS = dist-gzip
679 distuninstallcheck_listfiles = find . -type f -print
680 am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
681 | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
682@@ -399,8 +463,8 @@
683 $(am__aclocal_m4_deps):
684
685 config.h: stamp-h1
686- @if test ! -f $@; then rm -f stamp-h1; else :; fi
687- @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
688+ @test -f $@ || rm -f stamp-h1
689+ @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1
690
691 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
692 @rm -f stamp-h1
693@@ -425,22 +489,25 @@
694 -rm -f libtool config.lt
695
696 # This directory's subdirectories are mostly independent; you can cd
697-# into them and run `make' without going through this Makefile.
698-# To change the values of `make' variables: instead of editing Makefiles,
699-# (1) if the variable is set in `config.status', edit `config.status'
700-# (which will cause the Makefiles to be regenerated when you run `make');
701-# (2) otherwise, pass the desired values on the `make' command line.
702-$(RECURSIVE_TARGETS):
703- @fail= failcom='exit 1'; \
704- for f in x $$MAKEFLAGS; do \
705- case $$f in \
706- *=* | --[!k]*);; \
707- *k*) failcom='fail=yes';; \
708- esac; \
709- done; \
710+# into them and run 'make' without going through this Makefile.
711+# To change the values of 'make' variables: instead of editing Makefiles,
712+# (1) if the variable is set in 'config.status', edit 'config.status'
713+# (which will cause the Makefiles to be regenerated when you run 'make');
714+# (2) otherwise, pass the desired values on the 'make' command line.
715+$(am__recursive_targets):
716+ @fail=; \
717+ if $(am__make_keepgoing); then \
718+ failcom='fail=yes'; \
719+ else \
720+ failcom='exit 1'; \
721+ fi; \
722 dot_seen=no; \
723 target=`echo $@ | sed s/-recursive//`; \
724- list='$(SUBDIRS)'; for subdir in $$list; do \
725+ case "$@" in \
726+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
727+ *) list='$(SUBDIRS)' ;; \
728+ esac; \
729+ for subdir in $$list; do \
730 echo "Making $$target in $$subdir"; \
731 if test "$$subdir" = "."; then \
732 dot_seen=yes; \
733@@ -455,57 +522,12 @@
734 $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
735 fi; test -z "$$fail"
736
737-$(RECURSIVE_CLEAN_TARGETS):
738- @fail= failcom='exit 1'; \
739- for f in x $$MAKEFLAGS; do \
740- case $$f in \
741- *=* | --[!k]*);; \
742- *k*) failcom='fail=yes';; \
743- esac; \
744- done; \
745- dot_seen=no; \
746- case "$@" in \
747- distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
748- *) list='$(SUBDIRS)' ;; \
749- esac; \
750- rev=''; for subdir in $$list; do \
751- if test "$$subdir" = "."; then :; else \
752- rev="$$subdir $$rev"; \
753- fi; \
754- done; \
755- rev="$$rev ."; \
756- target=`echo $@ | sed s/-recursive//`; \
757- for subdir in $$rev; do \
758- echo "Making $$target in $$subdir"; \
759- if test "$$subdir" = "."; then \
760- local_target="$$target-am"; \
761- else \
762- local_target="$$target"; \
763- fi; \
764- ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
765- || eval $$failcom; \
766- done && test -z "$$fail"
767-tags-recursive:
768- list='$(SUBDIRS)'; for subdir in $$list; do \
769- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
770- done
771-ctags-recursive:
772- list='$(SUBDIRS)'; for subdir in $$list; do \
773- test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
774- done
775-
776-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
777- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
778- unique=`for i in $$list; do \
779- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
780- done | \
781- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
782- END { if (nonempty) { for (i in files) print i; }; }'`; \
783- mkid -fID $$unique
784-tags: TAGS
785-
786-TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
787- $(TAGS_FILES) $(LISP)
788+ID: $(am__tagged_files)
789+ $(am__define_uniq_tagged_files); mkid -fID $$unique
790+tags: tags-recursive
791+TAGS: tags
792+
793+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
794 set x; \
795 here=`pwd`; \
796 if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
797@@ -521,12 +543,7 @@
798 set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \
799 fi; \
800 done; \
801- list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
802- unique=`for i in $$list; do \
803- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
804- done | \
805- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
806- END { if (nonempty) { for (i in files) print i; }; }'`; \
807+ $(am__define_uniq_tagged_files); \
808 shift; \
809 if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
810 test -n "$$unique" || unique=$$empty_fix; \
811@@ -538,15 +555,11 @@
812 $$unique; \
813 fi; \
814 fi
815-ctags: CTAGS
816-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
817- $(TAGS_FILES) $(LISP)
818- list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
819- unique=`for i in $$list; do \
820- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
821- done | \
822- $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
823- END { if (nonempty) { for (i in files) print i; }; }'`; \
824+ctags: ctags-recursive
825+
826+CTAGS: ctags
827+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
828+ $(am__define_uniq_tagged_files); \
829 test -z "$(CTAGS_ARGS)$$unique" \
830 || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
831 $$unique
832@@ -555,9 +568,31 @@
833 here=`$(am__cd) $(top_builddir) && pwd` \
834 && $(am__cd) $(top_srcdir) \
835 && gtags -i $(GTAGS_ARGS) "$$here"
836+cscope: cscope.files
837+ test ! -s cscope.files \
838+ || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
839+clean-cscope:
840+ -rm -f cscope.files
841+cscope.files: clean-cscope cscopelist
842+cscopelist: cscopelist-recursive
843+
844+cscopelist-am: $(am__tagged_files)
845+ list='$(am__tagged_files)'; \
846+ case "$(srcdir)" in \
847+ [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
848+ *) sdir=$(subdir)/$(srcdir) ;; \
849+ esac; \
850+ for i in $$list; do \
851+ if test -f "$$i"; then \
852+ echo "$(subdir)/$$i"; \
853+ else \
854+ echo "$$sdir/$$i"; \
855+ fi; \
856+ done >> $(top_builddir)/cscope.files
857
858 distclean-tags:
859 -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
860+ -rm -f cscope.out cscope.in.out cscope.po.out cscope.files
861
862 distdir: $(DISTFILES)
863 $(am__remove_distdir)
864@@ -625,40 +660,42 @@
865 || chmod -R a+r "$(distdir)"
866 dist-gzip: distdir
867 tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
868- $(am__remove_distdir)
869+ $(am__post_remove_distdir)
870
871 dist-bzip2: distdir
872 tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
873- $(am__remove_distdir)
874+ $(am__post_remove_distdir)
875
876 dist-lzip: distdir
877 tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
878- $(am__remove_distdir)
879-
880-dist-lzma: distdir
881- tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
882- $(am__remove_distdir)
883+ $(am__post_remove_distdir)
884
885 dist-xz: distdir
886 tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
887- $(am__remove_distdir)
888+ $(am__post_remove_distdir)
889
890 dist-tarZ: distdir
891+ @echo WARNING: "Support for shar distribution archives is" \
892+ "deprecated." >&2
893+ @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
894 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
895- $(am__remove_distdir)
896+ $(am__post_remove_distdir)
897
898 dist-shar: distdir
899+ @echo WARNING: "Support for distribution archives compressed with" \
900+ "legacy program 'compress' is deprecated." >&2
901+ @echo WARNING: "It will be removed altogether in Automake 2.0" >&2
902 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
903- $(am__remove_distdir)
904+ $(am__post_remove_distdir)
905
906 dist-zip: distdir
907 -rm -f $(distdir).zip
908 zip -rq $(distdir).zip $(distdir)
909- $(am__remove_distdir)
910+ $(am__post_remove_distdir)
911
912-dist dist-all: distdir
913- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
914- $(am__remove_distdir)
915+dist dist-all:
916+ $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
917+ $(am__post_remove_distdir)
918
919 # This target untars the dist file and tries a VPATH configuration. Then
920 # it guarantees that the distribution is self-contained by making another
921@@ -669,8 +706,6 @@
922 GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
923 *.tar.bz2*) \
924 bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
925- *.tar.lzma*) \
926- lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
927 *.tar.lz*) \
928 lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
929 *.tar.xz*) \
930@@ -682,18 +717,19 @@
931 *.zip*) \
932 unzip $(distdir).zip ;;\
933 esac
934- chmod -R a-w $(distdir); chmod a+w $(distdir)
935- mkdir $(distdir)/_build
936- mkdir $(distdir)/_inst
937+ chmod -R a-w $(distdir)
938+ chmod u+w $(distdir)
939+ mkdir $(distdir)/_build $(distdir)/_inst
940 chmod a-w $(distdir)
941 test -d $(distdir)/_build || exit 0; \
942 dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
943 && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
944 && am__cwd=`pwd` \
945 && $(am__cd) $(distdir)/_build \
946- && ../configure --srcdir=.. --prefix="$$dc_install_base" \
947+ && ../configure \
948 $(AM_DISTCHECK_CONFIGURE_FLAGS) \
949 $(DISTCHECK_CONFIGURE_FLAGS) \
950+ --srcdir=.. --prefix="$$dc_install_base" \
951 && $(MAKE) $(AM_MAKEFLAGS) \
952 && $(MAKE) $(AM_MAKEFLAGS) dvi \
953 && $(MAKE) $(AM_MAKEFLAGS) check \
954@@ -716,7 +752,7 @@
955 && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
956 && cd "$$am__cwd" \
957 || exit 1
958- $(am__remove_distdir)
959+ $(am__post_remove_distdir)
960 @(echo "$(distdir) archives ready for distribution: "; \
961 list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
962 sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
963@@ -852,15 +888,14 @@
964
965 uninstall-am:
966
967-.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
968- ctags-recursive install-am install-strip tags-recursive
969+.MAKE: $(am__recursive_targets) all install-am install-strip
970
971-.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
972- all all-am am--refresh check check-am clean clean-generic \
973- clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
974- dist-gzip dist-lzip dist-lzma dist-shar dist-tarZ dist-xz \
975- dist-zip distcheck distclean distclean-generic distclean-hdr \
976- distclean-libtool distclean-local distclean-tags \
977+.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \
978+ am--refresh check check-am clean clean-cscope clean-generic \
979+ clean-libtool cscope cscopelist-am ctags ctags-am dist \
980+ dist-all dist-bzip2 dist-gzip dist-lzip dist-shar dist-tarZ \
981+ dist-xz dist-zip distcheck distclean distclean-generic \
982+ distclean-hdr distclean-libtool distclean-local distclean-tags \
983 distcleancheck distdir distuninstallcheck dvi dvi-am html \
984 html-am info info-am install install-am install-data \
985 install-data-am install-dvi install-dvi-am install-exec \
986@@ -869,8 +904,8 @@
987 install-ps install-ps-am install-strip installcheck \
988 installcheck-am installdirs installdirs-am maintainer-clean \
989 maintainer-clean-generic mostlyclean mostlyclean-generic \
990- mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
991- uninstall uninstall-am
992+ mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
993+ uninstall-am
994
995
996 distclean-local:
997
998=== modified file 'NEWS'
999--- NEWS 2010-04-23 00:16:37 +0000
1000+++ NEWS 2015-02-27 07:38:45 +0000
1001@@ -24,4 +24,19 @@
1002 Labels in text view possible
1003 Remember window size of configuration dialog
1004 Respect "suppress messages" for error dialogs with acpi/sysfs
1005-
1006+1.2.0...1.2.3: libnotify issues, new versions of libnotify, version changes
1007+ for libsensors in this package.
1008+1.2.4: Fixes some memory issues, stabilizes support for hddtemp
1009+ and improves battery reading via ACPI and sysfs. In addition, many
1010+ translations have been updated.
1011+1.2.5: Fix German translation; fix bug 8887 compile error
1012+1.2.6: Bug 9395 fixed: When sensors are no longer available for any reason,
1013+ plugin won't crash.
1014+ Bug 10031 fixed: Automake/Autoconfigure option for config headers.
1015+ Bug 9962: smarter ACPI battery value reading
1016+ Bug 10840: suppress tooltip
1017+ Bug 4142: Suppress notification warnings for hddtemp after having displayed once
1018+ Bug 11544: NULL pointer checks
1019+ Bug 11252: Removed gsources
1020+ Bug 11596: Recover directory "m4" in autogen.sh
1021+ Bug 11012: ACPI thermal zones not shown
1022
1023=== modified file 'NOTES'
1024--- NOTES 2008-01-04 13:29:34 +0000
1025+++ NOTES 2015-02-27 07:38:45 +0000
1026@@ -10,5 +10,4 @@
1027
1028 If you know of any further OS-specific interface or system library that might be worth including, please tell me.
1029
1030-For hddtemp to work for users in the plugin, it must be setuid root or a hddtemp daemon must be running. if none of this is done, it cant display the hddtemp. A possible workaround consists of adding a wrapper script as option to --with-pathhddtemp, that will call sudo on hddtmep.
1031-
1032+For hddtemp to work for users in the plugin, it must be setuid root or a hddtemp daemon must be running. If none of this is the case, the plugin can't display the hard disk temperatures. A possible workaround consists of adding a wrapper script as option to --with-pathhddtemp, that will call sudo on hddtemp.
1033
1034=== modified file 'README'
1035--- README 2012-05-15 23:20:16 +0000
1036+++ README 2015-02-27 07:38:45 +0000
1037@@ -1,9 +1,9 @@
1038 Xfce4-Sensors-Plugin
1039 ====================
1040
1041-Version 1.0.0 - For Xfce 4 Panel 4.6.0 (and hopefully newer as well!)
1042+Version 1.2.6 - For Xfce 4 Panel 4.6.0 (and hopefully newer as well!)
1043
1044-Copyright (c) 2004-2009 by Fabian Nowak (timystery@arcor.de)
1045+Copyright (c) 2004-2014 by Fabian Nowak (timystery@arcor.de)
1046 Copyright (c) 2005-2006 by Stefan Ott
1047
1048 Licence: GPL version 2 (or later at your option)
1049@@ -28,4 +28,3 @@
1050
1051 Thanks to: Xfce Team and Enrico Tröger for additional help;
1052 Raphael Groner for bug-hunting, usability reports, feature requests.
1053-
1054
1055=== modified file 'aclocal.m4'
1056--- aclocal.m4 2012-05-15 23:20:16 +0000
1057+++ aclocal.m4 2015-02-27 07:38:45 +0000
1058@@ -1,8 +1,7 @@
1059-# generated automatically by aclocal 1.11.5 -*- Autoconf -*-
1060-
1061-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
1062-# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
1063-# Inc.
1064+# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
1065+
1066+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
1067+
1068 # This file is free software; the Free Software Foundation
1069 # gives unlimited permission to copy and/or distribute it,
1070 # with or without modifications, as long as this notice is preserved.
1071@@ -12,13 +11,14 @@
1072 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
1073 # PARTICULAR PURPOSE.
1074
1075+m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
1076 m4_ifndef([AC_AUTOCONF_VERSION],
1077 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
1078-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
1079-[m4_warning([this file was generated for autoconf 2.68.
1080+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
1081+[m4_warning([this file was generated for autoconf 2.69.
1082 You have another version of autoconf. It may work, but is not guaranteed to.
1083 If you have problems, you may need to regenerate the build system entirely.
1084-To do so, use the procedure documented by the package, typically `autoreconf'.])])
1085+To do so, use the procedure documented by the package, typically 'autoreconf'.])])
1086
1087 # Copyright (C) 1995-2002 Free Software Foundation, Inc.
1088 # Copyright (C) 2001-2003,2004 Red Hat, Inc.
1089@@ -337,7 +337,6 @@
1090 dnl
1091 glib_DEFUN([GLIB_GNU_GETTEXT],
1092 [AC_REQUIRE([AC_PROG_CC])dnl
1093- AC_REQUIRE([AC_HEADER_STDC])dnl
1094
1095 GLIB_LC_MESSAGES
1096 GLIB_WITH_NLS
1097@@ -457,6 +456,1417 @@
1098 fi])
1099
1100
1101+# nls.m4 serial 5 (gettext-0.18)
1102+dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014 Free Software Foundation,
1103+dnl Inc.
1104+dnl This file is free software; the Free Software Foundation
1105+dnl gives unlimited permission to copy and/or distribute it,
1106+dnl with or without modifications, as long as this notice is preserved.
1107+dnl
1108+dnl This file can can be used in projects which are not available under
1109+dnl the GNU General Public License or the GNU Library General Public
1110+dnl License but which still want to provide support for the GNU gettext
1111+dnl functionality.
1112+dnl Please note that the actual code of the GNU gettext library is covered
1113+dnl by the GNU Library General Public License, and the rest of the GNU
1114+dnl gettext package package is covered by the GNU General Public License.
1115+dnl They are *not* in the public domain.
1116+
1117+dnl Authors:
1118+dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
1119+dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
1120+
1121+AC_PREREQ([2.50])
1122+
1123+AC_DEFUN([AM_NLS],
1124+[
1125+ AC_MSG_CHECKING([whether NLS is requested])
1126+ dnl Default is enabled NLS
1127+ AC_ARG_ENABLE([nls],
1128+ [ --disable-nls do not use Native Language Support],
1129+ USE_NLS=$enableval, USE_NLS=yes)
1130+ AC_MSG_RESULT([$USE_NLS])
1131+ AC_SUBST([USE_NLS])
1132+])
1133+
1134+# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
1135+# serial 1 (pkg-config-0.24)
1136+#
1137+# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
1138+#
1139+# This program is free software; you can redistribute it and/or modify
1140+# it under the terms of the GNU General Public License as published by
1141+# the Free Software Foundation; either version 2 of the License, or
1142+# (at your option) any later version.
1143+#
1144+# This program is distributed in the hope that it will be useful, but
1145+# WITHOUT ANY WARRANTY; without even the implied warranty of
1146+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
1147+# General Public License for more details.
1148+#
1149+# You should have received a copy of the GNU General Public License
1150+# along with this program; if not, write to the Free Software
1151+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
1152+#
1153+# As a special exception to the GNU General Public License, if you
1154+# distribute this file as part of a program that contains a
1155+# configuration script generated by Autoconf, you may include it under
1156+# the same distribution terms that you use for the rest of that program.
1157+
1158+# PKG_PROG_PKG_CONFIG([MIN-VERSION])
1159+# ----------------------------------
1160+AC_DEFUN([PKG_PROG_PKG_CONFIG],
1161+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
1162+m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
1163+m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
1164+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
1165+AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
1166+AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
1167+
1168+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
1169+ AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
1170+fi
1171+if test -n "$PKG_CONFIG"; then
1172+ _pkg_min_version=m4_default([$1], [0.9.0])
1173+ AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
1174+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
1175+ AC_MSG_RESULT([yes])
1176+ else
1177+ AC_MSG_RESULT([no])
1178+ PKG_CONFIG=""
1179+ fi
1180+fi[]dnl
1181+])# PKG_PROG_PKG_CONFIG
1182+
1183+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
1184+#
1185+# Check to see whether a particular set of modules exists. Similar
1186+# to PKG_CHECK_MODULES(), but does not set variables or print errors.
1187+#
1188+# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
1189+# only at the first occurence in configure.ac, so if the first place
1190+# it's called might be skipped (such as if it is within an "if", you
1191+# have to call PKG_CHECK_EXISTS manually
1192+# --------------------------------------------------------------
1193+AC_DEFUN([PKG_CHECK_EXISTS],
1194+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
1195+if test -n "$PKG_CONFIG" && \
1196+ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
1197+ m4_default([$2], [:])
1198+m4_ifvaln([$3], [else
1199+ $3])dnl
1200+fi])
1201+
1202+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
1203+# ---------------------------------------------
1204+m4_define([_PKG_CONFIG],
1205+[if test -n "$$1"; then
1206+ pkg_cv_[]$1="$$1"
1207+ elif test -n "$PKG_CONFIG"; then
1208+ PKG_CHECK_EXISTS([$3],
1209+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
1210+ test "x$?" != "x0" && pkg_failed=yes ],
1211+ [pkg_failed=yes])
1212+ else
1213+ pkg_failed=untried
1214+fi[]dnl
1215+])# _PKG_CONFIG
1216+
1217+# _PKG_SHORT_ERRORS_SUPPORTED
1218+# -----------------------------
1219+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
1220+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
1221+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
1222+ _pkg_short_errors_supported=yes
1223+else
1224+ _pkg_short_errors_supported=no
1225+fi[]dnl
1226+])# _PKG_SHORT_ERRORS_SUPPORTED
1227+
1228+
1229+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
1230+# [ACTION-IF-NOT-FOUND])
1231+#
1232+#
1233+# Note that if there is a possibility the first call to
1234+# PKG_CHECK_MODULES might not happen, you should be sure to include an
1235+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
1236+#
1237+#
1238+# --------------------------------------------------------------
1239+AC_DEFUN([PKG_CHECK_MODULES],
1240+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
1241+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
1242+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
1243+
1244+pkg_failed=no
1245+AC_MSG_CHECKING([for $1])
1246+
1247+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
1248+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
1249+
1250+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
1251+and $1[]_LIBS to avoid the need to call pkg-config.
1252+See the pkg-config man page for more details.])
1253+
1254+if test $pkg_failed = yes; then
1255+ AC_MSG_RESULT([no])
1256+ _PKG_SHORT_ERRORS_SUPPORTED
1257+ if test $_pkg_short_errors_supported = yes; then
1258+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
1259+ else
1260+ $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
1261+ fi
1262+ # Put the nasty error message in config.log where it belongs
1263+ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
1264+
1265+ m4_default([$4], [AC_MSG_ERROR(
1266+[Package requirements ($2) were not met:
1267+
1268+$$1_PKG_ERRORS
1269+
1270+Consider adjusting the PKG_CONFIG_PATH environment variable if you
1271+installed software in a non-standard prefix.
1272+
1273+_PKG_TEXT])[]dnl
1274+ ])
1275+elif test $pkg_failed = untried; then
1276+ AC_MSG_RESULT([no])
1277+ m4_default([$4], [AC_MSG_FAILURE(
1278+[The pkg-config script could not be found or is too old. Make sure it
1279+is in your PATH or set the PKG_CONFIG environment variable to the full
1280+path to pkg-config.
1281+
1282+_PKG_TEXT
1283+
1284+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
1285+ ])
1286+else
1287+ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
1288+ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
1289+ AC_MSG_RESULT([yes])
1290+ $3
1291+fi[]dnl
1292+])# PKG_CHECK_MODULES
1293+
1294+
1295+# PKG_INSTALLDIR(DIRECTORY)
1296+# -------------------------
1297+# Substitutes the variable pkgconfigdir as the location where a module
1298+# should install pkg-config .pc files. By default the directory is
1299+# $libdir/pkgconfig, but the default can be changed by passing
1300+# DIRECTORY. The user can override through the --with-pkgconfigdir
1301+# parameter.
1302+AC_DEFUN([PKG_INSTALLDIR],
1303+[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
1304+m4_pushdef([pkg_description],
1305+ [pkg-config installation directory @<:@]pkg_default[@:>@])
1306+AC_ARG_WITH([pkgconfigdir],
1307+ [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
1308+ [with_pkgconfigdir=]pkg_default)
1309+AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
1310+m4_popdef([pkg_default])
1311+m4_popdef([pkg_description])
1312+]) dnl PKG_INSTALLDIR
1313+
1314+
1315+# PKG_NOARCH_INSTALLDIR(DIRECTORY)
1316+# -------------------------
1317+# Substitutes the variable noarch_pkgconfigdir as the location where a
1318+# module should install arch-independent pkg-config .pc files. By
1319+# default the directory is $datadir/pkgconfig, but the default can be
1320+# changed by passing DIRECTORY. The user can override through the
1321+# --with-noarch-pkgconfigdir parameter.
1322+AC_DEFUN([PKG_NOARCH_INSTALLDIR],
1323+[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
1324+m4_pushdef([pkg_description],
1325+ [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])
1326+AC_ARG_WITH([noarch-pkgconfigdir],
1327+ [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
1328+ [with_noarch_pkgconfigdir=]pkg_default)
1329+AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
1330+m4_popdef([pkg_default])
1331+m4_popdef([pkg_description])
1332+]) dnl PKG_NOARCH_INSTALLDIR
1333+
1334+
1335+# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
1336+# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
1337+# -------------------------------------------
1338+# Retrieves the value of the pkg-config variable for the given module.
1339+AC_DEFUN([PKG_CHECK_VAR],
1340+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
1341+AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
1342+
1343+_PKG_CONFIG([$1], [variable="][$3]["], [$2])
1344+AS_VAR_COPY([$1], [pkg_cv_][$1])
1345+
1346+AS_VAR_IF([$1], [""], [$5], [$4])dnl
1347+])# PKG_CHECK_VAR
1348+
1349+# Copyright (C) 2002-2013 Free Software Foundation, Inc.
1350+#
1351+# This file is free software; the Free Software Foundation
1352+# gives unlimited permission to copy and/or distribute it,
1353+# with or without modifications, as long as this notice is preserved.
1354+
1355+# AM_AUTOMAKE_VERSION(VERSION)
1356+# ----------------------------
1357+# Automake X.Y traces this macro to ensure aclocal.m4 has been
1358+# generated from the m4 files accompanying Automake X.Y.
1359+# (This private macro should not be called outside this file.)
1360+AC_DEFUN([AM_AUTOMAKE_VERSION],
1361+[am__api_version='1.14'
1362+dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
1363+dnl require some minimum version. Point them to the right macro.
1364+m4_if([$1], [1.14.1], [],
1365+ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
1366+])
1367+
1368+# _AM_AUTOCONF_VERSION(VERSION)
1369+# -----------------------------
1370+# aclocal traces this macro to find the Autoconf version.
1371+# This is a private macro too. Using m4_define simplifies
1372+# the logic in aclocal, which can simply ignore this definition.
1373+m4_define([_AM_AUTOCONF_VERSION], [])
1374+
1375+# AM_SET_CURRENT_AUTOMAKE_VERSION
1376+# -------------------------------
1377+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
1378+# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
1379+AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
1380+[AM_AUTOMAKE_VERSION([1.14.1])dnl
1381+m4_ifndef([AC_AUTOCONF_VERSION],
1382+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
1383+_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
1384+
1385+# AM_AUX_DIR_EXPAND -*- Autoconf -*-
1386+
1387+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
1388+#
1389+# This file is free software; the Free Software Foundation
1390+# gives unlimited permission to copy and/or distribute it,
1391+# with or without modifications, as long as this notice is preserved.
1392+
1393+# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
1394+# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to
1395+# '$srcdir', '$srcdir/..', or '$srcdir/../..'.
1396+#
1397+# Of course, Automake must honor this variable whenever it calls a
1398+# tool from the auxiliary directory. The problem is that $srcdir (and
1399+# therefore $ac_aux_dir as well) can be either absolute or relative,
1400+# depending on how configure is run. This is pretty annoying, since
1401+# it makes $ac_aux_dir quite unusable in subdirectories: in the top
1402+# source directory, any form will work fine, but in subdirectories a
1403+# relative path needs to be adjusted first.
1404+#
1405+# $ac_aux_dir/missing
1406+# fails when called from a subdirectory if $ac_aux_dir is relative
1407+# $top_srcdir/$ac_aux_dir/missing
1408+# fails if $ac_aux_dir is absolute,
1409+# fails when called from a subdirectory in a VPATH build with
1410+# a relative $ac_aux_dir
1411+#
1412+# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
1413+# are both prefixed by $srcdir. In an in-source build this is usually
1414+# harmless because $srcdir is '.', but things will broke when you
1415+# start a VPATH build or use an absolute $srcdir.
1416+#
1417+# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
1418+# iff we strip the leading $srcdir from $ac_aux_dir. That would be:
1419+# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
1420+# and then we would define $MISSING as
1421+# MISSING="\${SHELL} $am_aux_dir/missing"
1422+# This will work as long as MISSING is not called from configure, because
1423+# unfortunately $(top_srcdir) has no meaning in configure.
1424+# However there are other variables, like CC, which are often used in
1425+# configure, and could therefore not use this "fixed" $ac_aux_dir.
1426+#
1427+# Another solution, used here, is to always expand $ac_aux_dir to an
1428+# absolute PATH. The drawback is that using absolute paths prevent a
1429+# configured tree to be moved without reconfiguration.
1430+
1431+AC_DEFUN([AM_AUX_DIR_EXPAND],
1432+[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
1433+# Expand $ac_aux_dir to an absolute path.
1434+am_aux_dir=`cd "$ac_aux_dir" && pwd`
1435+])
1436+
1437+# AM_CONDITIONAL -*- Autoconf -*-
1438+
1439+# Copyright (C) 1997-2013 Free Software Foundation, Inc.
1440+#
1441+# This file is free software; the Free Software Foundation
1442+# gives unlimited permission to copy and/or distribute it,
1443+# with or without modifications, as long as this notice is preserved.
1444+
1445+# AM_CONDITIONAL(NAME, SHELL-CONDITION)
1446+# -------------------------------------
1447+# Define a conditional.
1448+AC_DEFUN([AM_CONDITIONAL],
1449+[AC_PREREQ([2.52])dnl
1450+ m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
1451+ [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
1452+AC_SUBST([$1_TRUE])dnl
1453+AC_SUBST([$1_FALSE])dnl
1454+_AM_SUBST_NOTMAKE([$1_TRUE])dnl
1455+_AM_SUBST_NOTMAKE([$1_FALSE])dnl
1456+m4_define([_AM_COND_VALUE_$1], [$2])dnl
1457+if $2; then
1458+ $1_TRUE=
1459+ $1_FALSE='#'
1460+else
1461+ $1_TRUE='#'
1462+ $1_FALSE=
1463+fi
1464+AC_CONFIG_COMMANDS_PRE(
1465+[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
1466+ AC_MSG_ERROR([[conditional "$1" was never defined.
1467+Usually this means the macro was only invoked conditionally.]])
1468+fi])])
1469+
1470+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
1471+#
1472+# This file is free software; the Free Software Foundation
1473+# gives unlimited permission to copy and/or distribute it,
1474+# with or without modifications, as long as this notice is preserved.
1475+
1476+
1477+# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be
1478+# written in clear, in which case automake, when reading aclocal.m4,
1479+# will think it sees a *use*, and therefore will trigger all it's
1480+# C support machinery. Also note that it means that autoscan, seeing
1481+# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
1482+
1483+
1484+# _AM_DEPENDENCIES(NAME)
1485+# ----------------------
1486+# See how the compiler implements dependency checking.
1487+# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".
1488+# We try a few techniques and use that to set a single cache variable.
1489+#
1490+# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
1491+# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
1492+# dependency, and given that the user is not expected to run this macro,
1493+# just rely on AC_PROG_CC.
1494+AC_DEFUN([_AM_DEPENDENCIES],
1495+[AC_REQUIRE([AM_SET_DEPDIR])dnl
1496+AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
1497+AC_REQUIRE([AM_MAKE_INCLUDE])dnl
1498+AC_REQUIRE([AM_DEP_TRACK])dnl
1499+
1500+m4_if([$1], [CC], [depcc="$CC" am_compiler_list=],
1501+ [$1], [CXX], [depcc="$CXX" am_compiler_list=],
1502+ [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
1503+ [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'],
1504+ [$1], [UPC], [depcc="$UPC" am_compiler_list=],
1505+ [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
1506+ [depcc="$$1" am_compiler_list=])
1507+
1508+AC_CACHE_CHECK([dependency style of $depcc],
1509+ [am_cv_$1_dependencies_compiler_type],
1510+[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
1511+ # We make a subdir and do the tests there. Otherwise we can end up
1512+ # making bogus files that we don't know about and never remove. For
1513+ # instance it was reported that on HP-UX the gcc test will end up
1514+ # making a dummy file named 'D' -- because '-MD' means "put the output
1515+ # in D".
1516+ rm -rf conftest.dir
1517+ mkdir conftest.dir
1518+ # Copy depcomp to subdir because otherwise we won't find it if we're
1519+ # using a relative directory.
1520+ cp "$am_depcomp" conftest.dir
1521+ cd conftest.dir
1522+ # We will build objects and dependencies in a subdirectory because
1523+ # it helps to detect inapplicable dependency modes. For instance
1524+ # both Tru64's cc and ICC support -MD to output dependencies as a
1525+ # side effect of compilation, but ICC will put the dependencies in
1526+ # the current directory while Tru64 will put them in the object
1527+ # directory.
1528+ mkdir sub
1529+
1530+ am_cv_$1_dependencies_compiler_type=none
1531+ if test "$am_compiler_list" = ""; then
1532+ am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
1533+ fi
1534+ am__universal=false
1535+ m4_case([$1], [CC],
1536+ [case " $depcc " in #(
1537+ *\ -arch\ *\ -arch\ *) am__universal=true ;;
1538+ esac],
1539+ [CXX],
1540+ [case " $depcc " in #(
1541+ *\ -arch\ *\ -arch\ *) am__universal=true ;;
1542+ esac])
1543+
1544+ for depmode in $am_compiler_list; do
1545+ # Setup a source with many dependencies, because some compilers
1546+ # like to wrap large dependency lists on column 80 (with \), and
1547+ # we should not choose a depcomp mode which is confused by this.
1548+ #
1549+ # We need to recreate these files for each test, as the compiler may
1550+ # overwrite some of them when testing with obscure command lines.
1551+ # This happens at least with the AIX C compiler.
1552+ : > sub/conftest.c
1553+ for i in 1 2 3 4 5 6; do
1554+ echo '#include "conftst'$i'.h"' >> sub/conftest.c
1555+ # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
1556+ # Solaris 10 /bin/sh.
1557+ echo '/* dummy */' > sub/conftst$i.h
1558+ done
1559+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
1560+
1561+ # We check with '-c' and '-o' for the sake of the "dashmstdout"
1562+ # mode. It turns out that the SunPro C++ compiler does not properly
1563+ # handle '-M -o', and we need to detect this. Also, some Intel
1564+ # versions had trouble with output in subdirs.
1565+ am__obj=sub/conftest.${OBJEXT-o}
1566+ am__minus_obj="-o $am__obj"
1567+ case $depmode in
1568+ gcc)
1569+ # This depmode causes a compiler race in universal mode.
1570+ test "$am__universal" = false || continue
1571+ ;;
1572+ nosideeffect)
1573+ # After this tag, mechanisms are not by side-effect, so they'll
1574+ # only be used when explicitly requested.
1575+ if test "x$enable_dependency_tracking" = xyes; then
1576+ continue
1577+ else
1578+ break
1579+ fi
1580+ ;;
1581+ msvc7 | msvc7msys | msvisualcpp | msvcmsys)
1582+ # This compiler won't grok '-c -o', but also, the minuso test has
1583+ # not run yet. These depmodes are late enough in the game, and
1584+ # so weak that their functioning should not be impacted.
1585+ am__obj=conftest.${OBJEXT-o}
1586+ am__minus_obj=
1587+ ;;
1588+ none) break ;;
1589+ esac
1590+ if depmode=$depmode \
1591+ source=sub/conftest.c object=$am__obj \
1592+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
1593+ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
1594+ >/dev/null 2>conftest.err &&
1595+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
1596+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
1597+ grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
1598+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
1599+ # icc doesn't choke on unknown options, it will just issue warnings
1600+ # or remarks (even with -Werror). So we grep stderr for any message
1601+ # that says an option was ignored or not supported.
1602+ # When given -MP, icc 7.0 and 7.1 complain thusly:
1603+ # icc: Command line warning: ignoring option '-M'; no argument required
1604+ # The diagnosis changed in icc 8.0:
1605+ # icc: Command line remark: option '-MP' not supported
1606+ if (grep 'ignoring option' conftest.err ||
1607+ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
1608+ am_cv_$1_dependencies_compiler_type=$depmode
1609+ break
1610+ fi
1611+ fi
1612+ done
1613+
1614+ cd ..
1615+ rm -rf conftest.dir
1616+else
1617+ am_cv_$1_dependencies_compiler_type=none
1618+fi
1619+])
1620+AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
1621+AM_CONDITIONAL([am__fastdep$1], [
1622+ test "x$enable_dependency_tracking" != xno \
1623+ && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
1624+])
1625+
1626+
1627+# AM_SET_DEPDIR
1628+# -------------
1629+# Choose a directory name for dependency files.
1630+# This macro is AC_REQUIREd in _AM_DEPENDENCIES.
1631+AC_DEFUN([AM_SET_DEPDIR],
1632+[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
1633+AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
1634+])
1635+
1636+
1637+# AM_DEP_TRACK
1638+# ------------
1639+AC_DEFUN([AM_DEP_TRACK],
1640+[AC_ARG_ENABLE([dependency-tracking], [dnl
1641+AS_HELP_STRING(
1642+ [--enable-dependency-tracking],
1643+ [do not reject slow dependency extractors])
1644+AS_HELP_STRING(
1645+ [--disable-dependency-tracking],
1646+ [speeds up one-time build])])
1647+if test "x$enable_dependency_tracking" != xno; then
1648+ am_depcomp="$ac_aux_dir/depcomp"
1649+ AMDEPBACKSLASH='\'
1650+ am__nodep='_no'
1651+fi
1652+AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
1653+AC_SUBST([AMDEPBACKSLASH])dnl
1654+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
1655+AC_SUBST([am__nodep])dnl
1656+_AM_SUBST_NOTMAKE([am__nodep])dnl
1657+])
1658+
1659+# Generate code to set up dependency tracking. -*- Autoconf -*-
1660+
1661+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
1662+#
1663+# This file is free software; the Free Software Foundation
1664+# gives unlimited permission to copy and/or distribute it,
1665+# with or without modifications, as long as this notice is preserved.
1666+
1667+
1668+# _AM_OUTPUT_DEPENDENCY_COMMANDS
1669+# ------------------------------
1670+AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
1671+[{
1672+ # Older Autoconf quotes --file arguments for eval, but not when files
1673+ # are listed without --file. Let's play safe and only enable the eval
1674+ # if we detect the quoting.
1675+ case $CONFIG_FILES in
1676+ *\'*) eval set x "$CONFIG_FILES" ;;
1677+ *) set x $CONFIG_FILES ;;
1678+ esac
1679+ shift
1680+ for mf
1681+ do
1682+ # Strip MF so we end up with the name of the file.
1683+ mf=`echo "$mf" | sed -e 's/:.*$//'`
1684+ # Check whether this is an Automake generated Makefile or not.
1685+ # We used to match only the files named 'Makefile.in', but
1686+ # some people rename them; so instead we look at the file content.
1687+ # Grep'ing the first line is not enough: some people post-process
1688+ # each Makefile.in and add a new line on top of each file to say so.
1689+ # Grep'ing the whole file is not good either: AIX grep has a line
1690+ # limit of 2048, but all sed's we know have understand at least 4000.
1691+ if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
1692+ dirpart=`AS_DIRNAME("$mf")`
1693+ else
1694+ continue
1695+ fi
1696+ # Extract the definition of DEPDIR, am__include, and am__quote
1697+ # from the Makefile without running 'make'.
1698+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
1699+ test -z "$DEPDIR" && continue
1700+ am__include=`sed -n 's/^am__include = //p' < "$mf"`
1701+ test -z "$am__include" && continue
1702+ am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
1703+ # Find all dependency output files, they are included files with
1704+ # $(DEPDIR) in their names. We invoke sed twice because it is the
1705+ # simplest approach to changing $(DEPDIR) to its actual value in the
1706+ # expansion.
1707+ for file in `sed -n "
1708+ s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
1709+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
1710+ # Make sure the directory exists.
1711+ test -f "$dirpart/$file" && continue
1712+ fdir=`AS_DIRNAME(["$file"])`
1713+ AS_MKDIR_P([$dirpart/$fdir])
1714+ # echo "creating $dirpart/$file"
1715+ echo '# dummy' > "$dirpart/$file"
1716+ done
1717+ done
1718+}
1719+])# _AM_OUTPUT_DEPENDENCY_COMMANDS
1720+
1721+
1722+# AM_OUTPUT_DEPENDENCY_COMMANDS
1723+# -----------------------------
1724+# This macro should only be invoked once -- use via AC_REQUIRE.
1725+#
1726+# This code is only required when automatic dependency tracking
1727+# is enabled. FIXME. This creates each '.P' file that we will
1728+# need in order to bootstrap the dependency handling code.
1729+AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
1730+[AC_CONFIG_COMMANDS([depfiles],
1731+ [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
1732+ [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
1733+])
1734+
1735+# Do all the work for Automake. -*- Autoconf -*-
1736+
1737+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
1738+#
1739+# This file is free software; the Free Software Foundation
1740+# gives unlimited permission to copy and/or distribute it,
1741+# with or without modifications, as long as this notice is preserved.
1742+
1743+# This macro actually does too much. Some checks are only needed if
1744+# your package does certain things. But this isn't really a big deal.
1745+
1746+dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O.
1747+m4_define([AC_PROG_CC],
1748+m4_defn([AC_PROG_CC])
1749+[_AM_PROG_CC_C_O
1750+])
1751+
1752+# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
1753+# AM_INIT_AUTOMAKE([OPTIONS])
1754+# -----------------------------------------------
1755+# The call with PACKAGE and VERSION arguments is the old style
1756+# call (pre autoconf-2.50), which is being phased out. PACKAGE
1757+# and VERSION should now be passed to AC_INIT and removed from
1758+# the call to AM_INIT_AUTOMAKE.
1759+# We support both call styles for the transition. After
1760+# the next Automake release, Autoconf can make the AC_INIT
1761+# arguments mandatory, and then we can depend on a new Autoconf
1762+# release and drop the old call support.
1763+AC_DEFUN([AM_INIT_AUTOMAKE],
1764+[AC_PREREQ([2.65])dnl
1765+dnl Autoconf wants to disallow AM_ names. We explicitly allow
1766+dnl the ones we care about.
1767+m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
1768+AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
1769+AC_REQUIRE([AC_PROG_INSTALL])dnl
1770+if test "`cd $srcdir && pwd`" != "`pwd`"; then
1771+ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
1772+ # is not polluted with repeated "-I."
1773+ AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
1774+ # test to see if srcdir already configured
1775+ if test -f $srcdir/config.status; then
1776+ AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
1777+ fi
1778+fi
1779+
1780+# test whether we have cygpath
1781+if test -z "$CYGPATH_W"; then
1782+ if (cygpath --version) >/dev/null 2>/dev/null; then
1783+ CYGPATH_W='cygpath -w'
1784+ else
1785+ CYGPATH_W=echo
1786+ fi
1787+fi
1788+AC_SUBST([CYGPATH_W])
1789+
1790+# Define the identity of the package.
1791+dnl Distinguish between old-style and new-style calls.
1792+m4_ifval([$2],
1793+[AC_DIAGNOSE([obsolete],
1794+ [$0: two- and three-arguments forms are deprecated.])
1795+m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
1796+ AC_SUBST([PACKAGE], [$1])dnl
1797+ AC_SUBST([VERSION], [$2])],
1798+[_AM_SET_OPTIONS([$1])dnl
1799+dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
1800+m4_if(
1801+ m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
1802+ [ok:ok],,
1803+ [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
1804+ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
1805+ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
1806+
1807+_AM_IF_OPTION([no-define],,
1808+[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
1809+ AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl
1810+
1811+# Some tools Automake needs.
1812+AC_REQUIRE([AM_SANITY_CHECK])dnl
1813+AC_REQUIRE([AC_ARG_PROGRAM])dnl
1814+AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
1815+AM_MISSING_PROG([AUTOCONF], [autoconf])
1816+AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
1817+AM_MISSING_PROG([AUTOHEADER], [autoheader])
1818+AM_MISSING_PROG([MAKEINFO], [makeinfo])
1819+AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
1820+AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
1821+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
1822+# For better backward compatibility. To be removed once Automake 1.9.x
1823+# dies out for good. For more background, see:
1824+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
1825+# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
1826+AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
1827+# We need awk for the "check" target. The system "awk" is bad on
1828+# some platforms.
1829+AC_REQUIRE([AC_PROG_AWK])dnl
1830+AC_REQUIRE([AC_PROG_MAKE_SET])dnl
1831+AC_REQUIRE([AM_SET_LEADING_DOT])dnl
1832+_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
1833+ [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
1834+ [_AM_PROG_TAR([v7])])])
1835+_AM_IF_OPTION([no-dependencies],,
1836+[AC_PROVIDE_IFELSE([AC_PROG_CC],
1837+ [_AM_DEPENDENCIES([CC])],
1838+ [m4_define([AC_PROG_CC],
1839+ m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
1840+AC_PROVIDE_IFELSE([AC_PROG_CXX],
1841+ [_AM_DEPENDENCIES([CXX])],
1842+ [m4_define([AC_PROG_CXX],
1843+ m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
1844+AC_PROVIDE_IFELSE([AC_PROG_OBJC],
1845+ [_AM_DEPENDENCIES([OBJC])],
1846+ [m4_define([AC_PROG_OBJC],
1847+ m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
1848+AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
1849+ [_AM_DEPENDENCIES([OBJCXX])],
1850+ [m4_define([AC_PROG_OBJCXX],
1851+ m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl
1852+])
1853+AC_REQUIRE([AM_SILENT_RULES])dnl
1854+dnl The testsuite driver may need to know about EXEEXT, so add the
1855+dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This
1856+dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below.
1857+AC_CONFIG_COMMANDS_PRE(dnl
1858+[m4_provide_if([_AM_COMPILER_EXEEXT],
1859+ [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
1860+
1861+# POSIX will say in a future version that running "rm -f" with no argument
1862+# is OK; and we want to be able to make that assumption in our Makefile
1863+# recipes. So use an aggressive probe to check that the usage we want is
1864+# actually supported "in the wild" to an acceptable degree.
1865+# See automake bug#10828.
1866+# To make any issue more visible, cause the running configure to be aborted
1867+# by default if the 'rm' program in use doesn't match our expectations; the
1868+# user can still override this though.
1869+if rm -f && rm -fr && rm -rf; then : OK; else
1870+ cat >&2 <<'END'
1871+Oops!
1872+
1873+Your 'rm' program seems unable to run without file operands specified
1874+on the command line, even when the '-f' option is present. This is contrary
1875+to the behaviour of most rm programs out there, and not conforming with
1876+the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
1877+
1878+Please tell bug-automake@gnu.org about your system, including the value
1879+of your $PATH and any error possibly output before this message. This
1880+can help us improve future automake versions.
1881+
1882+END
1883+ if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
1884+ echo 'Configuration will proceed anyway, since you have set the' >&2
1885+ echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
1886+ echo >&2
1887+ else
1888+ cat >&2 <<'END'
1889+Aborting the configuration process, to ensure you take notice of the issue.
1890+
1891+You can download and install GNU coreutils to get an 'rm' implementation
1892+that behaves properly: <http://www.gnu.org/software/coreutils/>.
1893+
1894+If you want to complete the configuration process using your problematic
1895+'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
1896+to "yes", and re-run configure.
1897+
1898+END
1899+ AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
1900+ fi
1901+fi
1902+])
1903+
1904+dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
1905+dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
1906+dnl mangled by Autoconf and run in a shell conditional statement.
1907+m4_define([_AC_COMPILER_EXEEXT],
1908+m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
1909+
1910+# When config.status generates a header, we must update the stamp-h file.
1911+# This file resides in the same directory as the config header
1912+# that is generated. The stamp files are numbered to have different names.
1913+
1914+# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
1915+# loop where config.status creates the headers, so we can generate
1916+# our stamp files there.
1917+AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
1918+[# Compute $1's index in $config_headers.
1919+_am_arg=$1
1920+_am_stamp_count=1
1921+for _am_header in $config_headers :; do
1922+ case $_am_header in
1923+ $_am_arg | $_am_arg:* )
1924+ break ;;
1925+ * )
1926+ _am_stamp_count=`expr $_am_stamp_count + 1` ;;
1927+ esac
1928+done
1929+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
1930+
1931+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
1932+#
1933+# This file is free software; the Free Software Foundation
1934+# gives unlimited permission to copy and/or distribute it,
1935+# with or without modifications, as long as this notice is preserved.
1936+
1937+# AM_PROG_INSTALL_SH
1938+# ------------------
1939+# Define $install_sh.
1940+AC_DEFUN([AM_PROG_INSTALL_SH],
1941+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
1942+if test x"${install_sh}" != xset; then
1943+ case $am_aux_dir in
1944+ *\ * | *\ *)
1945+ install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
1946+ *)
1947+ install_sh="\${SHELL} $am_aux_dir/install-sh"
1948+ esac
1949+fi
1950+AC_SUBST([install_sh])])
1951+
1952+# Copyright (C) 2003-2013 Free Software Foundation, Inc.
1953+#
1954+# This file is free software; the Free Software Foundation
1955+# gives unlimited permission to copy and/or distribute it,
1956+# with or without modifications, as long as this notice is preserved.
1957+
1958+# Check whether the underlying file-system supports filenames
1959+# with a leading dot. For instance MS-DOS doesn't.
1960+AC_DEFUN([AM_SET_LEADING_DOT],
1961+[rm -rf .tst 2>/dev/null
1962+mkdir .tst 2>/dev/null
1963+if test -d .tst; then
1964+ am__leading_dot=.
1965+else
1966+ am__leading_dot=_
1967+fi
1968+rmdir .tst 2>/dev/null
1969+AC_SUBST([am__leading_dot])])
1970+
1971+# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
1972+# From Jim Meyering
1973+
1974+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
1975+#
1976+# This file is free software; the Free Software Foundation
1977+# gives unlimited permission to copy and/or distribute it,
1978+# with or without modifications, as long as this notice is preserved.
1979+
1980+# AM_MAINTAINER_MODE([DEFAULT-MODE])
1981+# ----------------------------------
1982+# Control maintainer-specific portions of Makefiles.
1983+# Default is to disable them, unless 'enable' is passed literally.
1984+# For symmetry, 'disable' may be passed as well. Anyway, the user
1985+# can override the default with the --enable/--disable switch.
1986+AC_DEFUN([AM_MAINTAINER_MODE],
1987+[m4_case(m4_default([$1], [disable]),
1988+ [enable], [m4_define([am_maintainer_other], [disable])],
1989+ [disable], [m4_define([am_maintainer_other], [enable])],
1990+ [m4_define([am_maintainer_other], [enable])
1991+ m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])])
1992+AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
1993+ dnl maintainer-mode's default is 'disable' unless 'enable' is passed
1994+ AC_ARG_ENABLE([maintainer-mode],
1995+ [AS_HELP_STRING([--]am_maintainer_other[-maintainer-mode],
1996+ am_maintainer_other[ make rules and dependencies not useful
1997+ (and sometimes confusing) to the casual installer])],
1998+ [USE_MAINTAINER_MODE=$enableval],
1999+ [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
2000+ AC_MSG_RESULT([$USE_MAINTAINER_MODE])
2001+ AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
2002+ MAINT=$MAINTAINER_MODE_TRUE
2003+ AC_SUBST([MAINT])dnl
2004+]
2005+)
2006+
2007+# Check to see how 'make' treats includes. -*- Autoconf -*-
2008+
2009+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
2010+#
2011+# This file is free software; the Free Software Foundation
2012+# gives unlimited permission to copy and/or distribute it,
2013+# with or without modifications, as long as this notice is preserved.
2014+
2015+# AM_MAKE_INCLUDE()
2016+# -----------------
2017+# Check to see how make treats includes.
2018+AC_DEFUN([AM_MAKE_INCLUDE],
2019+[am_make=${MAKE-make}
2020+cat > confinc << 'END'
2021+am__doit:
2022+ @echo this is the am__doit target
2023+.PHONY: am__doit
2024+END
2025+# If we don't find an include directive, just comment out the code.
2026+AC_MSG_CHECKING([for style of include used by $am_make])
2027+am__include="#"
2028+am__quote=
2029+_am_result=none
2030+# First try GNU make style include.
2031+echo "include confinc" > confmf
2032+# Ignore all kinds of additional output from 'make'.
2033+case `$am_make -s -f confmf 2> /dev/null` in #(
2034+*the\ am__doit\ target*)
2035+ am__include=include
2036+ am__quote=
2037+ _am_result=GNU
2038+ ;;
2039+esac
2040+# Now try BSD make style include.
2041+if test "$am__include" = "#"; then
2042+ echo '.include "confinc"' > confmf
2043+ case `$am_make -s -f confmf 2> /dev/null` in #(
2044+ *the\ am__doit\ target*)
2045+ am__include=.include
2046+ am__quote="\""
2047+ _am_result=BSD
2048+ ;;
2049+ esac
2050+fi
2051+AC_SUBST([am__include])
2052+AC_SUBST([am__quote])
2053+AC_MSG_RESULT([$_am_result])
2054+rm -f confinc confmf
2055+])
2056+
2057+# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
2058+
2059+# Copyright (C) 1997-2013 Free Software Foundation, Inc.
2060+#
2061+# This file is free software; the Free Software Foundation
2062+# gives unlimited permission to copy and/or distribute it,
2063+# with or without modifications, as long as this notice is preserved.
2064+
2065+# AM_MISSING_PROG(NAME, PROGRAM)
2066+# ------------------------------
2067+AC_DEFUN([AM_MISSING_PROG],
2068+[AC_REQUIRE([AM_MISSING_HAS_RUN])
2069+$1=${$1-"${am_missing_run}$2"}
2070+AC_SUBST($1)])
2071+
2072+# AM_MISSING_HAS_RUN
2073+# ------------------
2074+# Define MISSING if not defined so far and test if it is modern enough.
2075+# If it is, set am_missing_run to use it, otherwise, to nothing.
2076+AC_DEFUN([AM_MISSING_HAS_RUN],
2077+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
2078+AC_REQUIRE_AUX_FILE([missing])dnl
2079+if test x"${MISSING+set}" != xset; then
2080+ case $am_aux_dir in
2081+ *\ * | *\ *)
2082+ MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
2083+ *)
2084+ MISSING="\${SHELL} $am_aux_dir/missing" ;;
2085+ esac
2086+fi
2087+# Use eval to expand $SHELL
2088+if eval "$MISSING --is-lightweight"; then
2089+ am_missing_run="$MISSING "
2090+else
2091+ am_missing_run=
2092+ AC_MSG_WARN(['missing' script is too old or missing])
2093+fi
2094+])
2095+
2096+# Helper functions for option handling. -*- Autoconf -*-
2097+
2098+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
2099+#
2100+# This file is free software; the Free Software Foundation
2101+# gives unlimited permission to copy and/or distribute it,
2102+# with or without modifications, as long as this notice is preserved.
2103+
2104+# _AM_MANGLE_OPTION(NAME)
2105+# -----------------------
2106+AC_DEFUN([_AM_MANGLE_OPTION],
2107+[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
2108+
2109+# _AM_SET_OPTION(NAME)
2110+# --------------------
2111+# Set option NAME. Presently that only means defining a flag for this option.
2112+AC_DEFUN([_AM_SET_OPTION],
2113+[m4_define(_AM_MANGLE_OPTION([$1]), [1])])
2114+
2115+# _AM_SET_OPTIONS(OPTIONS)
2116+# ------------------------
2117+# OPTIONS is a space-separated list of Automake options.
2118+AC_DEFUN([_AM_SET_OPTIONS],
2119+[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
2120+
2121+# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
2122+# -------------------------------------------
2123+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
2124+AC_DEFUN([_AM_IF_OPTION],
2125+[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
2126+
2127+# Copyright (C) 1999-2013 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+# _AM_PROG_CC_C_O
2134+# ---------------
2135+# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC
2136+# to automatically call this.
2137+AC_DEFUN([_AM_PROG_CC_C_O],
2138+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
2139+AC_REQUIRE_AUX_FILE([compile])dnl
2140+AC_LANG_PUSH([C])dnl
2141+AC_CACHE_CHECK(
2142+ [whether $CC understands -c and -o together],
2143+ [am_cv_prog_cc_c_o],
2144+ [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])])
2145+ # Make sure it works both with $CC and with simple cc.
2146+ # Following AC_PROG_CC_C_O, we do the test twice because some
2147+ # compilers refuse to overwrite an existing .o file with -o,
2148+ # though they will create one.
2149+ am_cv_prog_cc_c_o=yes
2150+ for am_i in 1 2; do
2151+ if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \
2152+ && test -f conftest2.$ac_objext; then
2153+ : OK
2154+ else
2155+ am_cv_prog_cc_c_o=no
2156+ break
2157+ fi
2158+ done
2159+ rm -f core conftest*
2160+ unset am_i])
2161+if test "$am_cv_prog_cc_c_o" != yes; then
2162+ # Losing compiler, so override with the script.
2163+ # FIXME: It is wrong to rewrite CC.
2164+ # But if we don't then we get into trouble of one sort or another.
2165+ # A longer-term fix would be to have automake use am__CC in this case,
2166+ # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
2167+ CC="$am_aux_dir/compile $CC"
2168+fi
2169+AC_LANG_POP([C])])
2170+
2171+# For backward compatibility.
2172+AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
2173+
2174+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
2175+#
2176+# This file is free software; the Free Software Foundation
2177+# gives unlimited permission to copy and/or distribute it,
2178+# with or without modifications, as long as this notice is preserved.
2179+
2180+# AM_RUN_LOG(COMMAND)
2181+# -------------------
2182+# Run COMMAND, save the exit status in ac_status, and log it.
2183+# (This has been adapted from Autoconf's _AC_RUN_LOG macro.)
2184+AC_DEFUN([AM_RUN_LOG],
2185+[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD
2186+ ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
2187+ ac_status=$?
2188+ echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
2189+ (exit $ac_status); }])
2190+
2191+# Check to make sure that the build environment is sane. -*- Autoconf -*-
2192+
2193+# Copyright (C) 1996-2013 Free Software Foundation, Inc.
2194+#
2195+# This file is free software; the Free Software Foundation
2196+# gives unlimited permission to copy and/or distribute it,
2197+# with or without modifications, as long as this notice is preserved.
2198+
2199+# AM_SANITY_CHECK
2200+# ---------------
2201+AC_DEFUN([AM_SANITY_CHECK],
2202+[AC_MSG_CHECKING([whether build environment is sane])
2203+# Reject unsafe characters in $srcdir or the absolute working directory
2204+# name. Accept space and tab only in the latter.
2205+am_lf='
2206+'
2207+case `pwd` in
2208+ *[[\\\"\#\$\&\'\`$am_lf]]*)
2209+ AC_MSG_ERROR([unsafe absolute working directory name]);;
2210+esac
2211+case $srcdir in
2212+ *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*)
2213+ AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;
2214+esac
2215+
2216+# Do 'set' in a subshell so we don't clobber the current shell's
2217+# arguments. Must try -L first in case configure is actually a
2218+# symlink; some systems play weird games with the mod time of symlinks
2219+# (eg FreeBSD returns the mod time of the symlink's containing
2220+# directory).
2221+if (
2222+ am_has_slept=no
2223+ for am_try in 1 2; do
2224+ echo "timestamp, slept: $am_has_slept" > conftest.file
2225+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
2226+ if test "$[*]" = "X"; then
2227+ # -L didn't work.
2228+ set X `ls -t "$srcdir/configure" conftest.file`
2229+ fi
2230+ if test "$[*]" != "X $srcdir/configure conftest.file" \
2231+ && test "$[*]" != "X conftest.file $srcdir/configure"; then
2232+
2233+ # If neither matched, then we have a broken ls. This can happen
2234+ # if, for instance, CONFIG_SHELL is bash and it inherits a
2235+ # broken ls alias from the environment. This has actually
2236+ # happened. Such a system could not be considered "sane".
2237+ AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
2238+ alias in your environment])
2239+ fi
2240+ if test "$[2]" = conftest.file || test $am_try -eq 2; then
2241+ break
2242+ fi
2243+ # Just in case.
2244+ sleep 1
2245+ am_has_slept=yes
2246+ done
2247+ test "$[2]" = conftest.file
2248+ )
2249+then
2250+ # Ok.
2251+ :
2252+else
2253+ AC_MSG_ERROR([newly created file is older than distributed files!
2254+Check your system clock])
2255+fi
2256+AC_MSG_RESULT([yes])
2257+# If we didn't sleep, we still need to ensure time stamps of config.status and
2258+# generated files are strictly newer.
2259+am_sleep_pid=
2260+if grep 'slept: no' conftest.file >/dev/null 2>&1; then
2261+ ( sleep 1 ) &
2262+ am_sleep_pid=$!
2263+fi
2264+AC_CONFIG_COMMANDS_PRE(
2265+ [AC_MSG_CHECKING([that generated files are newer than configure])
2266+ if test -n "$am_sleep_pid"; then
2267+ # Hide warnings about reused PIDs.
2268+ wait $am_sleep_pid 2>/dev/null
2269+ fi
2270+ AC_MSG_RESULT([done])])
2271+rm -f conftest.file
2272+])
2273+
2274+# Copyright (C) 2009-2013 Free Software Foundation, Inc.
2275+#
2276+# This file is free software; the Free Software Foundation
2277+# gives unlimited permission to copy and/or distribute it,
2278+# with or without modifications, as long as this notice is preserved.
2279+
2280+# AM_SILENT_RULES([DEFAULT])
2281+# --------------------------
2282+# Enable less verbose build rules; with the default set to DEFAULT
2283+# ("yes" being less verbose, "no" or empty being verbose).
2284+AC_DEFUN([AM_SILENT_RULES],
2285+[AC_ARG_ENABLE([silent-rules], [dnl
2286+AS_HELP_STRING(
2287+ [--enable-silent-rules],
2288+ [less verbose build output (undo: "make V=1")])
2289+AS_HELP_STRING(
2290+ [--disable-silent-rules],
2291+ [verbose build output (undo: "make V=0")])dnl
2292+])
2293+case $enable_silent_rules in @%:@ (((
2294+ yes) AM_DEFAULT_VERBOSITY=0;;
2295+ no) AM_DEFAULT_VERBOSITY=1;;
2296+ *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
2297+esac
2298+dnl
2299+dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
2300+dnl do not support nested variable expansions.
2301+dnl See automake bug#9928 and bug#10237.
2302+am_make=${MAKE-make}
2303+AC_CACHE_CHECK([whether $am_make supports nested variables],
2304+ [am_cv_make_support_nested_variables],
2305+ [if AS_ECHO([['TRUE=$(BAR$(V))
2306+BAR0=false
2307+BAR1=true
2308+V=1
2309+am__doit:
2310+ @$(TRUE)
2311+.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then
2312+ am_cv_make_support_nested_variables=yes
2313+else
2314+ am_cv_make_support_nested_variables=no
2315+fi])
2316+if test $am_cv_make_support_nested_variables = yes; then
2317+ dnl Using '$V' instead of '$(V)' breaks IRIX make.
2318+ AM_V='$(V)'
2319+ AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
2320+else
2321+ AM_V=$AM_DEFAULT_VERBOSITY
2322+ AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
2323+fi
2324+AC_SUBST([AM_V])dnl
2325+AM_SUBST_NOTMAKE([AM_V])dnl
2326+AC_SUBST([AM_DEFAULT_V])dnl
2327+AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl
2328+AC_SUBST([AM_DEFAULT_VERBOSITY])dnl
2329+AM_BACKSLASH='\'
2330+AC_SUBST([AM_BACKSLASH])dnl
2331+_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
2332+])
2333+
2334+# Copyright (C) 2001-2013 Free Software Foundation, Inc.
2335+#
2336+# This file is free software; the Free Software Foundation
2337+# gives unlimited permission to copy and/or distribute it,
2338+# with or without modifications, as long as this notice is preserved.
2339+
2340+# AM_PROG_INSTALL_STRIP
2341+# ---------------------
2342+# One issue with vendor 'install' (even GNU) is that you can't
2343+# specify the program used to strip binaries. This is especially
2344+# annoying in cross-compiling environments, where the build's strip
2345+# is unlikely to handle the host's binaries.
2346+# Fortunately install-sh will honor a STRIPPROG variable, so we
2347+# always use install-sh in "make install-strip", and initialize
2348+# STRIPPROG with the value of the STRIP variable (set by the user).
2349+AC_DEFUN([AM_PROG_INSTALL_STRIP],
2350+[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
2351+# Installed binaries are usually stripped using 'strip' when the user
2352+# run "make install-strip". However 'strip' might not be the right
2353+# tool to use in cross-compilation environments, therefore Automake
2354+# will honor the 'STRIP' environment variable to overrule this program.
2355+dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.
2356+if test "$cross_compiling" != no; then
2357+ AC_CHECK_TOOL([STRIP], [strip], :)
2358+fi
2359+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
2360+AC_SUBST([INSTALL_STRIP_PROGRAM])])
2361+
2362+# Copyright (C) 2006-2013 Free Software Foundation, Inc.
2363+#
2364+# This file is free software; the Free Software Foundation
2365+# gives unlimited permission to copy and/or distribute it,
2366+# with or without modifications, as long as this notice is preserved.
2367+
2368+# _AM_SUBST_NOTMAKE(VARIABLE)
2369+# ---------------------------
2370+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
2371+# This macro is traced by Automake.
2372+AC_DEFUN([_AM_SUBST_NOTMAKE])
2373+
2374+# AM_SUBST_NOTMAKE(VARIABLE)
2375+# --------------------------
2376+# Public sister of _AM_SUBST_NOTMAKE.
2377+AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
2378+
2379+# Check how to create a tarball. -*- Autoconf -*-
2380+
2381+# Copyright (C) 2004-2013 Free Software Foundation, Inc.
2382+#
2383+# This file is free software; the Free Software Foundation
2384+# gives unlimited permission to copy and/or distribute it,
2385+# with or without modifications, as long as this notice is preserved.
2386+
2387+# _AM_PROG_TAR(FORMAT)
2388+# --------------------
2389+# Check how to create a tarball in format FORMAT.
2390+# FORMAT should be one of 'v7', 'ustar', or 'pax'.
2391+#
2392+# Substitute a variable $(am__tar) that is a command
2393+# writing to stdout a FORMAT-tarball containing the directory
2394+# $tardir.
2395+# tardir=directory && $(am__tar) > result.tar
2396+#
2397+# Substitute a variable $(am__untar) that extract such
2398+# a tarball read from stdin.
2399+# $(am__untar) < result.tar
2400+#
2401+AC_DEFUN([_AM_PROG_TAR],
2402+[# Always define AMTAR for backward compatibility. Yes, it's still used
2403+# in the wild :-( We should find a proper way to deprecate it ...
2404+AC_SUBST([AMTAR], ['$${TAR-tar}'])
2405+
2406+# We'll loop over all known methods to create a tar archive until one works.
2407+_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
2408+
2409+m4_if([$1], [v7],
2410+ [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
2411+
2412+ [m4_case([$1],
2413+ [ustar],
2414+ [# The POSIX 1988 'ustar' format is defined with fixed-size fields.
2415+ # There is notably a 21 bits limit for the UID and the GID. In fact,
2416+ # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343
2417+ # and bug#13588).
2418+ am_max_uid=2097151 # 2^21 - 1
2419+ am_max_gid=$am_max_uid
2420+ # The $UID and $GID variables are not portable, so we need to resort
2421+ # to the POSIX-mandated id(1) utility. Errors in the 'id' calls
2422+ # below are definitely unexpected, so allow the users to see them
2423+ # (that is, avoid stderr redirection).
2424+ am_uid=`id -u || echo unknown`
2425+ am_gid=`id -g || echo unknown`
2426+ AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format])
2427+ if test $am_uid -le $am_max_uid; then
2428+ AC_MSG_RESULT([yes])
2429+ else
2430+ AC_MSG_RESULT([no])
2431+ _am_tools=none
2432+ fi
2433+ AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format])
2434+ if test $am_gid -le $am_max_gid; then
2435+ AC_MSG_RESULT([yes])
2436+ else
2437+ AC_MSG_RESULT([no])
2438+ _am_tools=none
2439+ fi],
2440+
2441+ [pax],
2442+ [],
2443+
2444+ [m4_fatal([Unknown tar format])])
2445+
2446+ AC_MSG_CHECKING([how to create a $1 tar archive])
2447+
2448+ # Go ahead even if we have the value already cached. We do so because we
2449+ # need to set the values for the 'am__tar' and 'am__untar' variables.
2450+ _am_tools=${am_cv_prog_tar_$1-$_am_tools}
2451+
2452+ for _am_tool in $_am_tools; do
2453+ case $_am_tool in
2454+ gnutar)
2455+ for _am_tar in tar gnutar gtar; do
2456+ AM_RUN_LOG([$_am_tar --version]) && break
2457+ done
2458+ am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
2459+ am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
2460+ am__untar="$_am_tar -xf -"
2461+ ;;
2462+ plaintar)
2463+ # Must skip GNU tar: if it does not support --format= it doesn't create
2464+ # ustar tarball either.
2465+ (tar --version) >/dev/null 2>&1 && continue
2466+ am__tar='tar chf - "$$tardir"'
2467+ am__tar_='tar chf - "$tardir"'
2468+ am__untar='tar xf -'
2469+ ;;
2470+ pax)
2471+ am__tar='pax -L -x $1 -w "$$tardir"'
2472+ am__tar_='pax -L -x $1 -w "$tardir"'
2473+ am__untar='pax -r'
2474+ ;;
2475+ cpio)
2476+ am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
2477+ am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
2478+ am__untar='cpio -i -H $1 -d'
2479+ ;;
2480+ none)
2481+ am__tar=false
2482+ am__tar_=false
2483+ am__untar=false
2484+ ;;
2485+ esac
2486+
2487+ # If the value was cached, stop now. We just wanted to have am__tar
2488+ # and am__untar set.
2489+ test -n "${am_cv_prog_tar_$1}" && break
2490+
2491+ # tar/untar a dummy directory, and stop if the command works.
2492+ rm -rf conftest.dir
2493+ mkdir conftest.dir
2494+ echo GrepMe > conftest.dir/file
2495+ AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
2496+ rm -rf conftest.dir
2497+ if test -s conftest.tar; then
2498+ AM_RUN_LOG([$am__untar <conftest.tar])
2499+ AM_RUN_LOG([cat conftest.dir/file])
2500+ grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
2501+ fi
2502+ done
2503+ rm -rf conftest.dir
2504+
2505+ AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
2506+ AC_MSG_RESULT([$am_cv_prog_tar_$1])])
2507+
2508+AC_SUBST([am__tar])
2509+AC_SUBST([am__untar])
2510+]) # _AM_PROG_TAR
2511+
2512
2513 dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
2514 # serial 42 IT_PROG_INTLTOOL
2515@@ -1978,7 +3388,7 @@
2516 rm -rf conftest*
2517 ;;
2518
2519-x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
2520+x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
2521 s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
2522 # Find out which ABI we are using.
2523 echo 'int i;' > conftest.$ac_ext
2524@@ -1990,9 +3400,19 @@
2525 LD="${LD-ld} -m elf_i386_fbsd"
2526 ;;
2527 x86_64-*linux*)
2528- LD="${LD-ld} -m elf_i386"
2529- ;;
2530- ppc64-*linux*|powerpc64-*linux*)
2531+ case `/usr/bin/file conftest.o` in
2532+ *x86-64*)
2533+ LD="${LD-ld} -m elf32_x86_64"
2534+ ;;
2535+ *)
2536+ LD="${LD-ld} -m elf_i386"
2537+ ;;
2538+ esac
2539+ ;;
2540+ powerpc64le-*)
2541+ LD="${LD-ld} -m elf32lppclinux"
2542+ ;;
2543+ powerpc64-*)
2544 LD="${LD-ld} -m elf32ppclinux"
2545 ;;
2546 s390x-*linux*)
2547@@ -2011,7 +3431,10 @@
2548 x86_64-*linux*)
2549 LD="${LD-ld} -m elf_x86_64"
2550 ;;
2551- ppc*-*linux*|powerpc*-*linux*)
2552+ powerpcle-*)
2553+ LD="${LD-ld} -m elf64lppc"
2554+ ;;
2555+ powerpc-*)
2556 LD="${LD-ld} -m elf64ppc"
2557 ;;
2558 s390*-*linux*|s390*-*tpf*)
2559@@ -2354,7 +3777,8 @@
2560 ;;
2561 *)
2562 lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
2563- if test -n "$lt_cv_sys_max_cmd_len"; then
2564+ if test -n "$lt_cv_sys_max_cmd_len" && \
2565+ test undefined != "$lt_cv_sys_max_cmd_len"; then
2566 lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
2567 lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
2568 else
2569@@ -3178,17 +4602,6 @@
2570 esac
2571 ;;
2572
2573-gnu*)
2574- version_type=linux # correct to gnu/linux during the next big refactor
2575- need_lib_prefix=no
2576- need_version=no
2577- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
2578- soname_spec='${libname}${release}${shared_ext}$major'
2579- shlibpath_var=LD_LIBRARY_PATH
2580- shlibpath_overrides_runpath=no
2581- hardcode_into_libs=yes
2582- ;;
2583-
2584 haiku*)
2585 version_type=linux # correct to gnu/linux during the next big refactor
2586 need_lib_prefix=no
2587@@ -3305,7 +4718,7 @@
2588 ;;
2589
2590 # This must be glibc/ELF.
2591-linux* | k*bsd*-gnu | kopensolaris*-gnu)
2592+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
2593 version_type=linux # correct to gnu/linux during the next big refactor
2594 need_lib_prefix=no
2595 need_version=no
2596@@ -3921,10 +5334,6 @@
2597 fi
2598 ;;
2599
2600-gnu*)
2601- lt_cv_deplibs_check_method=pass_all
2602- ;;
2603-
2604 haiku*)
2605 lt_cv_deplibs_check_method=pass_all
2606 ;;
2607@@ -3963,7 +5372,7 @@
2608 ;;
2609
2610 # This must be glibc/ELF.
2611-linux* | k*bsd*-gnu | kopensolaris*-gnu)
2612+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
2613 lt_cv_deplibs_check_method=pass_all
2614 ;;
2615
2616@@ -4715,7 +6124,7 @@
2617 ;;
2618 esac
2619 ;;
2620- linux* | k*bsd*-gnu | kopensolaris*-gnu)
2621+ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
2622 case $cc_basename in
2623 KCC*)
2624 # KAI C++ Compiler
2625@@ -5014,7 +6423,7 @@
2626 _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
2627 ;;
2628
2629- linux* | k*bsd*-gnu | kopensolaris*-gnu)
2630+ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
2631 case $cc_basename in
2632 # old Intel for x86_64 which still supported -KPIC.
2633 ecc*)
2634@@ -6903,9 +8312,6 @@
2635 _LT_TAGVAR(ld_shlibs, $1)=yes
2636 ;;
2637
2638- gnu*)
2639- ;;
2640-
2641 haiku*)
2642 _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
2643 _LT_TAGVAR(link_all_deplibs, $1)=yes
2644@@ -7067,7 +8473,7 @@
2645 _LT_TAGVAR(inherit_rpath, $1)=yes
2646 ;;
2647
2648- linux* | k*bsd*-gnu | kopensolaris*-gnu)
2649+ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
2650 case $cc_basename in
2651 KCC*)
2652 # Kuck and Associates, Inc. (KAI) C++ Compiler
2653@@ -9278,1235 +10684,6 @@
2654 m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])])
2655 m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])])
2656
2657-# nls.m4 serial 5 (gettext-0.18)
2658-dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation,
2659-dnl Inc.
2660-dnl This file is free software; the Free Software Foundation
2661-dnl gives unlimited permission to copy and/or distribute it,
2662-dnl with or without modifications, as long as this notice is preserved.
2663-dnl
2664-dnl This file can can be used in projects which are not available under
2665-dnl the GNU General Public License or the GNU Library General Public
2666-dnl License but which still want to provide support for the GNU gettext
2667-dnl functionality.
2668-dnl Please note that the actual code of the GNU gettext library is covered
2669-dnl by the GNU Library General Public License, and the rest of the GNU
2670-dnl gettext package package is covered by the GNU General Public License.
2671-dnl They are *not* in the public domain.
2672-
2673-dnl Authors:
2674-dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000.
2675-dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003.
2676-
2677-AC_PREREQ([2.50])
2678-
2679-AC_DEFUN([AM_NLS],
2680-[
2681- AC_MSG_CHECKING([whether NLS is requested])
2682- dnl Default is enabled NLS
2683- AC_ARG_ENABLE([nls],
2684- [ --disable-nls do not use Native Language Support],
2685- USE_NLS=$enableval, USE_NLS=yes)
2686- AC_MSG_RESULT([$USE_NLS])
2687- AC_SUBST([USE_NLS])
2688-])
2689-
2690-# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
2691-# serial 1 (pkg-config-0.24)
2692-#
2693-# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
2694-#
2695-# This program is free software; you can redistribute it and/or modify
2696-# it under the terms of the GNU General Public License as published by
2697-# the Free Software Foundation; either version 2 of the License, or
2698-# (at your option) any later version.
2699-#
2700-# This program is distributed in the hope that it will be useful, but
2701-# WITHOUT ANY WARRANTY; without even the implied warranty of
2702-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
2703-# General Public License for more details.
2704-#
2705-# You should have received a copy of the GNU General Public License
2706-# along with this program; if not, write to the Free Software
2707-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
2708-#
2709-# As a special exception to the GNU General Public License, if you
2710-# distribute this file as part of a program that contains a
2711-# configuration script generated by Autoconf, you may include it under
2712-# the same distribution terms that you use for the rest of that program.
2713-
2714-# PKG_PROG_PKG_CONFIG([MIN-VERSION])
2715-# ----------------------------------
2716-AC_DEFUN([PKG_PROG_PKG_CONFIG],
2717-[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
2718-m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
2719-m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
2720-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
2721-AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
2722-AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
2723-
2724-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
2725- AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
2726-fi
2727-if test -n "$PKG_CONFIG"; then
2728- _pkg_min_version=m4_default([$1], [0.9.0])
2729- AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
2730- if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
2731- AC_MSG_RESULT([yes])
2732- else
2733- AC_MSG_RESULT([no])
2734- PKG_CONFIG=""
2735- fi
2736-fi[]dnl
2737-])# PKG_PROG_PKG_CONFIG
2738-
2739-# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
2740-#
2741-# Check to see whether a particular set of modules exists. Similar
2742-# to PKG_CHECK_MODULES(), but does not set variables or print errors.
2743-#
2744-# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
2745-# only at the first occurence in configure.ac, so if the first place
2746-# it's called might be skipped (such as if it is within an "if", you
2747-# have to call PKG_CHECK_EXISTS manually
2748-# --------------------------------------------------------------
2749-AC_DEFUN([PKG_CHECK_EXISTS],
2750-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
2751-if test -n "$PKG_CONFIG" && \
2752- AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
2753- m4_default([$2], [:])
2754-m4_ifvaln([$3], [else
2755- $3])dnl
2756-fi])
2757-
2758-# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
2759-# ---------------------------------------------
2760-m4_define([_PKG_CONFIG],
2761-[if test -n "$$1"; then
2762- pkg_cv_[]$1="$$1"
2763- elif test -n "$PKG_CONFIG"; then
2764- PKG_CHECK_EXISTS([$3],
2765- [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
2766- test "x$?" != "x0" && pkg_failed=yes ],
2767- [pkg_failed=yes])
2768- else
2769- pkg_failed=untried
2770-fi[]dnl
2771-])# _PKG_CONFIG
2772-
2773-# _PKG_SHORT_ERRORS_SUPPORTED
2774-# -----------------------------
2775-AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
2776-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
2777-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
2778- _pkg_short_errors_supported=yes
2779-else
2780- _pkg_short_errors_supported=no
2781-fi[]dnl
2782-])# _PKG_SHORT_ERRORS_SUPPORTED
2783-
2784-
2785-# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
2786-# [ACTION-IF-NOT-FOUND])
2787-#
2788-#
2789-# Note that if there is a possibility the first call to
2790-# PKG_CHECK_MODULES might not happen, you should be sure to include an
2791-# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
2792-#
2793-#
2794-# --------------------------------------------------------------
2795-AC_DEFUN([PKG_CHECK_MODULES],
2796-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
2797-AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
2798-AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
2799-
2800-pkg_failed=no
2801-AC_MSG_CHECKING([for $1])
2802-
2803-_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
2804-_PKG_CONFIG([$1][_LIBS], [libs], [$2])
2805-
2806-m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
2807-and $1[]_LIBS to avoid the need to call pkg-config.
2808-See the pkg-config man page for more details.])
2809-
2810-if test $pkg_failed = yes; then
2811- AC_MSG_RESULT([no])
2812- _PKG_SHORT_ERRORS_SUPPORTED
2813- if test $_pkg_short_errors_supported = yes; then
2814- $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
2815- else
2816- $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
2817- fi
2818- # Put the nasty error message in config.log where it belongs
2819- echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
2820-
2821- m4_default([$4], [AC_MSG_ERROR(
2822-[Package requirements ($2) were not met:
2823-
2824-$$1_PKG_ERRORS
2825-
2826-Consider adjusting the PKG_CONFIG_PATH environment variable if you
2827-installed software in a non-standard prefix.
2828-
2829-_PKG_TEXT])[]dnl
2830- ])
2831-elif test $pkg_failed = untried; then
2832- AC_MSG_RESULT([no])
2833- m4_default([$4], [AC_MSG_FAILURE(
2834-[The pkg-config script could not be found or is too old. Make sure it
2835-is in your PATH or set the PKG_CONFIG environment variable to the full
2836-path to pkg-config.
2837-
2838-_PKG_TEXT
2839-
2840-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
2841- ])
2842-else
2843- $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
2844- $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
2845- AC_MSG_RESULT([yes])
2846- $3
2847-fi[]dnl
2848-])# PKG_CHECK_MODULES
2849-
2850-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
2851-# Foundation, Inc.
2852-#
2853-# This file is free software; the Free Software Foundation
2854-# gives unlimited permission to copy and/or distribute it,
2855-# with or without modifications, as long as this notice is preserved.
2856-
2857-# serial 1
2858-
2859-# AM_AUTOMAKE_VERSION(VERSION)
2860-# ----------------------------
2861-# Automake X.Y traces this macro to ensure aclocal.m4 has been
2862-# generated from the m4 files accompanying Automake X.Y.
2863-# (This private macro should not be called outside this file.)
2864-AC_DEFUN([AM_AUTOMAKE_VERSION],
2865-[am__api_version='1.11'
2866-dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
2867-dnl require some minimum version. Point them to the right macro.
2868-m4_if([$1], [1.11.5], [],
2869- [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
2870-])
2871-
2872-# _AM_AUTOCONF_VERSION(VERSION)
2873-# -----------------------------
2874-# aclocal traces this macro to find the Autoconf version.
2875-# This is a private macro too. Using m4_define simplifies
2876-# the logic in aclocal, which can simply ignore this definition.
2877-m4_define([_AM_AUTOCONF_VERSION], [])
2878-
2879-# AM_SET_CURRENT_AUTOMAKE_VERSION
2880-# -------------------------------
2881-# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
2882-# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
2883-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
2884-[AM_AUTOMAKE_VERSION([1.11.5])dnl
2885-m4_ifndef([AC_AUTOCONF_VERSION],
2886- [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
2887-_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
2888-
2889-# AM_AUX_DIR_EXPAND -*- Autoconf -*-
2890-
2891-# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
2892-#
2893-# This file is free software; the Free Software Foundation
2894-# gives unlimited permission to copy and/or distribute it,
2895-# with or without modifications, as long as this notice is preserved.
2896-
2897-# serial 1
2898-
2899-# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
2900-# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
2901-# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
2902-#
2903-# Of course, Automake must honor this variable whenever it calls a
2904-# tool from the auxiliary directory. The problem is that $srcdir (and
2905-# therefore $ac_aux_dir as well) can be either absolute or relative,
2906-# depending on how configure is run. This is pretty annoying, since
2907-# it makes $ac_aux_dir quite unusable in subdirectories: in the top
2908-# source directory, any form will work fine, but in subdirectories a
2909-# relative path needs to be adjusted first.
2910-#
2911-# $ac_aux_dir/missing
2912-# fails when called from a subdirectory if $ac_aux_dir is relative
2913-# $top_srcdir/$ac_aux_dir/missing
2914-# fails if $ac_aux_dir is absolute,
2915-# fails when called from a subdirectory in a VPATH build with
2916-# a relative $ac_aux_dir
2917-#
2918-# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
2919-# are both prefixed by $srcdir. In an in-source build this is usually
2920-# harmless because $srcdir is `.', but things will broke when you
2921-# start a VPATH build or use an absolute $srcdir.
2922-#
2923-# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
2924-# iff we strip the leading $srcdir from $ac_aux_dir. That would be:
2925-# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
2926-# and then we would define $MISSING as
2927-# MISSING="\${SHELL} $am_aux_dir/missing"
2928-# This will work as long as MISSING is not called from configure, because
2929-# unfortunately $(top_srcdir) has no meaning in configure.
2930-# However there are other variables, like CC, which are often used in
2931-# configure, and could therefore not use this "fixed" $ac_aux_dir.
2932-#
2933-# Another solution, used here, is to always expand $ac_aux_dir to an
2934-# absolute PATH. The drawback is that using absolute paths prevent a
2935-# configured tree to be moved without reconfiguration.
2936-
2937-AC_DEFUN([AM_AUX_DIR_EXPAND],
2938-[dnl Rely on autoconf to set up CDPATH properly.
2939-AC_PREREQ([2.50])dnl
2940-# expand $ac_aux_dir to an absolute path
2941-am_aux_dir=`cd $ac_aux_dir && pwd`
2942-])
2943-
2944-# AM_CONDITIONAL -*- Autoconf -*-
2945-
2946-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
2947-# Free Software Foundation, Inc.
2948-#
2949-# This file is free software; the Free Software Foundation
2950-# gives unlimited permission to copy and/or distribute it,
2951-# with or without modifications, as long as this notice is preserved.
2952-
2953-# serial 9
2954-
2955-# AM_CONDITIONAL(NAME, SHELL-CONDITION)
2956-# -------------------------------------
2957-# Define a conditional.
2958-AC_DEFUN([AM_CONDITIONAL],
2959-[AC_PREREQ(2.52)dnl
2960- ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
2961- [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
2962-AC_SUBST([$1_TRUE])dnl
2963-AC_SUBST([$1_FALSE])dnl
2964-_AM_SUBST_NOTMAKE([$1_TRUE])dnl
2965-_AM_SUBST_NOTMAKE([$1_FALSE])dnl
2966-m4_define([_AM_COND_VALUE_$1], [$2])dnl
2967-if $2; then
2968- $1_TRUE=
2969- $1_FALSE='#'
2970-else
2971- $1_TRUE='#'
2972- $1_FALSE=
2973-fi
2974-AC_CONFIG_COMMANDS_PRE(
2975-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
2976- AC_MSG_ERROR([[conditional "$1" was never defined.
2977-Usually this means the macro was only invoked conditionally.]])
2978-fi])])
2979-
2980-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
2981-# 2010, 2011 Free Software Foundation, Inc.
2982-#
2983-# This file is free software; the Free Software Foundation
2984-# gives unlimited permission to copy and/or distribute it,
2985-# with or without modifications, as long as this notice is preserved.
2986-
2987-# serial 12
2988-
2989-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
2990-# written in clear, in which case automake, when reading aclocal.m4,
2991-# will think it sees a *use*, and therefore will trigger all it's
2992-# C support machinery. Also note that it means that autoscan, seeing
2993-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
2994-
2995-
2996-# _AM_DEPENDENCIES(NAME)
2997-# ----------------------
2998-# See how the compiler implements dependency checking.
2999-# NAME is "CC", "CXX", "GCJ", or "OBJC".
3000-# We try a few techniques and use that to set a single cache variable.
3001-#
3002-# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
3003-# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
3004-# dependency, and given that the user is not expected to run this macro,
3005-# just rely on AC_PROG_CC.
3006-AC_DEFUN([_AM_DEPENDENCIES],
3007-[AC_REQUIRE([AM_SET_DEPDIR])dnl
3008-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
3009-AC_REQUIRE([AM_MAKE_INCLUDE])dnl
3010-AC_REQUIRE([AM_DEP_TRACK])dnl
3011-
3012-ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
3013- [$1], CXX, [depcc="$CXX" am_compiler_list=],
3014- [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
3015- [$1], UPC, [depcc="$UPC" am_compiler_list=],
3016- [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
3017- [depcc="$$1" am_compiler_list=])
3018-
3019-AC_CACHE_CHECK([dependency style of $depcc],
3020- [am_cv_$1_dependencies_compiler_type],
3021-[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
3022- # We make a subdir and do the tests there. Otherwise we can end up
3023- # making bogus files that we don't know about and never remove. For
3024- # instance it was reported that on HP-UX the gcc test will end up
3025- # making a dummy file named `D' -- because `-MD' means `put the output
3026- # in D'.
3027- rm -rf conftest.dir
3028- mkdir conftest.dir
3029- # Copy depcomp to subdir because otherwise we won't find it if we're
3030- # using a relative directory.
3031- cp "$am_depcomp" conftest.dir
3032- cd conftest.dir
3033- # We will build objects and dependencies in a subdirectory because
3034- # it helps to detect inapplicable dependency modes. For instance
3035- # both Tru64's cc and ICC support -MD to output dependencies as a
3036- # side effect of compilation, but ICC will put the dependencies in
3037- # the current directory while Tru64 will put them in the object
3038- # directory.
3039- mkdir sub
3040-
3041- am_cv_$1_dependencies_compiler_type=none
3042- if test "$am_compiler_list" = ""; then
3043- am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
3044- fi
3045- am__universal=false
3046- m4_case([$1], [CC],
3047- [case " $depcc " in #(
3048- *\ -arch\ *\ -arch\ *) am__universal=true ;;
3049- esac],
3050- [CXX],
3051- [case " $depcc " in #(
3052- *\ -arch\ *\ -arch\ *) am__universal=true ;;
3053- esac])
3054-
3055- for depmode in $am_compiler_list; do
3056- # Setup a source with many dependencies, because some compilers
3057- # like to wrap large dependency lists on column 80 (with \), and
3058- # we should not choose a depcomp mode which is confused by this.
3059- #
3060- # We need to recreate these files for each test, as the compiler may
3061- # overwrite some of them when testing with obscure command lines.
3062- # This happens at least with the AIX C compiler.
3063- : > sub/conftest.c
3064- for i in 1 2 3 4 5 6; do
3065- echo '#include "conftst'$i'.h"' >> sub/conftest.c
3066- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
3067- # Solaris 8's {/usr,}/bin/sh.
3068- touch sub/conftst$i.h
3069- done
3070- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
3071-
3072- # We check with `-c' and `-o' for the sake of the "dashmstdout"
3073- # mode. It turns out that the SunPro C++ compiler does not properly
3074- # handle `-M -o', and we need to detect this. Also, some Intel
3075- # versions had trouble with output in subdirs
3076- am__obj=sub/conftest.${OBJEXT-o}
3077- am__minus_obj="-o $am__obj"
3078- case $depmode in
3079- gcc)
3080- # This depmode causes a compiler race in universal mode.
3081- test "$am__universal" = false || continue
3082- ;;
3083- nosideeffect)
3084- # after this tag, mechanisms are not by side-effect, so they'll
3085- # only be used when explicitly requested
3086- if test "x$enable_dependency_tracking" = xyes; then
3087- continue
3088- else
3089- break
3090- fi
3091- ;;
3092- msvc7 | msvc7msys | msvisualcpp | msvcmsys)
3093- # This compiler won't grok `-c -o', but also, the minuso test has
3094- # not run yet. These depmodes are late enough in the game, and
3095- # so weak that their functioning should not be impacted.
3096- am__obj=conftest.${OBJEXT-o}
3097- am__minus_obj=
3098- ;;
3099- none) break ;;
3100- esac
3101- if depmode=$depmode \
3102- source=sub/conftest.c object=$am__obj \
3103- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
3104- $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
3105- >/dev/null 2>conftest.err &&
3106- grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
3107- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
3108- grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
3109- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
3110- # icc doesn't choke on unknown options, it will just issue warnings
3111- # or remarks (even with -Werror). So we grep stderr for any message
3112- # that says an option was ignored or not supported.
3113- # When given -MP, icc 7.0 and 7.1 complain thusly:
3114- # icc: Command line warning: ignoring option '-M'; no argument required
3115- # The diagnosis changed in icc 8.0:
3116- # icc: Command line remark: option '-MP' not supported
3117- if (grep 'ignoring option' conftest.err ||
3118- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
3119- am_cv_$1_dependencies_compiler_type=$depmode
3120- break
3121- fi
3122- fi
3123- done
3124-
3125- cd ..
3126- rm -rf conftest.dir
3127-else
3128- am_cv_$1_dependencies_compiler_type=none
3129-fi
3130-])
3131-AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
3132-AM_CONDITIONAL([am__fastdep$1], [
3133- test "x$enable_dependency_tracking" != xno \
3134- && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
3135-])
3136-
3137-
3138-# AM_SET_DEPDIR
3139-# -------------
3140-# Choose a directory name for dependency files.
3141-# This macro is AC_REQUIREd in _AM_DEPENDENCIES
3142-AC_DEFUN([AM_SET_DEPDIR],
3143-[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
3144-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
3145-])
3146-
3147-
3148-# AM_DEP_TRACK
3149-# ------------
3150-AC_DEFUN([AM_DEP_TRACK],
3151-[AC_ARG_ENABLE(dependency-tracking,
3152-[ --disable-dependency-tracking speeds up one-time build
3153- --enable-dependency-tracking do not reject slow dependency extractors])
3154-if test "x$enable_dependency_tracking" != xno; then
3155- am_depcomp="$ac_aux_dir/depcomp"
3156- AMDEPBACKSLASH='\'
3157- am__nodep='_no'
3158-fi
3159-AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
3160-AC_SUBST([AMDEPBACKSLASH])dnl
3161-_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
3162-AC_SUBST([am__nodep])dnl
3163-_AM_SUBST_NOTMAKE([am__nodep])dnl
3164-])
3165-
3166-# Generate code to set up dependency tracking. -*- Autoconf -*-
3167-
3168-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
3169-# Free Software Foundation, Inc.
3170-#
3171-# This file is free software; the Free Software Foundation
3172-# gives unlimited permission to copy and/or distribute it,
3173-# with or without modifications, as long as this notice is preserved.
3174-
3175-#serial 5
3176-
3177-# _AM_OUTPUT_DEPENDENCY_COMMANDS
3178-# ------------------------------
3179-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
3180-[{
3181- # Autoconf 2.62 quotes --file arguments for eval, but not when files
3182- # are listed without --file. Let's play safe and only enable the eval
3183- # if we detect the quoting.
3184- case $CONFIG_FILES in
3185- *\'*) eval set x "$CONFIG_FILES" ;;
3186- *) set x $CONFIG_FILES ;;
3187- esac
3188- shift
3189- for mf
3190- do
3191- # Strip MF so we end up with the name of the file.
3192- mf=`echo "$mf" | sed -e 's/:.*$//'`
3193- # Check whether this is an Automake generated Makefile or not.
3194- # We used to match only the files named `Makefile.in', but
3195- # some people rename them; so instead we look at the file content.
3196- # Grep'ing the first line is not enough: some people post-process
3197- # each Makefile.in and add a new line on top of each file to say so.
3198- # Grep'ing the whole file is not good either: AIX grep has a line
3199- # limit of 2048, but all sed's we know have understand at least 4000.
3200- if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then
3201- dirpart=`AS_DIRNAME("$mf")`
3202- else
3203- continue
3204- fi
3205- # Extract the definition of DEPDIR, am__include, and am__quote
3206- # from the Makefile without running `make'.
3207- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
3208- test -z "$DEPDIR" && continue
3209- am__include=`sed -n 's/^am__include = //p' < "$mf"`
3210- test -z "am__include" && continue
3211- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
3212- # When using ansi2knr, U may be empty or an underscore; expand it
3213- U=`sed -n 's/^U = //p' < "$mf"`
3214- # Find all dependency output files, they are included files with
3215- # $(DEPDIR) in their names. We invoke sed twice because it is the
3216- # simplest approach to changing $(DEPDIR) to its actual value in the
3217- # expansion.
3218- for file in `sed -n "
3219- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
3220- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
3221- # Make sure the directory exists.
3222- test -f "$dirpart/$file" && continue
3223- fdir=`AS_DIRNAME(["$file"])`
3224- AS_MKDIR_P([$dirpart/$fdir])
3225- # echo "creating $dirpart/$file"
3226- echo '# dummy' > "$dirpart/$file"
3227- done
3228- done
3229-}
3230-])# _AM_OUTPUT_DEPENDENCY_COMMANDS
3231-
3232-
3233-# AM_OUTPUT_DEPENDENCY_COMMANDS
3234-# -----------------------------
3235-# This macro should only be invoked once -- use via AC_REQUIRE.
3236-#
3237-# This code is only required when automatic dependency tracking
3238-# is enabled. FIXME. This creates each `.P' file that we will
3239-# need in order to bootstrap the dependency handling code.
3240-AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
3241-[AC_CONFIG_COMMANDS([depfiles],
3242- [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
3243- [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
3244-])
3245-
3246-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
3247-# Free Software Foundation, Inc.
3248-#
3249-# This file is free software; the Free Software Foundation
3250-# gives unlimited permission to copy and/or distribute it,
3251-# with or without modifications, as long as this notice is preserved.
3252-
3253-# serial 8
3254-
3255-# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
3256-AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
3257-
3258-# Do all the work for Automake. -*- Autoconf -*-
3259-
3260-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
3261-# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
3262-#
3263-# This file is free software; the Free Software Foundation
3264-# gives unlimited permission to copy and/or distribute it,
3265-# with or without modifications, as long as this notice is preserved.
3266-
3267-# serial 16
3268-
3269-# This macro actually does too much. Some checks are only needed if
3270-# your package does certain things. But this isn't really a big deal.
3271-
3272-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
3273-# AM_INIT_AUTOMAKE([OPTIONS])
3274-# -----------------------------------------------
3275-# The call with PACKAGE and VERSION arguments is the old style
3276-# call (pre autoconf-2.50), which is being phased out. PACKAGE
3277-# and VERSION should now be passed to AC_INIT and removed from
3278-# the call to AM_INIT_AUTOMAKE.
3279-# We support both call styles for the transition. After
3280-# the next Automake release, Autoconf can make the AC_INIT
3281-# arguments mandatory, and then we can depend on a new Autoconf
3282-# release and drop the old call support.
3283-AC_DEFUN([AM_INIT_AUTOMAKE],
3284-[AC_PREREQ([2.62])dnl
3285-dnl Autoconf wants to disallow AM_ names. We explicitly allow
3286-dnl the ones we care about.
3287-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
3288-AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
3289-AC_REQUIRE([AC_PROG_INSTALL])dnl
3290-if test "`cd $srcdir && pwd`" != "`pwd`"; then
3291- # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
3292- # is not polluted with repeated "-I."
3293- AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
3294- # test to see if srcdir already configured
3295- if test -f $srcdir/config.status; then
3296- AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
3297- fi
3298-fi
3299-
3300-# test whether we have cygpath
3301-if test -z "$CYGPATH_W"; then
3302- if (cygpath --version) >/dev/null 2>/dev/null; then
3303- CYGPATH_W='cygpath -w'
3304- else
3305- CYGPATH_W=echo
3306- fi
3307-fi
3308-AC_SUBST([CYGPATH_W])
3309-
3310-# Define the identity of the package.
3311-dnl Distinguish between old-style and new-style calls.
3312-m4_ifval([$2],
3313-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
3314- AC_SUBST([PACKAGE], [$1])dnl
3315- AC_SUBST([VERSION], [$2])],
3316-[_AM_SET_OPTIONS([$1])dnl
3317-dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
3318-m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
3319- [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
3320- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
3321- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
3322-
3323-_AM_IF_OPTION([no-define],,
3324-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
3325- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
3326-
3327-# Some tools Automake needs.
3328-AC_REQUIRE([AM_SANITY_CHECK])dnl
3329-AC_REQUIRE([AC_ARG_PROGRAM])dnl
3330-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
3331-AM_MISSING_PROG(AUTOCONF, autoconf)
3332-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
3333-AM_MISSING_PROG(AUTOHEADER, autoheader)
3334-AM_MISSING_PROG(MAKEINFO, makeinfo)
3335-AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
3336-AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
3337-AC_REQUIRE([AM_PROG_MKDIR_P])dnl
3338-# We need awk for the "check" target. The system "awk" is bad on
3339-# some platforms.
3340-AC_REQUIRE([AC_PROG_AWK])dnl
3341-AC_REQUIRE([AC_PROG_MAKE_SET])dnl
3342-AC_REQUIRE([AM_SET_LEADING_DOT])dnl
3343-_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
3344- [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
3345- [_AM_PROG_TAR([v7])])])
3346-_AM_IF_OPTION([no-dependencies],,
3347-[AC_PROVIDE_IFELSE([AC_PROG_CC],
3348- [_AM_DEPENDENCIES(CC)],
3349- [define([AC_PROG_CC],
3350- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
3351-AC_PROVIDE_IFELSE([AC_PROG_CXX],
3352- [_AM_DEPENDENCIES(CXX)],
3353- [define([AC_PROG_CXX],
3354- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
3355-AC_PROVIDE_IFELSE([AC_PROG_OBJC],
3356- [_AM_DEPENDENCIES(OBJC)],
3357- [define([AC_PROG_OBJC],
3358- defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
3359-])
3360-_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
3361-dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
3362-dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro
3363-dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
3364-AC_CONFIG_COMMANDS_PRE(dnl
3365-[m4_provide_if([_AM_COMPILER_EXEEXT],
3366- [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
3367-])
3368-
3369-dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
3370-dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
3371-dnl mangled by Autoconf and run in a shell conditional statement.
3372-m4_define([_AC_COMPILER_EXEEXT],
3373-m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
3374-
3375-
3376-# When config.status generates a header, we must update the stamp-h file.
3377-# This file resides in the same directory as the config header
3378-# that is generated. The stamp files are numbered to have different names.
3379-
3380-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
3381-# loop where config.status creates the headers, so we can generate
3382-# our stamp files there.
3383-AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
3384-[# Compute $1's index in $config_headers.
3385-_am_arg=$1
3386-_am_stamp_count=1
3387-for _am_header in $config_headers :; do
3388- case $_am_header in
3389- $_am_arg | $_am_arg:* )
3390- break ;;
3391- * )
3392- _am_stamp_count=`expr $_am_stamp_count + 1` ;;
3393- esac
3394-done
3395-echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
3396-
3397-# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation,
3398-# Inc.
3399-#
3400-# This file is free software; the Free Software Foundation
3401-# gives unlimited permission to copy and/or distribute it,
3402-# with or without modifications, as long as this notice is preserved.
3403-
3404-# serial 1
3405-
3406-# AM_PROG_INSTALL_SH
3407-# ------------------
3408-# Define $install_sh.
3409-AC_DEFUN([AM_PROG_INSTALL_SH],
3410-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
3411-if test x"${install_sh}" != xset; then
3412- case $am_aux_dir in
3413- *\ * | *\ *)
3414- install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
3415- *)
3416- install_sh="\${SHELL} $am_aux_dir/install-sh"
3417- esac
3418-fi
3419-AC_SUBST(install_sh)])
3420-
3421-# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
3422-#
3423-# This file is free software; the Free Software Foundation
3424-# gives unlimited permission to copy and/or distribute it,
3425-# with or without modifications, as long as this notice is preserved.
3426-
3427-# serial 2
3428-
3429-# Check whether the underlying file-system supports filenames
3430-# with a leading dot. For instance MS-DOS doesn't.
3431-AC_DEFUN([AM_SET_LEADING_DOT],
3432-[rm -rf .tst 2>/dev/null
3433-mkdir .tst 2>/dev/null
3434-if test -d .tst; then
3435- am__leading_dot=.
3436-else
3437- am__leading_dot=_
3438-fi
3439-rmdir .tst 2>/dev/null
3440-AC_SUBST([am__leading_dot])])
3441-
3442-# Add --enable-maintainer-mode option to configure. -*- Autoconf -*-
3443-# From Jim Meyering
3444-
3445-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2008,
3446-# 2011 Free Software Foundation, Inc.
3447-#
3448-# This file is free software; the Free Software Foundation
3449-# gives unlimited permission to copy and/or distribute it,
3450-# with or without modifications, as long as this notice is preserved.
3451-
3452-# serial 5
3453-
3454-# AM_MAINTAINER_MODE([DEFAULT-MODE])
3455-# ----------------------------------
3456-# Control maintainer-specific portions of Makefiles.
3457-# Default is to disable them, unless `enable' is passed literally.
3458-# For symmetry, `disable' may be passed as well. Anyway, the user
3459-# can override the default with the --enable/--disable switch.
3460-AC_DEFUN([AM_MAINTAINER_MODE],
3461-[m4_case(m4_default([$1], [disable]),
3462- [enable], [m4_define([am_maintainer_other], [disable])],
3463- [disable], [m4_define([am_maintainer_other], [enable])],
3464- [m4_define([am_maintainer_other], [enable])
3465- m4_warn([syntax], [unexpected argument to AM@&t@_MAINTAINER_MODE: $1])])
3466-AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
3467- dnl maintainer-mode's default is 'disable' unless 'enable' is passed
3468- AC_ARG_ENABLE([maintainer-mode],
3469-[ --][am_maintainer_other][-maintainer-mode am_maintainer_other make rules and dependencies not useful
3470- (and sometimes confusing) to the casual installer],
3471- [USE_MAINTAINER_MODE=$enableval],
3472- [USE_MAINTAINER_MODE=]m4_if(am_maintainer_other, [enable], [no], [yes]))
3473- AC_MSG_RESULT([$USE_MAINTAINER_MODE])
3474- AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes])
3475- MAINT=$MAINTAINER_MODE_TRUE
3476- AC_SUBST([MAINT])dnl
3477-]
3478-)
3479-
3480-AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
3481-
3482-# Check to see how 'make' treats includes. -*- Autoconf -*-
3483-
3484-# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc.
3485-#
3486-# This file is free software; the Free Software Foundation
3487-# gives unlimited permission to copy and/or distribute it,
3488-# with or without modifications, as long as this notice is preserved.
3489-
3490-# serial 4
3491-
3492-# AM_MAKE_INCLUDE()
3493-# -----------------
3494-# Check to see how make treats includes.
3495-AC_DEFUN([AM_MAKE_INCLUDE],
3496-[am_make=${MAKE-make}
3497-cat > confinc << 'END'
3498-am__doit:
3499- @echo this is the am__doit target
3500-.PHONY: am__doit
3501-END
3502-# If we don't find an include directive, just comment out the code.
3503-AC_MSG_CHECKING([for style of include used by $am_make])
3504-am__include="#"
3505-am__quote=
3506-_am_result=none
3507-# First try GNU make style include.
3508-echo "include confinc" > confmf
3509-# Ignore all kinds of additional output from `make'.
3510-case `$am_make -s -f confmf 2> /dev/null` in #(
3511-*the\ am__doit\ target*)
3512- am__include=include
3513- am__quote=
3514- _am_result=GNU
3515- ;;
3516-esac
3517-# Now try BSD make style include.
3518-if test "$am__include" = "#"; then
3519- echo '.include "confinc"' > confmf
3520- case `$am_make -s -f confmf 2> /dev/null` in #(
3521- *the\ am__doit\ target*)
3522- am__include=.include
3523- am__quote="\""
3524- _am_result=BSD
3525- ;;
3526- esac
3527-fi
3528-AC_SUBST([am__include])
3529-AC_SUBST([am__quote])
3530-AC_MSG_RESULT([$_am_result])
3531-rm -f confinc confmf
3532-])
3533-
3534-# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008
3535-# Free Software Foundation, Inc.
3536-#
3537-# This file is free software; the Free Software Foundation
3538-# gives unlimited permission to copy and/or distribute it,
3539-# with or without modifications, as long as this notice is preserved.
3540-
3541-# serial 6
3542-
3543-# AM_PROG_CC_C_O
3544-# --------------
3545-# Like AC_PROG_CC_C_O, but changed for automake.
3546-AC_DEFUN([AM_PROG_CC_C_O],
3547-[AC_REQUIRE([AC_PROG_CC_C_O])dnl
3548-AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
3549-AC_REQUIRE_AUX_FILE([compile])dnl
3550-# FIXME: we rely on the cache variable name because
3551-# there is no other way.
3552-set dummy $CC
3553-am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
3554-eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
3555-if test "$am_t" != yes; then
3556- # Losing compiler, so override with the script.
3557- # FIXME: It is wrong to rewrite CC.
3558- # But if we don't then we get into trouble of one sort or another.
3559- # A longer-term fix would be to have automake use am__CC in this case,
3560- # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
3561- CC="$am_aux_dir/compile $CC"
3562-fi
3563-dnl Make sure AC_PROG_CC is never called again, or it will override our
3564-dnl setting of CC.
3565-m4_define([AC_PROG_CC],
3566- [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])])
3567-])
3568-
3569-# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
3570-
3571-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
3572-# Free Software Foundation, Inc.
3573-#
3574-# This file is free software; the Free Software Foundation
3575-# gives unlimited permission to copy and/or distribute it,
3576-# with or without modifications, as long as this notice is preserved.
3577-
3578-# serial 6
3579-
3580-# AM_MISSING_PROG(NAME, PROGRAM)
3581-# ------------------------------
3582-AC_DEFUN([AM_MISSING_PROG],
3583-[AC_REQUIRE([AM_MISSING_HAS_RUN])
3584-$1=${$1-"${am_missing_run}$2"}
3585-AC_SUBST($1)])
3586-
3587-
3588-# AM_MISSING_HAS_RUN
3589-# ------------------
3590-# Define MISSING if not defined so far and test if it supports --run.
3591-# If it does, set am_missing_run to use it, otherwise, to nothing.
3592-AC_DEFUN([AM_MISSING_HAS_RUN],
3593-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
3594-AC_REQUIRE_AUX_FILE([missing])dnl
3595-if test x"${MISSING+set}" != xset; then
3596- case $am_aux_dir in
3597- *\ * | *\ *)
3598- MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
3599- *)
3600- MISSING="\${SHELL} $am_aux_dir/missing" ;;
3601- esac
3602-fi
3603-# Use eval to expand $SHELL
3604-if eval "$MISSING --run true"; then
3605- am_missing_run="$MISSING --run "
3606-else
3607- am_missing_run=
3608- AC_MSG_WARN([`missing' script is too old or missing])
3609-fi
3610-])
3611-
3612-# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
3613-# Inc.
3614-#
3615-# This file is free software; the Free Software Foundation
3616-# gives unlimited permission to copy and/or distribute it,
3617-# with or without modifications, as long as this notice is preserved.
3618-
3619-# serial 1
3620-
3621-# AM_PROG_MKDIR_P
3622-# ---------------
3623-# Check for `mkdir -p'.
3624-AC_DEFUN([AM_PROG_MKDIR_P],
3625-[AC_PREREQ([2.60])dnl
3626-AC_REQUIRE([AC_PROG_MKDIR_P])dnl
3627-dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
3628-dnl while keeping a definition of mkdir_p for backward compatibility.
3629-dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
3630-dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
3631-dnl Makefile.ins that do not define MKDIR_P, so we do our own
3632-dnl adjustment using top_builddir (which is defined more often than
3633-dnl MKDIR_P).
3634-AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
3635-case $mkdir_p in
3636- [[\\/$]]* | ?:[[\\/]]*) ;;
3637- */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
3638-esac
3639-])
3640-
3641-# Helper functions for option handling. -*- Autoconf -*-
3642-
3643-# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
3644-# Foundation, Inc.
3645-#
3646-# This file is free software; the Free Software Foundation
3647-# gives unlimited permission to copy and/or distribute it,
3648-# with or without modifications, as long as this notice is preserved.
3649-
3650-# serial 5
3651-
3652-# _AM_MANGLE_OPTION(NAME)
3653-# -----------------------
3654-AC_DEFUN([_AM_MANGLE_OPTION],
3655-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
3656-
3657-# _AM_SET_OPTION(NAME)
3658-# --------------------
3659-# Set option NAME. Presently that only means defining a flag for this option.
3660-AC_DEFUN([_AM_SET_OPTION],
3661-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
3662-
3663-# _AM_SET_OPTIONS(OPTIONS)
3664-# ------------------------
3665-# OPTIONS is a space-separated list of Automake options.
3666-AC_DEFUN([_AM_SET_OPTIONS],
3667-[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
3668-
3669-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
3670-# -------------------------------------------
3671-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
3672-AC_DEFUN([_AM_IF_OPTION],
3673-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
3674-
3675-# Check to make sure that the build environment is sane. -*- Autoconf -*-
3676-
3677-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
3678-# Free Software Foundation, Inc.
3679-#
3680-# This file is free software; the Free Software Foundation
3681-# gives unlimited permission to copy and/or distribute it,
3682-# with or without modifications, as long as this notice is preserved.
3683-
3684-# serial 5
3685-
3686-# AM_SANITY_CHECK
3687-# ---------------
3688-AC_DEFUN([AM_SANITY_CHECK],
3689-[AC_MSG_CHECKING([whether build environment is sane])
3690-# Just in case
3691-sleep 1
3692-echo timestamp > conftest.file
3693-# Reject unsafe characters in $srcdir or the absolute working directory
3694-# name. Accept space and tab only in the latter.
3695-am_lf='
3696-'
3697-case `pwd` in
3698- *[[\\\"\#\$\&\'\`$am_lf]]*)
3699- AC_MSG_ERROR([unsafe absolute working directory name]);;
3700-esac
3701-case $srcdir in
3702- *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*)
3703- AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
3704-esac
3705-
3706-# Do `set' in a subshell so we don't clobber the current shell's
3707-# arguments. Must try -L first in case configure is actually a
3708-# symlink; some systems play weird games with the mod time of symlinks
3709-# (eg FreeBSD returns the mod time of the symlink's containing
3710-# directory).
3711-if (
3712- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
3713- if test "$[*]" = "X"; then
3714- # -L didn't work.
3715- set X `ls -t "$srcdir/configure" conftest.file`
3716- fi
3717- rm -f conftest.file
3718- if test "$[*]" != "X $srcdir/configure conftest.file" \
3719- && test "$[*]" != "X conftest.file $srcdir/configure"; then
3720-
3721- # If neither matched, then we have a broken ls. This can happen
3722- # if, for instance, CONFIG_SHELL is bash and it inherits a
3723- # broken ls alias from the environment. This has actually
3724- # happened. Such a system could not be considered "sane".
3725- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
3726-alias in your environment])
3727- fi
3728-
3729- test "$[2]" = conftest.file
3730- )
3731-then
3732- # Ok.
3733- :
3734-else
3735- AC_MSG_ERROR([newly created file is older than distributed files!
3736-Check your system clock])
3737-fi
3738-AC_MSG_RESULT(yes)])
3739-
3740-# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
3741-#
3742-# This file is free software; the Free Software Foundation
3743-# gives unlimited permission to copy and/or distribute it,
3744-# with or without modifications, as long as this notice is preserved.
3745-
3746-# serial 1
3747-
3748-# AM_PROG_INSTALL_STRIP
3749-# ---------------------
3750-# One issue with vendor `install' (even GNU) is that you can't
3751-# specify the program used to strip binaries. This is especially
3752-# annoying in cross-compiling environments, where the build's strip
3753-# is unlikely to handle the host's binaries.
3754-# Fortunately install-sh will honor a STRIPPROG variable, so we
3755-# always use install-sh in `make install-strip', and initialize
3756-# STRIPPROG with the value of the STRIP variable (set by the user).
3757-AC_DEFUN([AM_PROG_INSTALL_STRIP],
3758-[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
3759-# Installed binaries are usually stripped using `strip' when the user
3760-# run `make install-strip'. However `strip' might not be the right
3761-# tool to use in cross-compilation environments, therefore Automake
3762-# will honor the `STRIP' environment variable to overrule this program.
3763-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
3764-if test "$cross_compiling" != no; then
3765- AC_CHECK_TOOL([STRIP], [strip], :)
3766-fi
3767-INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
3768-AC_SUBST([INSTALL_STRIP_PROGRAM])])
3769-
3770-# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
3771-#
3772-# This file is free software; the Free Software Foundation
3773-# gives unlimited permission to copy and/or distribute it,
3774-# with or without modifications, as long as this notice is preserved.
3775-
3776-# serial 3
3777-
3778-# _AM_SUBST_NOTMAKE(VARIABLE)
3779-# ---------------------------
3780-# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
3781-# This macro is traced by Automake.
3782-AC_DEFUN([_AM_SUBST_NOTMAKE])
3783-
3784-# AM_SUBST_NOTMAKE(VARIABLE)
3785-# --------------------------
3786-# Public sister of _AM_SUBST_NOTMAKE.
3787-AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
3788-
3789-# Check how to create a tarball. -*- Autoconf -*-
3790-
3791-# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc.
3792-#
3793-# This file is free software; the Free Software Foundation
3794-# gives unlimited permission to copy and/or distribute it,
3795-# with or without modifications, as long as this notice is preserved.
3796-
3797-# serial 2
3798-
3799-# _AM_PROG_TAR(FORMAT)
3800-# --------------------
3801-# Check how to create a tarball in format FORMAT.
3802-# FORMAT should be one of `v7', `ustar', or `pax'.
3803-#
3804-# Substitute a variable $(am__tar) that is a command
3805-# writing to stdout a FORMAT-tarball containing the directory
3806-# $tardir.
3807-# tardir=directory && $(am__tar) > result.tar
3808-#
3809-# Substitute a variable $(am__untar) that extract such
3810-# a tarball read from stdin.
3811-# $(am__untar) < result.tar
3812-AC_DEFUN([_AM_PROG_TAR],
3813-[# Always define AMTAR for backward compatibility. Yes, it's still used
3814-# in the wild :-( We should find a proper way to deprecate it ...
3815-AC_SUBST([AMTAR], ['$${TAR-tar}'])
3816-m4_if([$1], [v7],
3817- [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
3818- [m4_case([$1], [ustar],, [pax],,
3819- [m4_fatal([Unknown tar format])])
3820-AC_MSG_CHECKING([how to create a $1 tar archive])
3821-# Loop over all known methods to create a tar archive until one works.
3822-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
3823-_am_tools=${am_cv_prog_tar_$1-$_am_tools}
3824-# Do not fold the above two line into one, because Tru64 sh and
3825-# Solaris sh will not grok spaces in the rhs of `-'.
3826-for _am_tool in $_am_tools
3827-do
3828- case $_am_tool in
3829- gnutar)
3830- for _am_tar in tar gnutar gtar;
3831- do
3832- AM_RUN_LOG([$_am_tar --version]) && break
3833- done
3834- am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
3835- am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
3836- am__untar="$_am_tar -xf -"
3837- ;;
3838- plaintar)
3839- # Must skip GNU tar: if it does not support --format= it doesn't create
3840- # ustar tarball either.
3841- (tar --version) >/dev/null 2>&1 && continue
3842- am__tar='tar chf - "$$tardir"'
3843- am__tar_='tar chf - "$tardir"'
3844- am__untar='tar xf -'
3845- ;;
3846- pax)
3847- am__tar='pax -L -x $1 -w "$$tardir"'
3848- am__tar_='pax -L -x $1 -w "$tardir"'
3849- am__untar='pax -r'
3850- ;;
3851- cpio)
3852- am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
3853- am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
3854- am__untar='cpio -i -H $1 -d'
3855- ;;
3856- none)
3857- am__tar=false
3858- am__tar_=false
3859- am__untar=false
3860- ;;
3861- esac
3862-
3863- # If the value was cached, stop now. We just wanted to have am__tar
3864- # and am__untar set.
3865- test -n "${am_cv_prog_tar_$1}" && break
3866-
3867- # tar/untar a dummy directory, and stop if the command works
3868- rm -rf conftest.dir
3869- mkdir conftest.dir
3870- echo GrepMe > conftest.dir/file
3871- AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
3872- rm -rf conftest.dir
3873- if test -s conftest.tar; then
3874- AM_RUN_LOG([$am__untar <conftest.tar])
3875- grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
3876- fi
3877-done
3878-rm -rf conftest.dir
3879-
3880-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
3881-AC_MSG_RESULT([$am_cv_prog_tar_$1])])
3882-AC_SUBST([am__tar])
3883-AC_SUBST([am__untar])
3884-]) # _AM_PROG_TAR
3885-
3886 dnl $Id$
3887 dnl
3888 dnl Copyright (c) 2002-2006
3889@@ -10514,19 +10691,19 @@
3890 dnl
3891 dnl Written for Xfce by Benedikt Meurer <benny@xfce.org>.
3892 dnl
3893-dnl This program is free software; you can redistribute it and/or modify it
3894-dnl under the terms of the GNU General Public License as published by the Free
3895-dnl Software Foundation; either version 2 of the License, or (at your option)
3896-dnl any later version.
3897-dnl
3898-dnl This program is distributed in the hope that it will be useful, but WITHOUT
3899-dnl ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
3900-dnl FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
3901-dnl more details.
3902-dnl
3903-dnl You should have received a copy of the GNU General Public License along with
3904-dnl this program; if not, write to the Free Software Foundation, Inc., 59 Temple
3905-dnl Place, Suite 330, Boston, MA 02111-1307 USA
3906+dnl This program is free software; you can redistribute it and/or modify
3907+dnl it under the terms of the GNU General Public License as published by
3908+dnl the Free Software Foundation; either version 2 of the License, or
3909+dnl (at your option) any later version.
3910+dnl
3911+dnl This program is distributed in the hope that it will be useful,
3912+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
3913+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3914+dnl GNU General Public License for more details.
3915+dnl
3916+dnl You should have received a copy of the GNU General Public License along
3917+dnl with this program; if not, write to the Free Software Foundation, Inc.,
3918+dnl 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
3919 dnl
3920 dnl xdt-depends
3921 dnl -----------
3922@@ -10711,30 +10888,6 @@
3923
3924
3925
3926-dnl BM_DEPEND(varname, package, version)
3927-dnl
3928-dnl Simple wrapper for XDT_CHECK_PACKAGE("varname", "package", "version"). Kept
3929-dnl for backward compatibility. Will be removed in the future.
3930-dnl
3931-AC_DEFUN([BM_DEPEND],
3932-[
3933- XDT_CHECK_PACKAGE([$1], [$2], [$3])
3934-])
3935-
3936-
3937-
3938-dnl BM_DEPEND_CHECK(var, pkg, version, name, helpstring, default)
3939-dnl
3940-dnl Simple wrapper for XDT_CHECK_OPTIONAL_PACKAGE(). Kept for backward
3941-dnl compatibility. Will be removed in the future.
3942-dnl
3943-AC_DEFUN([BM_DEPEND_CHECK],
3944-[
3945- XDT_CHECK_OPTIONAL_PACKAGE([$1], [$2], [$3], [$4], [$5], [$6])
3946-])
3947-
3948-
3949-
3950 dnl XDT_CHECK_LIBX11()
3951 dnl
3952 dnl Executes various checks for X11. Sets LIBX11_CFLAGS, LIBX11_LDFLAGS
3953@@ -10871,66 +11024,6 @@
3954 ])
3955
3956
3957-
3958-dnl BM_LIBX11()
3959-dnl
3960-dnl Simple wrapper for XDT_CHECK_LIBX11. Kept for backward
3961-dnl compatibility. Will be removed in the future.
3962-dnl
3963-AC_DEFUN([BM_LIBX11],
3964-[
3965- AC_REQUIRE([XDT_CHECK_LIBX11])
3966-])
3967-
3968-
3969-
3970-dnl BM_LIBX11_REQUIRE()
3971-dnl
3972-dnl Simple wrapper for XDT_CHECK_LIBX11_REQUIRE. Kept for backward
3973-dnl compatibility. Will be removed in the future.
3974-dnl
3975-AC_DEFUN([BM_LIBX11_REQUIRE],
3976-[
3977- AC_REQUIRE([XDT_CHECK_LIBX11_REQUIRE])
3978-])
3979-
3980-
3981-
3982-dnl BM_LIBSM()
3983-dnl
3984-dnl Simple wrapper for XDT_CHECK_LIBSM. Kept for backward
3985-dnl compatibility. Will be removed in the future.
3986-dnl
3987-AC_DEFUN([BM_LIBSM],
3988-[
3989- AC_REQUIRE([XDT_CHECK_LIBSM])
3990-])
3991-
3992-
3993-
3994-dnl BM_LIBXPM
3995-dnl
3996-dnl Simple wrapper for XDT_CHECK_LIBXPM. Kept for backward
3997-dnl compatibility. Will be removed in the future.
3998-dnl
3999-AC_DEFUN([BM_LIBXPM],
4000-[
4001- AC_REQUIRE([XDT_CHECK_LIBXPM])
4002-])
4003-
4004-
4005-
4006-dnl BM_LIBXPM_REQUIRE
4007-dnl
4008-dnl Simple wrapper for XDT_CHECK_LIBXPM_REQUIRE. Kept for
4009-dnl backward compatibility. Will be removed in the future.
4010-dnl
4011-AC_DEFUN([BM_LIBXPM_REQUIRE],
4012-[
4013- AC_REQUIRE([XDT_CHECK_LIBXPM_REQUIRE])
4014-])
4015-
4016-
4017 dnl $Id$
4018 dnl
4019 dnl Copyright (c) 2002-2006
4020@@ -10938,19 +11031,19 @@
4021 dnl
4022 dnl Written for Xfce by Benedikt Meurer <benny@xfce.org>.
4023 dnl
4024-dnl This program is free software; you can redistribute it and/or modify it
4025-dnl under the terms of the GNU General Public License as published by the Free
4026-dnl Software Foundation; either version 2 of the License, or (at your option)
4027-dnl any later version.
4028-dnl
4029-dnl This program is distributed in the hope that it will be useful, but WITHOUT
4030-dnl ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
4031-dnl FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
4032-dnl more details.
4033-dnl
4034-dnl You should have received a copy of the GNU General Public License along with
4035-dnl this program; if not, write to the Free Software Foundation, Inc., 59 Temple
4036-dnl Place, Suite 330, Boston, MA 02111-1307 USA
4037+dnl This program is free software; you can redistribute it and/or modify
4038+dnl it under the terms of the GNU General Public License as published by
4039+dnl the Free Software Foundation; either version 2 of the License, or
4040+dnl (at your option) any later version.
4041+dnl
4042+dnl This program is distributed in the hope that it will be useful,
4043+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
4044+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
4045+dnl GNU General Public License for more details.
4046+dnl
4047+dnl You should have received a copy of the GNU General Public License along
4048+dnl with this program; if not, write to the Free Software Foundation, Inc.,
4049+dnl 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
4050 dnl
4051 dnl xdt-depends
4052 dnl -----------
4053@@ -10975,7 +11068,7 @@
4054 AC_MSG_CHECKING([if $CC supports $flag])
4055 saved_CFLAGS="$CFLAGS"
4056 CFLAGS="$CFLAGS $flag"
4057- AC_COMPILE_IFELSE([ ], [flag_supported=yes], [flag_supported=no])
4058+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([ ])], [flag_supported=yes], [flag_supported=no])
4059 CFLAGS="$saved_CFLAGS"
4060 AC_MSG_RESULT([$flag_supported])
4061
4062@@ -11007,17 +11100,25 @@
4063 -Wno-missing-field-initializers \
4064 -Wno-unused-parameter -Wold-style-definition \
4065 -Wdeclaration-after-statement \
4066- -Wmissing-declarations -Wredundant-decls \
4067+ -Wmissing-declarations \
4068 -Wmissing-noreturn -Wshadow -Wpointer-arith \
4069- -Wcast-align -Wformat-security \
4070+ -Wcast-align -Wformat -Wformat-security -Wformat-y2k \
4071 -Winit-self -Wmissing-include-dirs -Wundef \
4072- -Wmissing-format-attribute -Wnested-externs \
4073- -fstack-protector"
4074- CPPFLAGS="$CPPFLAGS -D_FORTIFY_SOURCE=2"
4075-
4076+ -Wnested-externs"
4077+ CPPFLAGS="$CPPFLAGS"
4078+
4079+ if test x`uname` = x"Linux"; then
4080+ xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -fstack-protector"
4081+ fi
4082+
4083+ dnl # signal.h inline is crapy on openbsd
4084+ if test x`uname` != x"OpenBSD"; then
4085+ xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -Wredundant-decls"
4086+ fi
4087+
4088 if test x"$enable_debug" = x"full"; then
4089 AC_DEFINE([DEBUG_TRACE], [1], [Define for tracing support])
4090- xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -O0 -g3 -Werror"
4091+ xdt_cv_additional_CFLAGS="$xdt_cv_additional_CFLAGS -O0 -g -Werror"
4092 CPPFLAGS="$CPPFLAGS -DG_ENABLE_DEBUG"
4093 AC_MSG_RESULT([full])
4094 else
4095@@ -11044,7 +11145,7 @@
4096 CPPFLAGS="$CPPFLAGS -DNDEBUG"
4097
4098 if test x"$enable_debug" = x"no"; then
4099- CPPFLAGS="$CPPFLAGS -DG_DISABLE_CAST_CHECKS -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS"
4100+ CPPFLAGS="$CPPFLAGS -DG_DISABLE_CAST_CHECKS -DG_DISABLE_ASSERT"
4101 AC_MSG_RESULT([no])
4102 else
4103 AC_MSG_RESULT([minimum])
4104@@ -11071,7 +11172,7 @@
4105 saved_CFLAGS="$CFLAGS"
4106 CFLAGS="$CFLAGS $xdt_vis_test_cflags"
4107 AC_MSG_CHECKING([whether $CC supports the GNUC visibility attribute])
4108- AC_COMPILE_IFELSE(AC_LANG_SOURCE(
4109+ AC_COMPILE_IFELSE([AC_LANG_SOURCE(
4110 [
4111 void test_default (void);
4112 void test_hidden (void);
4113@@ -11084,7 +11185,7 @@
4114 test_hidden ();
4115 return 0;
4116 }
4117- ]),
4118+ ])],
4119 [
4120 have_gnuc_visibility=yes
4121 AC_MSG_RESULT([yes])
4122@@ -11097,7 +11198,11 @@
4123
4124 if test "x$have_gnuc_visibility" = "xyes"; then
4125 CPPFLAGS="$CPPFLAGS -DHAVE_GNUC_VISIBILITY"
4126- XDT_SUPPORTED_FLAGS([xdt_vis_hidden_cflags], [-fvisibility=hidden])
4127+ xdt_vis_hidden_cflags=""
4128+ XDT_SUPPORTED_FLAGS([xdt_vis_hidden_cflags], [-xldscope=hidden])
4129+ if test "x$xdt_vis_hidden_cflags" = "x"; then
4130+ XDT_SUPPORTED_FLAGS([xdt_vis_hidden_cflags], [-fvisibility=hidden])
4131+ fi
4132 CFLAGS="$CFLAGS $xdt_vis_hidden_cflags"
4133 fi
4134
4135@@ -11116,104 +11221,28 @@
4136 [enable_linker_opts=$enableval], [enable_linker_opts=yes])
4137
4138 if test "x$enable_linker_opts" != "xno"; then
4139- AC_MSG_CHECKING([whether $LD accepts --as-needed])
4140- case `$LD --as-needed -v 2>&1 </dev/null` in
4141- *GNU* | *'with BFD'*)
4142- LDFLAGS="$LDFLAGS -Wl,--as-needed"
4143- AC_MSG_RESULT([yes])
4144- ;;
4145- *)
4146- AC_MSG_RESULT([no])
4147- ;;
4148- esac
4149- AC_MSG_CHECKING([whether $LD accepts -O1])
4150- case `$LD -O1 -v 2>&1 </dev/null` in
4151- *GNU* | *'with BFD'*)
4152- LDFLAGS="$LDFLAGS -Wl,-O1"
4153- AC_MSG_RESULT([yes])
4154- ;;
4155- *)
4156- AC_MSG_RESULT([no])
4157- ;;
4158- esac
4159- fi
4160-])
4161-
4162-dnl BM_DEBUG_SUPPORT()
4163-dnl
4164-AC_DEFUN([BM_DEBUG_SUPPORT],
4165-[
4166-dnl # --enable-debug
4167- AC_REQUIRE([XDT_FEATURE_DEBUG])
4168-
4169-dnl # --enable-profiling
4170- AC_ARG_ENABLE([profiling],
4171-AC_HELP_STRING([--enable-profiling],
4172- [Generate extra code to write profile information])
4173-AC_HELP_STRING([--disable-profiling],
4174- [No extra code for profiling (default)]),
4175- [], [enable_profiling=no])
4176-
4177- AC_MSG_CHECKING([whether to build with profiling support])
4178- if test x"$enable_profiling" != x"no"; then
4179- CFLAGS="$CFLAGS -pg"
4180- LDFLAGS="$LDFLAGS -pg"
4181- AC_MSG_RESULT([yes])
4182- else
4183- AC_MSG_RESULT([no])
4184- fi
4185-
4186-dnl # --enable-gcov
4187- AC_ARG_ENABLE([gcov],
4188-AC_HELP_STRING([--enable-gcov],
4189- [compile with coverage profiling instrumentation (gcc only)])
4190-AC_HELP_STRING([--disable-gcov],
4191- [do not generate coverage profiling instrumentation (default)]),
4192- [], [enable_gcov=no])
4193-
4194- AC_MSG_CHECKING([whether to compile with coverage profiling instrumentation])
4195- if test x"$enable_gcov" != x"no"; then
4196- CFLAGS="$CFLAGS -fprofile-arcs -ftest-coverage"
4197- AC_MSG_RESULT([yes])
4198- else
4199- AC_MSG_RESULT([no])
4200- fi
4201-
4202-dnl # --disable-asserts
4203- AC_ARG_ENABLE([asserts],
4204-AC_HELP_STRING([--disable-asserts], [Disable assertions [DANGEROUS]]),
4205- [], [enable_asserts=yes])
4206-
4207- AC_MSG_CHECKING([whether to disable assertions])
4208- if test x"$enable_asserts" = x"no"; then
4209- AC_MSG_RESULT([yes])
4210- CPPFLAGS="$CPPFLAGS -DG_DISABLE_CHECKS -DG_DISABLE_ASSERT"
4211- CPPFLAGS="$CPPFLAGS -DG_DISABLE_CAST_CHECKS"
4212- else
4213- AC_MSG_RESULT([no])
4214- fi
4215-
4216-dnl # --enable-final
4217- AC_REQUIRE([AC_PROG_LD])
4218- AC_ARG_ENABLE([final],
4219-AC_HELP_STRING([--enable-final], [Build final version]),
4220- [], [enable_final=yes])
4221-
4222- AC_MSG_CHECKING([whether to build final version])
4223- if test x"$enable_final" = x"yes"; then
4224- AC_MSG_RESULT([yes])
4225- AC_MSG_CHECKING([whether $LD accepts -O1])
4226- case `$LD -O1 -v 2>&1 </dev/null` in
4227- *GNU* | *'with BFD'*)
4228- LDFLAGS="$LDFLAGS -Wl,-O1"
4229- AC_MSG_RESULT([yes])
4230- ;;
4231- *)
4232- AC_MSG_RESULT([no])
4233- ;;
4234- esac
4235- else
4236- AC_MSG_RESULT([no])
4237+ if test x`uname` != x"OpenBSD"; then
4238+ AC_MSG_CHECKING([whether $LD accepts --as-needed])
4239+ case `$LD --as-needed -v 2>&1 </dev/null` in
4240+ *GNU* | *'with BFD'*)
4241+ LDFLAGS="$LDFLAGS -Wl,--as-needed"
4242+ AC_MSG_RESULT([yes])
4243+ ;;
4244+ *)
4245+ AC_MSG_RESULT([no])
4246+ ;;
4247+ esac
4248+ fi
4249+ AC_MSG_CHECKING([whether $LD accepts -O1])
4250+ case `$LD -O1 -v 2>&1 </dev/null` in
4251+ *GNU* | *'with BFD'*)
4252+ LDFLAGS="$LDFLAGS -Wl,-O1"
4253+ AC_MSG_RESULT([yes])
4254+ ;;
4255+ *)
4256+ AC_MSG_RESULT([no])
4257+ ;;
4258+ esac
4259 fi
4260 ])
4261
4262@@ -11224,19 +11253,19 @@
4263 dnl
4264 dnl Written for Xfce by Benedikt Meurer <benny@xfce.org>.
4265 dnl
4266-dnl This program is free software; you can redistribute it and/or modify it
4267-dnl under the terms of the GNU General Public License as published by the Free
4268-dnl Software Foundation; either version 2 of the License, or (at your option)
4269-dnl any later version.
4270-dnl
4271-dnl This program is distributed in the hope that it will be useful, but WITHOUT
4272-dnl ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
4273-dnl FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
4274-dnl more details.
4275-dnl
4276-dnl You should have received a copy of the GNU General Public License along with
4277-dnl this program; if not, write to the Free Software Foundation, Inc., 59 Temple
4278-dnl Place, Suite 330, Boston, MA 02111-1307 USA
4279+dnl This program is free software; you can redistribute it and/or modify
4280+dnl it under the terms of the GNU General Public License as published by
4281+dnl the Free Software Foundation; either version 2 of the License, or
4282+dnl (at your option) any later version.
4283+dnl
4284+dnl This program is distributed in the hope that it will be useful,
4285+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
4286+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
4287+dnl GNU General Public License for more details.
4288+dnl
4289+dnl You should have received a copy of the GNU General Public License along
4290+dnl with this program; if not, write to the Free Software Foundation, Inc.,
4291+dnl 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
4292 dnl
4293 dnl xdt-i18n
4294 dnl --------
4295@@ -11295,16 +11324,3 @@
4296 ])
4297
4298
4299-
4300-dnl BM_I18N(PACKAGE, LINGUAS)
4301-dnl
4302-dnl Simple wrapper for XDT_I18N(LINGUAS, PACKAGE). Kept for
4303-dnl backward compatibility. Will be removed in the
4304-dnl future.
4305-dnl
4306-AC_DEFUN([BM_I18N],
4307-[
4308- XDT_I18N([$2], [$1])
4309-])
4310-
4311-
4312
4313=== modified file 'compile'
4314--- compile 2012-05-15 23:20:16 +0000
4315+++ compile 2015-02-27 07:38:45 +0000
4316@@ -1,10 +1,9 @@
4317 #! /bin/sh
4318 # Wrapper for compilers which do not understand '-c -o'.
4319
4320-scriptversion=2012-03-05.13; # UTC
4321+scriptversion=2012-10-14.11; # UTC
4322
4323-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010, 2012 Free
4324-# Software Foundation, Inc.
4325+# Copyright (C) 1999-2013 Free Software Foundation, Inc.
4326 # Written by Tom Tromey <tromey@cygnus.com>.
4327 #
4328 # This program is free software; you can redistribute it and/or modify
4329@@ -113,6 +112,11 @@
4330 lib=$dir/$lib.lib
4331 break
4332 fi
4333+ if test -f "$dir/lib$lib.a"; then
4334+ found=yes
4335+ lib=$dir/lib$lib.a
4336+ break
4337+ fi
4338 done
4339 IFS=$save_IFS
4340
4341
4342=== modified file 'config.guess'
4343--- config.guess 2012-05-15 23:20:16 +0000
4344+++ config.guess 2015-02-27 07:38:45 +0000
4345@@ -1,14 +1,12 @@
4346 #! /bin/sh
4347 # Attempt to guess a canonical system name.
4348-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
4349-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
4350-# 2011, 2012 Free Software Foundation, Inc.
4351+# Copyright 1992-2014 Free Software Foundation, Inc.
4352
4353-timestamp='2012-02-10'
4354+timestamp='2014-03-23'
4355
4356 # This file is free software; you can redistribute it and/or modify it
4357 # under the terms of the GNU General Public License as published by
4358-# the Free Software Foundation; either version 2 of the License, or
4359+# the Free Software Foundation; either version 3 of the License, or
4360 # (at your option) any later version.
4361 #
4362 # This program is distributed in the hope that it will be useful, but
4363@@ -22,19 +20,17 @@
4364 # As a special exception to the GNU General Public License, if you
4365 # distribute this file as part of a program that contains a
4366 # configuration script generated by Autoconf, you may include it under
4367-# the same distribution terms that you use for the rest of that program.
4368-
4369-
4370-# Originally written by Per Bothner. Please send patches (context
4371-# diff format) to <config-patches@gnu.org> and include a ChangeLog
4372-# entry.
4373+# the same distribution terms that you use for the rest of that
4374+# program. This Exception is an additional permission under section 7
4375+# of the GNU General Public License, version 3 ("GPLv3").
4376 #
4377-# This script attempts to guess a canonical system name similar to
4378-# config.sub. If it succeeds, it prints the system name on stdout, and
4379-# exits with 0. Otherwise, it exits with 1.
4380+# Originally written by Per Bothner.
4381 #
4382 # You can get the latest version of this script from:
4383 # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
4384+#
4385+# Please send patches with a ChangeLog entry to config-patches@gnu.org.
4386+
4387
4388 me=`echo "$0" | sed -e 's,.*/,,'`
4389
4390@@ -54,9 +50,7 @@
4391 GNU config.guess ($timestamp)
4392
4393 Originally written by Per Bothner.
4394-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
4395-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
4396-Free Software Foundation, Inc.
4397+Copyright 1992-2014 Free Software Foundation, Inc.
4398
4399 This is free software; see the source for copying conditions. There is NO
4400 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
4401@@ -138,6 +132,27 @@
4402 UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
4403 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
4404
4405+case "${UNAME_SYSTEM}" in
4406+Linux|GNU|GNU/*)
4407+ # If the system lacks a compiler, then just pick glibc.
4408+ # We could probably try harder.
4409+ LIBC=gnu
4410+
4411+ eval $set_cc_for_build
4412+ cat <<-EOF > $dummy.c
4413+ #include <features.h>
4414+ #if defined(__UCLIBC__)
4415+ LIBC=uclibc
4416+ #elif defined(__dietlibc__)
4417+ LIBC=dietlibc
4418+ #else
4419+ LIBC=gnu
4420+ #endif
4421+ EOF
4422+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`
4423+ ;;
4424+esac
4425+
4426 # Note: order is significant - the case branches are not exclusive.
4427
4428 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
4429@@ -200,6 +215,10 @@
4430 # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
4431 echo "${machine}-${os}${release}"
4432 exit ;;
4433+ *:Bitrig:*:*)
4434+ UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
4435+ echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
4436+ exit ;;
4437 *:OpenBSD:*:*)
4438 UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
4439 echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
4440@@ -302,7 +321,7 @@
4441 arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
4442 echo arm-acorn-riscix${UNAME_RELEASE}
4443 exit ;;
4444- arm:riscos:*:*|arm:RISCOS:*:*)
4445+ arm*:riscos:*:*|arm*:RISCOS:*:*)
4446 echo arm-unknown-riscos
4447 exit ;;
4448 SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
4449@@ -801,10 +820,13 @@
4450 i*:CYGWIN*:*)
4451 echo ${UNAME_MACHINE}-pc-cygwin
4452 exit ;;
4453+ *:MINGW64*:*)
4454+ echo ${UNAME_MACHINE}-pc-mingw64
4455+ exit ;;
4456 *:MINGW*:*)
4457 echo ${UNAME_MACHINE}-pc-mingw32
4458 exit ;;
4459- i*:MSYS*:*)
4460+ *:MSYS*:*)
4461 echo ${UNAME_MACHINE}-pc-msys
4462 exit ;;
4463 i*:windows32*:*)
4464@@ -852,21 +874,21 @@
4465 exit ;;
4466 *:GNU:*:*)
4467 # the GNU system
4468- echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
4469+ echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
4470 exit ;;
4471 *:GNU/*:*:*)
4472 # other systems with GNU libc and userland
4473- echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
4474+ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
4475 exit ;;
4476 i*86:Minix:*:*)
4477 echo ${UNAME_MACHINE}-pc-minix
4478 exit ;;
4479 aarch64:Linux:*:*)
4480- echo ${UNAME_MACHINE}-unknown-linux-gnu
4481+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
4482 exit ;;
4483 aarch64_be:Linux:*:*)
4484 UNAME_MACHINE=aarch64_be
4485- echo ${UNAME_MACHINE}-unknown-linux-gnu
4486+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
4487 exit ;;
4488 alpha:Linux:*:*)
4489 case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
4490@@ -879,59 +901,54 @@
4491 EV68*) UNAME_MACHINE=alphaev68 ;;
4492 esac
4493 objdump --private-headers /bin/sh | grep -q ld.so.1
4494- if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
4495- echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
4496+ if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
4497+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
4498+ exit ;;
4499+ arc:Linux:*:* | arceb:Linux:*:*)
4500+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
4501 exit ;;
4502 arm*:Linux:*:*)
4503 eval $set_cc_for_build
4504 if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
4505 | grep -q __ARM_EABI__
4506 then
4507- echo ${UNAME_MACHINE}-unknown-linux-gnu
4508+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
4509 else
4510 if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
4511 | grep -q __ARM_PCS_VFP
4512 then
4513- echo ${UNAME_MACHINE}-unknown-linux-gnueabi
4514+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
4515 else
4516- echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
4517+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
4518 fi
4519 fi
4520 exit ;;
4521 avr32*:Linux:*:*)
4522- echo ${UNAME_MACHINE}-unknown-linux-gnu
4523+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
4524 exit ;;
4525 cris:Linux:*:*)
4526- echo ${UNAME_MACHINE}-axis-linux-gnu
4527+ echo ${UNAME_MACHINE}-axis-linux-${LIBC}
4528 exit ;;
4529 crisv32:Linux:*:*)
4530- echo ${UNAME_MACHINE}-axis-linux-gnu
4531+ echo ${UNAME_MACHINE}-axis-linux-${LIBC}
4532 exit ;;
4533 frv:Linux:*:*)
4534- echo ${UNAME_MACHINE}-unknown-linux-gnu
4535+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
4536 exit ;;
4537 hexagon:Linux:*:*)
4538- echo ${UNAME_MACHINE}-unknown-linux-gnu
4539+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
4540 exit ;;
4541 i*86:Linux:*:*)
4542- LIBC=gnu
4543- eval $set_cc_for_build
4544- sed 's/^ //' << EOF >$dummy.c
4545- #ifdef __dietlibc__
4546- LIBC=dietlibc
4547- #endif
4548-EOF
4549- eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
4550- echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
4551+ echo ${UNAME_MACHINE}-pc-linux-${LIBC}
4552 exit ;;
4553 ia64:Linux:*:*)
4554- echo ${UNAME_MACHINE}-unknown-linux-gnu
4555+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
4556 exit ;;
4557 m32r*:Linux:*:*)
4558- echo ${UNAME_MACHINE}-unknown-linux-gnu
4559+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
4560 exit ;;
4561 m68*:Linux:*:*)
4562- echo ${UNAME_MACHINE}-unknown-linux-gnu
4563+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
4564 exit ;;
4565 mips:Linux:*:* | mips64:Linux:*:*)
4566 eval $set_cc_for_build
4567@@ -950,54 +967,63 @@
4568 #endif
4569 EOF
4570 eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'`
4571- test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
4572+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
4573 ;;
4574- or32:Linux:*:*)
4575- echo ${UNAME_MACHINE}-unknown-linux-gnu
4576+ openrisc*:Linux:*:*)
4577+ echo or1k-unknown-linux-${LIBC}
4578+ exit ;;
4579+ or32:Linux:*:* | or1k*:Linux:*:*)
4580+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
4581 exit ;;
4582 padre:Linux:*:*)
4583- echo sparc-unknown-linux-gnu
4584+ echo sparc-unknown-linux-${LIBC}
4585 exit ;;
4586 parisc64:Linux:*:* | hppa64:Linux:*:*)
4587- echo hppa64-unknown-linux-gnu
4588+ echo hppa64-unknown-linux-${LIBC}
4589 exit ;;
4590 parisc:Linux:*:* | hppa:Linux:*:*)
4591 # Look for CPU level
4592 case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
4593- PA7*) echo hppa1.1-unknown-linux-gnu ;;
4594- PA8*) echo hppa2.0-unknown-linux-gnu ;;
4595- *) echo hppa-unknown-linux-gnu ;;
4596+ PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
4597+ PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
4598+ *) echo hppa-unknown-linux-${LIBC} ;;
4599 esac
4600 exit ;;
4601 ppc64:Linux:*:*)
4602- echo powerpc64-unknown-linux-gnu
4603+ echo powerpc64-unknown-linux-${LIBC}
4604 exit ;;
4605 ppc:Linux:*:*)
4606- echo powerpc-unknown-linux-gnu
4607+ echo powerpc-unknown-linux-${LIBC}
4608+ exit ;;
4609+ ppc64le:Linux:*:*)
4610+ echo powerpc64le-unknown-linux-${LIBC}
4611+ exit ;;
4612+ ppcle:Linux:*:*)
4613+ echo powerpcle-unknown-linux-${LIBC}
4614 exit ;;
4615 s390:Linux:*:* | s390x:Linux:*:*)
4616- echo ${UNAME_MACHINE}-ibm-linux
4617+ echo ${UNAME_MACHINE}-ibm-linux-${LIBC}
4618 exit ;;
4619 sh64*:Linux:*:*)
4620- echo ${UNAME_MACHINE}-unknown-linux-gnu
4621+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
4622 exit ;;
4623 sh*:Linux:*:*)
4624- echo ${UNAME_MACHINE}-unknown-linux-gnu
4625+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
4626 exit ;;
4627 sparc:Linux:*:* | sparc64:Linux:*:*)
4628- echo ${UNAME_MACHINE}-unknown-linux-gnu
4629+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
4630 exit ;;
4631 tile*:Linux:*:*)
4632- echo ${UNAME_MACHINE}-unknown-linux-gnu
4633+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
4634 exit ;;
4635 vax:Linux:*:*)
4636- echo ${UNAME_MACHINE}-dec-linux-gnu
4637+ echo ${UNAME_MACHINE}-dec-linux-${LIBC}
4638 exit ;;
4639 x86_64:Linux:*:*)
4640- echo ${UNAME_MACHINE}-unknown-linux-gnu
4641+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
4642 exit ;;
4643 xtensa*:Linux:*:*)
4644- echo ${UNAME_MACHINE}-unknown-linux-gnu
4645+ echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
4646 exit ;;
4647 i*86:DYNIX/ptx:4*:*)
4648 # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
4649@@ -1201,6 +1227,9 @@
4650 BePC:Haiku:*:*) # Haiku running on Intel PC compatible.
4651 echo i586-pc-haiku
4652 exit ;;
4653+ x86_64:Haiku:*:*)
4654+ echo x86_64-unknown-haiku
4655+ exit ;;
4656 SX-4:SUPER-UX:*:*)
4657 echo sx4-nec-superux${UNAME_RELEASE}
4658 exit ;;
4659@@ -1227,19 +1256,31 @@
4660 exit ;;
4661 *:Darwin:*:*)
4662 UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
4663- case $UNAME_PROCESSOR in
4664- i386)
4665- eval $set_cc_for_build
4666- if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
4667- if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
4668- (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
4669- grep IS_64BIT_ARCH >/dev/null
4670- then
4671- UNAME_PROCESSOR="x86_64"
4672- fi
4673- fi ;;
4674- unknown) UNAME_PROCESSOR=powerpc ;;
4675- esac
4676+ eval $set_cc_for_build
4677+ if test "$UNAME_PROCESSOR" = unknown ; then
4678+ UNAME_PROCESSOR=powerpc
4679+ fi
4680+ if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then
4681+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
4682+ if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \
4683+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \
4684+ grep IS_64BIT_ARCH >/dev/null
4685+ then
4686+ case $UNAME_PROCESSOR in
4687+ i386) UNAME_PROCESSOR=x86_64 ;;
4688+ powerpc) UNAME_PROCESSOR=powerpc64 ;;
4689+ esac
4690+ fi
4691+ fi
4692+ elif test "$UNAME_PROCESSOR" = i386 ; then
4693+ # Avoid executing cc on OS X 10.9, as it ships with a stub
4694+ # that puts up a graphical alert prompting to install
4695+ # developer tools. Any system running Mac OS X 10.7 or
4696+ # later (Darwin 11 and later) is required to have a 64-bit
4697+ # processor. This is not true of the ARM version of Darwin
4698+ # that Apple uses in portable devices.
4699+ UNAME_PROCESSOR=x86_64
4700+ fi
4701 echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
4702 exit ;;
4703 *:procnto*:*:* | *:QNX:[0123456789]*:*)
4704@@ -1256,7 +1297,7 @@
4705 NEO-?:NONSTOP_KERNEL:*:*)
4706 echo neo-tandem-nsk${UNAME_RELEASE}
4707 exit ;;
4708- NSE-?:NONSTOP_KERNEL:*:*)
4709+ NSE-*:NONSTOP_KERNEL:*:*)
4710 echo nse-tandem-nsk${UNAME_RELEASE}
4711 exit ;;
4712 NSR-?:NONSTOP_KERNEL:*:*)
4713@@ -1330,157 +1371,6 @@
4714 exit ;;
4715 esac
4716
4717-#echo '(No uname command or uname output not recognized.)' 1>&2
4718-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
4719-
4720-eval $set_cc_for_build
4721-cat >$dummy.c <<EOF
4722-#ifdef _SEQUENT_
4723-# include <sys/types.h>
4724-# include <sys/utsname.h>
4725-#endif
4726-main ()
4727-{
4728-#if defined (sony)
4729-#if defined (MIPSEB)
4730- /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed,
4731- I don't know.... */
4732- printf ("mips-sony-bsd\n"); exit (0);
4733-#else
4734-#include <sys/param.h>
4735- printf ("m68k-sony-newsos%s\n",
4736-#ifdef NEWSOS4
4737- "4"
4738-#else
4739- ""
4740-#endif
4741- ); exit (0);
4742-#endif
4743-#endif
4744-
4745-#if defined (__arm) && defined (__acorn) && defined (__unix)
4746- printf ("arm-acorn-riscix\n"); exit (0);
4747-#endif
4748-
4749-#if defined (hp300) && !defined (hpux)
4750- printf ("m68k-hp-bsd\n"); exit (0);
4751-#endif
4752-
4753-#if defined (NeXT)
4754-#if !defined (__ARCHITECTURE__)
4755-#define __ARCHITECTURE__ "m68k"
4756-#endif
4757- int version;
4758- version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
4759- if (version < 4)
4760- printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
4761- else
4762- printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
4763- exit (0);
4764-#endif
4765-
4766-#if defined (MULTIMAX) || defined (n16)
4767-#if defined (UMAXV)
4768- printf ("ns32k-encore-sysv\n"); exit (0);
4769-#else
4770-#if defined (CMU)
4771- printf ("ns32k-encore-mach\n"); exit (0);
4772-#else
4773- printf ("ns32k-encore-bsd\n"); exit (0);
4774-#endif
4775-#endif
4776-#endif
4777-
4778-#if defined (__386BSD__)
4779- printf ("i386-pc-bsd\n"); exit (0);
4780-#endif
4781-
4782-#if defined (sequent)
4783-#if defined (i386)
4784- printf ("i386-sequent-dynix\n"); exit (0);
4785-#endif
4786-#if defined (ns32000)
4787- printf ("ns32k-sequent-dynix\n"); exit (0);
4788-#endif
4789-#endif
4790-
4791-#if defined (_SEQUENT_)
4792- struct utsname un;
4793-
4794- uname(&un);
4795-
4796- if (strncmp(un.version, "V2", 2) == 0) {
4797- printf ("i386-sequent-ptx2\n"); exit (0);
4798- }
4799- if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
4800- printf ("i386-sequent-ptx1\n"); exit (0);
4801- }
4802- printf ("i386-sequent-ptx\n"); exit (0);
4803-
4804-#endif
4805-
4806-#if defined (vax)
4807-# if !defined (ultrix)
4808-# include <sys/param.h>
4809-# if defined (BSD)
4810-# if BSD == 43
4811- printf ("vax-dec-bsd4.3\n"); exit (0);
4812-# else
4813-# if BSD == 199006
4814- printf ("vax-dec-bsd4.3reno\n"); exit (0);
4815-# else
4816- printf ("vax-dec-bsd\n"); exit (0);
4817-# endif
4818-# endif
4819-# else
4820- printf ("vax-dec-bsd\n"); exit (0);
4821-# endif
4822-# else
4823- printf ("vax-dec-ultrix\n"); exit (0);
4824-# endif
4825-#endif
4826-
4827-#if defined (alliant) && defined (i860)
4828- printf ("i860-alliant-bsd\n"); exit (0);
4829-#endif
4830-
4831- exit (1);
4832-}
4833-EOF
4834-
4835-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
4836- { echo "$SYSTEM_NAME"; exit; }
4837-
4838-# Apollos put the system type in the environment.
4839-
4840-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
4841-
4842-# Convex versions that predate uname can use getsysinfo(1)
4843-
4844-if [ -x /usr/convex/getsysinfo ]
4845-then
4846- case `getsysinfo -f cpu_type` in
4847- c1*)
4848- echo c1-convex-bsd
4849- exit ;;
4850- c2*)
4851- if getsysinfo -f scalar_acc
4852- then echo c32-convex-bsd
4853- else echo c2-convex-bsd
4854- fi
4855- exit ;;
4856- c34*)
4857- echo c34-convex-bsd
4858- exit ;;
4859- c38*)
4860- echo c38-convex-bsd
4861- exit ;;
4862- c4*)
4863- echo c4-convex-bsd
4864- exit ;;
4865- esac
4866-fi
4867-
4868 cat >&2 <<EOF
4869 $0: unable to guess system type
4870
4871
4872=== modified file 'config.h.in'
4873--- config.h.in 2011-06-18 22:46:33 +0000
4874+++ config.h.in 2015-02-27 07:38:45 +0000
4875@@ -1,4 +1,4 @@
4876-/* config.h.in. Generated from configure.in by autoheader. */
4877+/* config.h.in. Generated from configure.ac by autoheader. */
4878
4879 /* Define for debugging support */
4880 #undef DEBUG
4881@@ -139,9 +139,6 @@
4882 /* Complete path to netcat */
4883 #undef NETCAT_PATH
4884
4885-/* Define to 1 if your C compiler doesn't accept -c and -o together. */
4886-#undef NO_MINUS_C_MINUS_O
4887-
4888 /* Name of package */
4889 #undef PACKAGE
4890
4891
4892=== modified file 'config.sub'
4893--- config.sub 2012-05-15 23:20:16 +0000
4894+++ config.sub 2015-02-27 07:38:45 +0000
4895@@ -1,24 +1,18 @@
4896 #! /bin/sh
4897 # Configuration validation subroutine script.
4898-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
4899-# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
4900-# 2011, 2012 Free Software Foundation, Inc.
4901-
4902-timestamp='2012-02-10'
4903-
4904-# This file is (in principle) common to ALL GNU software.
4905-# The presence of a machine in this file suggests that SOME GNU software
4906-# can handle that machine. It does not imply ALL GNU software can.
4907-#
4908-# This file is free software; you can redistribute it and/or modify
4909-# it under the terms of the GNU General Public License as published by
4910-# the Free Software Foundation; either version 2 of the License, or
4911+# Copyright 1992-2014 Free Software Foundation, Inc.
4912+
4913+timestamp='2014-09-11'
4914+
4915+# This file is free software; you can redistribute it and/or modify it
4916+# under the terms of the GNU General Public License as published by
4917+# the Free Software Foundation; either version 3 of the License, or
4918 # (at your option) any later version.
4919 #
4920-# This program is distributed in the hope that it will be useful,
4921-# but WITHOUT ANY WARRANTY; without even the implied warranty of
4922-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
4923-# GNU General Public License for more details.
4924+# This program is distributed in the hope that it will be useful, but
4925+# WITHOUT ANY WARRANTY; without even the implied warranty of
4926+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
4927+# General Public License for more details.
4928 #
4929 # You should have received a copy of the GNU General Public License
4930 # along with this program; if not, see <http://www.gnu.org/licenses/>.
4931@@ -26,11 +20,12 @@
4932 # As a special exception to the GNU General Public License, if you
4933 # distribute this file as part of a program that contains a
4934 # configuration script generated by Autoconf, you may include it under
4935-# the same distribution terms that you use for the rest of that program.
4936-
4937-
4938-# Please send patches to <config-patches@gnu.org>. Submit a context
4939-# diff and a properly formatted GNU ChangeLog entry.
4940+# the same distribution terms that you use for the rest of that
4941+# program. This Exception is an additional permission under section 7
4942+# of the GNU General Public License, version 3 ("GPLv3").
4943+
4944+
4945+# Please send patches with a ChangeLog entry to config-patches@gnu.org.
4946 #
4947 # Configuration subroutine to validate and canonicalize a configuration type.
4948 # Supply the specified configuration type as an argument.
4949@@ -73,9 +68,7 @@
4950 version="\
4951 GNU config.sub ($timestamp)
4952
4953-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
4954-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
4955-Free Software Foundation, Inc.
4956+Copyright 1992-2014 Free Software Foundation, Inc.
4957
4958 This is free software; see the source for copying conditions. There is NO
4959 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
4960@@ -123,7 +116,7 @@
4961 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
4962 case $maybe_os in
4963 nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
4964- linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
4965+ linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
4966 knetbsd*-gnu* | netbsd*-gnu* | \
4967 kopensolaris*-gnu* | \
4968 storm-chaos* | os2-emx* | rtmk-nova*)
4969@@ -156,7 +149,7 @@
4970 -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
4971 -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
4972 -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
4973- -apple | -axis | -knuth | -cray | -microblaze)
4974+ -apple | -axis | -knuth | -cray | -microblaze*)
4975 os=
4976 basic_machine=$1
4977 ;;
4978@@ -225,6 +218,12 @@
4979 -isc*)
4980 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
4981 ;;
4982+ -lynx*178)
4983+ os=-lynxos178
4984+ ;;
4985+ -lynx*5)
4986+ os=-lynxos5
4987+ ;;
4988 -lynx*)
4989 os=-lynxos
4990 ;;
4991@@ -253,10 +252,12 @@
4992 | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
4993 | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
4994 | am33_2.0 \
4995- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
4996- | be32 | be64 \
4997+ | arc | arceb \
4998+ | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
4999+ | avr | avr32 \
5000+ | be32 | be64 \
The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches

to all changes: