Merge lp:~blkperl/ubuntu/raring/collectd/merge-from-debian into lp:ubuntu/raring/collectd
- Raring (13.04)
- merge-from-debian
- Merge into raring
Proposed by
William Van Hevelingen
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 31 | ||||
Proposed branch: | lp:~blkperl/ubuntu/raring/collectd/merge-from-debian | ||||
Merge into: | lp:ubuntu/raring/collectd | ||||
Diff against target: |
254153 lines (+210845/-27524) 263 files modified
AUTHORS (+28/-0) ChangeLog (+414/-0) Makefile.in (+14/-2) README (+56/-3) aclocal.m4 (+4/-4) bindings/Makefile.in (+9/-0) bindings/java/Makefile.in (+9/-0) bindings/java/org/collectd/api/CollectdFlushInterface.java (+1/-1) bindings/java/org/collectd/api/ValueList.java (+6/-0) bindings/java/org/collectd/java/GenericJMXConfConnection.java (+10/-2) bindings/java/org/collectd/java/GenericJMXConfMBean.java (+20/-26) bindings/java/org/collectd/java/GenericJMXConfValue.java (+8/-1) bindings/perl/lib/Collectd.pm (+0/-29) compile (+0/-143) config.guess (+0/-1502) config.sub (+0/-1714) configure (+2604/-666) configure.in (+672/-129) contrib/aix/collectd.spec (+75/-0) contrib/aix/init.d-collectd (+79/-0) contrib/collectd_unixsock.py (+12/-10) contrib/collection3/bin/graph.cgi (+297/-179) contrib/collection3/bin/index.cgi (+112/-25) contrib/collection3/etc/collection.conf (+10/-0) contrib/collection3/lib/Collectd/Graph/Common.pm (+132/-33) contrib/collection3/lib/Collectd/Graph/TypeLoader.pm (+2/-1) contrib/exec-ksm.sh (+53/-0) contrib/exec-munin.px (+8/-4) contrib/exec-nagios.conf (+2/-0) contrib/exec-nagios.px (+138/-18) contrib/exec-smartctl (+6/-8) contrib/migrate-4-5.px (+241/-0) contrib/php-collection/definitions.php (+10/-10) contrib/redhat/collectd.spec (+15/-4) contrib/redhat/init.d-collectd (+4/-3) debian/NEWS.Debian (+32/-0) debian/README.Debian (+42/-0) debian/changelog (+271/-0) debian/collectd-core.collectd.init.d (+89/-60) debian/collectd-core.config (+12/-0) debian/collectd-core.install (+1/-0) debian/collectd-core.overrides (+2/-2) debian/collectd-core.postinst (+9/-0) debian/collectd-core.postrm (+7/-2) debian/collectd-core.templates (+40/-0) debian/collectd-utils.install (+2/-0) debian/collectd.conf (+90/-3) debian/control (+21/-11) debian/copyright (+114/-16) debian/filters.conf (+2/-0) debian/libcollectdclient0.symbols (+1/-0) debian/patches/00list (+2/-9) debian/patches/CVE-2010-4336.dpatch (+0/-18) debian/patches/bts559801_plugin_find_fix.dpatch (+17/-1) debian/patches/bts592623-curl_json-file.dpatch (+0/-22) debian/patches/bts595756-notify_email-segfault.dpatch (+0/-140) debian/patches/bts596128-reheap-fix.dpatch (+0/-46) debian/patches/fix-detection-libiptc-1.4.10.dpatch (+0/-40) debian/patches/gcc-4.6-fixes.dpatch (+0/-299) debian/patches/iproute_porting.dpatch (+0/-30) debian/patches/libperl-linkage.dpatch (+187962/-96) debian/patches/migrate-4-5-df.dpatch (+66/-0) debian/patches/notify-desktop.dpatch (+0/-20) debian/patches/rtnl_dump_filter.dpatch (+30/-0) debian/patches/yajl2_porting.dpatch (+0/-59) debian/po/cs.po (+74/-5) debian/po/da.po (+142/-0) debian/po/de.po (+77/-7) debian/po/es.po (+88/-14) debian/po/fr.po (+89/-15) debian/po/gl.po (+81/-8) debian/po/it.po (+150/-0) debian/po/ja.po (+71/-4) debian/po/nl.po (+86/-11) debian/po/pl.po (+147/-0) debian/po/pt.po (+80/-11) debian/po/pt_BR.po (+149/-0) debian/po/ru.po (+80/-10) debian/po/sk.po (+112/-0) debian/po/sv.po (+82/-11) debian/po/templates.pot (+63/-5) debian/po/vi.po (+71/-4) debian/rules (+33/-18) debian/source/format (+1/-0) debian/thresholds.conf (+3/-7) depcomp (+0/-630) install-sh (+0/-520) libltdl/config/ylwrap (+222/-0) ltmain.sh (+0/-8413) missing (+0/-376) src/Makefile.am (+132/-12) src/Makefile.in (+919/-601) src/amqp.c (+993/-0) src/apache.c (+19/-49) src/ascent.c (+1/-0) src/bind.c (+40/-28) src/collectd-email.5 (+1/-1) src/collectd-exec.5 (+7/-1) src/collectd-exec.pod (+8/-0) src/collectd-java.5 (+8/-1) src/collectd-java.pod (+8/-0) src/collectd-nagios.1 (+6/-1) src/collectd-nagios.c (+138/-36) src/collectd-nagios.pod (+6/-0) src/collectd-perl.5 (+13/-25) src/collectd-perl.pod (+11/-25) src/collectd-python.5 (+3/-7) src/collectd-python.pod (+12/-8) src/collectd-snmp.5 (+1/-1) src/collectd-threshold.5 (+320/-0) src/collectd-threshold.pod (+201/-0) src/collectd-unixsock.5 (+1/-1) src/collectd.1 (+1/-1) src/collectd.c (+36/-40) src/collectd.conf.5 (+605/-126) src/collectd.conf.in (+170/-14) src/collectd.conf.pod (+666/-120) src/collectd.h (+12/-22) src/collectdctl.1 (+255/-0) src/collectdctl.c (+608/-0) src/collectdctl.pod (+160/-0) src/collectdmon.1 (+1/-1) src/common.c (+157/-17) src/common.h (+9/-4) src/config.h.in (+110/-8) src/configfile.c (+166/-28) src/configfile.h (+21/-5) src/conntrack.c (+17/-10) src/contextswitch.c (+35/-1) src/cpu.c (+25/-25) src/cpython.h (+1/-1) src/csv.c (+7/-4) src/curl.c (+1/-2) src/curl_json.c (+185/-164) src/curl_xml.c (+3/-1) src/dbi.c (+2/-2) src/df.c (+45/-71) src/disk.c (+39/-41) src/dns.c (+25/-35) src/ethstat.c (+336/-0) src/exec.c (+56/-54) src/filter_chain.c (+14/-1) src/fscache.c (+7/-12) src/gmond.c (+19/-21) src/hddtemp.c (+4/-225) src/interface.c (+27/-14) src/ipmi.c (+6/-5) src/iptables.c (+14/-23) src/ipvs.c (+8/-10) src/irq.c (+84/-99) src/java.c (+27/-14) src/libcollectdclient/Makefile.in (+9/-0) src/libcollectdclient/client.c (+69/-20) src/libcollectdclient/client.h (+4/-1) src/libcollectdclient/lcc_features.h (+4/-4) src/liboconfig/Makefile.in (+10/-1) src/libvirt.c (+219/-179) src/logfile.c (+8/-21) src/lpar.c (+273/-0) src/madwifi.c (+13/-13) src/match_empty_counter.c (+0/-2) src/match_timediff.c (+6/-22) src/match_value.c (+9/-0) src/md.c (+218/-0) src/memcachec.c (+0/-1) src/memcached.c (+24/-25) src/memory.c (+52/-3) src/meta_data.c (+38/-1) src/meta_data.h (+2/-1) src/modbus.c (+156/-30) src/mysql.c (+136/-270) src/netapp.c (+119/-116) src/netlink.c (+7/-7) src/network.c (+159/-76) src/network.h (+2/-0) src/nfs.c (+163/-138) src/nginx.c (+13/-11) src/notify_desktop.c (+10/-1) src/notify_email.c (+46/-10) src/ntpd.c (+10/-9) src/numa.c (+168/-0) src/onewire.c (+8/-9) src/openvpn.c (+16/-16) src/oracle.c (+54/-32) src/owniptc/Makefile.am (+0/-14) src/owniptc/Makefile.in (+0/-572) src/owniptc/README.collectd (+0/-25) src/owniptc/ipt_kernel_headers.h (+0/-45) src/owniptc/libip4tc.c (+0/-517) src/owniptc/libip6tc.c (+0/-456) src/owniptc/libip6tc.h (+0/-175) src/owniptc/libiptc.c (+0/-2716) src/owniptc/libiptc.h (+0/-187) src/owniptc/libxtc.h (+0/-53) src/owniptc/linux_list.h (+0/-741) src/owniptc/xtables.h (+0/-239) src/perl.c (+100/-60) src/pinba.c (+1/-1) src/plugin.c (+213/-50) src/plugin.h (+26/-10) src/postgresql.c (+17/-53) src/powerdns.c (+10/-6) src/processes.c (+219/-167) src/protocols.c (+5/-9) src/python.c (+31/-21) src/pyvalues.c (+59/-39) src/redis.c (+311/-0) src/routeros.c (+14/-14) src/rrdcached.c (+129/-59) src/rrdtool.c (+89/-59) src/sensors.c (+43/-41) src/serial.c (+5/-5) src/snmp.c (+50/-48) src/swap.c (+412/-126) src/syslog.c (+79/-21) src/tape.c (+3/-3) src/target_notification.c (+1/-1) src/target_scale.c (+97/-11) src/target_v5upgrade.c (+472/-0) src/tcpconns.c (+118/-5) src/teamspeak2.c (+15/-8) src/ted.c (+0/-1) src/thermal.c (+27/-42) src/threshold.c (+1030/-0) src/types.db (+117/-100) src/types.db.5 (+1/-1) src/types_list.c (+4/-0) src/unixsock.c (+28/-7) src/utils_avltree.c (+11/-0) src/utils_avltree.h (+15/-0) src/utils_cache.c (+122/-241) src/utils_cache.h (+1/-1) src/utils_cmd_flush.c (+10/-6) src/utils_cmd_getthreshold.c (+0/-178) src/utils_cmd_getthreshold.h (+0/-31) src/utils_cmd_listval.c (+3/-2) src/utils_cmd_putval.c (+32/-4) src/utils_cmd_putval.h (+5/-0) src/utils_db_query.c (+4/-244) src/utils_db_query.h (+2/-2) src/utils_dns.c (+45/-23) src/utils_dns.h (+2/-0) src/utils_format_json.c (+2/-2) src/utils_heap.c (+6/-3) src/utils_match.c (+5/-5) src/utils_match.h (+4/-4) src/utils_rrdcreate.c (+22/-8) src/utils_rrdcreate.h (+1/-1) src/utils_tail.c (+9/-0) src/utils_threshold.c (+0/-1054) src/utils_threshold.h (+0/-87) src/utils_time.c (+64/-0) src/utils_time.h (+70/-0) src/varnish.c (+661/-0) src/vmem.c (+20/-20) src/vserver.c (+17/-10) src/write_graphite.c (+695/-0) src/write_http.c (+21/-86) src/write_mongodb.c (+328/-0) src/write_redis.c (+238/-0) src/zfs_arc.c (+100/-82) version-gen.sh (+3/-3) ylwrap (+0/-222) |
||||
To merge this branch: | bzr merge lp:~blkperl/ubuntu/raring/collectd/merge-from-debian | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jamie Strandboge | Needs Fixing | ||
Ubuntu branches | Pending | ||
Review via email: mp+140116@code.launchpad.net |
This proposal supersedes a proposal from 2012-12-17.
Commit message
Description of the change
Merge upstream release from debian
To post a comment you must log in.
- 31. By William Van Hevelingen
-
Add bug reference
Revision history for this message
William Van Hevelingen (blkperl) wrote : | # |
Hi Jamie,
I installed a new raring vm and I can't reproduce the failure. I'm fairly new at this so any help would be much appreciated. I'm not sure how to fix the changelog is there ubuntu docs you can point me too?
These are the steps I took.
sudo apt-get update
sudo apt-get build-dep collectd
bzr branch lp:~blkperl/ubuntu/raring/collectd/merge-from-debian
cd merge-from-debian
debuild -us -uc
Thanks,
William
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'AUTHORS' |
2 | --- AUTHORS 2010-06-08 00:42:56 +0000 |
3 | +++ AUTHORS 2012-12-17 00:22:20 +0000 |
4 | @@ -15,6 +15,9 @@ |
5 | Contributors (sorted alphabetically) |
6 | ==================================== |
7 | |
8 | +Akkarit Sangpetch <asangpet at andrew.cmu.edu> |
9 | + - write_mongodb plugin. |
10 | + |
11 | Alessandro Iurlano <alessandro.iurlano at gmail.com> |
12 | - Initial filecount plugin. |
13 | |
14 | @@ -34,16 +37,26 @@ |
15 | Antony Dovgal <tony at daylessday.org> |
16 | - memcached plugin. |
17 | |
18 | +Aurélien Reynaud <collectd at wattapower.net> |
19 | + - LPAR plugin. |
20 | + - Various fixes for AIX, HP-UX and Solaris. |
21 | + |
22 | Bruno Prémont <bonbons at linux-vserver.org> |
23 | - BIND plugin. |
24 | - Many bugreports and -fixes in various plugins, |
25 | especially a nasty bug in the network plugin. |
26 | - Wireshark dissector. |
27 | |
28 | +Chris Lundquist <clundquist at bluebox.net> |
29 | + - Improvements to the write_mongodb plugin. |
30 | + |
31 | Christophe Kalt <collectd at klb.taranis.org> |
32 | - The version 3 `log' mode. |
33 | - Many Solaris related hints and fixes. |
34 | |
35 | +Cyril Feraudet <cyril at feraudet.com> |
36 | + - ethstat plugin. |
37 | + |
38 | Dan Berrange <berrange at redhat.com> |
39 | - uuid plugin. |
40 | |
41 | @@ -63,6 +76,9 @@ |
42 | Fabian Linzberger <e at lefant.net> |
43 | - Percentage aggregation for `collectd-nagios'. |
44 | |
45 | +Fabien Wernli <cpan at faxm0dem.org> |
46 | + - Solaris improvements in the memory and interfaces plugin. |
47 | + |
48 | Flavio Stanchina <flavio at stanchina.net> |
49 | - mbmon plugin. |
50 | |
51 | @@ -72,6 +88,9 @@ |
52 | Jason Pepas <cell at ices.utexas.edu> |
53 | - nfs plugin. |
54 | |
55 | +Jérôme Renard <jerome.renard at gmail.com> |
56 | + - varnish plugin. |
57 | + |
58 | Luboš Staněk <kolektor at atlas.cz> |
59 | - sensors plugin improvements. |
60 | - Time and effort to find a nasty bug in the ntpd-plugin. |
61 | @@ -99,6 +118,9 @@ |
62 | - ip6tables support in the iptables plugin. |
63 | - openvpn plugin (support for more status file formats) |
64 | |
65 | +Michael Hanselmann <public at hansmi.ch> |
66 | + - md plugin. |
67 | + |
68 | Michael Stapelberg <michael+git at stapelberg.de> |
69 | - OpenBSD port of the tcpconns plugin. |
70 | |
71 | @@ -159,6 +181,12 @@ |
72 | Scott Garrett <sgarrett at technomancer.com> |
73 | - tape plugin. |
74 | |
75 | +Scott Sanders <scott at jssjr.com> |
76 | + - Write-Graphite plugin. |
77 | + |
78 | +Sebastien Pahl <sebastien.pahl at dotcloud.com> |
79 | + - AMQP plugin. |
80 | + |
81 | Simon Kuhnle <simon at blarzwurst.de> |
82 | - OpenBSD code for the cpu and memory plugins. |
83 | |
84 | |
85 | === modified file 'ChangeLog' |
86 | --- ChangeLog 2010-07-28 18:45:31 +0000 |
87 | +++ ChangeLog 2012-12-17 00:22:20 +0000 |
88 | @@ -1,3 +1,374 @@ |
89 | +2012-04-01, Version 5.1.0 |
90 | + * Build system, iptables plugin: The shipped version of libiptc has |
91 | + been removed. |
92 | + * collectd-nagios: A list of value lists can now be queried using |
93 | + "-n LIST". Thanks to Sebastian Harl for his patches. |
94 | + * bind plugin: The "ParseTime" option has been added. It allows to use |
95 | + the system time rather than the time reported by BIND. |
96 | + * curl, memcachec, tail plugins: The "ExcludeRegexp" option has been |
97 | + added. Thanks to Peter Warasin for his initial patch. |
98 | + * ethstat plugin: The new "ethstat" plugin reads performance statistics |
99 | + directly from ethernet cards. Thanks to Cyril Feraudet for his patch. |
100 | + * GenericJMX plugin: Support for querying MBean "Operations" (in |
101 | + addition to "Attributes") has been added. Thanks to Pierre-Yves |
102 | + Ritschard for his patch. |
103 | + * irq plugin: The selection / ignore code now uses the default |
104 | + ignorelist infrastructure, providing the standard feature set, e.g. |
105 | + regex matching. |
106 | + * md plugin: The new "md" plugin reports the number of disks in various |
107 | + states in Linux software RAID devices. Thanks to Michael Hanselmann |
108 | + for his patch. |
109 | + * modbus plugin: Support for signed integer register types has been |
110 | + added. |
111 | + * nfs plugin: Support for Solaris has been added. Thanks to Cosmin |
112 | + Ioiart for his patch. |
113 | + * numa plugin: The new "numa" plugin reports statistics of the |
114 | + Non-Uniform Memory Access (NUMA) subsystem of Linux. |
115 | + * processes plugin: Various fixes for the FreeBSD implementation. |
116 | + Thanks to Phil Kulin for his patch. |
117 | + * rrdcached plugin: Passing flushes to the caching daemon has been |
118 | + added. |
119 | + * sensors plugin: The initialization code has been improved. Thanks to |
120 | + Henrique de Moraes Holschuh for his patch. |
121 | + * swap plugin: The "ReportByDevice" option has been added. |
122 | + * syslog plugin: Support for writing notifications has been added. |
123 | + Thanks to Fabien Wernli for his patch. |
124 | + * tcpconns plugin: Support for AIX has been added. Thanks to Manuel |
125 | + Luis Sanmartín Rozada for his patch. |
126 | + * threshold plugin: The "PersistOK" option has been added. Thanks to |
127 | + Aaron Brady for his patch. |
128 | + * varnish plugin: Support for Varnish 3.0 has been added. Thanks to |
129 | + Jérôme Renard for his patches. |
130 | + * write_mongodb plugin: The new "write_mongodb" plugin writes value |
131 | + lists to MongoDB, a shema-less database. Thanks to Akkarit Sangpetch |
132 | + and Chris Lundquist for their work. |
133 | + * write_graphite plugin: The new "write_graphite" plugin writes value |
134 | + lists to Carbon, the storage layer of the Graphite time-series |
135 | + database. Thanks to Scott Sanders and Pierre-Yves Ritschard for their |
136 | + work. |
137 | + * zfs_arc plugin: Several new statistics have been added. Thanks to |
138 | + Aurelien Rougemont for his patches. |
139 | + * scale target: Support for scaling specific data sources only has been |
140 | + added. Thanks to Gerrie Roos for his patch. |
141 | + |
142 | + |
143 | +2012-04-01, Version 5.0.4 |
144 | + * Build system: Fix the use of a libltdl macro. Thanks to Clemens Lang |
145 | + for fixing this. Adresses some issues with building the iptables |
146 | + plugin under Gentoo. |
147 | + * libcollectdclient: A memory leak in the lcc_getval() function has |
148 | + been fixed. Thanks to Jason Schmidlapp for finding and fixing this |
149 | + issue. |
150 | + * bind plugin: The use of 'QType" types has been fixed. |
151 | + * df plugin: Fixed compiler issue under Mac OS X 10.7. |
152 | + * conntrack plugin: Support zero as legitimate value. Thanks to Louis |
153 | + Opter for his patch. |
154 | + * memcached plugin: Increased the size of a static buffer, which was |
155 | + truncating status messages form memcached. Thanks to Timon for the |
156 | + patch. |
157 | + * network plugin: Forwarding of notifications has been disabled. This |
158 | + was a contition not checked for before, which may retult in an |
159 | + endless loop. |
160 | + * processes plugin: Support for process names with spaces has been |
161 | + added to the Linux implementation. Thanks to Darrell Bishop for his |
162 | + patch. |
163 | + * perl plugin: A race condition in several callbacks, including log and |
164 | + write callbacks, has been fixed. Thanks to "Rrpv" for reporting this |
165 | + bug. |
166 | + * snmp plugin: A bug when casting unsigned integers to gauge values has |
167 | + been fixed: Unsigned integers would be cast to a signed integer and |
168 | + then to a gauge, possibly resulting in a negative value. |
169 | + * tcpconns plugin: Compilation with newer versions of the FreeBSD |
170 | + runtime has been fixed. |
171 | + |
172 | +2012-02-19, Version 5.0.3 |
173 | + * Build system: Fix problems when building the ipvs and iptables |
174 | + plugins. Thanks to Sebastian Harl for his patch. A bashism in the |
175 | + version-gen.sh script has been fixed. Thanks to Jo-Philipp Wich for |
176 | + his patch. |
177 | + * csv and rrdtool plugins: Print a more helpful error message when the |
178 | + DataDir is a symlink pointing to a non-existing location. Thanks to |
179 | + Jonathan Nieder for his patch. |
180 | + * exec plugin: Fix a problem when using select(2) to read from file |
181 | + handles. Thanks to Gerrie Roos for his patch. |
182 | + * network plugin: An incorrect error message in the handling of the |
183 | + "Interface" configuration option has been fixed. Thanks to Gerrie |
184 | + Roos for his patch. |
185 | + * oracle plugin: A potential endless loop in the error handling has |
186 | + been fixed. |
187 | + * python plugin: A crash bug in the configuration handling has been |
188 | + fixed. Thanks to Sven Trenkel for his patch. |
189 | + * interfaces plugin: The change which was supposed to ignore "bogus" |
190 | + interfaces has been reverted, since it ignored legit interfaces, such |
191 | + as bonding pseudo-devices as well. |
192 | + |
193 | +2012-01-21, Version 5.0.2 |
194 | + * curl_xml plugin: Fix handling of file:// and other URLs (which don't |
195 | + follow HTTP status codes). Thanks to Fabien Wernli for his patch! |
196 | + * df plugin: Fix handling of negative "available" counts. This can |
197 | + occur with some file systems, for example UFS. Thanks to Toni Ylenius |
198 | + for his patch. |
199 | + * interface plugin: "mac" interfaces are now ignored on Solaris. These |
200 | + pseudo-interfaces occur multiple times, causing warnings. Also switch |
201 | + to 64-bit counters on Solaris, improving overflow behavior for |
202 | + high-speed interfaces. Thanks to Eddy Geez and Fabien Wernli for |
203 | + their patches. |
204 | + * memory plugin: Account kernel and unused memory under Solaris. Thanks |
205 | + to Fabien Wernli for his patch. |
206 | + * network plugin: A bug in the interaction between the Network plugin |
207 | + and filter chains has been fixed: When a filter modified a field such |
208 | + as the hostname, subsequent values in the same network packets could |
209 | + have ended up using the modified name rather than the original name. |
210 | + Thanks to Sebastian Harl for identifying the problem. |
211 | + * oracle plugin: A memory leak has been fixed in the parameter handling. |
212 | + * python plugin: A memory leak has been fixed. Thanks to Sven Trenkel |
213 | + for fixing this bug! |
214 | + |
215 | +2011-10-07, Version 5.0.1 |
216 | + * collectd: A mutex leak has been fixed in the meta data code. Thanks |
217 | + to Rafal Lesniak for his patch. |
218 | + * collectd: Compatibility fixes for GCC 4.6 have been applied. Thanks |
219 | + to Peter Green for his patch. |
220 | + * csv plugin: The line buffer size has been increased. Thanks to Colin |
221 | + McCabe for the patch. |
222 | + * curl_json plugin: Don't use the "parent" node to build the type |
223 | + instance, if it is empty. Compatibility with libyajl 2 has been |
224 | + added. Thanks to "spupykin" of the Arch Linux project for the initial |
225 | + code. Formatting of time has been fixed in the JSON module. |
226 | + * exec plugin: Fix the timestamp value passed to notification scripts. |
227 | + Thanks to Alexander Kovalenko for fixing this. |
228 | + * iptables plugin: Fix linking with some versions of libiptc. |
229 | + * irq plugin: Fix support for interrupts under Linux. The old code |
230 | + assumed that interrupts have a numeric value -- this is no longer |
231 | + true for Linux. Thanks to Bostjan Skufca for implementing this. |
232 | + * notify_desktop plugin: Compatibility with libnotify 0.7 has been |
233 | + added. Thanks to Samuli Suominen for his patch. |
234 | + * processes plugin: Fix handling of regular expressions containing |
235 | + spaces. Thanks for Sebastian Harl for fixing this. |
236 | + * rrdtool, rrdcached plugins: Improve precision of the XFF parameter. |
237 | + Previously, values like 0.999 would have been rounded to 1.0. Thanks |
238 | + to Francois-Xavier Bourlet for fixing this. |
239 | + * varnish plugin: Fix data type handling of some metrics. Some values |
240 | + were submitted as gauge even though they were derives. |
241 | + * Various plugin: Set a multi-threading flag in libcurl. Thanks to Mike |
242 | + Flisher for the fix. |
243 | + |
244 | +2011-03-28, Version 5.0.0 |
245 | + * collectd: The "FQDNLookup" option is now enabled by default. |
246 | + * collectd: The internal representation of time has been changed to |
247 | + allow a higher accuracy than one second. |
248 | + * collectdcmd: This new command line utility can send various commands |
249 | + to collectd using the UnixSock plugin. Thanks to Håkon Dugstad |
250 | + Johnsen and Sebastian Harl for their code. |
251 | + * collectd-nagios: The "-m" option has been implemented (treat NaNs as |
252 | + critical). |
253 | + * collectd-tg: Traffic generator creating bogus network traffic |
254 | + compatible to the Network plugin. This utility can be used to |
255 | + stress-test new write plugins and collectd in general. |
256 | + * libcollectdclient: Creating and sending network packets has been |
257 | + added to the collectd client library. |
258 | + * All data sets: The data source name of all data sets with exactly |
259 | + one data source has been changed to "value". |
260 | + * All plugins: All "counter" data sources have been converted to |
261 | + "derive" data sources. All plugins now use "derive" by default, but |
262 | + plugins such as the network plugin can still handle "counter", of |
263 | + course. The minimum value of all derive data sources is zero, the |
264 | + maximum value is unspecified. |
265 | + * amqp plugin: The new AMQP plugin can send data to and receive data |
266 | + from an AMQP broker. Thanks to Sebastien Pahl for his code. |
267 | + * apache plugin: Backwards compatibility code has been removed. |
268 | + Support for the IBM HTTP Server has been added. Thanks to Manuel |
269 | + Luis Sanmartín Rozada for his patch. |
270 | + * contextswitch plugin: Support for sysctlbyname(3) has been added. |
271 | + Thanks to Kimo Rosenbaum for his patch. |
272 | + * df plugin: The default behavior has been changed to be equivalent to |
273 | + the "ReportReserved" behavior of v4. |
274 | + * dns plugin: Improved RFC 1035 name parsing has been imported from |
275 | + "dnstop". |
276 | + * exec plugin: Backwards compatibility code has been removed. |
277 | + * GenericJMX plugin: The "InstancePrefix" option has been added to |
278 | + "Connection" blocks. |
279 | + * hddtemp plugin: The "TranslateDevicename" config option has been |
280 | + removed. |
281 | + * interface plugin: Use the "plugin instance" to store the interface |
282 | + value. |
283 | + * libvirt plugin: The "InterfaceFormat" option has been added. Thanks |
284 | + to Ruben Kerkhof for his patch. |
285 | + * lpar plugin: New plugins for "logical partitions", a virtualization |
286 | + technique of POWER CPUs. Thanks to Aurélien Reynaud for his code and |
287 | + patience. |
288 | + * modbus plugin: Support for libmodbus 2.9.2 has been added and the |
289 | + license has been changed to LGPLv2.1. |
290 | + * mysql plugin: Backwards compatibility code has been removed. The |
291 | + data sets used have been improved. |
292 | + * network plugin: The default buffer size has been increased to |
293 | + 1452 bytes. |
294 | + * perl plugin: Backwards compatibility code has been removed. |
295 | + * postgresql plugin: Backwards compatibility code has been removed. |
296 | + * redis plugin: Plugin for collecting statistics from Redis, a key- |
297 | + value store, has been added. Thanks to Andres J. Diaz for his code. |
298 | + * swap plugin: Implement collection of physical and virtual memory |
299 | + statistics under Solaris. The new default is collecting physical |
300 | + memory. Thanks to Aurélien Reynaud for his patches. |
301 | + * threshold plugin: The threshold configuration has been moved into |
302 | + this separate plugin. |
303 | + * unixsock plugin: The "DeleteSocket" option has been added. |
304 | + * varnish plugin: The new Varnish plugin reads statistics from |
305 | + Varnish, a web accelerator. Thanks to Jérôme Renard and Marc |
306 | + Fournier for their contributions. |
307 | + * write_redis: New plugin for writing data to Redis, a key-value |
308 | + store. |
309 | + * zfs_arc plugin: The data sets have been replaced by more elegant |
310 | + alternatives. |
311 | + * v5upgrade target: Target for converting v4 data sets to the v5 |
312 | + schema. |
313 | + |
314 | +2012-04-01, Version 4.10.7 |
315 | + * Build system: Fix the use of a libltdl macro. Thanks to Clemens Lang |
316 | + for fixing this. Adresses some issues with building the iptables |
317 | + plugin under Gentoo. |
318 | + * libcollectdclient: A memory leak in the lcc_getval() function has |
319 | + been fixed. Thanks to Jason Schmidlapp for finding and fixing this |
320 | + issue. |
321 | + * bind plugin: The use of 'QType" types has been fixed. |
322 | + * df plugin: Fixed compiler issue under Mac OS X 10.7. |
323 | + * conntrack plugin: Support zero as legitimate value. Thanks to Louis |
324 | + Opter for his patch. |
325 | + * memcached plugin: Increased the size of a static buffer, which was |
326 | + truncating status messages form memcached. Thanks to Timon for the |
327 | + patch. |
328 | + * network plugin: Forwarding of notifications has been disabled. This |
329 | + was a contition not checked for before, which may retult in an |
330 | + endless loop. |
331 | + * processes plugin: Support for process names with spaces has been |
332 | + added to the Linux implementation. Thanks to Darrell Bishop for his |
333 | + patch. |
334 | + * perl plugin: A race condition in several callbacks, including log and |
335 | + write callbacks, has been fixed. Thanks to "Rrpv" for reporting this |
336 | + bug. |
337 | + * snmp plugin: A bug when casting unsigned integers to gauge values has |
338 | + been fixed: Unsigned integers would be cast to a signed integer and |
339 | + then to a gauge, possibly resulting in a negative value. |
340 | + * tcpconns plugin: Compilation with newer versions of the FreeBSD |
341 | + runtime has been fixed. |
342 | + |
343 | +2012-02-19, Version 4.10.6 |
344 | + * Build system: Fix problems when building the ipvs and iptables |
345 | + plugins. Thanks to Sebastian Harl for his patch. A bashism in the |
346 | + version-gen.sh script has been fixed. Thanks to Jo-Philipp Wich for |
347 | + his patch. |
348 | + * csv and rrdtool plugins: Print a more helpful error message when the |
349 | + DataDir is a symlink pointing to a non-existing location. Thanks to |
350 | + Jonathan Nieder for his patch. |
351 | + * exec plugin: Fix a problem when using select(2) to read from file |
352 | + handles. Thanks to Gerrie Roos for his patch. |
353 | + * network plugin: An incorrect error message in the handling of the |
354 | + "Interface" configuration option has been fixed. Thanks to Gerrie |
355 | + Roos for his patch. |
356 | + * oracle plugin: A potential endless loop in the error handling has |
357 | + been fixed. |
358 | + * python plugin: A crash bug in the configuration handling has been |
359 | + fixed. Thanks to Sven Trenkel for his patch. |
360 | + * interfaces plugin: The change which was supposed to ignore "bogus" |
361 | + interfaces has been reverted, since it ignored legit interfaces, such |
362 | + as bonding pseudo-devices as well. |
363 | + |
364 | +2012-01-21, Version 4.10.5 |
365 | + * curl_xml plugin: Fix handling of file:// and other URLs (which don't |
366 | + follow HTTP status codes). Thanks to Fabien Wernli for his patch! |
367 | + * df plugin: Fix handling of negative "available" counts. This can |
368 | + occur with some file systems, for example UFS. Thanks to Toni Ylenius |
369 | + for his patch. |
370 | + * interface plugin: "mac" interfaces are now ignored on Solaris. These |
371 | + pseudo-interfaces occur multiple times, causing warnings. Also switch |
372 | + to 64-bit counters on Solaris, improving overflow behavior for |
373 | + high-speed interfaces. Thanks to Eddy Geez and Fabien Wernli for |
374 | + their patches. |
375 | + * memory plugin: Account kernel and unused memory under Solaris. Thanks |
376 | + to Fabien Wernli for his patch. |
377 | + * network plugin: A bug in the interaction between the Network plugin |
378 | + and filter chains has been fixed: When a filter modified a field such |
379 | + as the hostname, subsequent values in the same network packets could |
380 | + have ended up using the modified name rather than the original name. |
381 | + Thanks to Sebastian Harl for identifying the problem. |
382 | + * oracle plugin: A memory leak has been fixed in the parameter handling. |
383 | + * python plugin: A memory leak has been fixed. Thanks to Sven Trenkel |
384 | + for fixing this bug! |
385 | + |
386 | +2011-10-14, Version 4.10.4 |
387 | + * collectd: A mutex leak has been fixed in the meta data code. Thanks |
388 | + to Rafal Lesniak for his patch. |
389 | + * collectd: Compatibility fixes for GCC 4.6 have been applied. Thanks |
390 | + to Peter Green for his patch. |
391 | + * csv plugin: The line buffer size has been increased. Thanks to Colin |
392 | + McCabe for the patch. |
393 | + * curl_json plugin: Don't use the "parent" node to build the type |
394 | + instance, if it is empty. Compatibility with libyajl 2 has been |
395 | + added. Thanks to "spupykin" of the Arch Linux project for the initial |
396 | + code. |
397 | + * iptables plugin: Fix linking with some versions of libiptc. |
398 | + * irq plugin: Fix support for interrupts under Linux. The old code |
399 | + assumed that interrupts have a numeric value -- this is no longer |
400 | + true for Linux. Thanks to Bostjan Skufca for implementing this. |
401 | + * notify_desktop plugin: Compatibility with libnotify 0.7 has been |
402 | + added. Thanks to Samuli Suominen for his patch. |
403 | + * processes plugin: Fix handling of regular expressions containing |
404 | + spaces. Thanks for Sebastian Harl for fixing this. |
405 | + * rrdtool, rrdcached plugins: Improve precision of the XFF parameter. |
406 | + Previously, values like 0.999 would have been rounded to 1.0. Thanks |
407 | + to Francois-Xavier Bourlet for fixing this. |
408 | + * Various plugin: Set a multi-threading flag in libcurl. Thanks to Mike |
409 | + Flisher for the fix. |
410 | + |
411 | +2011-03-26, Version 4.10.3 |
412 | + * Documentation: Several updates and additions. Thanks to Sebastian Harl. |
413 | + * collectd: Build issues (compiler warnings) have been fixed. Thanks to |
414 | + Bruno Prémont. |
415 | + * collectd: Threshold subsection: Handling of NAN values in the |
416 | + percentage calculation has been fixed. |
417 | + * collectd, java plugin, ntpd plugin: Several diagnostic messages have |
418 | + been improved. |
419 | + * curl_json plugin: Handling of arrays has been fixed. |
420 | + * libvirt plugin: A bug in reading the virtual CPU statistics has been |
421 | + fixed. Thanks to “JLPC” for reporting this problem. |
422 | + * modbus plugin: Compatibility with libmodbus 2.0.3 has been restored. |
423 | + * processes plugin: Potentially erroneous behavior has been fixed in an |
424 | + error handling case. |
425 | + * python plugin: Fix dispatching of values from Python scripts to |
426 | + collectd. Thanks to Gregory Szorc for finding and fixing this |
427 | + problem. |
428 | + |
429 | +2010-11-27, Version 4.10.2 |
430 | + * Documentation: Various documentation fixes. |
431 | + * collectd: If including one configuration file fails, continue with |
432 | + the rest of the configuration if possible. |
433 | + * collectd: Fix a bug in the read function scheduling. In rare cases |
434 | + read functions may not have been called as often as requested. |
435 | + * collectd: Concurrency issues with errno(3) under AIX have been |
436 | + fixed: A thread-safe version of errno has to be requested under AIX. |
437 | + Thanks to Aurélien Reynaud for his patch. |
438 | + * collectd: A left-over hard-coded 2 has been replaced by the |
439 | + configurable timeout value. |
440 | + * curl, memcachec, tail plugins: Fix handling of "DERIVE" data |
441 | + sources. Matching the end of a string has been improved; thanks to |
442 | + Sebastian Harl for the patch. |
443 | + * curl_json plugin: Fix a problem when parsing 64bit integers. Reading |
444 | + JSON data from non-HTTP sources has been fixed. |
445 | + * netapp plugin: Pass the interval setting to the dispatch function. |
446 | + Restore compatibility to NetApp Release 7.3. Thanks to Sven Trenkel |
447 | + for the patch. |
448 | + * network plugin: Be less verbose about unchecked signatures, in order |
449 | + to prevent spamming the logs. |
450 | + * notify_email plugin: Concurrency problems have been fixed. |
451 | + * python plugin: Set "sys.argv", since many scripts don't expect that |
452 | + it may not be set. Thanks to Sven Trenkel for the patch. |
453 | + * rrdtool, rrdcached plugin: Fix a too strict assertion when creating |
454 | + RRD files. |
455 | + * swap plugin: A bug which lead to incorrect I/O values has been |
456 | + fixed. |
457 | + * value match: A minor memory leak has been fixed. Thanks to Sven |
458 | + Trenkel for the patch. |
459 | + |
460 | 2010-07-09, Version 4.10.1 |
461 | * Build system: Checking for "strtok_r" under Solaris has been fixed. |
462 | * Portability: Fixes for Solaris 8 have been applied. Thanks to |
463 | @@ -75,6 +446,49 @@ |
464 | * regex match: The "Invert" option has been added. Thanks to Julien |
465 | Ammous for his patch. |
466 | |
467 | +2011-03-26, Version 4.9.5 |
468 | + * Documentation: Several updates and additions. Thanks to Sebastian Harl. |
469 | + * collectd: Build issues (compiler warnings) have been fixed. Thanks to |
470 | + Bruno Prémont. |
471 | + * collectd: Threshold subsection: Handling of NAN values in the |
472 | + percentage calculation has been fixed. |
473 | + * collectd, java plugin, ntpd plugin: Several diagnostic messages have |
474 | + been improved. |
475 | + * libvirt plugin: A bug in reading the virtual CPU statistics has been |
476 | + fixed. Thanks to “JLPC” for reporting this problem. |
477 | + * processes plugin: Potentially erroneous behavior has been fixed in an |
478 | + error handling case. |
479 | + * python plugin: Fix dispatching of values from Python scripts to |
480 | + collectd. Thanks to Gregory Szorc for finding and fixing this |
481 | + problem. |
482 | + |
483 | +2010-11-27, Version 4.9.4 |
484 | + * Documentation: Various documentation fixes. |
485 | + * collectd: If including one configuration file fails, continue with |
486 | + the rest of the configuration if possible. |
487 | + * collectd: Fix a bug in the read function scheduling. In rare cases |
488 | + read functions may not have been called as often as requested. |
489 | + * collectd: Concurrency issues with errno(3) under AIX have been |
490 | + fixed: A thread-safe version of errno has to be requested under AIX. |
491 | + Thanks to Aurélien Reynaud for his patch. |
492 | + * curl, memcachec, tail plugins: Fix handling of "DERIVE" data |
493 | + sources. Matching the end of a string has been improved; thanks to |
494 | + Sebastian Harl for the patch. |
495 | + * curl_json plugin: Fix a problem when parsing 64bit integers. Reading |
496 | + JSON data from non-HTTP sources has been fixed. |
497 | + * netapp plugin: Pass the interval setting to the dispatch function. |
498 | + Restore compatibility to NetApp Release 7.3. Thanks to Sven Trenkel |
499 | + for the patch. |
500 | + * network plugin: Be less verbose about unchecked signatures, in order |
501 | + to prevent spamming the logs. |
502 | + * notify_email plugin: Concurrency problems have been fixed. |
503 | + * python plugin: Set "sys.argv", since many scripts don't expect that |
504 | + it may not be set. Thanks to Sven Trenkel for the patch. |
505 | + * rrdtool, rrdcached plugin: Fix a too strict assertion when creating |
506 | + RRD files. |
507 | + * value match: A minor memory leak has been fixed. Thanks to Sven |
508 | + Trenkel for the patch. |
509 | + |
510 | 2010-07-09, Version 4.9.3 |
511 | * Build system: Checking for "strtok_r" under Solaris has been fixed. |
512 | * Portability: Fixes for Solaris 8 have been applied. Thanks to |
513 | |
514 | === modified file 'Makefile.in' |
515 | --- Makefile.in 2010-07-28 18:45:31 +0000 |
516 | +++ Makefile.in 2012-12-17 00:22:20 +0000 |
517 | @@ -36,8 +36,11 @@ |
518 | subdir = . |
519 | DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ |
520 | $(srcdir)/Makefile.in $(top_srcdir)/configure AUTHORS COPYING \ |
521 | - ChangeLog INSTALL NEWS TODO compile config.guess config.sub \ |
522 | - depcomp install-sh ltmain.sh missing ylwrap |
523 | + ChangeLog INSTALL NEWS TODO libltdl/config/compile \ |
524 | + libltdl/config/config.guess libltdl/config/config.sub \ |
525 | + libltdl/config/depcomp libltdl/config/install-sh \ |
526 | + libltdl/config/ltmain.sh libltdl/config/missing \ |
527 | + libltdl/config/ylwrap |
528 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
529 | am__aclocal_m4_deps = $(top_srcdir)/configure.in |
530 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
531 | @@ -109,6 +112,8 @@ |
532 | AUTOHEADER = @AUTOHEADER@ |
533 | AUTOMAKE = @AUTOMAKE@ |
534 | AWK = @AWK@ |
535 | +BUILD_WITH_LIBCREDIS_CPPFLAGS = @BUILD_WITH_LIBCREDIS_CPPFLAGS@ |
536 | +BUILD_WITH_LIBCREDIS_LDFLAGS = @BUILD_WITH_LIBCREDIS_LDFLAGS@ |
537 | BUILD_WITH_LIBCURL_CFLAGS = @BUILD_WITH_LIBCURL_CFLAGS@ |
538 | BUILD_WITH_LIBCURL_LIBS = @BUILD_WITH_LIBCURL_LIBS@ |
539 | BUILD_WITH_LIBDBI_CPPFLAGS = @BUILD_WITH_LIBDBI_CPPFLAGS@ |
540 | @@ -123,6 +128,8 @@ |
541 | BUILD_WITH_LIBMEMCACHED_LIBS = @BUILD_WITH_LIBMEMCACHED_LIBS@ |
542 | BUILD_WITH_LIBMODBUS_CFLAGS = @BUILD_WITH_LIBMODBUS_CFLAGS@ |
543 | BUILD_WITH_LIBMODBUS_LIBS = @BUILD_WITH_LIBMODBUS_LIBS@ |
544 | +BUILD_WITH_LIBMONGOC_CPPFLAGS = @BUILD_WITH_LIBMONGOC_CPPFLAGS@ |
545 | +BUILD_WITH_LIBMONGOC_LDFLAGS = @BUILD_WITH_LIBMONGOC_LDFLAGS@ |
546 | BUILD_WITH_LIBMYSQL_CFLAGS = @BUILD_WITH_LIBMYSQL_CFLAGS@ |
547 | BUILD_WITH_LIBMYSQL_LIBS = @BUILD_WITH_LIBMYSQL_LIBS@ |
548 | BUILD_WITH_LIBNETLINK_CFLAGS = @BUILD_WITH_LIBNETLINK_CFLAGS@ |
549 | @@ -133,6 +140,9 @@ |
550 | BUILD_WITH_LIBOWCAPI_LIBS = @BUILD_WITH_LIBOWCAPI_LIBS@ |
551 | BUILD_WITH_LIBPQ_CPPFLAGS = @BUILD_WITH_LIBPQ_CPPFLAGS@ |
552 | BUILD_WITH_LIBPQ_LDFLAGS = @BUILD_WITH_LIBPQ_LDFLAGS@ |
553 | +BUILD_WITH_LIBRABBITMQ_CPPFLAGS = @BUILD_WITH_LIBRABBITMQ_CPPFLAGS@ |
554 | +BUILD_WITH_LIBRABBITMQ_LDFLAGS = @BUILD_WITH_LIBRABBITMQ_LDFLAGS@ |
555 | +BUILD_WITH_LIBRABBITMQ_LIBS = @BUILD_WITH_LIBRABBITMQ_LIBS@ |
556 | BUILD_WITH_LIBROUTEROS_CPPFLAGS = @BUILD_WITH_LIBROUTEROS_CPPFLAGS@ |
557 | BUILD_WITH_LIBROUTEROS_LDFLAGS = @BUILD_WITH_LIBROUTEROS_LDFLAGS@ |
558 | BUILD_WITH_LIBRRD_CFLAGS = @BUILD_WITH_LIBRRD_CFLAGS@ |
559 | @@ -148,6 +158,8 @@ |
560 | BUILD_WITH_LIBTOKYOTYRANT_LIBS = @BUILD_WITH_LIBTOKYOTYRANT_LIBS@ |
561 | BUILD_WITH_LIBUPSCLIENT_CFLAGS = @BUILD_WITH_LIBUPSCLIENT_CFLAGS@ |
562 | BUILD_WITH_LIBUPSCLIENT_LIBS = @BUILD_WITH_LIBUPSCLIENT_LIBS@ |
563 | +BUILD_WITH_LIBVARNISH_CFLAGS = @BUILD_WITH_LIBVARNISH_CFLAGS@ |
564 | +BUILD_WITH_LIBVARNISH_LIBS = @BUILD_WITH_LIBVARNISH_LIBS@ |
565 | BUILD_WITH_LIBVIRT_CFLAGS = @BUILD_WITH_LIBVIRT_CFLAGS@ |
566 | BUILD_WITH_LIBVIRT_LIBS = @BUILD_WITH_LIBVIRT_LIBS@ |
567 | BUILD_WITH_LIBXML2_CFLAGS = @BUILD_WITH_LIBXML2_CFLAGS@ |
568 | |
569 | === modified file 'README' |
570 | --- README 2010-06-08 00:42:56 +0000 |
571 | +++ README 2012-12-17 00:22:20 +0000 |
572 | @@ -83,6 +83,9 @@ |
573 | - entropy |
574 | Amount of entropy available to the system. |
575 | |
576 | + - ethstat |
577 | + Network interface card statistics. |
578 | + |
579 | - exec |
580 | Values gathered by a custom program or script. |
581 | See collectd-exec(5). |
582 | @@ -125,6 +128,10 @@ |
583 | - load |
584 | System load average over the last 1, 5 and 15 minutes. |
585 | |
586 | + - lpar |
587 | + Detailed CPU statistics of the “Logical Partitions” virtualization |
588 | + technique built into IBM's POWER processors. |
589 | + |
590 | - libvirt |
591 | CPU, disk and network I/O statistics from virtual machines. |
592 | |
593 | @@ -136,6 +143,10 @@ |
594 | Motherboard sensors: temperature, fanspeed and voltage information, |
595 | using mbmon(1). |
596 | |
597 | + - md |
598 | + Linux software-RAID device information (number of active, failed, spare |
599 | + and missing disks). |
600 | + |
601 | - memcachec |
602 | Query and parse data from a memcache daemon (memcached). |
603 | |
604 | @@ -188,6 +199,9 @@ |
605 | Network UPS tools: UPS current, voltage, power, charge, utilisation, |
606 | temperature, etc. See upsd(8). |
607 | |
608 | + - numa |
609 | + Information about Non-Uniform Memory Access (NUMA). |
610 | + |
611 | - olsrd |
612 | Queries routing information from the “Optimized Link State Routing” |
613 | daemon. |
614 | @@ -235,6 +249,10 @@ |
615 | collectd without the need to start a heavy interpreter every interval. |
616 | See collectd-python(5) for details. |
617 | |
618 | + - redis |
619 | + The redis plugin gathers information from a redis server, including: |
620 | + uptime, used memory, total connections etc. |
621 | + |
622 | - routeros |
623 | Query interface and wireless registration statistics from RouterOS. |
624 | |
625 | @@ -288,6 +306,9 @@ |
626 | - users |
627 | Users currently logged in. |
628 | |
629 | + - varnish |
630 | + Various statistics from Varnish, an HTTP accelerator. |
631 | + |
632 | - vmem |
633 | Virtual memory statistics, e. g. the number of page-ins/-outs or the |
634 | number of pagefaults. |
635 | @@ -308,6 +329,10 @@ |
636 | * Output can be written or sent to various destinations by the following |
637 | plugins: |
638 | |
639 | + - amqp |
640 | + Sends JSON-encoded data to an Advanced Message Queuing Protocol (AMQP) |
641 | + server, such as RabbitMQ. |
642 | + |
643 | - csv |
644 | Write to comma separated values (CSV) files. This needs lots of |
645 | diskspace but is extremely portable and can be analysed with almost |
646 | @@ -343,11 +368,17 @@ |
647 | needed. Please read collectd-unixsock(5) for a description on how that's |
648 | done. |
649 | |
650 | + - write_graphite |
651 | + Sends data to Carbon, the storage layer of Graphite. |
652 | + |
653 | - write_http |
654 | Sends the values collected by collectd to a web-server using HTTP POST |
655 | requests. The transmitted data is either in a form understood by the |
656 | Exec plugin or formatted in JSON. |
657 | |
658 | + - write_redis |
659 | + Sends the values to a Redis key-value database server. |
660 | + |
661 | * Logging is, as everything in collectd, provided by plugins. The following |
662 | plugins keep up informed about what's going on: |
663 | |
664 | @@ -427,6 +458,10 @@ |
665 | |
666 | * Miscellaneous plugins: |
667 | |
668 | + - threshold |
669 | + Checks values against configured thresholds and creates notifications if |
670 | + values are out of bounds. See collectd-threshold(5) for details. |
671 | + |
672 | - uuid |
673 | Sets the hostname to an unique identifier. This is meant for setups |
674 | where each client may migrate to another physical host, possibly going |
675 | @@ -504,6 +539,10 @@ |
676 | * libclntsh (optional) |
677 | Used by the `oracle' plugin. |
678 | |
679 | + * libcredis (optional) |
680 | + Used by the redis plugin. Please note that you require a 0.2.2 version |
681 | + or higher. <http://code.google.com/p/credis/> |
682 | + |
683 | * libcurl (optional) |
684 | If you want to use the `apache', `ascent', `curl', `nginx', or `write_http' |
685 | plugin. |
686 | @@ -550,8 +589,10 @@ |
687 | <http://tangent.org/552/libmemcached.html> |
688 | |
689 | * libmodbus (optional) |
690 | - Used by the `modbus' plugin to communicate with Modbus/TCP devices. |
691 | - <https://launchpad.net/libmodbus> |
692 | + Used by the “modbus” plugin to communicate with Modbus/TCP devices. The |
693 | + “modbus” plugin works with version 2.0.3 of the library – due to frequent |
694 | + API changes other versions may or may not compile cleanly. |
695 | + <http://www.libmodbus.org/> |
696 | |
697 | * libmysqlclient (optional) |
698 | Unsurprisingly used by the `mysql' plugin. |
699 | @@ -586,6 +627,9 @@ |
700 | Used to capture packets by the `dns' plugin. |
701 | <http://www.tcpdump.org/> |
702 | |
703 | + * libperfstat (optional) |
704 | + Used by various plugins to gather statistics under AIX. |
705 | + |
706 | * libperl (optional) |
707 | Obviously used by the `perl' plugin. The library has to be compiled with |
708 | ithread support (introduced in Perl 5.6.0). |
709 | @@ -601,9 +645,14 @@ |
710 | <http://code.google.com/p/protobuf-c/> |
711 | |
712 | * libpython (optional) |
713 | - Used by the `python' plugin. Currently, only 2.3 ≦ Python < 3 is supported. |
714 | + Used by the `python' plugin. Currently, Python 2.3 and later and Python 3 |
715 | + are supported. |
716 | <http://www.python.org/> |
717 | |
718 | + * librabbitmq (optional; also called “rabbitmq-c”) |
719 | + Used by the AMQP plugin for AMQP connections, for example to RabbitMQ. |
720 | + <http://hg.rabbitmq.com/rabbitmq-c/> |
721 | + |
722 | * librouteros (optional) |
723 | Used by the `routeros' plugin to connect to a device running `RouterOS'. |
724 | <http://verplant.org/librouteros/> |
725 | @@ -650,6 +699,10 @@ |
726 | Parse JSON data. This is needed for the `curl_json' plugin. |
727 | <http://github.com/lloyd/yajl> |
728 | |
729 | + * libvarnish (optional) |
730 | + Fetches statistics from a Varnish instance. This is needed for the Varnish plugin |
731 | + <http://varnish-cache.org> |
732 | + |
733 | Configuring / Compiling / Installing |
734 | ------------------------------------ |
735 | |
736 | |
737 | === modified file 'aclocal.m4' |
738 | --- aclocal.m4 2010-07-28 18:45:31 +0000 |
739 | +++ aclocal.m4 2012-12-17 00:22:20 +0000 |
740 | @@ -13,8 +13,8 @@ |
741 | |
742 | m4_ifndef([AC_AUTOCONF_VERSION], |
743 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl |
744 | -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.65],, |
745 | -[m4_warning([this file was generated for autoconf 2.65. |
746 | +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],, |
747 | +[m4_warning([this file was generated for autoconf 2.67. |
748 | You have another version of autoconf. It may work, but is not guaranteed to. |
749 | If you have problems, you may need to regenerate the build system entirely. |
750 | To do so, use the procedure documented by the package, typically `autoreconf'.])]) |
751 | @@ -9116,7 +9116,7 @@ |
752 | Consider adjusting the PKG_CONFIG_PATH environment variable if you |
753 | installed software in a non-standard prefix. |
754 | |
755 | -_PKG_TEXT])dnl |
756 | +_PKG_TEXT])[]dnl |
757 | ]) |
758 | elif test $pkg_failed = untried; then |
759 | AC_MSG_RESULT([no]) |
760 | @@ -9127,7 +9127,7 @@ |
761 | |
762 | _PKG_TEXT |
763 | |
764 | -To get pkg-config, see <http://pkg-config.freedesktop.org/>.])dnl |
765 | +To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl |
766 | ]) |
767 | else |
768 | $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS |
769 | |
770 | === modified file 'bindings/Makefile.in' |
771 | --- bindings/Makefile.in 2010-07-28 18:45:31 +0000 |
772 | +++ bindings/Makefile.in 2012-12-17 00:22:20 +0000 |
773 | @@ -95,6 +95,8 @@ |
774 | AUTOHEADER = @AUTOHEADER@ |
775 | AUTOMAKE = @AUTOMAKE@ |
776 | AWK = @AWK@ |
777 | +BUILD_WITH_LIBCREDIS_CPPFLAGS = @BUILD_WITH_LIBCREDIS_CPPFLAGS@ |
778 | +BUILD_WITH_LIBCREDIS_LDFLAGS = @BUILD_WITH_LIBCREDIS_LDFLAGS@ |
779 | BUILD_WITH_LIBCURL_CFLAGS = @BUILD_WITH_LIBCURL_CFLAGS@ |
780 | BUILD_WITH_LIBCURL_LIBS = @BUILD_WITH_LIBCURL_LIBS@ |
781 | BUILD_WITH_LIBDBI_CPPFLAGS = @BUILD_WITH_LIBDBI_CPPFLAGS@ |
782 | @@ -109,6 +111,8 @@ |
783 | BUILD_WITH_LIBMEMCACHED_LIBS = @BUILD_WITH_LIBMEMCACHED_LIBS@ |
784 | BUILD_WITH_LIBMODBUS_CFLAGS = @BUILD_WITH_LIBMODBUS_CFLAGS@ |
785 | BUILD_WITH_LIBMODBUS_LIBS = @BUILD_WITH_LIBMODBUS_LIBS@ |
786 | +BUILD_WITH_LIBMONGOC_CPPFLAGS = @BUILD_WITH_LIBMONGOC_CPPFLAGS@ |
787 | +BUILD_WITH_LIBMONGOC_LDFLAGS = @BUILD_WITH_LIBMONGOC_LDFLAGS@ |
788 | BUILD_WITH_LIBMYSQL_CFLAGS = @BUILD_WITH_LIBMYSQL_CFLAGS@ |
789 | BUILD_WITH_LIBMYSQL_LIBS = @BUILD_WITH_LIBMYSQL_LIBS@ |
790 | BUILD_WITH_LIBNETLINK_CFLAGS = @BUILD_WITH_LIBNETLINK_CFLAGS@ |
791 | @@ -119,6 +123,9 @@ |
792 | BUILD_WITH_LIBOWCAPI_LIBS = @BUILD_WITH_LIBOWCAPI_LIBS@ |
793 | BUILD_WITH_LIBPQ_CPPFLAGS = @BUILD_WITH_LIBPQ_CPPFLAGS@ |
794 | BUILD_WITH_LIBPQ_LDFLAGS = @BUILD_WITH_LIBPQ_LDFLAGS@ |
795 | +BUILD_WITH_LIBRABBITMQ_CPPFLAGS = @BUILD_WITH_LIBRABBITMQ_CPPFLAGS@ |
796 | +BUILD_WITH_LIBRABBITMQ_LDFLAGS = @BUILD_WITH_LIBRABBITMQ_LDFLAGS@ |
797 | +BUILD_WITH_LIBRABBITMQ_LIBS = @BUILD_WITH_LIBRABBITMQ_LIBS@ |
798 | BUILD_WITH_LIBROUTEROS_CPPFLAGS = @BUILD_WITH_LIBROUTEROS_CPPFLAGS@ |
799 | BUILD_WITH_LIBROUTEROS_LDFLAGS = @BUILD_WITH_LIBROUTEROS_LDFLAGS@ |
800 | BUILD_WITH_LIBRRD_CFLAGS = @BUILD_WITH_LIBRRD_CFLAGS@ |
801 | @@ -134,6 +141,8 @@ |
802 | BUILD_WITH_LIBTOKYOTYRANT_LIBS = @BUILD_WITH_LIBTOKYOTYRANT_LIBS@ |
803 | BUILD_WITH_LIBUPSCLIENT_CFLAGS = @BUILD_WITH_LIBUPSCLIENT_CFLAGS@ |
804 | BUILD_WITH_LIBUPSCLIENT_LIBS = @BUILD_WITH_LIBUPSCLIENT_LIBS@ |
805 | +BUILD_WITH_LIBVARNISH_CFLAGS = @BUILD_WITH_LIBVARNISH_CFLAGS@ |
806 | +BUILD_WITH_LIBVARNISH_LIBS = @BUILD_WITH_LIBVARNISH_LIBS@ |
807 | BUILD_WITH_LIBVIRT_CFLAGS = @BUILD_WITH_LIBVIRT_CFLAGS@ |
808 | BUILD_WITH_LIBVIRT_LIBS = @BUILD_WITH_LIBVIRT_LIBS@ |
809 | BUILD_WITH_LIBXML2_CFLAGS = @BUILD_WITH_LIBXML2_CFLAGS@ |
810 | |
811 | === modified file 'bindings/java/Makefile.in' |
812 | --- bindings/java/Makefile.in 2010-07-28 18:45:31 +0000 |
813 | +++ bindings/java/Makefile.in 2012-12-17 00:22:20 +0000 |
814 | @@ -54,6 +54,8 @@ |
815 | AUTOHEADER = @AUTOHEADER@ |
816 | AUTOMAKE = @AUTOMAKE@ |
817 | AWK = @AWK@ |
818 | +BUILD_WITH_LIBCREDIS_CPPFLAGS = @BUILD_WITH_LIBCREDIS_CPPFLAGS@ |
819 | +BUILD_WITH_LIBCREDIS_LDFLAGS = @BUILD_WITH_LIBCREDIS_LDFLAGS@ |
820 | BUILD_WITH_LIBCURL_CFLAGS = @BUILD_WITH_LIBCURL_CFLAGS@ |
821 | BUILD_WITH_LIBCURL_LIBS = @BUILD_WITH_LIBCURL_LIBS@ |
822 | BUILD_WITH_LIBDBI_CPPFLAGS = @BUILD_WITH_LIBDBI_CPPFLAGS@ |
823 | @@ -68,6 +70,8 @@ |
824 | BUILD_WITH_LIBMEMCACHED_LIBS = @BUILD_WITH_LIBMEMCACHED_LIBS@ |
825 | BUILD_WITH_LIBMODBUS_CFLAGS = @BUILD_WITH_LIBMODBUS_CFLAGS@ |
826 | BUILD_WITH_LIBMODBUS_LIBS = @BUILD_WITH_LIBMODBUS_LIBS@ |
827 | +BUILD_WITH_LIBMONGOC_CPPFLAGS = @BUILD_WITH_LIBMONGOC_CPPFLAGS@ |
828 | +BUILD_WITH_LIBMONGOC_LDFLAGS = @BUILD_WITH_LIBMONGOC_LDFLAGS@ |
829 | BUILD_WITH_LIBMYSQL_CFLAGS = @BUILD_WITH_LIBMYSQL_CFLAGS@ |
830 | BUILD_WITH_LIBMYSQL_LIBS = @BUILD_WITH_LIBMYSQL_LIBS@ |
831 | BUILD_WITH_LIBNETLINK_CFLAGS = @BUILD_WITH_LIBNETLINK_CFLAGS@ |
832 | @@ -78,6 +82,9 @@ |
833 | BUILD_WITH_LIBOWCAPI_LIBS = @BUILD_WITH_LIBOWCAPI_LIBS@ |
834 | BUILD_WITH_LIBPQ_CPPFLAGS = @BUILD_WITH_LIBPQ_CPPFLAGS@ |
835 | BUILD_WITH_LIBPQ_LDFLAGS = @BUILD_WITH_LIBPQ_LDFLAGS@ |
836 | +BUILD_WITH_LIBRABBITMQ_CPPFLAGS = @BUILD_WITH_LIBRABBITMQ_CPPFLAGS@ |
837 | +BUILD_WITH_LIBRABBITMQ_LDFLAGS = @BUILD_WITH_LIBRABBITMQ_LDFLAGS@ |
838 | +BUILD_WITH_LIBRABBITMQ_LIBS = @BUILD_WITH_LIBRABBITMQ_LIBS@ |
839 | BUILD_WITH_LIBROUTEROS_CPPFLAGS = @BUILD_WITH_LIBROUTEROS_CPPFLAGS@ |
840 | BUILD_WITH_LIBROUTEROS_LDFLAGS = @BUILD_WITH_LIBROUTEROS_LDFLAGS@ |
841 | BUILD_WITH_LIBRRD_CFLAGS = @BUILD_WITH_LIBRRD_CFLAGS@ |
842 | @@ -93,6 +100,8 @@ |
843 | BUILD_WITH_LIBTOKYOTYRANT_LIBS = @BUILD_WITH_LIBTOKYOTYRANT_LIBS@ |
844 | BUILD_WITH_LIBUPSCLIENT_CFLAGS = @BUILD_WITH_LIBUPSCLIENT_CFLAGS@ |
845 | BUILD_WITH_LIBUPSCLIENT_LIBS = @BUILD_WITH_LIBUPSCLIENT_LIBS@ |
846 | +BUILD_WITH_LIBVARNISH_CFLAGS = @BUILD_WITH_LIBVARNISH_CFLAGS@ |
847 | +BUILD_WITH_LIBVARNISH_LIBS = @BUILD_WITH_LIBVARNISH_LIBS@ |
848 | BUILD_WITH_LIBVIRT_CFLAGS = @BUILD_WITH_LIBVIRT_CFLAGS@ |
849 | BUILD_WITH_LIBVIRT_LIBS = @BUILD_WITH_LIBVIRT_LIBS@ |
850 | BUILD_WITH_LIBXML2_CFLAGS = @BUILD_WITH_LIBXML2_CFLAGS@ |
851 | |
852 | === modified file 'bindings/java/org/collectd/api/CollectdFlushInterface.java' |
853 | --- bindings/java/org/collectd/api/CollectdFlushInterface.java 2009-08-29 12:42:15 +0000 |
854 | +++ bindings/java/org/collectd/api/CollectdFlushInterface.java 2012-12-17 00:22:20 +0000 |
855 | @@ -29,5 +29,5 @@ |
856 | */ |
857 | public interface CollectdFlushInterface |
858 | { |
859 | - public int flush (int timeout, String identifier); |
860 | + public int flush (Number timeout, String identifier); |
861 | } |
862 | |
863 | === modified file 'bindings/java/org/collectd/api/ValueList.java' |
864 | --- bindings/java/org/collectd/api/ValueList.java 2009-08-29 12:42:15 +0000 |
865 | +++ bindings/java/org/collectd/api/ValueList.java 2012-12-17 00:22:20 +0000 |
866 | @@ -87,10 +87,16 @@ |
867 | _ds = new DataSet (_type, dsrc); |
868 | } |
869 | |
870 | + /** |
871 | + * Returns the interval (in milliseconds) of the value list. |
872 | + */ |
873 | public long getInterval() { |
874 | return _interval; |
875 | } |
876 | |
877 | + /** |
878 | + * Sets the interval (in milliseconds) of the value list. |
879 | + */ |
880 | public void setInterval(long interval) { |
881 | _interval = interval; |
882 | } |
883 | |
884 | === modified file 'bindings/java/org/collectd/java/GenericJMXConfConnection.java' |
885 | --- bindings/java/org/collectd/java/GenericJMXConfConnection.java 2009-12-26 12:06:46 +0000 |
886 | +++ bindings/java/org/collectd/java/GenericJMXConfConnection.java 2012-12-17 00:22:20 +0000 |
887 | @@ -1,6 +1,6 @@ |
888 | /* |
889 | * collectd/java - org/collectd/java/GenericJMXConfConnection.java |
890 | - * Copyright (C) 2009 Florian octo Forster |
891 | + * Copyright (C) 2009,2010 Florian octo Forster |
892 | * |
893 | * This program is free software; you can redistribute it and/or modify it |
894 | * under the terms of the GNU General Public License as published by the |
895 | @@ -45,6 +45,7 @@ |
896 | private String _username = null; |
897 | private String _password = null; |
898 | private String _host = null; |
899 | + private String _instance_prefix = null; |
900 | private String _service_url = null; |
901 | private MBeanServerConnection _jmx_connection = null; |
902 | private List<GenericJMXConfMBean> _mbeans = null; |
903 | @@ -162,6 +163,12 @@ |
904 | if (tmp != null) |
905 | this._service_url = tmp; |
906 | } |
907 | + else if (child.getKey ().equalsIgnoreCase ("InstancePrefix")) |
908 | + { |
909 | + String tmp = getConfigString (child); |
910 | + if (tmp != null) |
911 | + this._instance_prefix = tmp; |
912 | + } |
913 | else if (child.getKey ().equalsIgnoreCase ("Collect")) |
914 | { |
915 | String tmp = getConfigString (child); |
916 | @@ -211,7 +218,8 @@ |
917 | { |
918 | int status; |
919 | |
920 | - status = this._mbeans.get (i).query (this._jmx_connection, pd); |
921 | + status = this._mbeans.get (i).query (this._jmx_connection, pd, |
922 | + this._instance_prefix); |
923 | if (status != 0) |
924 | { |
925 | this._jmx_connection = null; |
926 | |
927 | === modified file 'bindings/java/org/collectd/java/GenericJMXConfMBean.java' |
928 | --- bindings/java/org/collectd/java/GenericJMXConfMBean.java 2009-12-26 12:06:46 +0000 |
929 | +++ bindings/java/org/collectd/java/GenericJMXConfMBean.java 2012-12-17 00:22:20 +0000 |
930 | @@ -1,6 +1,6 @@ |
931 | /* |
932 | * collectd/java - org/collectd/java/GenericJMXConfMBean.java |
933 | - * Copyright (C) 2009 Florian octo Forster |
934 | + * Copyright (C) 2009,2010 Florian octo Forster |
935 | * |
936 | * This program is free software; you can redistribute it and/or modify it |
937 | * under the terms of the GNU General Public License as published by the |
938 | @@ -67,22 +67,6 @@ |
939 | return (v.getString ()); |
940 | } /* }}} String getConfigString */ |
941 | |
942 | - private String join (String separator, List<String> list) /* {{{ */ |
943 | - { |
944 | - StringBuffer sb; |
945 | - |
946 | - sb = new StringBuffer (); |
947 | - |
948 | - for (int i = 0; i < list.size (); i++) |
949 | - { |
950 | - if (i > 0) |
951 | - sb.append ("-"); |
952 | - sb.append (list.get (i)); |
953 | - } |
954 | - |
955 | - return (sb.toString ()); |
956 | - } /* }}} String join */ |
957 | - |
958 | /* |
959 | * <MBean "alias name"> |
960 | * ObjectName "object name" |
961 | @@ -170,7 +154,8 @@ |
962 | return (this._name); |
963 | } /* }}} */ |
964 | |
965 | - public int query (MBeanServerConnection conn, PluginData pd) /* {{{ */ |
966 | + public int query (MBeanServerConnection conn, PluginData pd, /* {{{ */ |
967 | + String instance_prefix) |
968 | { |
969 | Set<ObjectName> names; |
970 | Iterator<ObjectName> iter; |
971 | @@ -197,11 +182,12 @@ |
972 | ObjectName objName; |
973 | PluginData pd_tmp; |
974 | List<String> instanceList; |
975 | - String instance; |
976 | + StringBuffer instance; |
977 | |
978 | objName = iter.next (); |
979 | pd_tmp = new PluginData (pd); |
980 | instanceList = new ArrayList<String> (); |
981 | + instance = new StringBuffer (); |
982 | |
983 | Collectd.logDebug ("GenericJMXConfMBean: objName = " |
984 | + objName.toString ()); |
985 | @@ -224,14 +210,22 @@ |
986 | } |
987 | } |
988 | |
989 | + if (instance_prefix != null) |
990 | + instance.append (instance_prefix); |
991 | + |
992 | if (this._instance_prefix != null) |
993 | - instance = new String (this._instance_prefix |
994 | - + join ("-", instanceList)); |
995 | - else |
996 | - instance = join ("-", instanceList); |
997 | - pd_tmp.setPluginInstance (instance); |
998 | - |
999 | - Collectd.logDebug ("GenericJMXConfMBean: instance = " + instance); |
1000 | + instance.append (this._instance_prefix); |
1001 | + |
1002 | + for (int i = 0; i < instanceList.size (); i++) |
1003 | + { |
1004 | + if (i > 0) |
1005 | + instance.append ("-"); |
1006 | + instance.append (instanceList.get (i)); |
1007 | + } |
1008 | + |
1009 | + pd_tmp.setPluginInstance (instance.toString ()); |
1010 | + |
1011 | + Collectd.logDebug ("GenericJMXConfMBean: instance = " + instance.toString ()); |
1012 | |
1013 | for (int i = 0; i < this._values.size (); i++) |
1014 | this._values.get (i).query (conn, objName, pd_tmp); |
1015 | |
1016 | === modified file 'bindings/java/org/collectd/java/GenericJMXConfValue.java' |
1017 | --- bindings/java/org/collectd/java/GenericJMXConfValue.java 2009-10-15 20:54:46 +0000 |
1018 | +++ bindings/java/org/collectd/java/GenericJMXConfValue.java 2012-12-17 00:22:20 +0000 |
1019 | @@ -312,7 +312,14 @@ |
1020 | |
1021 | try |
1022 | { |
1023 | - value = conn.getAttribute (objName, key); |
1024 | + try |
1025 | + { |
1026 | + value = conn.getAttribute (objName, key); |
1027 | + } |
1028 | + catch (javax.management.AttributeNotFoundException e) |
1029 | + { |
1030 | + value = conn.invoke (objName, key, /* args = */ null, /* types = */ null); |
1031 | + } |
1032 | } |
1033 | catch (Exception e) |
1034 | { |
1035 | |
1036 | === modified file 'bindings/perl/lib/Collectd.pm' |
1037 | --- bindings/perl/lib/Collectd.pm 2010-01-26 00:22:32 +0000 |
1038 | +++ bindings/perl/lib/Collectd.pm 2012-12-17 00:22:20 +0000 |
1039 | @@ -465,35 +465,6 @@ |
1040 | } |
1041 | } |
1042 | |
1043 | -sub plugin_flush_one { |
1044 | - my $timeout = shift; |
1045 | - my $name = shift; |
1046 | - |
1047 | - WARNING ("Collectd::plugin_flush_one is deprecated - " |
1048 | - . "use Collectd::plugin_flush instead."); |
1049 | - |
1050 | - if (! (defined ($timeout) && defined ($name))) { |
1051 | - ERROR ("Usage: Collectd::plugin_flush_one(timeout, name)"); |
1052 | - return; |
1053 | - } |
1054 | - |
1055 | - plugin_flush (plugins => $name, timeout => $timeout); |
1056 | -} |
1057 | - |
1058 | -sub plugin_flush_all { |
1059 | - my $timeout = shift; |
1060 | - |
1061 | - WARNING ("Collectd::plugin_flush_all is deprecated - " |
1062 | - . "use Collectd::plugin_flush instead."); |
1063 | - |
1064 | - if (! defined ($timeout)) { |
1065 | - ERROR ("Usage: Collectd::plugin_flush_all(timeout)"); |
1066 | - return; |
1067 | - } |
1068 | - |
1069 | - plugin_flush (timeout => $timeout); |
1070 | -} |
1071 | - |
1072 | sub fc_call { |
1073 | my $type = shift; |
1074 | my $name = shift; |
1075 | |
1076 | === removed file 'compile' |
1077 | --- compile 2010-06-08 00:42:56 +0000 |
1078 | +++ compile 1970-01-01 00:00:00 +0000 |
1079 | @@ -1,143 +0,0 @@ |
1080 | -#! /bin/sh |
1081 | -# Wrapper for compilers which do not understand `-c -o'. |
1082 | - |
1083 | -scriptversion=2009-10-06.20; # UTC |
1084 | - |
1085 | -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009 Free Software |
1086 | -# Foundation, Inc. |
1087 | -# Written by Tom Tromey <tromey@cygnus.com>. |
1088 | -# |
1089 | -# This program is free software; you can redistribute it and/or modify |
1090 | -# it under the terms of the GNU General Public License as published by |
1091 | -# the Free Software Foundation; either version 2, or (at your option) |
1092 | -# any later version. |
1093 | -# |
1094 | -# This program is distributed in the hope that it will be useful, |
1095 | -# but WITHOUT ANY WARRANTY; without even the implied warranty of |
1096 | -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
1097 | -# GNU General Public License for more details. |
1098 | -# |
1099 | -# You should have received a copy of the GNU General Public License |
1100 | -# along with this program. If not, see <http://www.gnu.org/licenses/>. |
1101 | - |
1102 | -# As a special exception to the GNU General Public License, if you |
1103 | -# distribute this file as part of a program that contains a |
1104 | -# configuration script generated by Autoconf, you may include it under |
1105 | -# the same distribution terms that you use for the rest of that program. |
1106 | - |
1107 | -# This file is maintained in Automake, please report |
1108 | -# bugs to <bug-automake@gnu.org> or send patches to |
1109 | -# <automake-patches@gnu.org>. |
1110 | - |
1111 | -case $1 in |
1112 | - '') |
1113 | - echo "$0: No command. Try \`$0 --help' for more information." 1>&2 |
1114 | - exit 1; |
1115 | - ;; |
1116 | - -h | --h*) |
1117 | - cat <<\EOF |
1118 | -Usage: compile [--help] [--version] PROGRAM [ARGS] |
1119 | - |
1120 | -Wrapper for compilers which do not understand `-c -o'. |
1121 | -Remove `-o dest.o' from ARGS, run PROGRAM with the remaining |
1122 | -arguments, and rename the output as expected. |
1123 | - |
1124 | -If you are trying to build a whole package this is not the |
1125 | -right script to run: please start by reading the file `INSTALL'. |
1126 | - |
1127 | -Report bugs to <bug-automake@gnu.org>. |
1128 | -EOF |
1129 | - exit $? |
1130 | - ;; |
1131 | - -v | --v*) |
1132 | - echo "compile $scriptversion" |
1133 | - exit $? |
1134 | - ;; |
1135 | -esac |
1136 | - |
1137 | -ofile= |
1138 | -cfile= |
1139 | -eat= |
1140 | - |
1141 | -for arg |
1142 | -do |
1143 | - if test -n "$eat"; then |
1144 | - eat= |
1145 | - else |
1146 | - case $1 in |
1147 | - -o) |
1148 | - # configure might choose to run compile as `compile cc -o foo foo.c'. |
1149 | - # So we strip `-o arg' only if arg is an object. |
1150 | - eat=1 |
1151 | - case $2 in |
1152 | - *.o | *.obj) |
1153 | - ofile=$2 |
1154 | - ;; |
1155 | - *) |
1156 | - set x "$@" -o "$2" |
1157 | - shift |
1158 | - ;; |
1159 | - esac |
1160 | - ;; |
1161 | - *.c) |
1162 | - cfile=$1 |
1163 | - set x "$@" "$1" |
1164 | - shift |
1165 | - ;; |
1166 | - *) |
1167 | - set x "$@" "$1" |
1168 | - shift |
1169 | - ;; |
1170 | - esac |
1171 | - fi |
1172 | - shift |
1173 | -done |
1174 | - |
1175 | -if test -z "$ofile" || test -z "$cfile"; then |
1176 | - # If no `-o' option was seen then we might have been invoked from a |
1177 | - # pattern rule where we don't need one. That is ok -- this is a |
1178 | - # normal compilation that the losing compiler can handle. If no |
1179 | - # `.c' file was seen then we are probably linking. That is also |
1180 | - # ok. |
1181 | - exec "$@" |
1182 | -fi |
1183 | - |
1184 | -# Name of file we expect compiler to create. |
1185 | -cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` |
1186 | - |
1187 | -# Create the lock directory. |
1188 | -# Note: use `[/\\:.-]' here to ensure that we don't use the same name |
1189 | -# that we are using for the .o file. Also, base the name on the expected |
1190 | -# object file name, since that is what matters with a parallel build. |
1191 | -lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d |
1192 | -while true; do |
1193 | - if mkdir "$lockdir" >/dev/null 2>&1; then |
1194 | - break |
1195 | - fi |
1196 | - sleep 1 |
1197 | -done |
1198 | -# FIXME: race condition here if user kills between mkdir and trap. |
1199 | -trap "rmdir '$lockdir'; exit 1" 1 2 15 |
1200 | - |
1201 | -# Run the compile. |
1202 | -"$@" |
1203 | -ret=$? |
1204 | - |
1205 | -if test -f "$cofile"; then |
1206 | - test "$cofile" = "$ofile" || mv "$cofile" "$ofile" |
1207 | -elif test -f "${cofile}bj"; then |
1208 | - test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile" |
1209 | -fi |
1210 | - |
1211 | -rmdir "$lockdir" |
1212 | -exit $ret |
1213 | - |
1214 | -# Local Variables: |
1215 | -# mode: shell-script |
1216 | -# sh-indentation: 2 |
1217 | -# eval: (add-hook 'write-file-hooks 'time-stamp) |
1218 | -# time-stamp-start: "scriptversion=" |
1219 | -# time-stamp-format: "%:y-%02m-%02d.%02H" |
1220 | -# time-stamp-time-zone: "UTC" |
1221 | -# time-stamp-end: "; # UTC" |
1222 | -# End: |
1223 | |
1224 | === removed file 'config.guess' |
1225 | --- config.guess 2010-06-08 00:42:56 +0000 |
1226 | +++ config.guess 1970-01-01 00:00:00 +0000 |
1227 | @@ -1,1502 +0,0 @@ |
1228 | -#! /bin/sh |
1229 | -# Attempt to guess a canonical system name. |
1230 | -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, |
1231 | -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 |
1232 | -# Free Software Foundation, Inc. |
1233 | - |
1234 | -timestamp='2009-12-30' |
1235 | - |
1236 | -# This file is free software; you can redistribute it and/or modify it |
1237 | -# under the terms of the GNU General Public License as published by |
1238 | -# the Free Software Foundation; either version 2 of the License, or |
1239 | -# (at your option) any later version. |
1240 | -# |
1241 | -# This program is distributed in the hope that it will be useful, but |
1242 | -# WITHOUT ANY WARRANTY; without even the implied warranty of |
1243 | -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
1244 | -# General Public License for more details. |
1245 | -# |
1246 | -# You should have received a copy of the GNU General Public License |
1247 | -# along with this program; if not, write to the Free Software |
1248 | -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA |
1249 | -# 02110-1301, USA. |
1250 | -# |
1251 | -# As a special exception to the GNU General Public License, if you |
1252 | -# distribute this file as part of a program that contains a |
1253 | -# configuration script generated by Autoconf, you may include it under |
1254 | -# the same distribution terms that you use for the rest of that program. |
1255 | - |
1256 | - |
1257 | -# Originally written by Per Bothner. Please send patches (context |
1258 | -# diff format) to <config-patches@gnu.org> and include a ChangeLog |
1259 | -# entry. |
1260 | -# |
1261 | -# This script attempts to guess a canonical system name similar to |
1262 | -# config.sub. If it succeeds, it prints the system name on stdout, and |
1263 | -# exits with 0. Otherwise, it exits with 1. |
1264 | -# |
1265 | -# You can get the latest version of this script from: |
1266 | -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD |
1267 | - |
1268 | -me=`echo "$0" | sed -e 's,.*/,,'` |
1269 | - |
1270 | -usage="\ |
1271 | -Usage: $0 [OPTION] |
1272 | - |
1273 | -Output the configuration name of the system \`$me' is run on. |
1274 | - |
1275 | -Operation modes: |
1276 | - -h, --help print this help, then exit |
1277 | - -t, --time-stamp print date of last modification, then exit |
1278 | - -v, --version print version number, then exit |
1279 | - |
1280 | -Report bugs and patches to <config-patches@gnu.org>." |
1281 | - |
1282 | -version="\ |
1283 | -GNU config.guess ($timestamp) |
1284 | - |
1285 | -Originally written by Per Bothner. |
1286 | -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, |
1287 | -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free |
1288 | -Software Foundation, Inc. |
1289 | - |
1290 | -This is free software; see the source for copying conditions. There is NO |
1291 | -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." |
1292 | - |
1293 | -help=" |
1294 | -Try \`$me --help' for more information." |
1295 | - |
1296 | -# Parse command line |
1297 | -while test $# -gt 0 ; do |
1298 | - case $1 in |
1299 | - --time-stamp | --time* | -t ) |
1300 | - echo "$timestamp" ; exit ;; |
1301 | - --version | -v ) |
1302 | - echo "$version" ; exit ;; |
1303 | - --help | --h* | -h ) |
1304 | - echo "$usage"; exit ;; |
1305 | - -- ) # Stop option processing |
1306 | - shift; break ;; |
1307 | - - ) # Use stdin as input. |
1308 | - break ;; |
1309 | - -* ) |
1310 | - echo "$me: invalid option $1$help" >&2 |
1311 | - exit 1 ;; |
1312 | - * ) |
1313 | - break ;; |
1314 | - esac |
1315 | -done |
1316 | - |
1317 | -if test $# != 0; then |
1318 | - echo "$me: too many arguments$help" >&2 |
1319 | - exit 1 |
1320 | -fi |
1321 | - |
1322 | -trap 'exit 1' 1 2 15 |
1323 | - |
1324 | -# CC_FOR_BUILD -- compiler used by this script. Note that the use of a |
1325 | -# compiler to aid in system detection is discouraged as it requires |
1326 | -# temporary files to be created and, as you can see below, it is a |
1327 | -# headache to deal with in a portable fashion. |
1328 | - |
1329 | -# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still |
1330 | -# use `HOST_CC' if defined, but it is deprecated. |
1331 | - |
1332 | -# Portable tmp directory creation inspired by the Autoconf team. |
1333 | - |
1334 | -set_cc_for_build=' |
1335 | -trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; |
1336 | -trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; |
1337 | -: ${TMPDIR=/tmp} ; |
1338 | - { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || |
1339 | - { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || |
1340 | - { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || |
1341 | - { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; |
1342 | -dummy=$tmp/dummy ; |
1343 | -tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; |
1344 | -case $CC_FOR_BUILD,$HOST_CC,$CC in |
1345 | - ,,) echo "int x;" > $dummy.c ; |
1346 | - for c in cc gcc c89 c99 ; do |
1347 | - if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then |
1348 | - CC_FOR_BUILD="$c"; break ; |
1349 | - fi ; |
1350 | - done ; |
1351 | - if test x"$CC_FOR_BUILD" = x ; then |
1352 | - CC_FOR_BUILD=no_compiler_found ; |
1353 | - fi |
1354 | - ;; |
1355 | - ,,*) CC_FOR_BUILD=$CC ;; |
1356 | - ,*,*) CC_FOR_BUILD=$HOST_CC ;; |
1357 | -esac ; set_cc_for_build= ;' |
1358 | - |
1359 | -# This is needed to find uname on a Pyramid OSx when run in the BSD universe. |
1360 | -# (ghazi@noc.rutgers.edu 1994-08-24) |
1361 | -if (test -f /.attbin/uname) >/dev/null 2>&1 ; then |
1362 | - PATH=$PATH:/.attbin ; export PATH |
1363 | -fi |
1364 | - |
1365 | -UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown |
1366 | -UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown |
1367 | -UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown |
1368 | -UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown |
1369 | - |
1370 | -# Note: order is significant - the case branches are not exclusive. |
1371 | - |
1372 | -case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in |
1373 | - *:NetBSD:*:*) |
1374 | - # NetBSD (nbsd) targets should (where applicable) match one or |
1375 | - # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, |
1376 | - # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently |
1377 | - # switched to ELF, *-*-netbsd* would select the old |
1378 | - # object file format. This provides both forward |
1379 | - # compatibility and a consistent mechanism for selecting the |
1380 | - # object file format. |
1381 | - # |
1382 | - # Note: NetBSD doesn't particularly care about the vendor |
1383 | - # portion of the name. We always set it to "unknown". |
1384 | - sysctl="sysctl -n hw.machine_arch" |
1385 | - UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ |
1386 | - /usr/sbin/$sysctl 2>/dev/null || echo unknown)` |
1387 | - case "${UNAME_MACHINE_ARCH}" in |
1388 | - armeb) machine=armeb-unknown ;; |
1389 | - arm*) machine=arm-unknown ;; |
1390 | - sh3el) machine=shl-unknown ;; |
1391 | - sh3eb) machine=sh-unknown ;; |
1392 | - sh5el) machine=sh5le-unknown ;; |
1393 | - *) machine=${UNAME_MACHINE_ARCH}-unknown ;; |
1394 | - esac |
1395 | - # The Operating System including object format, if it has switched |
1396 | - # to ELF recently, or will in the future. |
1397 | - case "${UNAME_MACHINE_ARCH}" in |
1398 | - arm*|i386|m68k|ns32k|sh3*|sparc|vax) |
1399 | - eval $set_cc_for_build |
1400 | - if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ |
1401 | - | grep -q __ELF__ |
1402 | - then |
1403 | - # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). |
1404 | - # Return netbsd for either. FIX? |
1405 | - os=netbsd |
1406 | - else |
1407 | - os=netbsdelf |
1408 | - fi |
1409 | - ;; |
1410 | - *) |
1411 | - os=netbsd |
1412 | - ;; |
1413 | - esac |
1414 | - # The OS release |
1415 | - # Debian GNU/NetBSD machines have a different userland, and |
1416 | - # thus, need a distinct triplet. However, they do not need |
1417 | - # kernel version information, so it can be replaced with a |
1418 | - # suitable tag, in the style of linux-gnu. |
1419 | - case "${UNAME_VERSION}" in |
1420 | - Debian*) |
1421 | - release='-gnu' |
1422 | - ;; |
1423 | - *) |
1424 | - release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` |
1425 | - ;; |
1426 | - esac |
1427 | - # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: |
1428 | - # contains redundant information, the shorter form: |
1429 | - # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. |
1430 | - echo "${machine}-${os}${release}" |
1431 | - exit ;; |
1432 | - *:OpenBSD:*:*) |
1433 | - UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` |
1434 | - echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} |
1435 | - exit ;; |
1436 | - *:ekkoBSD:*:*) |
1437 | - echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} |
1438 | - exit ;; |
1439 | - *:SolidBSD:*:*) |
1440 | - echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} |
1441 | - exit ;; |
1442 | - macppc:MirBSD:*:*) |
1443 | - echo powerpc-unknown-mirbsd${UNAME_RELEASE} |
1444 | - exit ;; |
1445 | - *:MirBSD:*:*) |
1446 | - echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} |
1447 | - exit ;; |
1448 | - alpha:OSF1:*:*) |
1449 | - case $UNAME_RELEASE in |
1450 | - *4.0) |
1451 | - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` |
1452 | - ;; |
1453 | - *5.*) |
1454 | - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` |
1455 | - ;; |
1456 | - esac |
1457 | - # According to Compaq, /usr/sbin/psrinfo has been available on |
1458 | - # OSF/1 and Tru64 systems produced since 1995. I hope that |
1459 | - # covers most systems running today. This code pipes the CPU |
1460 | - # types through head -n 1, so we only detect the type of CPU 0. |
1461 | - ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` |
1462 | - case "$ALPHA_CPU_TYPE" in |
1463 | - "EV4 (21064)") |
1464 | - UNAME_MACHINE="alpha" ;; |
1465 | - "EV4.5 (21064)") |
1466 | - UNAME_MACHINE="alpha" ;; |
1467 | - "LCA4 (21066/21068)") |
1468 | - UNAME_MACHINE="alpha" ;; |
1469 | - "EV5 (21164)") |
1470 | - UNAME_MACHINE="alphaev5" ;; |
1471 | - "EV5.6 (21164A)") |
1472 | - UNAME_MACHINE="alphaev56" ;; |
1473 | - "EV5.6 (21164PC)") |
1474 | - UNAME_MACHINE="alphapca56" ;; |
1475 | - "EV5.7 (21164PC)") |
1476 | - UNAME_MACHINE="alphapca57" ;; |
1477 | - "EV6 (21264)") |
1478 | - UNAME_MACHINE="alphaev6" ;; |
1479 | - "EV6.7 (21264A)") |
1480 | - UNAME_MACHINE="alphaev67" ;; |
1481 | - "EV6.8CB (21264C)") |
1482 | - UNAME_MACHINE="alphaev68" ;; |
1483 | - "EV6.8AL (21264B)") |
1484 | - UNAME_MACHINE="alphaev68" ;; |
1485 | - "EV6.8CX (21264D)") |
1486 | - UNAME_MACHINE="alphaev68" ;; |
1487 | - "EV6.9A (21264/EV69A)") |
1488 | - UNAME_MACHINE="alphaev69" ;; |
1489 | - "EV7 (21364)") |
1490 | - UNAME_MACHINE="alphaev7" ;; |
1491 | - "EV7.9 (21364A)") |
1492 | - UNAME_MACHINE="alphaev79" ;; |
1493 | - esac |
1494 | - # A Pn.n version is a patched version. |
1495 | - # A Vn.n version is a released version. |
1496 | - # A Tn.n version is a released field test version. |
1497 | - # A Xn.n version is an unreleased experimental baselevel. |
1498 | - # 1.2 uses "1.2" for uname -r. |
1499 | - echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` |
1500 | - exit ;; |
1501 | - Alpha\ *:Windows_NT*:*) |
1502 | - # How do we know it's Interix rather than the generic POSIX subsystem? |
1503 | - # Should we change UNAME_MACHINE based on the output of uname instead |
1504 | - # of the specific Alpha model? |
1505 | - echo alpha-pc-interix |
1506 | - exit ;; |
1507 | - 21064:Windows_NT:50:3) |
1508 | - echo alpha-dec-winnt3.5 |
1509 | - exit ;; |
1510 | - Amiga*:UNIX_System_V:4.0:*) |
1511 | - echo m68k-unknown-sysv4 |
1512 | - exit ;; |
1513 | - *:[Aa]miga[Oo][Ss]:*:*) |
1514 | - echo ${UNAME_MACHINE}-unknown-amigaos |
1515 | - exit ;; |
1516 | - *:[Mm]orph[Oo][Ss]:*:*) |
1517 | - echo ${UNAME_MACHINE}-unknown-morphos |
1518 | - exit ;; |
1519 | - *:OS/390:*:*) |
1520 | - echo i370-ibm-openedition |
1521 | - exit ;; |
1522 | - *:z/VM:*:*) |
1523 | - echo s390-ibm-zvmoe |
1524 | - exit ;; |
1525 | - *:OS400:*:*) |
1526 | - echo powerpc-ibm-os400 |
1527 | - exit ;; |
1528 | - arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) |
1529 | - echo arm-acorn-riscix${UNAME_RELEASE} |
1530 | - exit ;; |
1531 | - arm:riscos:*:*|arm:RISCOS:*:*) |
1532 | - echo arm-unknown-riscos |
1533 | - exit ;; |
1534 | - SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) |
1535 | - echo hppa1.1-hitachi-hiuxmpp |
1536 | - exit ;; |
1537 | - Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*) |
1538 | - # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE. |
1539 | - if test "`(/bin/universe) 2>/dev/null`" = att ; then |
1540 | - echo pyramid-pyramid-sysv3 |
1541 | - else |
1542 | - echo pyramid-pyramid-bsd |
1543 | - fi |
1544 | - exit ;; |
1545 | - NILE*:*:*:dcosx) |
1546 | - echo pyramid-pyramid-svr4 |
1547 | - exit ;; |
1548 | - DRS?6000:unix:4.0:6*) |
1549 | - echo sparc-icl-nx6 |
1550 | - exit ;; |
1551 | - DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) |
1552 | - case `/usr/bin/uname -p` in |
1553 | - sparc) echo sparc-icl-nx7; exit ;; |
1554 | - esac ;; |
1555 | - s390x:SunOS:*:*) |
1556 | - echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` |
1557 | - exit ;; |
1558 | - sun4H:SunOS:5.*:*) |
1559 | - echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` |
1560 | - exit ;; |
1561 | - sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) |
1562 | - echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` |
1563 | - exit ;; |
1564 | - i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) |
1565 | - echo i386-pc-auroraux${UNAME_RELEASE} |
1566 | - exit ;; |
1567 | - i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) |
1568 | - eval $set_cc_for_build |
1569 | - SUN_ARCH="i386" |
1570 | - # If there is a compiler, see if it is configured for 64-bit objects. |
1571 | - # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. |
1572 | - # This test works for both compilers. |
1573 | - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then |
1574 | - if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ |
1575 | - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ |
1576 | - grep IS_64BIT_ARCH >/dev/null |
1577 | - then |
1578 | - SUN_ARCH="x86_64" |
1579 | - fi |
1580 | - fi |
1581 | - echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` |
1582 | - exit ;; |
1583 | - sun4*:SunOS:6*:*) |
1584 | - # According to config.sub, this is the proper way to canonicalize |
1585 | - # SunOS6. Hard to guess exactly what SunOS6 will be like, but |
1586 | - # it's likely to be more like Solaris than SunOS4. |
1587 | - echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` |
1588 | - exit ;; |
1589 | - sun4*:SunOS:*:*) |
1590 | - case "`/usr/bin/arch -k`" in |
1591 | - Series*|S4*) |
1592 | - UNAME_RELEASE=`uname -v` |
1593 | - ;; |
1594 | - esac |
1595 | - # Japanese Language versions have a version number like `4.1.3-JL'. |
1596 | - echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'` |
1597 | - exit ;; |
1598 | - sun3*:SunOS:*:*) |
1599 | - echo m68k-sun-sunos${UNAME_RELEASE} |
1600 | - exit ;; |
1601 | - sun*:*:4.2BSD:*) |
1602 | - UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` |
1603 | - test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3 |
1604 | - case "`/bin/arch`" in |
1605 | - sun3) |
1606 | - echo m68k-sun-sunos${UNAME_RELEASE} |
1607 | - ;; |
1608 | - sun4) |
1609 | - echo sparc-sun-sunos${UNAME_RELEASE} |
1610 | - ;; |
1611 | - esac |
1612 | - exit ;; |
1613 | - aushp:SunOS:*:*) |
1614 | - echo sparc-auspex-sunos${UNAME_RELEASE} |
1615 | - exit ;; |
1616 | - # The situation for MiNT is a little confusing. The machine name |
1617 | - # can be virtually everything (everything which is not |
1618 | - # "atarist" or "atariste" at least should have a processor |
1619 | - # > m68000). The system name ranges from "MiNT" over "FreeMiNT" |
1620 | - # to the lowercase version "mint" (or "freemint"). Finally |
1621 | - # the system name "TOS" denotes a system which is actually not |
1622 | - # MiNT. But MiNT is downward compatible to TOS, so this should |
1623 | - # be no problem. |
1624 | - atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) |
1625 | - echo m68k-atari-mint${UNAME_RELEASE} |
1626 | - exit ;; |
1627 | - atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) |
1628 | - echo m68k-atari-mint${UNAME_RELEASE} |
1629 | - exit ;; |
1630 | - *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) |
1631 | - echo m68k-atari-mint${UNAME_RELEASE} |
1632 | - exit ;; |
1633 | - milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) |
1634 | - echo m68k-milan-mint${UNAME_RELEASE} |
1635 | - exit ;; |
1636 | - hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) |
1637 | - echo m68k-hades-mint${UNAME_RELEASE} |
1638 | - exit ;; |
1639 | - *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) |
1640 | - echo m68k-unknown-mint${UNAME_RELEASE} |
1641 | - exit ;; |
1642 | - m68k:machten:*:*) |
1643 | - echo m68k-apple-machten${UNAME_RELEASE} |
1644 | - exit ;; |
1645 | - powerpc:machten:*:*) |
1646 | - echo powerpc-apple-machten${UNAME_RELEASE} |
1647 | - exit ;; |
1648 | - RISC*:Mach:*:*) |
1649 | - echo mips-dec-mach_bsd4.3 |
1650 | - exit ;; |
1651 | - RISC*:ULTRIX:*:*) |
1652 | - echo mips-dec-ultrix${UNAME_RELEASE} |
1653 | - exit ;; |
1654 | - VAX*:ULTRIX*:*:*) |
1655 | - echo vax-dec-ultrix${UNAME_RELEASE} |
1656 | - exit ;; |
1657 | - 2020:CLIX:*:* | 2430:CLIX:*:*) |
1658 | - echo clipper-intergraph-clix${UNAME_RELEASE} |
1659 | - exit ;; |
1660 | - mips:*:*:UMIPS | mips:*:*:RISCos) |
1661 | - eval $set_cc_for_build |
1662 | - sed 's/^ //' << EOF >$dummy.c |
1663 | -#ifdef __cplusplus |
1664 | -#include <stdio.h> /* for printf() prototype */ |
1665 | - int main (int argc, char *argv[]) { |
1666 | -#else |
1667 | - int main (argc, argv) int argc; char *argv[]; { |
1668 | -#endif |
1669 | - #if defined (host_mips) && defined (MIPSEB) |
1670 | - #if defined (SYSTYPE_SYSV) |
1671 | - printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); |
1672 | - #endif |
1673 | - #if defined (SYSTYPE_SVR4) |
1674 | - printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0); |
1675 | - #endif |
1676 | - #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) |
1677 | - printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0); |
1678 | - #endif |
1679 | - #endif |
1680 | - exit (-1); |
1681 | - } |
1682 | -EOF |
1683 | - $CC_FOR_BUILD -o $dummy $dummy.c && |
1684 | - dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` && |
1685 | - SYSTEM_NAME=`$dummy $dummyarg` && |
1686 | - { echo "$SYSTEM_NAME"; exit; } |
1687 | - echo mips-mips-riscos${UNAME_RELEASE} |
1688 | - exit ;; |
1689 | - Motorola:PowerMAX_OS:*:*) |
1690 | - echo powerpc-motorola-powermax |
1691 | - exit ;; |
1692 | - Motorola:*:4.3:PL8-*) |
1693 | - echo powerpc-harris-powermax |
1694 | - exit ;; |
1695 | - Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) |
1696 | - echo powerpc-harris-powermax |
1697 | - exit ;; |
1698 | - Night_Hawk:Power_UNIX:*:*) |
1699 | - echo powerpc-harris-powerunix |
1700 | - exit ;; |
1701 | - m88k:CX/UX:7*:*) |
1702 | - echo m88k-harris-cxux7 |
1703 | - exit ;; |
1704 | - m88k:*:4*:R4*) |
1705 | - echo m88k-motorola-sysv4 |
1706 | - exit ;; |
1707 | - m88k:*:3*:R3*) |
1708 | - echo m88k-motorola-sysv3 |
1709 | - exit ;; |
1710 | - AViiON:dgux:*:*) |
1711 | - # DG/UX returns AViiON for all architectures |
1712 | - UNAME_PROCESSOR=`/usr/bin/uname -p` |
1713 | - if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] |
1714 | - then |
1715 | - if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ |
1716 | - [ ${TARGET_BINARY_INTERFACE}x = x ] |
1717 | - then |
1718 | - echo m88k-dg-dgux${UNAME_RELEASE} |
1719 | - else |
1720 | - echo m88k-dg-dguxbcs${UNAME_RELEASE} |
1721 | - fi |
1722 | - else |
1723 | - echo i586-dg-dgux${UNAME_RELEASE} |
1724 | - fi |
1725 | - exit ;; |
1726 | - M88*:DolphinOS:*:*) # DolphinOS (SVR3) |
1727 | - echo m88k-dolphin-sysv3 |
1728 | - exit ;; |
1729 | - M88*:*:R3*:*) |
1730 | - # Delta 88k system running SVR3 |
1731 | - echo m88k-motorola-sysv3 |
1732 | - exit ;; |
1733 | - XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) |
1734 | - echo m88k-tektronix-sysv3 |
1735 | - exit ;; |
1736 | - Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) |
1737 | - echo m68k-tektronix-bsd |
1738 | - exit ;; |
1739 | - *:IRIX*:*:*) |
1740 | - echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` |
1741 | - exit ;; |
1742 | - ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. |
1743 | - echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id |
1744 | - exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' |
1745 | - i*86:AIX:*:*) |
1746 | - echo i386-ibm-aix |
1747 | - exit ;; |
1748 | - ia64:AIX:*:*) |
1749 | - if [ -x /usr/bin/oslevel ] ; then |
1750 | - IBM_REV=`/usr/bin/oslevel` |
1751 | - else |
1752 | - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} |
1753 | - fi |
1754 | - echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} |
1755 | - exit ;; |
1756 | - *:AIX:2:3) |
1757 | - if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then |
1758 | - eval $set_cc_for_build |
1759 | - sed 's/^ //' << EOF >$dummy.c |
1760 | - #include <sys/systemcfg.h> |
1761 | - |
1762 | - main() |
1763 | - { |
1764 | - if (!__power_pc()) |
1765 | - exit(1); |
1766 | - puts("powerpc-ibm-aix3.2.5"); |
1767 | - exit(0); |
1768 | - } |
1769 | -EOF |
1770 | - if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` |
1771 | - then |
1772 | - echo "$SYSTEM_NAME" |
1773 | - else |
1774 | - echo rs6000-ibm-aix3.2.5 |
1775 | - fi |
1776 | - elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then |
1777 | - echo rs6000-ibm-aix3.2.4 |
1778 | - else |
1779 | - echo rs6000-ibm-aix3.2 |
1780 | - fi |
1781 | - exit ;; |
1782 | - *:AIX:*:[456]) |
1783 | - IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` |
1784 | - if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then |
1785 | - IBM_ARCH=rs6000 |
1786 | - else |
1787 | - IBM_ARCH=powerpc |
1788 | - fi |
1789 | - if [ -x /usr/bin/oslevel ] ; then |
1790 | - IBM_REV=`/usr/bin/oslevel` |
1791 | - else |
1792 | - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} |
1793 | - fi |
1794 | - echo ${IBM_ARCH}-ibm-aix${IBM_REV} |
1795 | - exit ;; |
1796 | - *:AIX:*:*) |
1797 | - echo rs6000-ibm-aix |
1798 | - exit ;; |
1799 | - ibmrt:4.4BSD:*|romp-ibm:BSD:*) |
1800 | - echo romp-ibm-bsd4.4 |
1801 | - exit ;; |
1802 | - ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and |
1803 | - echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to |
1804 | - exit ;; # report: romp-ibm BSD 4.3 |
1805 | - *:BOSX:*:*) |
1806 | - echo rs6000-bull-bosx |
1807 | - exit ;; |
1808 | - DPX/2?00:B.O.S.:*:*) |
1809 | - echo m68k-bull-sysv3 |
1810 | - exit ;; |
1811 | - 9000/[34]??:4.3bsd:1.*:*) |
1812 | - echo m68k-hp-bsd |
1813 | - exit ;; |
1814 | - hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) |
1815 | - echo m68k-hp-bsd4.4 |
1816 | - exit ;; |
1817 | - 9000/[34678]??:HP-UX:*:*) |
1818 | - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` |
1819 | - case "${UNAME_MACHINE}" in |
1820 | - 9000/31? ) HP_ARCH=m68000 ;; |
1821 | - 9000/[34]?? ) HP_ARCH=m68k ;; |
1822 | - 9000/[678][0-9][0-9]) |
1823 | - if [ -x /usr/bin/getconf ]; then |
1824 | - sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` |
1825 | - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` |
1826 | - case "${sc_cpu_version}" in |
1827 | - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 |
1828 | - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 |
1829 | - 532) # CPU_PA_RISC2_0 |
1830 | - case "${sc_kernel_bits}" in |
1831 | - 32) HP_ARCH="hppa2.0n" ;; |
1832 | - 64) HP_ARCH="hppa2.0w" ;; |
1833 | - '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 |
1834 | - esac ;; |
1835 | - esac |
1836 | - fi |
1837 | - if [ "${HP_ARCH}" = "" ]; then |
1838 | - eval $set_cc_for_build |
1839 | - sed 's/^ //' << EOF >$dummy.c |
1840 | - |
1841 | - #define _HPUX_SOURCE |
1842 | - #include <stdlib.h> |
1843 | - #include <unistd.h> |
1844 | - |
1845 | - int main () |
1846 | - { |
1847 | - #if defined(_SC_KERNEL_BITS) |
1848 | - long bits = sysconf(_SC_KERNEL_BITS); |
1849 | - #endif |
1850 | - long cpu = sysconf (_SC_CPU_VERSION); |
1851 | - |
1852 | - switch (cpu) |
1853 | - { |
1854 | - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; |
1855 | - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; |
1856 | - case CPU_PA_RISC2_0: |
1857 | - #if defined(_SC_KERNEL_BITS) |
1858 | - switch (bits) |
1859 | - { |
1860 | - case 64: puts ("hppa2.0w"); break; |
1861 | - case 32: puts ("hppa2.0n"); break; |
1862 | - default: puts ("hppa2.0"); break; |
1863 | - } break; |
1864 | - #else /* !defined(_SC_KERNEL_BITS) */ |
1865 | - puts ("hppa2.0"); break; |
1866 | - #endif |
1867 | - default: puts ("hppa1.0"); break; |
1868 | - } |
1869 | - exit (0); |
1870 | - } |
1871 | -EOF |
1872 | - (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` |
1873 | - test -z "$HP_ARCH" && HP_ARCH=hppa |
1874 | - fi ;; |
1875 | - esac |
1876 | - if [ ${HP_ARCH} = "hppa2.0w" ] |
1877 | - then |
1878 | - eval $set_cc_for_build |
1879 | - |
1880 | - # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating |
1881 | - # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler |
1882 | - # generating 64-bit code. GNU and HP use different nomenclature: |
1883 | - # |
1884 | - # $ CC_FOR_BUILD=cc ./config.guess |
1885 | - # => hppa2.0w-hp-hpux11.23 |
1886 | - # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess |
1887 | - # => hppa64-hp-hpux11.23 |
1888 | - |
1889 | - if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | |
1890 | - grep -q __LP64__ |
1891 | - then |
1892 | - HP_ARCH="hppa2.0w" |
1893 | - else |
1894 | - HP_ARCH="hppa64" |
1895 | - fi |
1896 | - fi |
1897 | - echo ${HP_ARCH}-hp-hpux${HPUX_REV} |
1898 | - exit ;; |
1899 | - ia64:HP-UX:*:*) |
1900 | - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` |
1901 | - echo ia64-hp-hpux${HPUX_REV} |
1902 | - exit ;; |
1903 | - 3050*:HI-UX:*:*) |
1904 | - eval $set_cc_for_build |
1905 | - sed 's/^ //' << EOF >$dummy.c |
1906 | - #include <unistd.h> |
1907 | - int |
1908 | - main () |
1909 | - { |
1910 | - long cpu = sysconf (_SC_CPU_VERSION); |
1911 | - /* The order matters, because CPU_IS_HP_MC68K erroneously returns |
1912 | - true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct |
1913 | - results, however. */ |
1914 | - if (CPU_IS_PA_RISC (cpu)) |
1915 | - { |
1916 | - switch (cpu) |
1917 | - { |
1918 | - case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break; |
1919 | - case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break; |
1920 | - case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break; |
1921 | - default: puts ("hppa-hitachi-hiuxwe2"); break; |
1922 | - } |
1923 | - } |
1924 | - else if (CPU_IS_HP_MC68K (cpu)) |
1925 | - puts ("m68k-hitachi-hiuxwe2"); |
1926 | - else puts ("unknown-hitachi-hiuxwe2"); |
1927 | - exit (0); |
1928 | - } |
1929 | -EOF |
1930 | - $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` && |
1931 | - { echo "$SYSTEM_NAME"; exit; } |
1932 | - echo unknown-hitachi-hiuxwe2 |
1933 | - exit ;; |
1934 | - 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) |
1935 | - echo hppa1.1-hp-bsd |
1936 | - exit ;; |
1937 | - 9000/8??:4.3bsd:*:*) |
1938 | - echo hppa1.0-hp-bsd |
1939 | - exit ;; |
1940 | - *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) |
1941 | - echo hppa1.0-hp-mpeix |
1942 | - exit ;; |
1943 | - hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) |
1944 | - echo hppa1.1-hp-osf |
1945 | - exit ;; |
1946 | - hp8??:OSF1:*:*) |
1947 | - echo hppa1.0-hp-osf |
1948 | - exit ;; |
1949 | - i*86:OSF1:*:*) |
1950 | - if [ -x /usr/sbin/sysversion ] ; then |
1951 | - echo ${UNAME_MACHINE}-unknown-osf1mk |
1952 | - else |
1953 | - echo ${UNAME_MACHINE}-unknown-osf1 |
1954 | - fi |
1955 | - exit ;; |
1956 | - parisc*:Lites*:*:*) |
1957 | - echo hppa1.1-hp-lites |
1958 | - exit ;; |
1959 | - C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) |
1960 | - echo c1-convex-bsd |
1961 | - exit ;; |
1962 | - C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) |
1963 | - if getsysinfo -f scalar_acc |
1964 | - then echo c32-convex-bsd |
1965 | - else echo c2-convex-bsd |
1966 | - fi |
1967 | - exit ;; |
1968 | - C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) |
1969 | - echo c34-convex-bsd |
1970 | - exit ;; |
1971 | - C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) |
1972 | - echo c38-convex-bsd |
1973 | - exit ;; |
1974 | - C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) |
1975 | - echo c4-convex-bsd |
1976 | - exit ;; |
1977 | - CRAY*Y-MP:*:*:*) |
1978 | - echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' |
1979 | - exit ;; |
1980 | - CRAY*[A-Z]90:*:*:*) |
1981 | - echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \ |
1982 | - | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ |
1983 | - -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ |
1984 | - -e 's/\.[^.]*$/.X/' |
1985 | - exit ;; |
1986 | - CRAY*TS:*:*:*) |
1987 | - echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' |
1988 | - exit ;; |
1989 | - CRAY*T3E:*:*:*) |
1990 | - echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' |
1991 | - exit ;; |
1992 | - CRAY*SV1:*:*:*) |
1993 | - echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' |
1994 | - exit ;; |
1995 | - *:UNICOS/mp:*:*) |
1996 | - echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' |
1997 | - exit ;; |
1998 | - F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) |
1999 | - FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` |
2000 | - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` |
2001 | - FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'` |
2002 | - echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" |
2003 | - exit ;; |
2004 | - 5000:UNIX_System_V:4.*:*) |
2005 | - FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'` |
2006 | - FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'` |
2007 | - echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" |
2008 | - exit ;; |
2009 | - i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) |
2010 | - echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} |
2011 | - exit ;; |
2012 | - sparc*:BSD/OS:*:*) |
2013 | - echo sparc-unknown-bsdi${UNAME_RELEASE} |
2014 | - exit ;; |
2015 | - *:BSD/OS:*:*) |
2016 | - echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} |
2017 | - exit ;; |
2018 | - *:FreeBSD:*:*) |
2019 | - case ${UNAME_MACHINE} in |
2020 | - pc98) |
2021 | - echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; |
2022 | - amd64) |
2023 | - echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; |
2024 | - *) |
2025 | - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; |
2026 | - esac |
2027 | - exit ;; |
2028 | - i*:CYGWIN*:*) |
2029 | - echo ${UNAME_MACHINE}-pc-cygwin |
2030 | - exit ;; |
2031 | - *:MINGW*:*) |
2032 | - echo ${UNAME_MACHINE}-pc-mingw32 |
2033 | - exit ;; |
2034 | - i*:windows32*:*) |
2035 | - # uname -m includes "-pc" on this system. |
2036 | - echo ${UNAME_MACHINE}-mingw32 |
2037 | - exit ;; |
2038 | - i*:PW*:*) |
2039 | - echo ${UNAME_MACHINE}-pc-pw32 |
2040 | - exit ;; |
2041 | - *:Interix*:*) |
2042 | - case ${UNAME_MACHINE} in |
2043 | - x86) |
2044 | - echo i586-pc-interix${UNAME_RELEASE} |
2045 | - exit ;; |
2046 | - authenticamd | genuineintel | EM64T) |
2047 | - echo x86_64-unknown-interix${UNAME_RELEASE} |
2048 | - exit ;; |
2049 | - IA64) |
2050 | - echo ia64-unknown-interix${UNAME_RELEASE} |
2051 | - exit ;; |
2052 | - esac ;; |
2053 | - [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) |
2054 | - echo i${UNAME_MACHINE}-pc-mks |
2055 | - exit ;; |
2056 | - 8664:Windows_NT:*) |
2057 | - echo x86_64-pc-mks |
2058 | - exit ;; |
2059 | - i*:Windows_NT*:* | Pentium*:Windows_NT*:*) |
2060 | - # How do we know it's Interix rather than the generic POSIX subsystem? |
2061 | - # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we |
2062 | - # UNAME_MACHINE based on the output of uname instead of i386? |
2063 | - echo i586-pc-interix |
2064 | - exit ;; |
2065 | - i*:UWIN*:*) |
2066 | - echo ${UNAME_MACHINE}-pc-uwin |
2067 | - exit ;; |
2068 | - amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) |
2069 | - echo x86_64-unknown-cygwin |
2070 | - exit ;; |
2071 | - p*:CYGWIN*:*) |
2072 | - echo powerpcle-unknown-cygwin |
2073 | - exit ;; |
2074 | - prep*:SunOS:5.*:*) |
2075 | - echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` |
2076 | - exit ;; |
2077 | - *:GNU:*:*) |
2078 | - # the GNU system |
2079 | - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` |
2080 | - exit ;; |
2081 | - *:GNU/*:*:*) |
2082 | - # other systems with GNU libc and userland |
2083 | - echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu |
2084 | - exit ;; |
2085 | - i*86:Minix:*:*) |
2086 | - echo ${UNAME_MACHINE}-pc-minix |
2087 | - exit ;; |
2088 | - alpha:Linux:*:*) |
2089 | - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in |
2090 | - EV5) UNAME_MACHINE=alphaev5 ;; |
2091 | - EV56) UNAME_MACHINE=alphaev56 ;; |
2092 | - PCA56) UNAME_MACHINE=alphapca56 ;; |
2093 | - PCA57) UNAME_MACHINE=alphapca56 ;; |
2094 | - EV6) UNAME_MACHINE=alphaev6 ;; |
2095 | - EV67) UNAME_MACHINE=alphaev67 ;; |
2096 | - EV68*) UNAME_MACHINE=alphaev68 ;; |
2097 | - esac |
2098 | - objdump --private-headers /bin/sh | grep -q ld.so.1 |
2099 | - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi |
2100 | - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} |
2101 | - exit ;; |
2102 | - arm*:Linux:*:*) |
2103 | - eval $set_cc_for_build |
2104 | - if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ |
2105 | - | grep -q __ARM_EABI__ |
2106 | - then |
2107 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
2108 | - else |
2109 | - echo ${UNAME_MACHINE}-unknown-linux-gnueabi |
2110 | - fi |
2111 | - exit ;; |
2112 | - avr32*:Linux:*:*) |
2113 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
2114 | - exit ;; |
2115 | - cris:Linux:*:*) |
2116 | - echo cris-axis-linux-gnu |
2117 | - exit ;; |
2118 | - crisv32:Linux:*:*) |
2119 | - echo crisv32-axis-linux-gnu |
2120 | - exit ;; |
2121 | - frv:Linux:*:*) |
2122 | - echo frv-unknown-linux-gnu |
2123 | - exit ;; |
2124 | - i*86:Linux:*:*) |
2125 | - LIBC=gnu |
2126 | - eval $set_cc_for_build |
2127 | - sed 's/^ //' << EOF >$dummy.c |
2128 | - #ifdef __dietlibc__ |
2129 | - LIBC=dietlibc |
2130 | - #endif |
2131 | -EOF |
2132 | - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` |
2133 | - echo "${UNAME_MACHINE}-pc-linux-${LIBC}" |
2134 | - exit ;; |
2135 | - ia64:Linux:*:*) |
2136 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
2137 | - exit ;; |
2138 | - m32r*:Linux:*:*) |
2139 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
2140 | - exit ;; |
2141 | - m68*:Linux:*:*) |
2142 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
2143 | - exit ;; |
2144 | - mips:Linux:*:* | mips64:Linux:*:*) |
2145 | - eval $set_cc_for_build |
2146 | - sed 's/^ //' << EOF >$dummy.c |
2147 | - #undef CPU |
2148 | - #undef ${UNAME_MACHINE} |
2149 | - #undef ${UNAME_MACHINE}el |
2150 | - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) |
2151 | - CPU=${UNAME_MACHINE}el |
2152 | - #else |
2153 | - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) |
2154 | - CPU=${UNAME_MACHINE} |
2155 | - #else |
2156 | - CPU= |
2157 | - #endif |
2158 | - #endif |
2159 | -EOF |
2160 | - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` |
2161 | - test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } |
2162 | - ;; |
2163 | - or32:Linux:*:*) |
2164 | - echo or32-unknown-linux-gnu |
2165 | - exit ;; |
2166 | - padre:Linux:*:*) |
2167 | - echo sparc-unknown-linux-gnu |
2168 | - exit ;; |
2169 | - parisc64:Linux:*:* | hppa64:Linux:*:*) |
2170 | - echo hppa64-unknown-linux-gnu |
2171 | - exit ;; |
2172 | - parisc:Linux:*:* | hppa:Linux:*:*) |
2173 | - # Look for CPU level |
2174 | - case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in |
2175 | - PA7*) echo hppa1.1-unknown-linux-gnu ;; |
2176 | - PA8*) echo hppa2.0-unknown-linux-gnu ;; |
2177 | - *) echo hppa-unknown-linux-gnu ;; |
2178 | - esac |
2179 | - exit ;; |
2180 | - ppc64:Linux:*:*) |
2181 | - echo powerpc64-unknown-linux-gnu |
2182 | - exit ;; |
2183 | - ppc:Linux:*:*) |
2184 | - echo powerpc-unknown-linux-gnu |
2185 | - exit ;; |
2186 | - s390:Linux:*:* | s390x:Linux:*:*) |
2187 | - echo ${UNAME_MACHINE}-ibm-linux |
2188 | - exit ;; |
2189 | - sh64*:Linux:*:*) |
2190 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
2191 | - exit ;; |
2192 | - sh*:Linux:*:*) |
2193 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
2194 | - exit ;; |
2195 | - sparc:Linux:*:* | sparc64:Linux:*:*) |
2196 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
2197 | - exit ;; |
2198 | - vax:Linux:*:*) |
2199 | - echo ${UNAME_MACHINE}-dec-linux-gnu |
2200 | - exit ;; |
2201 | - x86_64:Linux:*:*) |
2202 | - echo x86_64-unknown-linux-gnu |
2203 | - exit ;; |
2204 | - xtensa*:Linux:*:*) |
2205 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
2206 | - exit ;; |
2207 | - i*86:DYNIX/ptx:4*:*) |
2208 | - # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. |
2209 | - # earlier versions are messed up and put the nodename in both |
2210 | - # sysname and nodename. |
2211 | - echo i386-sequent-sysv4 |
2212 | - exit ;; |
2213 | - i*86:UNIX_SV:4.2MP:2.*) |
2214 | - # Unixware is an offshoot of SVR4, but it has its own version |
2215 | - # number series starting with 2... |
2216 | - # I am not positive that other SVR4 systems won't match this, |
2217 | - # I just have to hope. -- rms. |
2218 | - # Use sysv4.2uw... so that sysv4* matches it. |
2219 | - echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} |
2220 | - exit ;; |
2221 | - i*86:OS/2:*:*) |
2222 | - # If we were able to find `uname', then EMX Unix compatibility |
2223 | - # is probably installed. |
2224 | - echo ${UNAME_MACHINE}-pc-os2-emx |
2225 | - exit ;; |
2226 | - i*86:XTS-300:*:STOP) |
2227 | - echo ${UNAME_MACHINE}-unknown-stop |
2228 | - exit ;; |
2229 | - i*86:atheos:*:*) |
2230 | - echo ${UNAME_MACHINE}-unknown-atheos |
2231 | - exit ;; |
2232 | - i*86:syllable:*:*) |
2233 | - echo ${UNAME_MACHINE}-pc-syllable |
2234 | - exit ;; |
2235 | - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) |
2236 | - echo i386-unknown-lynxos${UNAME_RELEASE} |
2237 | - exit ;; |
2238 | - i*86:*DOS:*:*) |
2239 | - echo ${UNAME_MACHINE}-pc-msdosdjgpp |
2240 | - exit ;; |
2241 | - i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*) |
2242 | - UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'` |
2243 | - if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then |
2244 | - echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} |
2245 | - else |
2246 | - echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} |
2247 | - fi |
2248 | - exit ;; |
2249 | - i*86:*:5:[678]*) |
2250 | - # UnixWare 7.x, OpenUNIX and OpenServer 6. |
2251 | - case `/bin/uname -X | grep "^Machine"` in |
2252 | - *486*) UNAME_MACHINE=i486 ;; |
2253 | - *Pentium) UNAME_MACHINE=i586 ;; |
2254 | - *Pent*|*Celeron) UNAME_MACHINE=i686 ;; |
2255 | - esac |
2256 | - echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION} |
2257 | - exit ;; |
2258 | - i*86:*:3.2:*) |
2259 | - if test -f /usr/options/cb.name; then |
2260 | - UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name` |
2261 | - echo ${UNAME_MACHINE}-pc-isc$UNAME_REL |
2262 | - elif /bin/uname -X 2>/dev/null >/dev/null ; then |
2263 | - UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` |
2264 | - (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 |
2265 | - (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ |
2266 | - && UNAME_MACHINE=i586 |
2267 | - (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ |
2268 | - && UNAME_MACHINE=i686 |
2269 | - (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ |
2270 | - && UNAME_MACHINE=i686 |
2271 | - echo ${UNAME_MACHINE}-pc-sco$UNAME_REL |
2272 | - else |
2273 | - echo ${UNAME_MACHINE}-pc-sysv32 |
2274 | - fi |
2275 | - exit ;; |
2276 | - pc:*:*:*) |
2277 | - # Left here for compatibility: |
2278 | - # uname -m prints for DJGPP always 'pc', but it prints nothing about |
2279 | - # the processor, so we play safe by assuming i586. |
2280 | - # Note: whatever this is, it MUST be the same as what config.sub |
2281 | - # prints for the "djgpp" host, or else GDB configury will decide that |
2282 | - # this is a cross-build. |
2283 | - echo i586-pc-msdosdjgpp |
2284 | - exit ;; |
2285 | - Intel:Mach:3*:*) |
2286 | - echo i386-pc-mach3 |
2287 | - exit ;; |
2288 | - paragon:*:*:*) |
2289 | - echo i860-intel-osf1 |
2290 | - exit ;; |
2291 | - i860:*:4.*:*) # i860-SVR4 |
2292 | - if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then |
2293 | - echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4 |
2294 | - else # Add other i860-SVR4 vendors below as they are discovered. |
2295 | - echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4 |
2296 | - fi |
2297 | - exit ;; |
2298 | - mini*:CTIX:SYS*5:*) |
2299 | - # "miniframe" |
2300 | - echo m68010-convergent-sysv |
2301 | - exit ;; |
2302 | - mc68k:UNIX:SYSTEM5:3.51m) |
2303 | - echo m68k-convergent-sysv |
2304 | - exit ;; |
2305 | - M680?0:D-NIX:5.3:*) |
2306 | - echo m68k-diab-dnix |
2307 | - exit ;; |
2308 | - M68*:*:R3V[5678]*:*) |
2309 | - test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; |
2310 | - 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) |
2311 | - OS_REL='' |
2312 | - test -r /etc/.relid \ |
2313 | - && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` |
2314 | - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ |
2315 | - && { echo i486-ncr-sysv4.3${OS_REL}; exit; } |
2316 | - /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ |
2317 | - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; |
2318 | - 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) |
2319 | - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ |
2320 | - && { echo i486-ncr-sysv4; exit; } ;; |
2321 | - NCR*:*:4.2:* | MPRAS*:*:4.2:*) |
2322 | - OS_REL='.3' |
2323 | - test -r /etc/.relid \ |
2324 | - && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` |
2325 | - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ |
2326 | - && { echo i486-ncr-sysv4.3${OS_REL}; exit; } |
2327 | - /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ |
2328 | - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } |
2329 | - /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ |
2330 | - && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;; |
2331 | - m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) |
2332 | - echo m68k-unknown-lynxos${UNAME_RELEASE} |
2333 | - exit ;; |
2334 | - mc68030:UNIX_System_V:4.*:*) |
2335 | - echo m68k-atari-sysv4 |
2336 | - exit ;; |
2337 | - TSUNAMI:LynxOS:2.*:*) |
2338 | - echo sparc-unknown-lynxos${UNAME_RELEASE} |
2339 | - exit ;; |
2340 | - rs6000:LynxOS:2.*:*) |
2341 | - echo rs6000-unknown-lynxos${UNAME_RELEASE} |
2342 | - exit ;; |
2343 | - PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) |
2344 | - echo powerpc-unknown-lynxos${UNAME_RELEASE} |
2345 | - exit ;; |
2346 | - SM[BE]S:UNIX_SV:*:*) |
2347 | - echo mips-dde-sysv${UNAME_RELEASE} |
2348 | - exit ;; |
2349 | - RM*:ReliantUNIX-*:*:*) |
2350 | - echo mips-sni-sysv4 |
2351 | - exit ;; |
2352 | - RM*:SINIX-*:*:*) |
2353 | - echo mips-sni-sysv4 |
2354 | - exit ;; |
2355 | - *:SINIX-*:*:*) |
2356 | - if uname -p 2>/dev/null >/dev/null ; then |
2357 | - UNAME_MACHINE=`(uname -p) 2>/dev/null` |
2358 | - echo ${UNAME_MACHINE}-sni-sysv4 |
2359 | - else |
2360 | - echo ns32k-sni-sysv |
2361 | - fi |
2362 | - exit ;; |
2363 | - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort |
2364 | - # says <Richard.M.Bartel@ccMail.Census.GOV> |
2365 | - echo i586-unisys-sysv4 |
2366 | - exit ;; |
2367 | - *:UNIX_System_V:4*:FTX*) |
2368 | - # From Gerald Hewes <hewes@openmarket.com>. |
2369 | - # How about differentiating between stratus architectures? -djm |
2370 | - echo hppa1.1-stratus-sysv4 |
2371 | - exit ;; |
2372 | - *:*:*:FTX*) |
2373 | - # From seanf@swdc.stratus.com. |
2374 | - echo i860-stratus-sysv4 |
2375 | - exit ;; |
2376 | - i*86:VOS:*:*) |
2377 | - # From Paul.Green@stratus.com. |
2378 | - echo ${UNAME_MACHINE}-stratus-vos |
2379 | - exit ;; |
2380 | - *:VOS:*:*) |
2381 | - # From Paul.Green@stratus.com. |
2382 | - echo hppa1.1-stratus-vos |
2383 | - exit ;; |
2384 | - mc68*:A/UX:*:*) |
2385 | - echo m68k-apple-aux${UNAME_RELEASE} |
2386 | - exit ;; |
2387 | - news*:NEWS-OS:6*:*) |
2388 | - echo mips-sony-newsos6 |
2389 | - exit ;; |
2390 | - R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) |
2391 | - if [ -d /usr/nec ]; then |
2392 | - echo mips-nec-sysv${UNAME_RELEASE} |
2393 | - else |
2394 | - echo mips-unknown-sysv${UNAME_RELEASE} |
2395 | - fi |
2396 | - exit ;; |
2397 | - BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. |
2398 | - echo powerpc-be-beos |
2399 | - exit ;; |
2400 | - BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. |
2401 | - echo powerpc-apple-beos |
2402 | - exit ;; |
2403 | - BePC:BeOS:*:*) # BeOS running on Intel PC compatible. |
2404 | - echo i586-pc-beos |
2405 | - exit ;; |
2406 | - BePC:Haiku:*:*) # Haiku running on Intel PC compatible. |
2407 | - echo i586-pc-haiku |
2408 | - exit ;; |
2409 | - SX-4:SUPER-UX:*:*) |
2410 | - echo sx4-nec-superux${UNAME_RELEASE} |
2411 | - exit ;; |
2412 | - SX-5:SUPER-UX:*:*) |
2413 | - echo sx5-nec-superux${UNAME_RELEASE} |
2414 | - exit ;; |
2415 | - SX-6:SUPER-UX:*:*) |
2416 | - echo sx6-nec-superux${UNAME_RELEASE} |
2417 | - exit ;; |
2418 | - SX-7:SUPER-UX:*:*) |
2419 | - echo sx7-nec-superux${UNAME_RELEASE} |
2420 | - exit ;; |
2421 | - SX-8:SUPER-UX:*:*) |
2422 | - echo sx8-nec-superux${UNAME_RELEASE} |
2423 | - exit ;; |
2424 | - SX-8R:SUPER-UX:*:*) |
2425 | - echo sx8r-nec-superux${UNAME_RELEASE} |
2426 | - exit ;; |
2427 | - Power*:Rhapsody:*:*) |
2428 | - echo powerpc-apple-rhapsody${UNAME_RELEASE} |
2429 | - exit ;; |
2430 | - *:Rhapsody:*:*) |
2431 | - echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} |
2432 | - exit ;; |
2433 | - *:Darwin:*:*) |
2434 | - UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown |
2435 | - case $UNAME_PROCESSOR in |
2436 | - i386) |
2437 | - eval $set_cc_for_build |
2438 | - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then |
2439 | - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ |
2440 | - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ |
2441 | - grep IS_64BIT_ARCH >/dev/null |
2442 | - then |
2443 | - UNAME_PROCESSOR="x86_64" |
2444 | - fi |
2445 | - fi ;; |
2446 | - unknown) UNAME_PROCESSOR=powerpc ;; |
2447 | - esac |
2448 | - echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} |
2449 | - exit ;; |
2450 | - *:procnto*:*:* | *:QNX:[0123456789]*:*) |
2451 | - UNAME_PROCESSOR=`uname -p` |
2452 | - if test "$UNAME_PROCESSOR" = "x86"; then |
2453 | - UNAME_PROCESSOR=i386 |
2454 | - UNAME_MACHINE=pc |
2455 | - fi |
2456 | - echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} |
2457 | - exit ;; |
2458 | - *:QNX:*:4*) |
2459 | - echo i386-pc-qnx |
2460 | - exit ;; |
2461 | - NSE-?:NONSTOP_KERNEL:*:*) |
2462 | - echo nse-tandem-nsk${UNAME_RELEASE} |
2463 | - exit ;; |
2464 | - NSR-?:NONSTOP_KERNEL:*:*) |
2465 | - echo nsr-tandem-nsk${UNAME_RELEASE} |
2466 | - exit ;; |
2467 | - *:NonStop-UX:*:*) |
2468 | - echo mips-compaq-nonstopux |
2469 | - exit ;; |
2470 | - BS2000:POSIX*:*:*) |
2471 | - echo bs2000-siemens-sysv |
2472 | - exit ;; |
2473 | - DS/*:UNIX_System_V:*:*) |
2474 | - echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} |
2475 | - exit ;; |
2476 | - *:Plan9:*:*) |
2477 | - # "uname -m" is not consistent, so use $cputype instead. 386 |
2478 | - # is converted to i386 for consistency with other x86 |
2479 | - # operating systems. |
2480 | - if test "$cputype" = "386"; then |
2481 | - UNAME_MACHINE=i386 |
2482 | - else |
2483 | - UNAME_MACHINE="$cputype" |
2484 | - fi |
2485 | - echo ${UNAME_MACHINE}-unknown-plan9 |
2486 | - exit ;; |
2487 | - *:TOPS-10:*:*) |
2488 | - echo pdp10-unknown-tops10 |
2489 | - exit ;; |
2490 | - *:TENEX:*:*) |
2491 | - echo pdp10-unknown-tenex |
2492 | - exit ;; |
2493 | - KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) |
2494 | - echo pdp10-dec-tops20 |
2495 | - exit ;; |
2496 | - XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) |
2497 | - echo pdp10-xkl-tops20 |
2498 | - exit ;; |
2499 | - *:TOPS-20:*:*) |
2500 | - echo pdp10-unknown-tops20 |
2501 | - exit ;; |
2502 | - *:ITS:*:*) |
2503 | - echo pdp10-unknown-its |
2504 | - exit ;; |
2505 | - SEI:*:*:SEIUX) |
2506 | - echo mips-sei-seiux${UNAME_RELEASE} |
2507 | - exit ;; |
2508 | - *:DragonFly:*:*) |
2509 | - echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` |
2510 | - exit ;; |
2511 | - *:*VMS:*:*) |
2512 | - UNAME_MACHINE=`(uname -p) 2>/dev/null` |
2513 | - case "${UNAME_MACHINE}" in |
2514 | - A*) echo alpha-dec-vms ; exit ;; |
2515 | - I*) echo ia64-dec-vms ; exit ;; |
2516 | - V*) echo vax-dec-vms ; exit ;; |
2517 | - esac ;; |
2518 | - *:XENIX:*:SysV) |
2519 | - echo i386-pc-xenix |
2520 | - exit ;; |
2521 | - i*86:skyos:*:*) |
2522 | - echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' |
2523 | - exit ;; |
2524 | - i*86:rdos:*:*) |
2525 | - echo ${UNAME_MACHINE}-pc-rdos |
2526 | - exit ;; |
2527 | - i*86:AROS:*:*) |
2528 | - echo ${UNAME_MACHINE}-pc-aros |
2529 | - exit ;; |
2530 | -esac |
2531 | - |
2532 | -#echo '(No uname command or uname output not recognized.)' 1>&2 |
2533 | -#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 |
2534 | - |
2535 | -eval $set_cc_for_build |
2536 | -cat >$dummy.c <<EOF |
2537 | -#ifdef _SEQUENT_ |
2538 | -# include <sys/types.h> |
2539 | -# include <sys/utsname.h> |
2540 | -#endif |
2541 | -main () |
2542 | -{ |
2543 | -#if defined (sony) |
2544 | -#if defined (MIPSEB) |
2545 | - /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, |
2546 | - I don't know.... */ |
2547 | - printf ("mips-sony-bsd\n"); exit (0); |
2548 | -#else |
2549 | -#include <sys/param.h> |
2550 | - printf ("m68k-sony-newsos%s\n", |
2551 | -#ifdef NEWSOS4 |
2552 | - "4" |
2553 | -#else |
2554 | - "" |
2555 | -#endif |
2556 | - ); exit (0); |
2557 | -#endif |
2558 | -#endif |
2559 | - |
2560 | -#if defined (__arm) && defined (__acorn) && defined (__unix) |
2561 | - printf ("arm-acorn-riscix\n"); exit (0); |
2562 | -#endif |
2563 | - |
2564 | -#if defined (hp300) && !defined (hpux) |
2565 | - printf ("m68k-hp-bsd\n"); exit (0); |
2566 | -#endif |
2567 | - |
2568 | -#if defined (NeXT) |
2569 | -#if !defined (__ARCHITECTURE__) |
2570 | -#define __ARCHITECTURE__ "m68k" |
2571 | -#endif |
2572 | - int version; |
2573 | - version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; |
2574 | - if (version < 4) |
2575 | - printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); |
2576 | - else |
2577 | - printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); |
2578 | - exit (0); |
2579 | -#endif |
2580 | - |
2581 | -#if defined (MULTIMAX) || defined (n16) |
2582 | -#if defined (UMAXV) |
2583 | - printf ("ns32k-encore-sysv\n"); exit (0); |
2584 | -#else |
2585 | -#if defined (CMU) |
2586 | - printf ("ns32k-encore-mach\n"); exit (0); |
2587 | -#else |
2588 | - printf ("ns32k-encore-bsd\n"); exit (0); |
2589 | -#endif |
2590 | -#endif |
2591 | -#endif |
2592 | - |
2593 | -#if defined (__386BSD__) |
2594 | - printf ("i386-pc-bsd\n"); exit (0); |
2595 | -#endif |
2596 | - |
2597 | -#if defined (sequent) |
2598 | -#if defined (i386) |
2599 | - printf ("i386-sequent-dynix\n"); exit (0); |
2600 | -#endif |
2601 | -#if defined (ns32000) |
2602 | - printf ("ns32k-sequent-dynix\n"); exit (0); |
2603 | -#endif |
2604 | -#endif |
2605 | - |
2606 | -#if defined (_SEQUENT_) |
2607 | - struct utsname un; |
2608 | - |
2609 | - uname(&un); |
2610 | - |
2611 | - if (strncmp(un.version, "V2", 2) == 0) { |
2612 | - printf ("i386-sequent-ptx2\n"); exit (0); |
2613 | - } |
2614 | - if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ |
2615 | - printf ("i386-sequent-ptx1\n"); exit (0); |
2616 | - } |
2617 | - printf ("i386-sequent-ptx\n"); exit (0); |
2618 | - |
2619 | -#endif |
2620 | - |
2621 | -#if defined (vax) |
2622 | -# if !defined (ultrix) |
2623 | -# include <sys/param.h> |
2624 | -# if defined (BSD) |
2625 | -# if BSD == 43 |
2626 | - printf ("vax-dec-bsd4.3\n"); exit (0); |
2627 | -# else |
2628 | -# if BSD == 199006 |
2629 | - printf ("vax-dec-bsd4.3reno\n"); exit (0); |
2630 | -# else |
2631 | - printf ("vax-dec-bsd\n"); exit (0); |
2632 | -# endif |
2633 | -# endif |
2634 | -# else |
2635 | - printf ("vax-dec-bsd\n"); exit (0); |
2636 | -# endif |
2637 | -# else |
2638 | - printf ("vax-dec-ultrix\n"); exit (0); |
2639 | -# endif |
2640 | -#endif |
2641 | - |
2642 | -#if defined (alliant) && defined (i860) |
2643 | - printf ("i860-alliant-bsd\n"); exit (0); |
2644 | -#endif |
2645 | - |
2646 | - exit (1); |
2647 | -} |
2648 | -EOF |
2649 | - |
2650 | -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && |
2651 | - { echo "$SYSTEM_NAME"; exit; } |
2652 | - |
2653 | -# Apollos put the system type in the environment. |
2654 | - |
2655 | -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } |
2656 | - |
2657 | -# Convex versions that predate uname can use getsysinfo(1) |
2658 | - |
2659 | -if [ -x /usr/convex/getsysinfo ] |
2660 | -then |
2661 | - case `getsysinfo -f cpu_type` in |
2662 | - c1*) |
2663 | - echo c1-convex-bsd |
2664 | - exit ;; |
2665 | - c2*) |
2666 | - if getsysinfo -f scalar_acc |
2667 | - then echo c32-convex-bsd |
2668 | - else echo c2-convex-bsd |
2669 | - fi |
2670 | - exit ;; |
2671 | - c34*) |
2672 | - echo c34-convex-bsd |
2673 | - exit ;; |
2674 | - c38*) |
2675 | - echo c38-convex-bsd |
2676 | - exit ;; |
2677 | - c4*) |
2678 | - echo c4-convex-bsd |
2679 | - exit ;; |
2680 | - esac |
2681 | -fi |
2682 | - |
2683 | -cat >&2 <<EOF |
2684 | -$0: unable to guess system type |
2685 | - |
2686 | -This script, last modified $timestamp, has failed to recognize |
2687 | -the operating system you are using. It is advised that you |
2688 | -download the most up to date version of the config scripts from |
2689 | - |
2690 | - http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD |
2691 | -and |
2692 | - http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD |
2693 | - |
2694 | -If the version you run ($0) is already up to date, please |
2695 | -send the following data and any information you think might be |
2696 | -pertinent to <config-patches@gnu.org> in order to provide the needed |
2697 | -information to handle your system. |
2698 | - |
2699 | -config.guess timestamp = $timestamp |
2700 | - |
2701 | -uname -m = `(uname -m) 2>/dev/null || echo unknown` |
2702 | -uname -r = `(uname -r) 2>/dev/null || echo unknown` |
2703 | -uname -s = `(uname -s) 2>/dev/null || echo unknown` |
2704 | -uname -v = `(uname -v) 2>/dev/null || echo unknown` |
2705 | - |
2706 | -/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null` |
2707 | -/bin/uname -X = `(/bin/uname -X) 2>/dev/null` |
2708 | - |
2709 | -hostinfo = `(hostinfo) 2>/dev/null` |
2710 | -/bin/universe = `(/bin/universe) 2>/dev/null` |
2711 | -/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null` |
2712 | -/bin/arch = `(/bin/arch) 2>/dev/null` |
2713 | -/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` |
2714 | -/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` |
2715 | - |
2716 | -UNAME_MACHINE = ${UNAME_MACHINE} |
2717 | -UNAME_RELEASE = ${UNAME_RELEASE} |
2718 | -UNAME_SYSTEM = ${UNAME_SYSTEM} |
2719 | -UNAME_VERSION = ${UNAME_VERSION} |
2720 | -EOF |
2721 | - |
2722 | -exit 1 |
2723 | - |
2724 | -# Local variables: |
2725 | -# eval: (add-hook 'write-file-hooks 'time-stamp) |
2726 | -# time-stamp-start: "timestamp='" |
2727 | -# time-stamp-format: "%:y-%02m-%02d" |
2728 | -# time-stamp-end: "'" |
2729 | -# End: |
2730 | |
2731 | === removed file 'config.sub' |
2732 | --- config.sub 2010-06-08 00:42:56 +0000 |
2733 | +++ config.sub 1970-01-01 00:00:00 +0000 |
2734 | @@ -1,1714 +0,0 @@ |
2735 | -#! /bin/sh |
2736 | -# Configuration validation subroutine script. |
2737 | -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, |
2738 | -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 |
2739 | -# Free Software Foundation, Inc. |
2740 | - |
2741 | -timestamp='2010-01-22' |
2742 | - |
2743 | -# This file is (in principle) common to ALL GNU software. |
2744 | -# The presence of a machine in this file suggests that SOME GNU software |
2745 | -# can handle that machine. It does not imply ALL GNU software can. |
2746 | -# |
2747 | -# This file is free software; you can redistribute it and/or modify |
2748 | -# it under the terms of the GNU General Public License as published by |
2749 | -# the Free Software Foundation; either version 2 of the License, or |
2750 | -# (at your option) any later version. |
2751 | -# |
2752 | -# This program is distributed in the hope that it will be useful, |
2753 | -# but WITHOUT ANY WARRANTY; without even the implied warranty of |
2754 | -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
2755 | -# GNU General Public License for more details. |
2756 | -# |
2757 | -# You should have received a copy of the GNU General Public License |
2758 | -# along with this program; if not, write to the Free Software |
2759 | -# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA |
2760 | -# 02110-1301, USA. |
2761 | -# |
2762 | -# As a special exception to the GNU General Public License, if you |
2763 | -# distribute this file as part of a program that contains a |
2764 | -# configuration script generated by Autoconf, you may include it under |
2765 | -# the same distribution terms that you use for the rest of that program. |
2766 | - |
2767 | - |
2768 | -# Please send patches to <config-patches@gnu.org>. Submit a context |
2769 | -# diff and a properly formatted GNU ChangeLog entry. |
2770 | -# |
2771 | -# Configuration subroutine to validate and canonicalize a configuration type. |
2772 | -# Supply the specified configuration type as an argument. |
2773 | -# If it is invalid, we print an error message on stderr and exit with code 1. |
2774 | -# Otherwise, we print the canonical config type on stdout and succeed. |
2775 | - |
2776 | -# You can get the latest version of this script from: |
2777 | -# http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD |
2778 | - |
2779 | -# This file is supposed to be the same for all GNU packages |
2780 | -# and recognize all the CPU types, system types and aliases |
2781 | -# that are meaningful with *any* GNU software. |
2782 | -# Each package is responsible for reporting which valid configurations |
2783 | -# it does not support. The user should be able to distinguish |
2784 | -# a failure to support a valid configuration from a meaningless |
2785 | -# configuration. |
2786 | - |
2787 | -# The goal of this file is to map all the various variations of a given |
2788 | -# machine specification into a single specification in the form: |
2789 | -# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM |
2790 | -# or in some cases, the newer four-part form: |
2791 | -# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM |
2792 | -# It is wrong to echo any other type of specification. |
2793 | - |
2794 | -me=`echo "$0" | sed -e 's,.*/,,'` |
2795 | - |
2796 | -usage="\ |
2797 | -Usage: $0 [OPTION] CPU-MFR-OPSYS |
2798 | - $0 [OPTION] ALIAS |
2799 | - |
2800 | -Canonicalize a configuration name. |
2801 | - |
2802 | -Operation modes: |
2803 | - -h, --help print this help, then exit |
2804 | - -t, --time-stamp print date of last modification, then exit |
2805 | - -v, --version print version number, then exit |
2806 | - |
2807 | -Report bugs and patches to <config-patches@gnu.org>." |
2808 | - |
2809 | -version="\ |
2810 | -GNU config.sub ($timestamp) |
2811 | - |
2812 | -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, |
2813 | -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free |
2814 | -Software Foundation, Inc. |
2815 | - |
2816 | -This is free software; see the source for copying conditions. There is NO |
2817 | -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." |
2818 | - |
2819 | -help=" |
2820 | -Try \`$me --help' for more information." |
2821 | - |
2822 | -# Parse command line |
2823 | -while test $# -gt 0 ; do |
2824 | - case $1 in |
2825 | - --time-stamp | --time* | -t ) |
2826 | - echo "$timestamp" ; exit ;; |
2827 | - --version | -v ) |
2828 | - echo "$version" ; exit ;; |
2829 | - --help | --h* | -h ) |
2830 | - echo "$usage"; exit ;; |
2831 | - -- ) # Stop option processing |
2832 | - shift; break ;; |
2833 | - - ) # Use stdin as input. |
2834 | - break ;; |
2835 | - -* ) |
2836 | - echo "$me: invalid option $1$help" |
2837 | - exit 1 ;; |
2838 | - |
2839 | - *local*) |
2840 | - # First pass through any local machine types. |
2841 | - echo $1 |
2842 | - exit ;; |
2843 | - |
2844 | - * ) |
2845 | - break ;; |
2846 | - esac |
2847 | -done |
2848 | - |
2849 | -case $# in |
2850 | - 0) echo "$me: missing argument$help" >&2 |
2851 | - exit 1;; |
2852 | - 1) ;; |
2853 | - *) echo "$me: too many arguments$help" >&2 |
2854 | - exit 1;; |
2855 | -esac |
2856 | - |
2857 | -# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). |
2858 | -# Here we must recognize all the valid KERNEL-OS combinations. |
2859 | -maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` |
2860 | -case $maybe_os in |
2861 | - nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ |
2862 | - uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ |
2863 | - kopensolaris*-gnu* | \ |
2864 | - storm-chaos* | os2-emx* | rtmk-nova*) |
2865 | - os=-$maybe_os |
2866 | - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` |
2867 | - ;; |
2868 | - *) |
2869 | - basic_machine=`echo $1 | sed 's/-[^-]*$//'` |
2870 | - if [ $basic_machine != $1 ] |
2871 | - then os=`echo $1 | sed 's/.*-/-/'` |
2872 | - else os=; fi |
2873 | - ;; |
2874 | -esac |
2875 | - |
2876 | -### Let's recognize common machines as not being operating systems so |
2877 | -### that things like config.sub decstation-3100 work. We also |
2878 | -### recognize some manufacturers as not being operating systems, so we |
2879 | -### can provide default operating systems below. |
2880 | -case $os in |
2881 | - -sun*os*) |
2882 | - # Prevent following clause from handling this invalid input. |
2883 | - ;; |
2884 | - -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \ |
2885 | - -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \ |
2886 | - -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \ |
2887 | - -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ |
2888 | - -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ |
2889 | - -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ |
2890 | - -apple | -axis | -knuth | -cray | -microblaze) |
2891 | - os= |
2892 | - basic_machine=$1 |
2893 | - ;; |
2894 | - -bluegene*) |
2895 | - os=-cnk |
2896 | - ;; |
2897 | - -sim | -cisco | -oki | -wec | -winbond) |
2898 | - os= |
2899 | - basic_machine=$1 |
2900 | - ;; |
2901 | - -scout) |
2902 | - ;; |
2903 | - -wrs) |
2904 | - os=-vxworks |
2905 | - basic_machine=$1 |
2906 | - ;; |
2907 | - -chorusos*) |
2908 | - os=-chorusos |
2909 | - basic_machine=$1 |
2910 | - ;; |
2911 | - -chorusrdb) |
2912 | - os=-chorusrdb |
2913 | - basic_machine=$1 |
2914 | - ;; |
2915 | - -hiux*) |
2916 | - os=-hiuxwe2 |
2917 | - ;; |
2918 | - -sco6) |
2919 | - os=-sco5v6 |
2920 | - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` |
2921 | - ;; |
2922 | - -sco5) |
2923 | - os=-sco3.2v5 |
2924 | - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` |
2925 | - ;; |
2926 | - -sco4) |
2927 | - os=-sco3.2v4 |
2928 | - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` |
2929 | - ;; |
2930 | - -sco3.2.[4-9]*) |
2931 | - os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` |
2932 | - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` |
2933 | - ;; |
2934 | - -sco3.2v[4-9]*) |
2935 | - # Don't forget version if it is 3.2v4 or newer. |
2936 | - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` |
2937 | - ;; |
2938 | - -sco5v6*) |
2939 | - # Don't forget version if it is 3.2v4 or newer. |
2940 | - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` |
2941 | - ;; |
2942 | - -sco*) |
2943 | - os=-sco3.2v2 |
2944 | - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` |
2945 | - ;; |
2946 | - -udk*) |
2947 | - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` |
2948 | - ;; |
2949 | - -isc) |
2950 | - os=-isc2.2 |
2951 | - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` |
2952 | - ;; |
2953 | - -clix*) |
2954 | - basic_machine=clipper-intergraph |
2955 | - ;; |
2956 | - -isc*) |
2957 | - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` |
2958 | - ;; |
2959 | - -lynx*) |
2960 | - os=-lynxos |
2961 | - ;; |
2962 | - -ptx*) |
2963 | - basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'` |
2964 | - ;; |
2965 | - -windowsnt*) |
2966 | - os=`echo $os | sed -e 's/windowsnt/winnt/'` |
2967 | - ;; |
2968 | - -psos*) |
2969 | - os=-psos |
2970 | - ;; |
2971 | - -mint | -mint[0-9]*) |
2972 | - basic_machine=m68k-atari |
2973 | - os=-mint |
2974 | - ;; |
2975 | -esac |
2976 | - |
2977 | -# Decode aliases for certain CPU-COMPANY combinations. |
2978 | -case $basic_machine in |
2979 | - # Recognize the basic CPU types without company name. |
2980 | - # Some are omitted here because they have special meanings below. |
2981 | - 1750a | 580 \ |
2982 | - | a29k \ |
2983 | - | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ |
2984 | - | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ |
2985 | - | am33_2.0 \ |
2986 | - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ |
2987 | - | bfin \ |
2988 | - | c4x | clipper \ |
2989 | - | d10v | d30v | dlx | dsp16xx \ |
2990 | - | fido | fr30 | frv \ |
2991 | - | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ |
2992 | - | i370 | i860 | i960 | ia64 \ |
2993 | - | ip2k | iq2000 \ |
2994 | - | lm32 \ |
2995 | - | m32c | m32r | m32rle | m68000 | m68k | m88k \ |
2996 | - | maxq | mb | microblaze | mcore | mep | metag \ |
2997 | - | mips | mipsbe | mipseb | mipsel | mipsle \ |
2998 | - | mips16 \ |
2999 | - | mips64 | mips64el \ |
3000 | - | mips64octeon | mips64octeonel \ |
3001 | - | mips64orion | mips64orionel \ |
3002 | - | mips64r5900 | mips64r5900el \ |
3003 | - | mips64vr | mips64vrel \ |
3004 | - | mips64vr4100 | mips64vr4100el \ |
3005 | - | mips64vr4300 | mips64vr4300el \ |
3006 | - | mips64vr5000 | mips64vr5000el \ |
3007 | - | mips64vr5900 | mips64vr5900el \ |
3008 | - | mipsisa32 | mipsisa32el \ |
3009 | - | mipsisa32r2 | mipsisa32r2el \ |
3010 | - | mipsisa64 | mipsisa64el \ |
3011 | - | mipsisa64r2 | mipsisa64r2el \ |
3012 | - | mipsisa64sb1 | mipsisa64sb1el \ |
3013 | - | mipsisa64sr71k | mipsisa64sr71kel \ |
3014 | - | mipstx39 | mipstx39el \ |
3015 | - | mn10200 | mn10300 \ |
3016 | - | moxie \ |
3017 | - | mt \ |
3018 | - | msp430 \ |
3019 | - | nios | nios2 \ |
3020 | - | ns16k | ns32k \ |
3021 | - | or32 \ |
3022 | - | pdp10 | pdp11 | pj | pjl \ |
3023 | - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ |
3024 | - | pyramid \ |
3025 | - | rx \ |
3026 | - | score \ |
3027 | - | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ |
3028 | - | sh64 | sh64le \ |
3029 | - | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ |
3030 | - | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ |
3031 | - | spu | strongarm \ |
3032 | - | tahoe | thumb | tic4x | tic80 | tron \ |
3033 | - | ubicom32 \ |
3034 | - | v850 | v850e \ |
3035 | - | we32k \ |
3036 | - | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ |
3037 | - | z8k | z80) |
3038 | - basic_machine=$basic_machine-unknown |
3039 | - ;; |
3040 | - m6811 | m68hc11 | m6812 | m68hc12 | picochip) |
3041 | - # Motorola 68HC11/12. |
3042 | - basic_machine=$basic_machine-unknown |
3043 | - os=-none |
3044 | - ;; |
3045 | - m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) |
3046 | - ;; |
3047 | - ms1) |
3048 | - basic_machine=mt-unknown |
3049 | - ;; |
3050 | - |
3051 | - # We use `pc' rather than `unknown' |
3052 | - # because (1) that's what they normally are, and |
3053 | - # (2) the word "unknown" tends to confuse beginning users. |
3054 | - i*86 | x86_64) |
3055 | - basic_machine=$basic_machine-pc |
3056 | - ;; |
3057 | - # Object if more than one company name word. |
3058 | - *-*-*) |
3059 | - echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 |
3060 | - exit 1 |
3061 | - ;; |
3062 | - # Recognize the basic CPU types with company name. |
3063 | - 580-* \ |
3064 | - | a29k-* \ |
3065 | - | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ |
3066 | - | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ |
3067 | - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ |
3068 | - | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ |
3069 | - | avr-* | avr32-* \ |
3070 | - | bfin-* | bs2000-* \ |
3071 | - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ |
3072 | - | clipper-* | craynv-* | cydra-* \ |
3073 | - | d10v-* | d30v-* | dlx-* \ |
3074 | - | elxsi-* \ |
3075 | - | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ |
3076 | - | h8300-* | h8500-* \ |
3077 | - | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ |
3078 | - | i*86-* | i860-* | i960-* | ia64-* \ |
3079 | - | ip2k-* | iq2000-* \ |
3080 | - | lm32-* \ |
3081 | - | m32c-* | m32r-* | m32rle-* \ |
3082 | - | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ |
3083 | - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ |
3084 | - | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ |
3085 | - | mips16-* \ |
3086 | - | mips64-* | mips64el-* \ |
3087 | - | mips64octeon-* | mips64octeonel-* \ |
3088 | - | mips64orion-* | mips64orionel-* \ |
3089 | - | mips64r5900-* | mips64r5900el-* \ |
3090 | - | mips64vr-* | mips64vrel-* \ |
3091 | - | mips64vr4100-* | mips64vr4100el-* \ |
3092 | - | mips64vr4300-* | mips64vr4300el-* \ |
3093 | - | mips64vr5000-* | mips64vr5000el-* \ |
3094 | - | mips64vr5900-* | mips64vr5900el-* \ |
3095 | - | mipsisa32-* | mipsisa32el-* \ |
3096 | - | mipsisa32r2-* | mipsisa32r2el-* \ |
3097 | - | mipsisa64-* | mipsisa64el-* \ |
3098 | - | mipsisa64r2-* | mipsisa64r2el-* \ |
3099 | - | mipsisa64sb1-* | mipsisa64sb1el-* \ |
3100 | - | mipsisa64sr71k-* | mipsisa64sr71kel-* \ |
3101 | - | mipstx39-* | mipstx39el-* \ |
3102 | - | mmix-* \ |
3103 | - | mt-* \ |
3104 | - | msp430-* \ |
3105 | - | nios-* | nios2-* \ |
3106 | - | none-* | np1-* | ns16k-* | ns32k-* \ |
3107 | - | orion-* \ |
3108 | - | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ |
3109 | - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ |
3110 | - | pyramid-* \ |
3111 | - | romp-* | rs6000-* | rx-* \ |
3112 | - | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ |
3113 | - | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ |
3114 | - | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ |
3115 | - | sparclite-* \ |
3116 | - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ |
3117 | - | tahoe-* | thumb-* \ |
3118 | - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ |
3119 | - | tile-* | tilegx-* \ |
3120 | - | tron-* \ |
3121 | - | ubicom32-* \ |
3122 | - | v850-* | v850e-* | vax-* \ |
3123 | - | we32k-* \ |
3124 | - | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ |
3125 | - | xstormy16-* | xtensa*-* \ |
3126 | - | ymp-* \ |
3127 | - | z8k-* | z80-*) |
3128 | - ;; |
3129 | - # Recognize the basic CPU types without company name, with glob match. |
3130 | - xtensa*) |
3131 | - basic_machine=$basic_machine-unknown |
3132 | - ;; |
3133 | - # Recognize the various machine names and aliases which stand |
3134 | - # for a CPU type and a company and sometimes even an OS. |
3135 | - 386bsd) |
3136 | - basic_machine=i386-unknown |
3137 | - os=-bsd |
3138 | - ;; |
3139 | - 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) |
3140 | - basic_machine=m68000-att |
3141 | - ;; |
3142 | - 3b*) |
3143 | - basic_machine=we32k-att |
3144 | - ;; |
3145 | - a29khif) |
3146 | - basic_machine=a29k-amd |
3147 | - os=-udi |
3148 | - ;; |
3149 | - abacus) |
3150 | - basic_machine=abacus-unknown |
3151 | - ;; |
3152 | - adobe68k) |
3153 | - basic_machine=m68010-adobe |
3154 | - os=-scout |
3155 | - ;; |
3156 | - alliant | fx80) |
3157 | - basic_machine=fx80-alliant |
3158 | - ;; |
3159 | - altos | altos3068) |
3160 | - basic_machine=m68k-altos |
3161 | - ;; |
3162 | - am29k) |
3163 | - basic_machine=a29k-none |
3164 | - os=-bsd |
3165 | - ;; |
3166 | - amd64) |
3167 | - basic_machine=x86_64-pc |
3168 | - ;; |
3169 | - amd64-*) |
3170 | - basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` |
3171 | - ;; |
3172 | - amdahl) |
3173 | - basic_machine=580-amdahl |
3174 | - os=-sysv |
3175 | - ;; |
3176 | - amiga | amiga-*) |
3177 | - basic_machine=m68k-unknown |
3178 | - ;; |
3179 | - amigaos | amigados) |
3180 | - basic_machine=m68k-unknown |
3181 | - os=-amigaos |
3182 | - ;; |
3183 | - amigaunix | amix) |
3184 | - basic_machine=m68k-unknown |
3185 | - os=-sysv4 |
3186 | - ;; |
3187 | - apollo68) |
3188 | - basic_machine=m68k-apollo |
3189 | - os=-sysv |
3190 | - ;; |
3191 | - apollo68bsd) |
3192 | - basic_machine=m68k-apollo |
3193 | - os=-bsd |
3194 | - ;; |
3195 | - aros) |
3196 | - basic_machine=i386-pc |
3197 | - os=-aros |
3198 | - ;; |
3199 | - aux) |
3200 | - basic_machine=m68k-apple |
3201 | - os=-aux |
3202 | - ;; |
3203 | - balance) |
3204 | - basic_machine=ns32k-sequent |
3205 | - os=-dynix |
3206 | - ;; |
3207 | - blackfin) |
3208 | - basic_machine=bfin-unknown |
3209 | - os=-linux |
3210 | - ;; |
3211 | - blackfin-*) |
3212 | - basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'` |
3213 | - os=-linux |
3214 | - ;; |
3215 | - bluegene*) |
3216 | - basic_machine=powerpc-ibm |
3217 | - os=-cnk |
3218 | - ;; |
3219 | - c90) |
3220 | - basic_machine=c90-cray |
3221 | - os=-unicos |
3222 | - ;; |
3223 | - cegcc) |
3224 | - basic_machine=arm-unknown |
3225 | - os=-cegcc |
3226 | - ;; |
3227 | - convex-c1) |
3228 | - basic_machine=c1-convex |
3229 | - os=-bsd |
3230 | - ;; |
3231 | - convex-c2) |
3232 | - basic_machine=c2-convex |
3233 | - os=-bsd |
3234 | - ;; |
3235 | - convex-c32) |
3236 | - basic_machine=c32-convex |
3237 | - os=-bsd |
3238 | - ;; |
3239 | - convex-c34) |
3240 | - basic_machine=c34-convex |
3241 | - os=-bsd |
3242 | - ;; |
3243 | - convex-c38) |
3244 | - basic_machine=c38-convex |
3245 | - os=-bsd |
3246 | - ;; |
3247 | - cray | j90) |
3248 | - basic_machine=j90-cray |
3249 | - os=-unicos |
3250 | - ;; |
3251 | - craynv) |
3252 | - basic_machine=craynv-cray |
3253 | - os=-unicosmp |
3254 | - ;; |
3255 | - cr16) |
3256 | - basic_machine=cr16-unknown |
3257 | - os=-elf |
3258 | - ;; |
3259 | - crds | unos) |
3260 | - basic_machine=m68k-crds |
3261 | - ;; |
3262 | - crisv32 | crisv32-* | etraxfs*) |
3263 | - basic_machine=crisv32-axis |
3264 | - ;; |
3265 | - cris | cris-* | etrax*) |
3266 | - basic_machine=cris-axis |
3267 | - ;; |
3268 | - crx) |
3269 | - basic_machine=crx-unknown |
3270 | - os=-elf |
3271 | - ;; |
3272 | - da30 | da30-*) |
3273 | - basic_machine=m68k-da30 |
3274 | - ;; |
3275 | - decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) |
3276 | - basic_machine=mips-dec |
3277 | - ;; |
3278 | - decsystem10* | dec10*) |
3279 | - basic_machine=pdp10-dec |
3280 | - os=-tops10 |
3281 | - ;; |
3282 | - decsystem20* | dec20*) |
3283 | - basic_machine=pdp10-dec |
3284 | - os=-tops20 |
3285 | - ;; |
3286 | - delta | 3300 | motorola-3300 | motorola-delta \ |
3287 | - | 3300-motorola | delta-motorola) |
3288 | - basic_machine=m68k-motorola |
3289 | - ;; |
3290 | - delta88) |
3291 | - basic_machine=m88k-motorola |
3292 | - os=-sysv3 |
3293 | - ;; |
3294 | - dicos) |
3295 | - basic_machine=i686-pc |
3296 | - os=-dicos |
3297 | - ;; |
3298 | - djgpp) |
3299 | - basic_machine=i586-pc |
3300 | - os=-msdosdjgpp |
3301 | - ;; |
3302 | - dpx20 | dpx20-*) |
3303 | - basic_machine=rs6000-bull |
3304 | - os=-bosx |
3305 | - ;; |
3306 | - dpx2* | dpx2*-bull) |
3307 | - basic_machine=m68k-bull |
3308 | - os=-sysv3 |
3309 | - ;; |
3310 | - ebmon29k) |
3311 | - basic_machine=a29k-amd |
3312 | - os=-ebmon |
3313 | - ;; |
3314 | - elxsi) |
3315 | - basic_machine=elxsi-elxsi |
3316 | - os=-bsd |
3317 | - ;; |
3318 | - encore | umax | mmax) |
3319 | - basic_machine=ns32k-encore |
3320 | - ;; |
3321 | - es1800 | OSE68k | ose68k | ose | OSE) |
3322 | - basic_machine=m68k-ericsson |
3323 | - os=-ose |
3324 | - ;; |
3325 | - fx2800) |
3326 | - basic_machine=i860-alliant |
3327 | - ;; |
3328 | - genix) |
3329 | - basic_machine=ns32k-ns |
3330 | - ;; |
3331 | - gmicro) |
3332 | - basic_machine=tron-gmicro |
3333 | - os=-sysv |
3334 | - ;; |
3335 | - go32) |
3336 | - basic_machine=i386-pc |
3337 | - os=-go32 |
3338 | - ;; |
3339 | - h3050r* | hiux*) |
3340 | - basic_machine=hppa1.1-hitachi |
3341 | - os=-hiuxwe2 |
3342 | - ;; |
3343 | - h8300hms) |
3344 | - basic_machine=h8300-hitachi |
3345 | - os=-hms |
3346 | - ;; |
3347 | - h8300xray) |
3348 | - basic_machine=h8300-hitachi |
3349 | - os=-xray |
3350 | - ;; |
3351 | - h8500hms) |
3352 | - basic_machine=h8500-hitachi |
3353 | - os=-hms |
3354 | - ;; |
3355 | - harris) |
3356 | - basic_machine=m88k-harris |
3357 | - os=-sysv3 |
3358 | - ;; |
3359 | - hp300-*) |
3360 | - basic_machine=m68k-hp |
3361 | - ;; |
3362 | - hp300bsd) |
3363 | - basic_machine=m68k-hp |
3364 | - os=-bsd |
3365 | - ;; |
3366 | - hp300hpux) |
3367 | - basic_machine=m68k-hp |
3368 | - os=-hpux |
3369 | - ;; |
3370 | - hp3k9[0-9][0-9] | hp9[0-9][0-9]) |
3371 | - basic_machine=hppa1.0-hp |
3372 | - ;; |
3373 | - hp9k2[0-9][0-9] | hp9k31[0-9]) |
3374 | - basic_machine=m68000-hp |
3375 | - ;; |
3376 | - hp9k3[2-9][0-9]) |
3377 | - basic_machine=m68k-hp |
3378 | - ;; |
3379 | - hp9k6[0-9][0-9] | hp6[0-9][0-9]) |
3380 | - basic_machine=hppa1.0-hp |
3381 | - ;; |
3382 | - hp9k7[0-79][0-9] | hp7[0-79][0-9]) |
3383 | - basic_machine=hppa1.1-hp |
3384 | - ;; |
3385 | - hp9k78[0-9] | hp78[0-9]) |
3386 | - # FIXME: really hppa2.0-hp |
3387 | - basic_machine=hppa1.1-hp |
3388 | - ;; |
3389 | - hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) |
3390 | - # FIXME: really hppa2.0-hp |
3391 | - basic_machine=hppa1.1-hp |
3392 | - ;; |
3393 | - hp9k8[0-9][13679] | hp8[0-9][13679]) |
3394 | - basic_machine=hppa1.1-hp |
3395 | - ;; |
3396 | - hp9k8[0-9][0-9] | hp8[0-9][0-9]) |
3397 | - basic_machine=hppa1.0-hp |
3398 | - ;; |
3399 | - hppa-next) |
3400 | - os=-nextstep3 |
3401 | - ;; |
3402 | - hppaosf) |
3403 | - basic_machine=hppa1.1-hp |
3404 | - os=-osf |
3405 | - ;; |
3406 | - hppro) |
3407 | - basic_machine=hppa1.1-hp |
3408 | - os=-proelf |
3409 | - ;; |
3410 | - i370-ibm* | ibm*) |
3411 | - basic_machine=i370-ibm |
3412 | - ;; |
3413 | -# I'm not sure what "Sysv32" means. Should this be sysv3.2? |
3414 | - i*86v32) |
3415 | - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` |
3416 | - os=-sysv32 |
3417 | - ;; |
3418 | - i*86v4*) |
3419 | - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` |
3420 | - os=-sysv4 |
3421 | - ;; |
3422 | - i*86v) |
3423 | - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` |
3424 | - os=-sysv |
3425 | - ;; |
3426 | - i*86sol2) |
3427 | - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` |
3428 | - os=-solaris2 |
3429 | - ;; |
3430 | - i386mach) |
3431 | - basic_machine=i386-mach |
3432 | - os=-mach |
3433 | - ;; |
3434 | - i386-vsta | vsta) |
3435 | - basic_machine=i386-unknown |
3436 | - os=-vsta |
3437 | - ;; |
3438 | - iris | iris4d) |
3439 | - basic_machine=mips-sgi |
3440 | - case $os in |
3441 | - -irix*) |
3442 | - ;; |
3443 | - *) |
3444 | - os=-irix4 |
3445 | - ;; |
3446 | - esac |
3447 | - ;; |
3448 | - isi68 | isi) |
3449 | - basic_machine=m68k-isi |
3450 | - os=-sysv |
3451 | - ;; |
3452 | - m68knommu) |
3453 | - basic_machine=m68k-unknown |
3454 | - os=-linux |
3455 | - ;; |
3456 | - m68knommu-*) |
3457 | - basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'` |
3458 | - os=-linux |
3459 | - ;; |
3460 | - m88k-omron*) |
3461 | - basic_machine=m88k-omron |
3462 | - ;; |
3463 | - magnum | m3230) |
3464 | - basic_machine=mips-mips |
3465 | - os=-sysv |
3466 | - ;; |
3467 | - merlin) |
3468 | - basic_machine=ns32k-utek |
3469 | - os=-sysv |
3470 | - ;; |
3471 | - microblaze) |
3472 | - basic_machine=microblaze-xilinx |
3473 | - ;; |
3474 | - mingw32) |
3475 | - basic_machine=i386-pc |
3476 | - os=-mingw32 |
3477 | - ;; |
3478 | - mingw32ce) |
3479 | - basic_machine=arm-unknown |
3480 | - os=-mingw32ce |
3481 | - ;; |
3482 | - miniframe) |
3483 | - basic_machine=m68000-convergent |
3484 | - ;; |
3485 | - *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) |
3486 | - basic_machine=m68k-atari |
3487 | - os=-mint |
3488 | - ;; |
3489 | - mips3*-*) |
3490 | - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` |
3491 | - ;; |
3492 | - mips3*) |
3493 | - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown |
3494 | - ;; |
3495 | - monitor) |
3496 | - basic_machine=m68k-rom68k |
3497 | - os=-coff |
3498 | - ;; |
3499 | - morphos) |
3500 | - basic_machine=powerpc-unknown |
3501 | - os=-morphos |
3502 | - ;; |
3503 | - msdos) |
3504 | - basic_machine=i386-pc |
3505 | - os=-msdos |
3506 | - ;; |
3507 | - ms1-*) |
3508 | - basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` |
3509 | - ;; |
3510 | - mvs) |
3511 | - basic_machine=i370-ibm |
3512 | - os=-mvs |
3513 | - ;; |
3514 | - ncr3000) |
3515 | - basic_machine=i486-ncr |
3516 | - os=-sysv4 |
3517 | - ;; |
3518 | - netbsd386) |
3519 | - basic_machine=i386-unknown |
3520 | - os=-netbsd |
3521 | - ;; |
3522 | - netwinder) |
3523 | - basic_machine=armv4l-rebel |
3524 | - os=-linux |
3525 | - ;; |
3526 | - news | news700 | news800 | news900) |
3527 | - basic_machine=m68k-sony |
3528 | - os=-newsos |
3529 | - ;; |
3530 | - news1000) |
3531 | - basic_machine=m68030-sony |
3532 | - os=-newsos |
3533 | - ;; |
3534 | - news-3600 | risc-news) |
3535 | - basic_machine=mips-sony |
3536 | - os=-newsos |
3537 | - ;; |
3538 | - necv70) |
3539 | - basic_machine=v70-nec |
3540 | - os=-sysv |
3541 | - ;; |
3542 | - next | m*-next ) |
3543 | - basic_machine=m68k-next |
3544 | - case $os in |
3545 | - -nextstep* ) |
3546 | - ;; |
3547 | - -ns2*) |
3548 | - os=-nextstep2 |
3549 | - ;; |
3550 | - *) |
3551 | - os=-nextstep3 |
3552 | - ;; |
3553 | - esac |
3554 | - ;; |
3555 | - nh3000) |
3556 | - basic_machine=m68k-harris |
3557 | - os=-cxux |
3558 | - ;; |
3559 | - nh[45]000) |
3560 | - basic_machine=m88k-harris |
3561 | - os=-cxux |
3562 | - ;; |
3563 | - nindy960) |
3564 | - basic_machine=i960-intel |
3565 | - os=-nindy |
3566 | - ;; |
3567 | - mon960) |
3568 | - basic_machine=i960-intel |
3569 | - os=-mon960 |
3570 | - ;; |
3571 | - nonstopux) |
3572 | - basic_machine=mips-compaq |
3573 | - os=-nonstopux |
3574 | - ;; |
3575 | - np1) |
3576 | - basic_machine=np1-gould |
3577 | - ;; |
3578 | - nsr-tandem) |
3579 | - basic_machine=nsr-tandem |
3580 | - ;; |
3581 | - op50n-* | op60c-*) |
3582 | - basic_machine=hppa1.1-oki |
3583 | - os=-proelf |
3584 | - ;; |
3585 | - openrisc | openrisc-*) |
3586 | - basic_machine=or32-unknown |
3587 | - ;; |
3588 | - os400) |
3589 | - basic_machine=powerpc-ibm |
3590 | - os=-os400 |
3591 | - ;; |
3592 | - OSE68000 | ose68000) |
3593 | - basic_machine=m68000-ericsson |
3594 | - os=-ose |
3595 | - ;; |
3596 | - os68k) |
3597 | - basic_machine=m68k-none |
3598 | - os=-os68k |
3599 | - ;; |
3600 | - pa-hitachi) |
3601 | - basic_machine=hppa1.1-hitachi |
3602 | - os=-hiuxwe2 |
3603 | - ;; |
3604 | - paragon) |
3605 | - basic_machine=i860-intel |
3606 | - os=-osf |
3607 | - ;; |
3608 | - parisc) |
3609 | - basic_machine=hppa-unknown |
3610 | - os=-linux |
3611 | - ;; |
3612 | - parisc-*) |
3613 | - basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'` |
3614 | - os=-linux |
3615 | - ;; |
3616 | - pbd) |
3617 | - basic_machine=sparc-tti |
3618 | - ;; |
3619 | - pbb) |
3620 | - basic_machine=m68k-tti |
3621 | - ;; |
3622 | - pc532 | pc532-*) |
3623 | - basic_machine=ns32k-pc532 |
3624 | - ;; |
3625 | - pc98) |
3626 | - basic_machine=i386-pc |
3627 | - ;; |
3628 | - pc98-*) |
3629 | - basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` |
3630 | - ;; |
3631 | - pentium | p5 | k5 | k6 | nexgen | viac3) |
3632 | - basic_machine=i586-pc |
3633 | - ;; |
3634 | - pentiumpro | p6 | 6x86 | athlon | athlon_*) |
3635 | - basic_machine=i686-pc |
3636 | - ;; |
3637 | - pentiumii | pentium2 | pentiumiii | pentium3) |
3638 | - basic_machine=i686-pc |
3639 | - ;; |
3640 | - pentium4) |
3641 | - basic_machine=i786-pc |
3642 | - ;; |
3643 | - pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) |
3644 | - basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` |
3645 | - ;; |
3646 | - pentiumpro-* | p6-* | 6x86-* | athlon-*) |
3647 | - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` |
3648 | - ;; |
3649 | - pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) |
3650 | - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` |
3651 | - ;; |
3652 | - pentium4-*) |
3653 | - basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` |
3654 | - ;; |
3655 | - pn) |
3656 | - basic_machine=pn-gould |
3657 | - ;; |
3658 | - power) basic_machine=power-ibm |
3659 | - ;; |
3660 | - ppc) basic_machine=powerpc-unknown |
3661 | - ;; |
3662 | - ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` |
3663 | - ;; |
3664 | - ppcle | powerpclittle | ppc-le | powerpc-little) |
3665 | - basic_machine=powerpcle-unknown |
3666 | - ;; |
3667 | - ppcle-* | powerpclittle-*) |
3668 | - basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` |
3669 | - ;; |
3670 | - ppc64) basic_machine=powerpc64-unknown |
3671 | - ;; |
3672 | - ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` |
3673 | - ;; |
3674 | - ppc64le | powerpc64little | ppc64-le | powerpc64-little) |
3675 | - basic_machine=powerpc64le-unknown |
3676 | - ;; |
3677 | - ppc64le-* | powerpc64little-*) |
3678 | - basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` |
3679 | - ;; |
3680 | - ps2) |
3681 | - basic_machine=i386-ibm |
3682 | - ;; |
3683 | - pw32) |
3684 | - basic_machine=i586-unknown |
3685 | - os=-pw32 |
3686 | - ;; |
3687 | - rdos) |
3688 | - basic_machine=i386-pc |
3689 | - os=-rdos |
3690 | - ;; |
3691 | - rom68k) |
3692 | - basic_machine=m68k-rom68k |
3693 | - os=-coff |
3694 | - ;; |
3695 | - rm[46]00) |
3696 | - basic_machine=mips-siemens |
3697 | - ;; |
3698 | - rtpc | rtpc-*) |
3699 | - basic_machine=romp-ibm |
3700 | - ;; |
3701 | - s390 | s390-*) |
3702 | - basic_machine=s390-ibm |
3703 | - ;; |
3704 | - s390x | s390x-*) |
3705 | - basic_machine=s390x-ibm |
3706 | - ;; |
3707 | - sa29200) |
3708 | - basic_machine=a29k-amd |
3709 | - os=-udi |
3710 | - ;; |
3711 | - sb1) |
3712 | - basic_machine=mipsisa64sb1-unknown |
3713 | - ;; |
3714 | - sb1el) |
3715 | - basic_machine=mipsisa64sb1el-unknown |
3716 | - ;; |
3717 | - sde) |
3718 | - basic_machine=mipsisa32-sde |
3719 | - os=-elf |
3720 | - ;; |
3721 | - sei) |
3722 | - basic_machine=mips-sei |
3723 | - os=-seiux |
3724 | - ;; |
3725 | - sequent) |
3726 | - basic_machine=i386-sequent |
3727 | - ;; |
3728 | - sh) |
3729 | - basic_machine=sh-hitachi |
3730 | - os=-hms |
3731 | - ;; |
3732 | - sh5el) |
3733 | - basic_machine=sh5le-unknown |
3734 | - ;; |
3735 | - sh64) |
3736 | - basic_machine=sh64-unknown |
3737 | - ;; |
3738 | - sparclite-wrs | simso-wrs) |
3739 | - basic_machine=sparclite-wrs |
3740 | - os=-vxworks |
3741 | - ;; |
3742 | - sps7) |
3743 | - basic_machine=m68k-bull |
3744 | - os=-sysv2 |
3745 | - ;; |
3746 | - spur) |
3747 | - basic_machine=spur-unknown |
3748 | - ;; |
3749 | - st2000) |
3750 | - basic_machine=m68k-tandem |
3751 | - ;; |
3752 | - stratus) |
3753 | - basic_machine=i860-stratus |
3754 | - os=-sysv4 |
3755 | - ;; |
3756 | - sun2) |
3757 | - basic_machine=m68000-sun |
3758 | - ;; |
3759 | - sun2os3) |
3760 | - basic_machine=m68000-sun |
3761 | - os=-sunos3 |
3762 | - ;; |
3763 | - sun2os4) |
3764 | - basic_machine=m68000-sun |
3765 | - os=-sunos4 |
3766 | - ;; |
3767 | - sun3os3) |
3768 | - basic_machine=m68k-sun |
3769 | - os=-sunos3 |
3770 | - ;; |
3771 | - sun3os4) |
3772 | - basic_machine=m68k-sun |
3773 | - os=-sunos4 |
3774 | - ;; |
3775 | - sun4os3) |
3776 | - basic_machine=sparc-sun |
3777 | - os=-sunos3 |
3778 | - ;; |
3779 | - sun4os4) |
3780 | - basic_machine=sparc-sun |
3781 | - os=-sunos4 |
3782 | - ;; |
3783 | - sun4sol2) |
3784 | - basic_machine=sparc-sun |
3785 | - os=-solaris2 |
3786 | - ;; |
3787 | - sun3 | sun3-*) |
3788 | - basic_machine=m68k-sun |
3789 | - ;; |
3790 | - sun4) |
3791 | - basic_machine=sparc-sun |
3792 | - ;; |
3793 | - sun386 | sun386i | roadrunner) |
3794 | - basic_machine=i386-sun |
3795 | - ;; |
3796 | - sv1) |
3797 | - basic_machine=sv1-cray |
3798 | - os=-unicos |
3799 | - ;; |
3800 | - symmetry) |
3801 | - basic_machine=i386-sequent |
3802 | - os=-dynix |
3803 | - ;; |
3804 | - t3e) |
3805 | - basic_machine=alphaev5-cray |
3806 | - os=-unicos |
3807 | - ;; |
3808 | - t90) |
3809 | - basic_machine=t90-cray |
3810 | - os=-unicos |
3811 | - ;; |
3812 | - tic54x | c54x*) |
3813 | - basic_machine=tic54x-unknown |
3814 | - os=-coff |
3815 | - ;; |
3816 | - tic55x | c55x*) |
3817 | - basic_machine=tic55x-unknown |
3818 | - os=-coff |
3819 | - ;; |
3820 | - tic6x | c6x*) |
3821 | - basic_machine=tic6x-unknown |
3822 | - os=-coff |
3823 | - ;; |
3824 | - # This must be matched before tile*. |
3825 | - tilegx*) |
3826 | - basic_machine=tilegx-unknown |
3827 | - os=-linux-gnu |
3828 | - ;; |
3829 | - tile*) |
3830 | - basic_machine=tile-unknown |
3831 | - os=-linux-gnu |
3832 | - ;; |
3833 | - tx39) |
3834 | - basic_machine=mipstx39-unknown |
3835 | - ;; |
3836 | - tx39el) |
3837 | - basic_machine=mipstx39el-unknown |
3838 | - ;; |
3839 | - toad1) |
3840 | - basic_machine=pdp10-xkl |
3841 | - os=-tops20 |
3842 | - ;; |
3843 | - tower | tower-32) |
3844 | - basic_machine=m68k-ncr |
3845 | - ;; |
3846 | - tpf) |
3847 | - basic_machine=s390x-ibm |
3848 | - os=-tpf |
3849 | - ;; |
3850 | - udi29k) |
3851 | - basic_machine=a29k-amd |
3852 | - os=-udi |
3853 | - ;; |
3854 | - ultra3) |
3855 | - basic_machine=a29k-nyu |
3856 | - os=-sym1 |
3857 | - ;; |
3858 | - v810 | necv810) |
3859 | - basic_machine=v810-nec |
3860 | - os=-none |
3861 | - ;; |
3862 | - vaxv) |
3863 | - basic_machine=vax-dec |
3864 | - os=-sysv |
3865 | - ;; |
3866 | - vms) |
3867 | - basic_machine=vax-dec |
3868 | - os=-vms |
3869 | - ;; |
3870 | - vpp*|vx|vx-*) |
3871 | - basic_machine=f301-fujitsu |
3872 | - ;; |
3873 | - vxworks960) |
3874 | - basic_machine=i960-wrs |
3875 | - os=-vxworks |
3876 | - ;; |
3877 | - vxworks68) |
3878 | - basic_machine=m68k-wrs |
3879 | - os=-vxworks |
3880 | - ;; |
3881 | - vxworks29k) |
3882 | - basic_machine=a29k-wrs |
3883 | - os=-vxworks |
3884 | - ;; |
3885 | - w65*) |
3886 | - basic_machine=w65-wdc |
3887 | - os=-none |
3888 | - ;; |
3889 | - w89k-*) |
3890 | - basic_machine=hppa1.1-winbond |
3891 | - os=-proelf |
3892 | - ;; |
3893 | - xbox) |
3894 | - basic_machine=i686-pc |
3895 | - os=-mingw32 |
3896 | - ;; |
3897 | - xps | xps100) |
3898 | - basic_machine=xps100-honeywell |
3899 | - ;; |
3900 | - ymp) |
3901 | - basic_machine=ymp-cray |
3902 | - os=-unicos |
3903 | - ;; |
3904 | - z8k-*-coff) |
3905 | - basic_machine=z8k-unknown |
3906 | - os=-sim |
3907 | - ;; |
3908 | - z80-*-coff) |
3909 | - basic_machine=z80-unknown |
3910 | - os=-sim |
3911 | - ;; |
3912 | - none) |
3913 | - basic_machine=none-none |
3914 | - os=-none |
3915 | - ;; |
3916 | - |
3917 | -# Here we handle the default manufacturer of certain CPU types. It is in |
3918 | -# some cases the only manufacturer, in others, it is the most popular. |
3919 | - w89k) |
3920 | - basic_machine=hppa1.1-winbond |
3921 | - ;; |
3922 | - op50n) |
3923 | - basic_machine=hppa1.1-oki |
3924 | - ;; |
3925 | - op60c) |
3926 | - basic_machine=hppa1.1-oki |
3927 | - ;; |
3928 | - romp) |
3929 | - basic_machine=romp-ibm |
3930 | - ;; |
3931 | - mmix) |
3932 | - basic_machine=mmix-knuth |
3933 | - ;; |
3934 | - rs6000) |
3935 | - basic_machine=rs6000-ibm |
3936 | - ;; |
3937 | - vax) |
3938 | - basic_machine=vax-dec |
3939 | - ;; |
3940 | - pdp10) |
3941 | - # there are many clones, so DEC is not a safe bet |
3942 | - basic_machine=pdp10-unknown |
3943 | - ;; |
3944 | - pdp11) |
3945 | - basic_machine=pdp11-dec |
3946 | - ;; |
3947 | - we32k) |
3948 | - basic_machine=we32k-att |
3949 | - ;; |
3950 | - sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) |
3951 | - basic_machine=sh-unknown |
3952 | - ;; |
3953 | - sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) |
3954 | - basic_machine=sparc-sun |
3955 | - ;; |
3956 | - cydra) |
3957 | - basic_machine=cydra-cydrome |
3958 | - ;; |
3959 | - orion) |
3960 | - basic_machine=orion-highlevel |
3961 | - ;; |
3962 | - orion105) |
3963 | - basic_machine=clipper-highlevel |
3964 | - ;; |
3965 | - mac | mpw | mac-mpw) |
3966 | - basic_machine=m68k-apple |
3967 | - ;; |
3968 | - pmac | pmac-mpw) |
3969 | - basic_machine=powerpc-apple |
3970 | - ;; |
3971 | - *-unknown) |
3972 | - # Make sure to match an already-canonicalized machine name. |
3973 | - ;; |
3974 | - *) |
3975 | - echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 |
3976 | - exit 1 |
3977 | - ;; |
3978 | -esac |
3979 | - |
3980 | -# Here we canonicalize certain aliases for manufacturers. |
3981 | -case $basic_machine in |
3982 | - *-digital*) |
3983 | - basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'` |
3984 | - ;; |
3985 | - *-commodore*) |
3986 | - basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'` |
3987 | - ;; |
3988 | - *) |
3989 | - ;; |
3990 | -esac |
3991 | - |
3992 | -# Decode manufacturer-specific aliases for certain operating systems. |
3993 | - |
3994 | -if [ x"$os" != x"" ] |
3995 | -then |
3996 | -case $os in |
3997 | - # First match some system type aliases |
3998 | - # that might get confused with valid system types. |
3999 | - # -solaris* is a basic system type, with this one exception. |
4000 | - -auroraux) |
4001 | - os=-auroraux |
4002 | - ;; |
4003 | - -solaris1 | -solaris1.*) |
4004 | - os=`echo $os | sed -e 's|solaris1|sunos4|'` |
4005 | - ;; |
4006 | - -solaris) |
4007 | - os=-solaris2 |
4008 | - ;; |
4009 | - -svr4*) |
4010 | - os=-sysv4 |
4011 | - ;; |
4012 | - -unixware*) |
4013 | - os=-sysv4.2uw |
4014 | - ;; |
4015 | - -gnu/linux*) |
4016 | - os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` |
4017 | - ;; |
4018 | - # First accept the basic system types. |
4019 | - # The portable systems comes first. |
4020 | - # Each alternative MUST END IN A *, to match a version number. |
4021 | - # -sysv* is not here because it comes later, after sysvr4. |
4022 | - -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ |
4023 | - | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ |
4024 | - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ |
4025 | - | -sym* | -kopensolaris* \ |
4026 | - | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ |
4027 | - | -aos* | -aros* \ |
4028 | - | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ |
4029 | - | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ |
4030 | - | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ |
4031 | - | -openbsd* | -solidbsd* \ |
4032 | - | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ |
4033 | - | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ |
4034 | - | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ |
4035 | - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ |
4036 | - | -chorusos* | -chorusrdb* | -cegcc* \ |
4037 | - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ |
4038 | - | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ |
4039 | - | -uxpv* | -beos* | -mpeix* | -udk* \ |
4040 | - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ |
4041 | - | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ |
4042 | - | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ |
4043 | - | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ |
4044 | - | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ |
4045 | - | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ |
4046 | - | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) |
4047 | - # Remember, each alternative MUST END IN *, to match a version number. |
4048 | - ;; |
4049 | - -qnx*) |
4050 | - case $basic_machine in |
4051 | - x86-* | i*86-*) |
4052 | - ;; |
4053 | - *) |
4054 | - os=-nto$os |
4055 | - ;; |
4056 | - esac |
4057 | - ;; |
4058 | - -nto-qnx*) |
4059 | - ;; |
4060 | - -nto*) |
4061 | - os=`echo $os | sed -e 's|nto|nto-qnx|'` |
4062 | - ;; |
4063 | - -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ |
4064 | - | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \ |
4065 | - | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) |
4066 | - ;; |
4067 | - -mac*) |
4068 | - os=`echo $os | sed -e 's|mac|macos|'` |
4069 | - ;; |
4070 | - -linux-dietlibc) |
4071 | - os=-linux-dietlibc |
4072 | - ;; |
4073 | - -linux*) |
4074 | - os=`echo $os | sed -e 's|linux|linux-gnu|'` |
4075 | - ;; |
4076 | - -sunos5*) |
4077 | - os=`echo $os | sed -e 's|sunos5|solaris2|'` |
4078 | - ;; |
4079 | - -sunos6*) |
4080 | - os=`echo $os | sed -e 's|sunos6|solaris3|'` |
4081 | - ;; |
4082 | - -opened*) |
4083 | - os=-openedition |
4084 | - ;; |
4085 | - -os400*) |
4086 | - os=-os400 |
4087 | - ;; |
4088 | - -wince*) |
4089 | - os=-wince |
4090 | - ;; |
4091 | - -osfrose*) |
4092 | - os=-osfrose |
4093 | - ;; |
4094 | - -osf*) |
4095 | - os=-osf |
4096 | - ;; |
4097 | - -utek*) |
4098 | - os=-bsd |
4099 | - ;; |
4100 | - -dynix*) |
4101 | - os=-bsd |
4102 | - ;; |
4103 | - -acis*) |
4104 | - os=-aos |
4105 | - ;; |
4106 | - -atheos*) |
4107 | - os=-atheos |
4108 | - ;; |
4109 | - -syllable*) |
4110 | - os=-syllable |
4111 | - ;; |
4112 | - -386bsd) |
4113 | - os=-bsd |
4114 | - ;; |
4115 | - -ctix* | -uts*) |
4116 | - os=-sysv |
4117 | - ;; |
4118 | - -nova*) |
4119 | - os=-rtmk-nova |
4120 | - ;; |
4121 | - -ns2 ) |
4122 | - os=-nextstep2 |
4123 | - ;; |
4124 | - -nsk*) |
4125 | - os=-nsk |
4126 | - ;; |
4127 | - # Preserve the version number of sinix5. |
4128 | - -sinix5.*) |
4129 | - os=`echo $os | sed -e 's|sinix|sysv|'` |
4130 | - ;; |
4131 | - -sinix*) |
4132 | - os=-sysv4 |
4133 | - ;; |
4134 | - -tpf*) |
4135 | - os=-tpf |
4136 | - ;; |
4137 | - -triton*) |
4138 | - os=-sysv3 |
4139 | - ;; |
4140 | - -oss*) |
4141 | - os=-sysv3 |
4142 | - ;; |
4143 | - -svr4) |
4144 | - os=-sysv4 |
4145 | - ;; |
4146 | - -svr3) |
4147 | - os=-sysv3 |
4148 | - ;; |
4149 | - -sysvr4) |
4150 | - os=-sysv4 |
4151 | - ;; |
4152 | - # This must come after -sysvr4. |
4153 | - -sysv*) |
4154 | - ;; |
4155 | - -ose*) |
4156 | - os=-ose |
4157 | - ;; |
4158 | - -es1800*) |
4159 | - os=-ose |
4160 | - ;; |
4161 | - -xenix) |
4162 | - os=-xenix |
4163 | - ;; |
4164 | - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) |
4165 | - os=-mint |
4166 | - ;; |
4167 | - -aros*) |
4168 | - os=-aros |
4169 | - ;; |
4170 | - -kaos*) |
4171 | - os=-kaos |
4172 | - ;; |
4173 | - -zvmoe) |
4174 | - os=-zvmoe |
4175 | - ;; |
4176 | - -dicos*) |
4177 | - os=-dicos |
4178 | - ;; |
4179 | - -nacl*) |
4180 | - ;; |
4181 | - -none) |
4182 | - ;; |
4183 | - *) |
4184 | - # Get rid of the `-' at the beginning of $os. |
4185 | - os=`echo $os | sed 's/[^-]*-//'` |
4186 | - echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2 |
4187 | - exit 1 |
4188 | - ;; |
4189 | -esac |
4190 | -else |
4191 | - |
4192 | -# Here we handle the default operating systems that come with various machines. |
4193 | -# The value should be what the vendor currently ships out the door with their |
4194 | -# machine or put another way, the most popular os provided with the machine. |
4195 | - |
4196 | -# Note that if you're going to try to match "-MANUFACTURER" here (say, |
4197 | -# "-sun"), then you have to tell the case statement up towards the top |
4198 | -# that MANUFACTURER isn't an operating system. Otherwise, code above |
4199 | -# will signal an error saying that MANUFACTURER isn't an operating |
4200 | -# system, and we'll never get to this point. |
4201 | - |
4202 | -case $basic_machine in |
4203 | - score-*) |
4204 | - os=-elf |
4205 | - ;; |
4206 | - spu-*) |
4207 | - os=-elf |
4208 | - ;; |
4209 | - *-acorn) |
4210 | - os=-riscix1.2 |
4211 | - ;; |
4212 | - arm*-rebel) |
4213 | - os=-linux |
4214 | - ;; |
4215 | - arm*-semi) |
4216 | - os=-aout |
4217 | - ;; |
4218 | - c4x-* | tic4x-*) |
4219 | - os=-coff |
4220 | - ;; |
4221 | - # This must come before the *-dec entry. |
4222 | - pdp10-*) |
4223 | - os=-tops20 |
4224 | - ;; |
4225 | - pdp11-*) |
4226 | - os=-none |
4227 | - ;; |
4228 | - *-dec | vax-*) |
4229 | - os=-ultrix4.2 |
4230 | - ;; |
4231 | - m68*-apollo) |
4232 | - os=-domain |
4233 | - ;; |
4234 | - i386-sun) |
4235 | - os=-sunos4.0.2 |
4236 | - ;; |
4237 | - m68000-sun) |
4238 | - os=-sunos3 |
4239 | - # This also exists in the configure program, but was not the |
4240 | - # default. |
4241 | - # os=-sunos4 |
4242 | - ;; |
4243 | - m68*-cisco) |
4244 | - os=-aout |
4245 | - ;; |
4246 | - mep-*) |
4247 | - os=-elf |
4248 | - ;; |
4249 | - mips*-cisco) |
4250 | - os=-elf |
4251 | - ;; |
4252 | - mips*-*) |
4253 | - os=-elf |
4254 | - ;; |
4255 | - or32-*) |
4256 | - os=-coff |
4257 | - ;; |
4258 | - *-tti) # must be before sparc entry or we get the wrong os. |
4259 | - os=-sysv3 |
4260 | - ;; |
4261 | - sparc-* | *-sun) |
4262 | - os=-sunos4.1.1 |
4263 | - ;; |
4264 | - *-be) |
4265 | - os=-beos |
4266 | - ;; |
4267 | - *-haiku) |
4268 | - os=-haiku |
4269 | - ;; |
4270 | - *-ibm) |
4271 | - os=-aix |
4272 | - ;; |
4273 | - *-knuth) |
4274 | - os=-mmixware |
4275 | - ;; |
4276 | - *-wec) |
4277 | - os=-proelf |
4278 | - ;; |
4279 | - *-winbond) |
4280 | - os=-proelf |
4281 | - ;; |
4282 | - *-oki) |
4283 | - os=-proelf |
4284 | - ;; |
4285 | - *-hp) |
4286 | - os=-hpux |
4287 | - ;; |
4288 | - *-hitachi) |
4289 | - os=-hiux |
4290 | - ;; |
4291 | - i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) |
4292 | - os=-sysv |
4293 | - ;; |
4294 | - *-cbm) |
4295 | - os=-amigaos |
4296 | - ;; |
4297 | - *-dg) |
4298 | - os=-dgux |
4299 | - ;; |
4300 | - *-dolphin) |
4301 | - os=-sysv3 |
4302 | - ;; |
4303 | - m68k-ccur) |
4304 | - os=-rtu |
4305 | - ;; |
4306 | - m88k-omron*) |
4307 | - os=-luna |
4308 | - ;; |
4309 | - *-next ) |
4310 | - os=-nextstep |
4311 | - ;; |
4312 | - *-sequent) |
4313 | - os=-ptx |
4314 | - ;; |
4315 | - *-crds) |
4316 | - os=-unos |
4317 | - ;; |
4318 | - *-ns) |
4319 | - os=-genix |
4320 | - ;; |
4321 | - i370-*) |
4322 | - os=-mvs |
4323 | - ;; |
4324 | - *-next) |
4325 | - os=-nextstep3 |
4326 | - ;; |
4327 | - *-gould) |
4328 | - os=-sysv |
4329 | - ;; |
4330 | - *-highlevel) |
4331 | - os=-bsd |
4332 | - ;; |
4333 | - *-encore) |
4334 | - os=-bsd |
4335 | - ;; |
4336 | - *-sgi) |
4337 | - os=-irix |
4338 | - ;; |
4339 | - *-siemens) |
4340 | - os=-sysv4 |
4341 | - ;; |
4342 | - *-masscomp) |
4343 | - os=-rtu |
4344 | - ;; |
4345 | - f30[01]-fujitsu | f700-fujitsu) |
4346 | - os=-uxpv |
4347 | - ;; |
4348 | - *-rom68k) |
4349 | - os=-coff |
4350 | - ;; |
4351 | - *-*bug) |
4352 | - os=-coff |
4353 | - ;; |
4354 | - *-apple) |
4355 | - os=-macos |
4356 | - ;; |
4357 | - *-atari*) |
4358 | - os=-mint |
4359 | - ;; |
4360 | - *) |
4361 | - os=-none |
4362 | - ;; |
4363 | -esac |
4364 | -fi |
4365 | - |
4366 | -# Here we handle the case where we know the os, and the CPU type, but not the |
4367 | -# manufacturer. We pick the logical manufacturer. |
4368 | -vendor=unknown |
4369 | -case $basic_machine in |
4370 | - *-unknown) |
4371 | - case $os in |
4372 | - -riscix*) |
4373 | - vendor=acorn |
4374 | - ;; |
4375 | - -sunos*) |
4376 | - vendor=sun |
4377 | - ;; |
4378 | - -cnk*|-aix*) |
4379 | - vendor=ibm |
4380 | - ;; |
4381 | - -beos*) |
4382 | - vendor=be |
4383 | - ;; |
4384 | - -hpux*) |
4385 | - vendor=hp |
4386 | - ;; |
4387 | - -mpeix*) |
4388 | - vendor=hp |
4389 | - ;; |
4390 | - -hiux*) |
4391 | - vendor=hitachi |
4392 | - ;; |
4393 | - -unos*) |
4394 | - vendor=crds |
4395 | - ;; |
4396 | - -dgux*) |
4397 | - vendor=dg |
4398 | - ;; |
4399 | - -luna*) |
4400 | - vendor=omron |
4401 | - ;; |
4402 | - -genix*) |
4403 | - vendor=ns |
4404 | - ;; |
4405 | - -mvs* | -opened*) |
4406 | - vendor=ibm |
4407 | - ;; |
4408 | - -os400*) |
4409 | - vendor=ibm |
4410 | - ;; |
4411 | - -ptx*) |
4412 | - vendor=sequent |
4413 | - ;; |
4414 | - -tpf*) |
4415 | - vendor=ibm |
4416 | - ;; |
4417 | - -vxsim* | -vxworks* | -windiss*) |
4418 | - vendor=wrs |
4419 | - ;; |
4420 | - -aux*) |
4421 | - vendor=apple |
4422 | - ;; |
4423 | - -hms*) |
4424 | - vendor=hitachi |
4425 | - ;; |
4426 | - -mpw* | -macos*) |
4427 | - vendor=apple |
4428 | - ;; |
4429 | - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) |
4430 | - vendor=atari |
4431 | - ;; |
4432 | - -vos*) |
4433 | - vendor=stratus |
4434 | - ;; |
4435 | - esac |
4436 | - basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` |
4437 | - ;; |
4438 | -esac |
4439 | - |
4440 | -echo $basic_machine$os |
4441 | -exit |
4442 | - |
4443 | -# Local variables: |
4444 | -# eval: (add-hook 'write-file-hooks 'time-stamp) |
4445 | -# time-stamp-start: "timestamp='" |
4446 | -# time-stamp-format: "%:y-%02m-%02d" |
4447 | -# time-stamp-end: "'" |
4448 | -# End: |
4449 | |
4450 | === modified file 'configure' |
4451 | --- configure 2010-07-28 18:45:31 +0000 |
4452 | +++ configure 2012-12-17 00:22:20 +0000 |
4453 | @@ -1,11 +1,11 @@ |
4454 | #! /bin/sh |
4455 | # Guess values for system-dependent variables and create Makefiles. |
4456 | -# Generated by GNU Autoconf 2.65 for collectd 4.10.1. |
4457 | +# Generated by GNU Autoconf 2.67 for collectd 5.1.0. |
4458 | # |
4459 | # |
4460 | # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, |
4461 | -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, |
4462 | -# Inc. |
4463 | +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software |
4464 | +# Foundation, Inc. |
4465 | # |
4466 | # |
4467 | # This configure script is free software; the Free Software Foundation |
4468 | @@ -316,7 +316,7 @@ |
4469 | test -d "$as_dir" && break |
4470 | done |
4471 | test -z "$as_dirs" || eval "mkdir $as_dirs" |
4472 | - } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" |
4473 | + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" |
4474 | |
4475 | |
4476 | } # as_fn_mkdir_p |
4477 | @@ -356,19 +356,19 @@ |
4478 | fi # as_fn_arith |
4479 | |
4480 | |
4481 | -# as_fn_error ERROR [LINENO LOG_FD] |
4482 | -# --------------------------------- |
4483 | +# as_fn_error STATUS ERROR [LINENO LOG_FD] |
4484 | +# ---------------------------------------- |
4485 | # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are |
4486 | # provided, also output the error to LOG_FD, referencing LINENO. Then exit the |
4487 | -# script with status $?, using 1 if that was 0. |
4488 | +# script with STATUS, using 1 if that was 0. |
4489 | as_fn_error () |
4490 | { |
4491 | - as_status=$?; test $as_status -eq 0 && as_status=1 |
4492 | - if test "$3"; then |
4493 | - as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
4494 | - $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 |
4495 | + as_status=$1; test $as_status -eq 0 && as_status=1 |
4496 | + if test "$4"; then |
4497 | + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack |
4498 | + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 |
4499 | fi |
4500 | - $as_echo "$as_me: error: $1" >&2 |
4501 | + $as_echo "$as_me: error: $2" >&2 |
4502 | as_fn_exit $as_status |
4503 | } # as_fn_error |
4504 | |
4505 | @@ -683,7 +683,7 @@ |
4506 | exec 6>&1 |
4507 | |
4508 | # Name of the host. |
4509 | -# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, |
4510 | +# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, |
4511 | # so uname gets run too. |
4512 | ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` |
4513 | |
4514 | @@ -702,8 +702,8 @@ |
4515 | # Identity of this package. |
4516 | PACKAGE_NAME='collectd' |
4517 | PACKAGE_TARNAME='collectd' |
4518 | -PACKAGE_VERSION='4.10.1' |
4519 | -PACKAGE_STRING='collectd 4.10.1' |
4520 | +PACKAGE_VERSION='5.1.0' |
4521 | +PACKAGE_STRING='collectd 5.1.0' |
4522 | PACKAGE_BUGREPORT='' |
4523 | PACKAGE_URL='' |
4524 | |
4525 | @@ -769,14 +769,22 @@ |
4526 | BUILD_PLUGIN_ZFS_ARC_TRUE |
4527 | BUILD_PLUGIN_XMMS_FALSE |
4528 | BUILD_PLUGIN_XMMS_TRUE |
4529 | +BUILD_PLUGIN_WRITE_MONGODB_FALSE |
4530 | +BUILD_PLUGIN_WRITE_MONGODB_TRUE |
4531 | +BUILD_PLUGIN_WRITE_REDIS_FALSE |
4532 | +BUILD_PLUGIN_WRITE_REDIS_TRUE |
4533 | BUILD_PLUGIN_WRITE_HTTP_FALSE |
4534 | BUILD_PLUGIN_WRITE_HTTP_TRUE |
4535 | +BUILD_PLUGIN_WRITE_GRAPHITE_FALSE |
4536 | +BUILD_PLUGIN_WRITE_GRAPHITE_TRUE |
4537 | BUILD_PLUGIN_WIRELESS_FALSE |
4538 | BUILD_PLUGIN_WIRELESS_TRUE |
4539 | BUILD_PLUGIN_VSERVER_FALSE |
4540 | BUILD_PLUGIN_VSERVER_TRUE |
4541 | BUILD_PLUGIN_VMEM_FALSE |
4542 | BUILD_PLUGIN_VMEM_TRUE |
4543 | +BUILD_PLUGIN_VARNISH_FALSE |
4544 | +BUILD_PLUGIN_VARNISH_TRUE |
4545 | BUILD_PLUGIN_UUID_FALSE |
4546 | BUILD_PLUGIN_UUID_TRUE |
4547 | BUILD_PLUGIN_USERS_FALSE |
4548 | @@ -787,6 +795,8 @@ |
4549 | BUILD_PLUGIN_UNIXSOCK_TRUE |
4550 | BUILD_PLUGIN_TOKYOTYRANT_FALSE |
4551 | BUILD_PLUGIN_TOKYOTYRANT_TRUE |
4552 | +BUILD_PLUGIN_THRESHOLD_FALSE |
4553 | +BUILD_PLUGIN_THRESHOLD_TRUE |
4554 | BUILD_PLUGIN_THERMAL_FALSE |
4555 | BUILD_PLUGIN_THERMAL_TRUE |
4556 | BUILD_PLUGIN_TED_FALSE |
4557 | @@ -795,6 +805,8 @@ |
4558 | BUILD_PLUGIN_TEAMSPEAK2_TRUE |
4559 | BUILD_PLUGIN_TCPCONNS_FALSE |
4560 | BUILD_PLUGIN_TCPCONNS_TRUE |
4561 | +BUILD_PLUGIN_TARGET_V5UPGRADE_FALSE |
4562 | +BUILD_PLUGIN_TARGET_V5UPGRADE_TRUE |
4563 | BUILD_PLUGIN_TARGET_SET_FALSE |
4564 | BUILD_PLUGIN_TARGET_SET_TRUE |
4565 | BUILD_PLUGIN_TARGET_SCALE_FALSE |
4566 | @@ -825,6 +837,8 @@ |
4567 | BUILD_PLUGIN_RRDCACHED_TRUE |
4568 | BUILD_PLUGIN_ROUTEROS_FALSE |
4569 | BUILD_PLUGIN_ROUTEROS_TRUE |
4570 | +BUILD_PLUGIN_REDIS_FALSE |
4571 | +BUILD_PLUGIN_REDIS_TRUE |
4572 | BUILD_PLUGIN_PYTHON_FALSE |
4573 | BUILD_PLUGIN_PYTHON_TRUE |
4574 | BUILD_PLUGIN_PROTOCOLS_FALSE |
4575 | @@ -851,6 +865,8 @@ |
4576 | BUILD_PLUGIN_OLSRD_TRUE |
4577 | BUILD_PLUGIN_NUT_FALSE |
4578 | BUILD_PLUGIN_NUT_TRUE |
4579 | +BUILD_PLUGIN_NUMA_FALSE |
4580 | +BUILD_PLUGIN_NUMA_TRUE |
4581 | BUILD_PLUGIN_NTPD_FALSE |
4582 | BUILD_PLUGIN_NTPD_TRUE |
4583 | BUILD_PLUGIN_NOTIFY_EMAIL_FALSE |
4584 | @@ -879,6 +895,8 @@ |
4585 | BUILD_PLUGIN_MEMCACHED_TRUE |
4586 | BUILD_PLUGIN_MEMCACHEC_FALSE |
4587 | BUILD_PLUGIN_MEMCACHEC_TRUE |
4588 | +BUILD_PLUGIN_MD_FALSE |
4589 | +BUILD_PLUGIN_MD_TRUE |
4590 | BUILD_PLUGIN_MBMON_FALSE |
4591 | BUILD_PLUGIN_MBMON_TRUE |
4592 | BUILD_PLUGIN_MATCH_VALUE_FALSE |
4593 | @@ -893,6 +911,8 @@ |
4594 | BUILD_PLUGIN_MATCH_EMPTY_COUNTER_TRUE |
4595 | BUILD_PLUGIN_MADWIFI_FALSE |
4596 | BUILD_PLUGIN_MADWIFI_TRUE |
4597 | +BUILD_PLUGIN_LPAR_FALSE |
4598 | +BUILD_PLUGIN_LPAR_TRUE |
4599 | BUILD_PLUGIN_LOGFILE_FALSE |
4600 | BUILD_PLUGIN_LOGFILE_TRUE |
4601 | BUILD_PLUGIN_LOAD_FALSE |
4602 | @@ -921,6 +941,8 @@ |
4603 | BUILD_PLUGIN_FILECOUNT_TRUE |
4604 | BUILD_PLUGIN_EXEC_FALSE |
4605 | BUILD_PLUGIN_EXEC_TRUE |
4606 | +BUILD_PLUGIN_ETHSTAT_FALSE |
4607 | +BUILD_PLUGIN_ETHSTAT_TRUE |
4608 | BUILD_PLUGIN_ENTROPY_FALSE |
4609 | BUILD_PLUGIN_ENTROPY_TRUE |
4610 | BUILD_PLUGIN_EMAIL_FALSE |
4611 | @@ -961,6 +983,8 @@ |
4612 | BUILD_PLUGIN_APCUPS_TRUE |
4613 | BUILD_PLUGIN_APACHE_FALSE |
4614 | BUILD_PLUGIN_APACHE_TRUE |
4615 | +BUILD_PLUGIN_AMQP_FALSE |
4616 | +BUILD_PLUGIN_AMQP_TRUE |
4617 | BUILD_FEATURE_GETIFADDRS_FALSE |
4618 | BUILD_FEATURE_GETIFADDRS_TRUE |
4619 | BUILD_FEATURE_DAEMON_FALSE |
4620 | @@ -975,6 +999,8 @@ |
4621 | BUILD_WITH_LIBVIRT_CFLAGS |
4622 | BUILD_WITH_LIBXML2_LIBS |
4623 | BUILD_WITH_LIBXML2_CFLAGS |
4624 | +BUILD_WITH_LIBVARNISH_LIBS |
4625 | +BUILD_WITH_LIBVARNISH_CFLAGS |
4626 | BUILD_WITH_LIBYAJL_FALSE |
4627 | BUILD_WITH_LIBYAJL_TRUE |
4628 | BUILD_WITH_LIBYAJL_LIBS |
4629 | @@ -1005,6 +1031,11 @@ |
4630 | BUILD_WITH_LIBROUTEROS_TRUE |
4631 | BUILD_WITH_LIBROUTEROS_LDFLAGS |
4632 | BUILD_WITH_LIBROUTEROS_CPPFLAGS |
4633 | +BUILD_WITH_LIBRABBITMQ_FALSE |
4634 | +BUILD_WITH_LIBRABBITMQ_TRUE |
4635 | +BUILD_WITH_LIBRABBITMQ_LIBS |
4636 | +BUILD_WITH_LIBRABBITMQ_LDFLAGS |
4637 | +BUILD_WITH_LIBRABBITMQ_CPPFLAGS |
4638 | BUILD_WITH_PYTHON_LIBS |
4639 | BUILD_WITH_PYTHON_LDFLAGS |
4640 | BUILD_WITH_PYTHON_CPPFLAGS |
4641 | @@ -1050,6 +1081,10 @@ |
4642 | BUILD_WITH_LIBMYSQL_TRUE |
4643 | BUILD_WITH_LIBMYSQL_LIBS |
4644 | BUILD_WITH_LIBMYSQL_CFLAGS |
4645 | +BUILD_WITH_LIBMONGOC_FALSE |
4646 | +BUILD_WITH_LIBMONGOC_TRUE |
4647 | +BUILD_WITH_LIBMONGOC_LDFLAGS |
4648 | +BUILD_WITH_LIBMONGOC_CPPFLAGS |
4649 | BUILD_WITH_LIBMODBUS_LIBS |
4650 | BUILD_WITH_LIBMODBUS_CFLAGS |
4651 | BUILD_WITH_LIBMEMCACHED_FALSE |
4652 | @@ -1067,10 +1102,10 @@ |
4653 | JAVAC |
4654 | BUILD_WITH_LIBIPTC_LDFLAGS |
4655 | BUILD_WITH_LIBIPTC_CPPFLAGS |
4656 | +BUILD_WITH_LIBIPTC_FALSE |
4657 | +BUILD_WITH_LIBIPTC_TRUE |
4658 | BUILD_WITH_OWN_LIBIPTC_FALSE |
4659 | BUILD_WITH_OWN_LIBIPTC_TRUE |
4660 | -BUILD_WITH_LIBIPTC_FALSE |
4661 | -BUILD_WITH_LIBIPTC_TRUE |
4662 | BUILD_WITH_LIBGCRYPT_FALSE |
4663 | BUILD_WITH_LIBGCRYPT_TRUE |
4664 | GCRYPT_LIBS |
4665 | @@ -1095,6 +1130,10 @@ |
4666 | BUILD_WITH_LIBCURL_TRUE |
4667 | BUILD_WITH_LIBCURL_LIBS |
4668 | BUILD_WITH_LIBCURL_CFLAGS |
4669 | +BUILD_WITH_LIBCREDIS_FALSE |
4670 | +BUILD_WITH_LIBCREDIS_TRUE |
4671 | +BUILD_WITH_LIBCREDIS_LDFLAGS |
4672 | +BUILD_WITH_LIBCREDIS_CPPFLAGS |
4673 | BUILD_WITH_LIBKVM_OPENFILES_FALSE |
4674 | BUILD_WITH_LIBKVM_OPENFILES_TRUE |
4675 | BUILD_WITH_LIBKVM_NLIST_FALSE |
4676 | @@ -1123,6 +1162,8 @@ |
4677 | BUILD_WITH_LIBRT_TRUE |
4678 | BUILD_WITH_LIBSOCKET_FALSE |
4679 | BUILD_WITH_LIBSOCKET_TRUE |
4680 | +IP_VS_H_NEEDS_KERNEL_CFLAGS_FALSE |
4681 | +IP_VS_H_NEEDS_KERNEL_CFLAGS_TRUE |
4682 | BUILD_FEATURE_STANDARDS_FALSE |
4683 | BUILD_FEATURE_STANDARDS_TRUE |
4684 | pkgconfigdir |
4685 | @@ -1283,6 +1324,7 @@ |
4686 | enable_standards |
4687 | with_nan_emulation |
4688 | with_fp_layout |
4689 | +with_libcredis |
4690 | with_libcurl |
4691 | with_libdbi |
4692 | with_libesmtp |
4693 | @@ -1293,6 +1335,7 @@ |
4694 | with_java |
4695 | with_libmemcached |
4696 | with_libmodbus |
4697 | +with_libmongoc |
4698 | with_libmysql |
4699 | with_libnetlink |
4700 | with_libnetapp |
4701 | @@ -1306,6 +1349,7 @@ |
4702 | with_libpq |
4703 | with_libpthread |
4704 | with_python |
4705 | +with_librabbitmq |
4706 | with_librouteros |
4707 | with_librrd |
4708 | with_libsensors |
4709 | @@ -1314,10 +1358,12 @@ |
4710 | with_libupsclient |
4711 | with_libxmms |
4712 | with_libyajl |
4713 | +with_libvarnish |
4714 | enable_debug |
4715 | enable_daemon |
4716 | enable_getifaddrs |
4717 | enable_all_plugins |
4718 | +enable_amqp |
4719 | enable_apache |
4720 | enable_apcups |
4721 | enable_apple_sensors |
4722 | @@ -1338,6 +1384,7 @@ |
4723 | enable_dns |
4724 | enable_email |
4725 | enable_entropy |
4726 | +enable_ethstat |
4727 | enable_exec |
4728 | enable_filecount |
4729 | enable_fscache |
4730 | @@ -1352,6 +1399,7 @@ |
4731 | enable_libvirt |
4732 | enable_load |
4733 | enable_logfile |
4734 | +enable_lpar |
4735 | enable_madwifi |
4736 | enable_match_empty_counter |
4737 | enable_match_hashed |
4738 | @@ -1359,6 +1407,7 @@ |
4739 | enable_match_timediff |
4740 | enable_match_value |
4741 | enable_mbmon |
4742 | +enable_md |
4743 | enable_memcachec |
4744 | enable_memcached |
4745 | enable_memory |
4746 | @@ -1373,6 +1422,7 @@ |
4747 | enable_notify_desktop |
4748 | enable_notify_email |
4749 | enable_ntpd |
4750 | +enable_numa |
4751 | enable_nut |
4752 | enable_olsrd |
4753 | enable_onewire |
4754 | @@ -1386,6 +1436,7 @@ |
4755 | enable_processes |
4756 | enable_protocols |
4757 | enable_python |
4758 | +enable_redis |
4759 | enable_routeros |
4760 | enable_rrdcached |
4761 | enable_rrdtool |
4762 | @@ -1401,19 +1452,25 @@ |
4763 | enable_target_replace |
4764 | enable_target_scale |
4765 | enable_target_set |
4766 | +enable_target_v5upgrade |
4767 | enable_tcpconns |
4768 | enable_teamspeak2 |
4769 | enable_ted |
4770 | enable_thermal |
4771 | +enable_threshold |
4772 | enable_tokyotyrant |
4773 | enable_unixsock |
4774 | enable_uptime |
4775 | enable_users |
4776 | enable_uuid |
4777 | +enable_varnish |
4778 | enable_vmem |
4779 | enable_vserver |
4780 | enable_wireless |
4781 | +enable_write_graphite |
4782 | enable_write_http |
4783 | +enable_write_redis |
4784 | +enable_write_mongodb |
4785 | enable_xmms |
4786 | enable_zfs_arc |
4787 | with_perl_bindings |
4788 | @@ -1500,8 +1557,9 @@ |
4789 | fi |
4790 | |
4791 | case $ac_option in |
4792 | - *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; |
4793 | - *) ac_optarg=yes ;; |
4794 | + *=?*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; |
4795 | + *=) ac_optarg= ;; |
4796 | + *) ac_optarg=yes ;; |
4797 | esac |
4798 | |
4799 | # Accept the important Cygnus configure options, so we can diagnose typos. |
4800 | @@ -1546,7 +1604,7 @@ |
4801 | ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` |
4802 | # Reject names that are not valid shell variable names. |
4803 | expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && |
4804 | - as_fn_error "invalid feature name: $ac_useropt" |
4805 | + as_fn_error $? "invalid feature name: $ac_useropt" |
4806 | ac_useropt_orig=$ac_useropt |
4807 | ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` |
4808 | case $ac_user_opts in |
4809 | @@ -1572,7 +1630,7 @@ |
4810 | ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` |
4811 | # Reject names that are not valid shell variable names. |
4812 | expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && |
4813 | - as_fn_error "invalid feature name: $ac_useropt" |
4814 | + as_fn_error $? "invalid feature name: $ac_useropt" |
4815 | ac_useropt_orig=$ac_useropt |
4816 | ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` |
4817 | case $ac_user_opts in |
4818 | @@ -1776,7 +1834,7 @@ |
4819 | ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` |
4820 | # Reject names that are not valid shell variable names. |
4821 | expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && |
4822 | - as_fn_error "invalid package name: $ac_useropt" |
4823 | + as_fn_error $? "invalid package name: $ac_useropt" |
4824 | ac_useropt_orig=$ac_useropt |
4825 | ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` |
4826 | case $ac_user_opts in |
4827 | @@ -1792,7 +1850,7 @@ |
4828 | ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` |
4829 | # Reject names that are not valid shell variable names. |
4830 | expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && |
4831 | - as_fn_error "invalid package name: $ac_useropt" |
4832 | + as_fn_error $? "invalid package name: $ac_useropt" |
4833 | ac_useropt_orig=$ac_useropt |
4834 | ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` |
4835 | case $ac_user_opts in |
4836 | @@ -1822,8 +1880,8 @@ |
4837 | | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) |
4838 | x_libraries=$ac_optarg ;; |
4839 | |
4840 | - -*) as_fn_error "unrecognized option: \`$ac_option' |
4841 | -Try \`$0 --help' for more information." |
4842 | + -*) as_fn_error $? "unrecognized option: \`$ac_option' |
4843 | +Try \`$0 --help' for more information" |
4844 | ;; |
4845 | |
4846 | *=*) |
4847 | @@ -1831,7 +1889,7 @@ |
4848 | # Reject names that are not valid shell variable names. |
4849 | case $ac_envvar in #( |
4850 | '' | [0-9]* | *[!_$as_cr_alnum]* ) |
4851 | - as_fn_error "invalid variable name: \`$ac_envvar'" ;; |
4852 | + as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; |
4853 | esac |
4854 | eval $ac_envvar=\$ac_optarg |
4855 | export $ac_envvar ;; |
4856 | @@ -1849,13 +1907,13 @@ |
4857 | |
4858 | if test -n "$ac_prev"; then |
4859 | ac_option=--`echo $ac_prev | sed 's/_/-/g'` |
4860 | - as_fn_error "missing argument to $ac_option" |
4861 | + as_fn_error $? "missing argument to $ac_option" |
4862 | fi |
4863 | |
4864 | if test -n "$ac_unrecognized_opts"; then |
4865 | case $enable_option_checking in |
4866 | no) ;; |
4867 | - fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; |
4868 | + fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; |
4869 | *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; |
4870 | esac |
4871 | fi |
4872 | @@ -1878,7 +1936,7 @@ |
4873 | [\\/$]* | ?:[\\/]* ) continue;; |
4874 | NONE | '' ) case $ac_var in *prefix ) continue;; esac;; |
4875 | esac |
4876 | - as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" |
4877 | + as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" |
4878 | done |
4879 | |
4880 | # There might be people who depend on the old broken behavior: `$host' |
4881 | @@ -1892,8 +1950,8 @@ |
4882 | if test "x$host_alias" != x; then |
4883 | if test "x$build_alias" = x; then |
4884 | cross_compiling=maybe |
4885 | - $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. |
4886 | - If a cross compiler is detected then cross compile mode will be used." >&2 |
4887 | + $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. |
4888 | + If a cross compiler is detected then cross compile mode will be used" >&2 |
4889 | elif test "x$build_alias" != "x$host_alias"; then |
4890 | cross_compiling=yes |
4891 | fi |
4892 | @@ -1908,9 +1966,9 @@ |
4893 | ac_pwd=`pwd` && test -n "$ac_pwd" && |
4894 | ac_ls_di=`ls -di .` && |
4895 | ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || |
4896 | - as_fn_error "working directory cannot be determined" |
4897 | + as_fn_error $? "working directory cannot be determined" |
4898 | test "X$ac_ls_di" = "X$ac_pwd_ls_di" || |
4899 | - as_fn_error "pwd does not report name of working directory" |
4900 | + as_fn_error $? "pwd does not report name of working directory" |
4901 | |
4902 | |
4903 | # Find the source files, if location was not specified. |
4904 | @@ -1949,11 +2007,11 @@ |
4905 | fi |
4906 | if test ! -r "$srcdir/$ac_unique_file"; then |
4907 | test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." |
4908 | - as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" |
4909 | + as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" |
4910 | fi |
4911 | ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" |
4912 | ac_abs_confdir=`( |
4913 | - cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" |
4914 | + cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" |
4915 | pwd)` |
4916 | # When building in place, set srcdir=. |
4917 | if test "$ac_abs_confdir" = "$ac_pwd"; then |
4918 | @@ -1979,7 +2037,7 @@ |
4919 | # Omit some internal or obsolete options to make the list less imposing. |
4920 | # This message is too long to be a string in the A/UX 3.1 sh. |
4921 | cat <<_ACEOF |
4922 | -\`configure' configures collectd 4.10.1 to adapt to many kinds of systems. |
4923 | +\`configure' configures collectd 5.1.0 to adapt to many kinds of systems. |
4924 | |
4925 | Usage: $0 [OPTION]... [VAR=VALUE]... |
4926 | |
4927 | @@ -1993,7 +2051,7 @@ |
4928 | --help=short display options specific to this package |
4929 | --help=recursive display the short help of all the included packages |
4930 | -V, --version display version information and exit |
4931 | - -q, --quiet, --silent do not print \`checking...' messages |
4932 | + -q, --quiet, --silent do not print \`checking ...' messages |
4933 | --cache-file=FILE cache test results in FILE [disabled] |
4934 | -C, --config-cache alias for \`--cache-file=config.cache' |
4935 | -n, --no-create do not create output files |
4936 | @@ -2049,7 +2107,7 @@ |
4937 | |
4938 | if test -n "$ac_init_help"; then |
4939 | case $ac_init_help in |
4940 | - short | recursive ) echo "Configuration of collectd 4.10.1:";; |
4941 | + short | recursive ) echo "Configuration of collectd 5.1.0:";; |
4942 | esac |
4943 | cat <<\_ACEOF |
4944 | |
4945 | @@ -2076,6 +2134,7 @@ |
4946 | collectd plugins: |
4947 | --enable-all-plugins enable all plugins (auto by def) |
4948 | |
4949 | + --enable-amqp AMQP output plugin |
4950 | --enable-apache Apache httpd statistics |
4951 | --enable-apcups Statistics of UPSes by APC |
4952 | --enable-apple_sensors Apple's hardware sensors |
4953 | @@ -2096,6 +2155,7 @@ |
4954 | --enable-dns DNS traffic analysis |
4955 | --enable-email EMail statistics |
4956 | --enable-entropy Entropy statistics |
4957 | + --enable-ethstat Stats from NIC driver |
4958 | --enable-exec Execution of external programs |
4959 | --enable-filecount Count files in directories |
4960 | --enable-fscache fscache statistics |
4961 | @@ -2110,6 +2170,7 @@ |
4962 | --enable-libvirt Virtual machine statistics |
4963 | --enable-load System load |
4964 | --enable-logfile File logging plugin |
4965 | + --enable-lpar AIX logical partitions statistics |
4966 | --enable-madwifi Madwifi wireless statistics |
4967 | --enable-match_empty_counter |
4968 | The empty counter match |
4969 | @@ -2118,6 +2179,7 @@ |
4970 | --enable-match_timediff The timediff match |
4971 | --enable-match_value The value match |
4972 | --enable-mbmon Query mbmond |
4973 | + --enable-md md (Linux software RAID) devices |
4974 | --enable-memcachec memcachec statistics |
4975 | --enable-memcached memcached statistics |
4976 | --enable-memory Memory usage |
4977 | @@ -2132,6 +2194,7 @@ |
4978 | --enable-notify_desktop Desktop notifications |
4979 | --enable-notify_email Email notifier |
4980 | --enable-ntpd NTPd statistics |
4981 | + --enable-numa NUMA virtual memory statistics |
4982 | --enable-nut Network UPS tools statistics |
4983 | --enable-olsrd olsrd statistics |
4984 | --enable-onewire OneWire sensor statistics |
4985 | @@ -2145,6 +2208,7 @@ |
4986 | --enable-processes Process statistics |
4987 | --enable-protocols Protocol (IP, TCP, ...) statistics |
4988 | --enable-python Embed a Python interpreter |
4989 | + --enable-redis Redis plugin |
4990 | --enable-routeros RouterOS plugin |
4991 | --enable-rrdcached RRDTool output plugin |
4992 | --enable-rrdtool RRDTool output plugin |
4993 | @@ -2161,19 +2225,26 @@ |
4994 | --enable-target_replace The replace target |
4995 | --enable-target_scale The scale target |
4996 | --enable-target_set The set target |
4997 | + --enable-target_v5upgrade |
4998 | + The v5upgrade target |
4999 | --enable-tcpconns TCP connection statistics |
5000 | --enable-teamspeak2 TeamSpeak2 server statistics |
The diff has been truncated for viewing.
Thanks for your merge. Unfortunately, collectd FTBFS on raring due to configure exiting with error. Also, your debian/changelog does not follow changelog conventions for Ubuntu. Please update these items and feel free to resubmit. Thanks again.