Merge lp:~noskcaj/ubuntu/utopic/libvirt-glib/merge into lp:ubuntu/utopic/libvirt-glib
- Utopic (14.10)
- merge
- Merge into utopic
Proposed by
Jackson Doak
Status: | Merged |
---|---|
Merge reported by: | Tim Lunn |
Merged at revision: | not available |
Proposed branch: | lp:~noskcaj/ubuntu/utopic/libvirt-glib/merge |
Merge into: | lp:ubuntu/utopic/libvirt-glib |
Diff against target: |
25223 lines (+11140/-5840) 164 files modified
AUTHORS (+12/-7) AUTHORS.in (+15/-0) ChangeLog (+175/-0) INSTALL (+1/-1) Makefile.am (+12/-3) Makefile.in (+170/-123) NEWS (+18/-2) aclocal.m4 (+180/-150) build-aux/compile (+7/-2) build-aux/config.guess (+36/-22) build-aux/config.sub (+51/-45) build-aux/depcomp (+268/-185) build-aux/missing (+150/-265) cfg.mk (+0/-15) config.h.in (+3/-0) configure (+1091/-376) configure.ac (+48/-5) debian/changelog (+38/-0) debian/control (+9/-2) debian/libvirt-glib-1.0-0.symbols (+2/-1) debian/libvirt-glib-1.0-dev.install (+0/-1) docs/Makefile.in (+130/-91) docs/libvirt-gconfig/Libvirt-gconfig-sections.txt (+263/-141) docs/libvirt-gconfig/Libvirt-gconfig.types (+3/-0) docs/libvirt-gconfig/Makefile.in (+85/-38) docs/libvirt-gconfig/html/GVirConfigCapabilities.html (+31/-31) docs/libvirt-gconfig/html/GVirConfigDomain.html (+487/-367) docs/libvirt-gconfig/html/GVirConfigDomainSnapshot.html (+293/-5) docs/libvirt-gconfig/html/GVirConfigInterface.html (+0/-95) docs/libvirt-gconfig/html/GVirConfigNetwork.html (+3/-3) docs/libvirt-gconfig/html/GVirConfigNetworkFilter.html (+5/-5) docs/libvirt-gconfig/html/GVirConfigNodeDevice.html (+3/-3) docs/libvirt-gconfig/html/GVirConfigObject.html (+17/-16) docs/libvirt-gconfig/html/GVirConfigSecret.html (+3/-3) docs/libvirt-gconfig/html/GVirConfigStoragePool.html (+266/-3) docs/libvirt-gconfig/html/GVirConfigStorageVol.html (+3/-3) docs/libvirt-gconfig/html/Libvirt-gconfig-GVirConfig.html (+95/-0) docs/libvirt-gconfig/html/Libvirt-gconfig.devhelp2 (+104/-35) docs/libvirt-gconfig/html/annotation-glossary.html (+25/-27) docs/libvirt-gconfig/html/api-index-full.html (+373/-42) docs/libvirt-gconfig/html/ch01.html (+6/-6) docs/libvirt-gconfig/html/index.html (+5/-5) docs/libvirt-gconfig/html/index.sgml (+111/-41) docs/libvirt-gconfig/html/object-tree.html (+7/-4) docs/libvirt-glib/Libvirt-glib-sections.txt (+1/-6) docs/libvirt-glib/Makefile.in (+85/-38) docs/libvirt-glib/html/Libvirt-glib-Error-reporting.html (+12/-12) docs/libvirt-glib/html/Libvirt-glib-Event-loop.html (+5/-5) docs/libvirt-glib/html/Libvirt-glib-Library-initialization.html (+4/-4) docs/libvirt-glib/html/Libvirt-glib.devhelp2 (+1/-1) docs/libvirt-glib/html/annotation-glossary.html (+13/-18) docs/libvirt-glib/html/api-index-full.html (+3/-3) docs/libvirt-glib/html/ch01.html (+5/-5) docs/libvirt-glib/html/index.html (+4/-4) docs/libvirt-glib/html/index.sgml (+1/-1) docs/libvirt-glib/html/object-tree.html (+3/-3) docs/libvirt-gobject/Libvirt-gobject-sections.txt (+110/-120) docs/libvirt-gobject/Makefile.in (+85/-38) docs/libvirt-gobject/html/GVirConnection.html (+806/-806) docs/libvirt-gobject/html/GVirDomain.html (+845/-777) docs/libvirt-gobject/html/GVirDomainSnapshot.html (+11/-11) docs/libvirt-gobject/html/GVirInterface.html (+0/-136) docs/libvirt-gobject/html/GVirManager.html (+38/-38) docs/libvirt-gobject/html/GVirNetwork.html (+15/-15) docs/libvirt-gobject/html/GVirNetworkFilter.html (+15/-15) docs/libvirt-gobject/html/GVirNodeDevice.html (+9/-9) docs/libvirt-gobject/html/GVirSecret.html (+15/-15) docs/libvirt-gobject/html/GVirStoragePool.html (+446/-418) docs/libvirt-gobject/html/GVirStorageVol.html (+101/-81) docs/libvirt-gobject/html/GVirStream.html (+174/-150) docs/libvirt-gobject/html/Libvirt-gobject-GVir.html (+136/-0) docs/libvirt-gobject/html/Libvirt-gobject.devhelp2 (+136/-111) docs/libvirt-gobject/html/annotation-glossary.html (+25/-36) docs/libvirt-gobject/html/api-index-full.html (+24/-24) docs/libvirt-gobject/html/ch01.html (+6/-6) docs/libvirt-gobject/html/index.html (+5/-5) docs/libvirt-gobject/html/index.sgml (+143/-117) docs/libvirt-gobject/html/object-tree.html (+4/-4) examples/Makefile.in (+116/-62) examples/config-demo.py (+2/-1) libvirt-gconfig/Makefile.am (+8/-0) libvirt-gconfig/Makefile.in (+168/-91) libvirt-gconfig/libvirt-gconfig-compat.h (+20/-0) libvirt-gconfig/libvirt-gconfig-domain-channel.c (+18/-0) libvirt-gconfig/libvirt-gconfig-domain-channel.h (+3/-0) libvirt-gconfig/libvirt-gconfig-domain-chardev-source-private.h (+40/-0) libvirt-gconfig/libvirt-gconfig-domain-chardev-source-pty.c (+25/-2) libvirt-gconfig/libvirt-gconfig-domain-chardev-source-pty.h (+4/-2) libvirt-gconfig/libvirt-gconfig-domain-chardev-source.c (+21/-0) libvirt-gconfig/libvirt-gconfig-domain-chardev.c (+23/-0) libvirt-gconfig/libvirt-gconfig-domain-chardev.h (+3/-0) libvirt-gconfig/libvirt-gconfig-domain-device.c (+9/-0) libvirt-gconfig/libvirt-gconfig-domain-device.h (+2/-0) libvirt-gconfig/libvirt-gconfig-domain-disk.c (+38/-0) libvirt-gconfig/libvirt-gconfig-domain-disk.h (+25/-0) libvirt-gconfig/libvirt-gconfig-domain-graphics-desktop.c (+98/-0) libvirt-gconfig/libvirt-gconfig-domain-graphics-desktop.h (+71/-0) libvirt-gconfig/libvirt-gconfig-domain-graphics-rdp.c (+130/-0) libvirt-gconfig/libvirt-gconfig-domain-graphics-rdp.h (+79/-0) libvirt-gconfig/libvirt-gconfig-domain-graphics-sdl.c (+12/-0) libvirt-gconfig/libvirt-gconfig-domain-graphics-sdl.h (+2/-0) libvirt-gconfig/libvirt-gconfig-domain-graphics.c (+2/-6) libvirt-gconfig/libvirt-gconfig-domain-interface-bridge.c (+3/-3) libvirt-gconfig/libvirt-gconfig-domain-interface-network.c (+3/-3) libvirt-gconfig/libvirt-gconfig-domain-interface-user.c (+3/-3) libvirt-gconfig/libvirt-gconfig-domain-snapshot-disk.c (+173/-0) libvirt-gconfig/libvirt-gconfig-domain-snapshot-disk.h (+84/-0) libvirt-gconfig/libvirt-gconfig-domain-snapshot-private.h (+38/-0) libvirt-gconfig/libvirt-gconfig-domain-snapshot.c (+254/-4) libvirt-gconfig/libvirt-gconfig-domain-snapshot.h (+47/-1) libvirt-gconfig/libvirt-gconfig-domain.c (+5/-3) libvirt-gconfig/libvirt-gconfig-helpers-private.h (+8/-4) libvirt-gconfig/libvirt-gconfig-helpers.c (+4/-3) libvirt-gconfig/libvirt-gconfig-interface.c (+3/-3) libvirt-gconfig/libvirt-gconfig-network-filter.c (+3/-3) libvirt-gconfig/libvirt-gconfig-network.c (+3/-3) libvirt-gconfig/libvirt-gconfig-node-device.c (+3/-3) libvirt-gconfig/libvirt-gconfig-object-private.h (+2/-0) libvirt-gconfig/libvirt-gconfig-object.c (+22/-12) libvirt-gconfig/libvirt-gconfig-private.h (+1/-0) libvirt-gconfig/libvirt-gconfig-secret.c (+3/-3) libvirt-gconfig/libvirt-gconfig-storage-permissions.c (+63/-0) libvirt-gconfig/libvirt-gconfig-storage-permissions.h (+4/-0) libvirt-gconfig/libvirt-gconfig-storage-pool-source.c (+132/-0) libvirt-gconfig/libvirt-gconfig-storage-pool-source.h (+8/-0) libvirt-gconfig/libvirt-gconfig-storage-pool-target.c (+39/-0) libvirt-gconfig/libvirt-gconfig-storage-pool-target.h (+2/-0) libvirt-gconfig/libvirt-gconfig-storage-pool.c (+146/-3) libvirt-gconfig/libvirt-gconfig-storage-pool.h (+8/-0) libvirt-gconfig/libvirt-gconfig-storage-vol.c (+3/-3) libvirt-gconfig/libvirt-gconfig.h (+3/-0) libvirt-gconfig/libvirt-gconfig.sym (+88/-1) libvirt-gconfig/tests/Makefile.am (+1/-1) libvirt-gconfig/tests/Makefile.in (+118/-63) libvirt-gconfig/tests/test-domain-create.c (+19/-3) libvirt-glib.spec (+1/-1) libvirt-glib/Makefile.am (+1/-0) libvirt-glib/Makefile.in (+121/-67) libvirt-glib/libvirt-glib-error.c (+3/-0) libvirt-glib/libvirt-glib-error.h (+6/-6) libvirt-glib/libvirt-glib-main.c (+4/-0) libvirt-gobject/Makefile.in (+121/-68) libvirt-gobject/libvirt-gobject-connection.c (+23/-21) libvirt-gobject/libvirt-gobject-domain-snapshot.c (+10/-10) libvirt-gobject/libvirt-gobject-domain.c (+13/-13) libvirt-gobject/libvirt-gobject-interface.c (+10/-10) libvirt-gobject/libvirt-gobject-main.c (+2/-2) libvirt-gobject/libvirt-gobject-manager.c (+3/-3) libvirt-gobject/libvirt-gobject-network-filter.c (+3/-3) libvirt-gobject/libvirt-gobject-network.c (+10/-10) libvirt-gobject/libvirt-gobject-node-device.c (+10/-10) libvirt-gobject/libvirt-gobject-secret.c (+12/-12) libvirt-gobject/libvirt-gobject-storage-pool.c (+2/-2) libvirt-gobject/libvirt-gobject-storage-vol.c (+10/-10) libvirt-gobject/libvirt-gobject-stream.c (+8/-6) m4/intltool.m4 (+237/-0) m4/virt-gettext.m4 (+5/-0) po/Makefile.in.in (+222/-0) po/POTFILES.in (+4/-0) python/Makefile.am (+1/-1) python/Makefile.in (+108/-55) vapi/LibvirtGObject-1.0.metadata (+0/-2) vapi/Makefile.am (+1/-1) vapi/Makefile.in (+84/-37) |
To merge this branch: | bzr merge lp:~noskcaj/ubuntu/utopic/libvirt-glib/merge |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Tim Lunn | Approve | ||
Review via email: mp+223032@code.launchpad.net |
Commit message
Description of the change
Merge from debian. needed for gnome-boxes 3.12
To post a comment you must log in.
Revision history for this message
Tim Lunn (darkxst) : | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'AUTHORS' |
2 | --- AUTHORS 2013-03-27 13:11:49 +0000 |
3 | +++ AUTHORS 2014-06-13 08:07:26 +0000 |
4 | @@ -10,12 +10,17 @@ |
5 | |
6 | Patches have been received from: |
7 | |
8 | - Guido Günther <agx@sigxcpu.org> |
9 | - Nirbheek Chauhan <nirbheek@gentoo.org> |
10 | - Michal Privoznik <mprivozn@redhat.com> |
11 | - Jovanka Gulicoska <jovanka.gulicoska@gmail.com> |
12 | - Timo Juhani Lindfors <timo.lindfors@iki.fi> |
13 | - Alexander Larsson <alexl@redhat.com> |
14 | - Claudio Bley <cbley@av-test.de> |
15 | +Alexander Larsson <alexl@redhat.com> |
16 | +Christophe Fergeau <cfergeau@redhat.com> |
17 | +Claudio Bley <cbley@av-test.de> |
18 | +Daniel P. Berrange <berrange@redhat.com> |
19 | +Guido Günther <agx@sigxcpu.org> |
20 | +Jovanka Gulicoska <jovanka.gulicoska@gmail.com> |
21 | +Marc-André Lureau <marcandre.lureau@redhat.com> |
22 | +Michal Privoznik <mprivozn@redhat.com> |
23 | +Nirbheek Chauhan <nirbheek@gentoo.org> |
24 | +Stefano Facchini <stefano.facchini@gmail.com> |
25 | +Timo Juhani Lindfors <timo.lindfors@iki.fi> |
26 | +Zeeshan Ali (Khattak) <zeeshanak@gnome.org> |
27 | |
28 | ... send patches to get your name added ... |
29 | |
30 | === added file 'AUTHORS.in' |
31 | --- AUTHORS.in 1970-01-01 00:00:00 +0000 |
32 | +++ AUTHORS.in 2014-06-13 08:07:26 +0000 |
33 | @@ -0,0 +1,15 @@ |
34 | + libvirt-glib Authors |
35 | + ==================== |
36 | + |
37 | +The primary maintainers of libvirt-glib are: |
38 | + |
39 | + Christophe Fergeau <cfergeau@redhat.com> |
40 | + Daniel P. Berrange <berrange@redhat.com> |
41 | + Marc-André Lureau <marcandre.lureau@redhat.com> |
42 | + Zeeshan Ali (Khattak) <zeeshanak@gnome.org> |
43 | + |
44 | +Patches have been received from: |
45 | + |
46 | +#authorslist# |
47 | + |
48 | + ... send patches to get your name added ... |
49 | |
50 | === modified file 'ChangeLog' |
51 | --- ChangeLog 2013-03-27 13:11:49 +0000 |
52 | +++ ChangeLog 2014-06-13 08:07:26 +0000 |
53 | @@ -1,3 +1,178 @@ |
54 | +2013-07-08 Daniel P. Berrange <berrange@redhat.com> |
55 | + |
56 | + Update NEWS for 0.1.7 release |
57 | + |
58 | +2013-07-04 Daniel P. Berrange <berrange@redhat.com> |
59 | + |
60 | + Add missing file from previous commit |
61 | + The commit 35a310c62a8bf704aceb3a5b3ecce36c11525914 forgot |
62 | + to add libvirt-gconfig/libvirt-gconfig-domain-chardev-source-private.h |
63 | + |
64 | + Add API to access device alias names |
65 | + Add gvir_config_domain_device_get_alias to read the |
66 | + <alias name="foo"/> XML in each device. |
67 | + |
68 | + Add APIs to access chardev source information |
69 | + Enable apps to determine the current source path of a chardev |
70 | + with a pty based source. |
71 | + |
72 | + Fix name of gvir_config_domain_chardev_source_pty_set_path |
73 | + The method gvir_config_domain_chardev_source_pty_set_path was |
74 | + accidentally called gvir_config_domain_source_pty_set_path. |
75 | + This naming flaw in turn caused the introspection data to |
76 | + be incorrectly generated, putting a 'source_pty_set_path' |
77 | + method on the GVirConfigDomain object. |
78 | + |
79 | +2013-06-07 Christophe Fergeau <cfergeau@redhat.com> |
80 | + |
81 | + gconfig: Add GVirConfigDomainSnapshot getters/setters |
82 | + |
83 | + gconfig: Add GVirConfigDomainSnapshotDisk getters/setters |
84 | + |
85 | + gconfig: Add GVirConfigDomainSnapshotDisk skeleton |
86 | + |
87 | + gconfig: Add gvir_config_domain_disk_[gs]et_driver_format |
88 | + libvirt commit |
89 | + http://libvirt.org/git/?p=libvirt.git;a=commit;h=e2c41e486018ee74f6a75c1f717622 |
90 | + strongly hints that driver type for a disk domain should be an |
91 | + enum rather than a raw string. Since we already have setters/getters |
92 | + for this attribute, we can't use the same name as in the XML. However, |
93 | + as Daniel Berrangé pointed out, |
94 | + gvir_config_domain_disk_[gs]et_driver_format is a better name for this, |
95 | + so we add the API accepting an enum under this name. |
96 | + |
97 | + I did not set "Rename to: gvir_config_domain_disk_[gs]et_driver_format" |
98 | + in a gtk-doc comment to force bindings to use this better version |
99 | + as this would break Boxes for example. |
100 | + |
101 | + gconfig: Add GVirConfigDomainDiskFormat enum |
102 | + |
103 | + gconfig: Allow not found child in gvir_config_object_get_child_with_type |
104 | + This will be useful when implementing gvir_domain_snapshot_get_parent() |
105 | + as the child node 'parent' is not always present in the XML. |
106 | + |
107 | +2013-05-12 Christophe Fergeau <cfergeau@redhat.com> |
108 | + |
109 | + build-sys: s/INCLUDES/AM_CPPFLAGS |
110 | + automake outputs a warning about AM_CPPFLAGS being the recommended |
111 | + name to use for INCLUDES |
112 | + |
113 | + glib: Add G_GNUC_PRINTF where appropriate |
114 | + This is used to tell the compiler about printf-like format strings |
115 | + used by some functions. Without this marking, gcc 4.8 is outputs |
116 | + warnings to recommend using it. |
117 | + |
118 | + Adjust examples for gvir_config_object_get_conf rename |
119 | + It was renamed to gvir_config_object_to_xml() a long while ago. |
120 | + |
121 | +2013-05-02 Christophe Fergeau <cfergeau@redhat.com> |
122 | + |
123 | + object: Add "transfer none" annotation to argv parameter |
124 | + This makes the parameter to be passed "unowned" in Vala. This was |
125 | + previously done using a vala metadata file, but it's better to do |
126 | + it directly through a gtk-doc annotation, as this means the gir |
127 | + file will know about this, and thus any gir-based binding can |
128 | + make use of this info. |
129 | + |
130 | + This also makes libvirt-gobject consistent with what was done |
131 | + for gconfig and glib in commit 431720. |
132 | + |
133 | +2013-05-01 Christophe Fergeau <cfergeau@redhat.com> |
134 | + |
135 | + Rename misnamed 'conn' variable everywhere |
136 | + Through copy and paste from libvirt-gobject-connection.c, we end |
137 | + up with an instance variable named 'conn' in most of our classes |
138 | + even if we are not manipulating a connection object. This commit |
139 | + renames all 'conn' occurrences in libvirt-gobject and |
140 | + libvirt-gconfig with a name more consistent with the type of the |
141 | + variable named 'conn'. |
142 | + |
143 | + gconfig: Fix gvir_config_domain_graphics_new_from_tree |
144 | + It does not handle the recently added |
145 | + GVirConfigDomainGraphicsRdp and GVirConfigDomainGraphicsDesktop |
146 | + classes. |
147 | + |
148 | +2013-04-19 Daniel P. Berrange <berrange@redhat.com> |
149 | + |
150 | + Adopt saner libtool versioning scheme from libvirt |
151 | + The current way libtool versioning is calculated has a timebomb |
152 | + when the package version number changes to 1.0.0, which will |
153 | + cause the library soname to change. Adapt to the latest libvirt |
154 | + macros for libtool versioning, which use an explicit variable |
155 | + LIBVIRT_GLIB_SONUM setting for changing soname. |
156 | + |
157 | +2013-04-16 Christophe Fergeau <cfergeau@redhat.com> |
158 | + |
159 | + Fix year in NEWS |
160 | + We switched from 2012 to 2013!! |
161 | + |
162 | +2013-04-10 Daniel P. Berrange <berrange@redhat.com> |
163 | + |
164 | + Auto-generate AUTHORS file from GIT logs during make dist |
165 | + Instead of manually keeping the AUTHORS file in sync with |
166 | + GIT, auto-generate it during make dist phase |
167 | + |
168 | + Add framework for i18n of error message strings |
169 | + |
170 | +2013-04-08 Daniel P. Berrange <berrange@redhat.com> |
171 | + |
172 | + Add printf/sentinel attribute annotations to helper functions |
173 | + To allow the compiler to check args add G_GNUC_PRINTF and |
174 | + G_GNUC_NULL_TERMINATED to libvirt-gconfig-helpers-private.h |
175 | + |
176 | +2013-04-03 Christophe Fergeau <cfergeau@redhat.com> |
177 | + |
178 | + gconfig: Add GvirConfigStoragePermission getters |
179 | + |
180 | + gconfig: Add GvirConfigStoragePoolTarget getters |
181 | + |
182 | + gconfig: Add GVirConfigStoragePoolSource getters |
183 | + |
184 | + gconfig: Add GVirConfigStoragePool getters |
185 | + |
186 | + gconfig: Add calls to [gs]et_virt_type to domain tests |
187 | + Setting GVirConfigDomain::virt_type is required for a working |
188 | + domain configuration, using it in the test programs will be helpful |
189 | + if people are using this as a base when starting to use libvirt-gconfig |
190 | + |
191 | + config: Add GVirConfigDomainChannel getters |
192 | + |
193 | + config: Add GVirConfigDomainGraphicsDesktop class |
194 | + |
195 | + config: Add GVirConfigDomainGraphicsRdp class |
196 | + |
197 | + config: Add gvir_config_domain_graphics_sdl_set_fullscreen() |
198 | + |
199 | + config: Fix 2 leaks in domain memory setters |
200 | + |
201 | +2013-04-03 Stefano Facchini <stefano.facchini@gmail.com> |
202 | + |
203 | + build: Replace obsolete macro in configure.ac |
204 | + Fix the build for newer automake |
205 | + |
206 | +2013-04-02 Daniel P. Berrange <berrange@redhat.com> |
207 | + |
208 | + Disable static libraries by default |
209 | + Every source file is currently built twice by libtool, once for |
210 | + the shared library and once for the static library. Static libs |
211 | + are not commonly packaged by distros and slow down compilation |
212 | + time by more than 50% compared to a shared-only build time. |
213 | + |
214 | + Time for non-parallel make |
215 | + |
216 | + shared only: 52 secs |
217 | + shared + static: 1 min 26 secs |
218 | + |
219 | + Those few people who really want them, can pass --enable-static |
220 | + to configure |
221 | + |
222 | + Disabling them by default requires use of LT_INIT. We don't need |
223 | + to support older libtool, so drop use of AM_PROG_LIBTOOL entirely |
224 | + |
225 | +2013-03-19 Daniel P. Berrange <berrange@redhat.com> |
226 | + |
227 | + Post release version bump |
228 | + |
229 | 2013-03-18 Daniel P. Berrange <berrange@redhat.com> |
230 | |
231 | Update NEWS for 0.1.6 release |
232 | |
233 | === modified file 'INSTALL' |
234 | --- INSTALL 2012-08-27 14:48:49 +0000 |
235 | +++ INSTALL 2014-06-13 08:07:26 +0000 |
236 | @@ -1,7 +1,7 @@ |
237 | Installation Instructions |
238 | ************************* |
239 | |
240 | -Copyright (C) 1994-1996, 1999-2002, 2004-2012 Free Software Foundation, |
241 | +Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation, |
242 | Inc. |
243 | |
244 | Copying and distribution of this file, with or without modification, |
245 | |
246 | === modified file 'Makefile.am' |
247 | --- Makefile.am 2012-07-21 22:17:19 +0000 |
248 | +++ Makefile.am 2014-06-13 08:07:26 +0000 |
249 | @@ -1,5 +1,5 @@ |
250 | |
251 | -SUBDIRS = libvirt-glib libvirt-gconfig libvirt-gobject python vapi examples docs |
252 | +SUBDIRS = libvirt-glib libvirt-gconfig libvirt-gobject python vapi examples docs po |
253 | |
254 | ACLOCAL_AMFLAGS = -I m4 |
255 | |
256 | @@ -13,17 +13,18 @@ |
257 | GNUmakefile \ |
258 | maint.mk \ |
259 | cfg.mk \ |
260 | + AUTHORS.in \ |
261 | $(NULL) |
262 | |
263 | DISTCLEAN_FILES = $(PACKAGE).spec $(pkgconfig_DATA) |
264 | |
265 | DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc=yes --enable-introspection=yes |
266 | |
267 | -dist-hook: gen-ChangeLog |
268 | +dist-hook: gen-ChangeLog gen-AUTHORS |
269 | |
270 | # Generate the ChangeLog file (with all entries since the switch to git) |
271 | # and insert it into the directory we're about to use to create a tarball. |
272 | -.PHONY: gen-ChangeLog |
273 | +.PHONY: gen-ChangeLog gen-AUTHORS |
274 | gen-ChangeLog: |
275 | if test -d .git || test -d ../.git; then \ |
276 | $(top_srcdir)/build-aux/gitlog-to-changelog \ |
277 | @@ -31,3 +32,11 @@ |
278 | rm -f $(distdir)/ChangeLog; \ |
279 | mv $(distdir)/cl-t $(distdir)/ChangeLog; \ |
280 | fi |
281 | + |
282 | +gen-AUTHORS: |
283 | + $(AM_V_GEN)if test -d $(srcdir)/.git; then \ |
284 | + out="`cd $(srcdir) && git log --pretty=format:'%aN <%aE>' | sort -u`" && \ |
285 | + perl -p -e "s/#authorslist#// and print '$$out'" \ |
286 | + < $(srcdir)/AUTHORS.in > $(distdir)/AUTHORS-tmp && \ |
287 | + mv -f $(distdir)/AUTHORS-tmp $(distdir)/AUTHORS ; \ |
288 | + fi |
289 | |
290 | === modified file 'Makefile.in' |
291 | --- Makefile.in 2013-03-27 13:11:49 +0000 |
292 | +++ Makefile.in 2014-06-13 08:07:26 +0000 |
293 | @@ -1,7 +1,7 @@ |
294 | -# Makefile.in generated by automake 1.12.2 from Makefile.am. |
295 | +# Makefile.in generated by automake 1.13.2 from Makefile.am. |
296 | # @configure_input@ |
297 | |
298 | -# Copyright (C) 1994-2012 Free Software Foundation, Inc. |
299 | +# Copyright (C) 1994-2013 Free Software Foundation, Inc. |
300 | |
301 | # This Makefile.in is free software; the Free Software Foundation |
302 | # gives unlimited permission to copy and/or distribute it, |
303 | @@ -15,23 +15,51 @@ |
304 | @SET_MAKE@ |
305 | |
306 | VPATH = @srcdir@ |
307 | -am__make_dryrun = \ |
308 | - { \ |
309 | - am__dry=no; \ |
310 | +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' |
311 | +am__make_running_with_option = \ |
312 | + case $${target_option-} in \ |
313 | + ?) ;; \ |
314 | + *) echo "am__make_running_with_option: internal error: invalid" \ |
315 | + "target option '$${target_option-}' specified" >&2; \ |
316 | + exit 1;; \ |
317 | + esac; \ |
318 | + has_opt=no; \ |
319 | + sane_makeflags=$$MAKEFLAGS; \ |
320 | + if $(am__is_gnu_make); then \ |
321 | + sane_makeflags=$$MFLAGS; \ |
322 | + else \ |
323 | case $$MAKEFLAGS in \ |
324 | *\\[\ \ ]*) \ |
325 | - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ |
326 | - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ |
327 | - *) \ |
328 | - for am__flg in $$MAKEFLAGS; do \ |
329 | - case $$am__flg in \ |
330 | - *=*|--*) ;; \ |
331 | - *n*) am__dry=yes; break;; \ |
332 | - esac; \ |
333 | - done;; \ |
334 | - esac; \ |
335 | - test $$am__dry = yes; \ |
336 | - } |
337 | + bs=\\; \ |
338 | + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ |
339 | + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ |
340 | + esac; \ |
341 | + fi; \ |
342 | + skip_next=no; \ |
343 | + strip_trailopt () \ |
344 | + { \ |
345 | + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ |
346 | + }; \ |
347 | + for flg in $$sane_makeflags; do \ |
348 | + test $$skip_next = yes && { skip_next=no; continue; }; \ |
349 | + case $$flg in \ |
350 | + *=*|--*) continue;; \ |
351 | + -*I) strip_trailopt 'I'; skip_next=yes;; \ |
352 | + -*I?*) strip_trailopt 'I';; \ |
353 | + -*O) strip_trailopt 'O'; skip_next=yes;; \ |
354 | + -*O?*) strip_trailopt 'O';; \ |
355 | + -*l) strip_trailopt 'l'; skip_next=yes;; \ |
356 | + -*l?*) strip_trailopt 'l';; \ |
357 | + -[dEDm]) skip_next=yes;; \ |
358 | + -[JT]) skip_next=yes;; \ |
359 | + esac; \ |
360 | + case $$flg in \ |
361 | + *$$target_option*) has_opt=yes; break;; \ |
362 | + esac; \ |
363 | + done; \ |
364 | + test $$has_opt = yes |
365 | +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) |
366 | +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) |
367 | pkgdatadir = $(datadir)/@PACKAGE@ |
368 | pkgincludedir = $(includedir)/@PACKAGE@ |
369 | pkglibdir = $(libdir)/@PACKAGE@ |
370 | @@ -51,29 +79,31 @@ |
371 | build_triplet = @build@ |
372 | host_triplet = @host@ |
373 | subdir = . |
374 | -DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ |
375 | - $(srcdir)/Makefile.in $(srcdir)/config.h.in \ |
376 | +DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \ |
377 | + $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ |
378 | + $(top_srcdir)/configure $(am__configure_deps) \ |
379 | + $(srcdir)/config.h.in $(srcdir)/libvirt-glib-1.0.pc.in \ |
380 | $(srcdir)/libvirt-gconfig-1.0.pc.in \ |
381 | - $(srcdir)/libvirt-glib-1.0.pc.in \ |
382 | + $(srcdir)/libvirt-gobject-1.0.pc.in \ |
383 | $(srcdir)/libvirt-glib.spec.in \ |
384 | - $(srcdir)/libvirt-gobject-1.0.pc.in \ |
385 | - $(srcdir)/mingw-libvirt-glib.spec.in \ |
386 | + $(srcdir)/mingw-libvirt-glib.spec.in COPYING build-aux/compile \ |
387 | + build-aux/config.guess build-aux/config.sub \ |
388 | + build-aux/install-sh build-aux/missing build-aux/ltmain.sh \ |
389 | $(top_srcdir)/build-aux/compile \ |
390 | $(top_srcdir)/build-aux/config.guess \ |
391 | $(top_srcdir)/build-aux/config.sub \ |
392 | $(top_srcdir)/build-aux/install-sh \ |
393 | $(top_srcdir)/build-aux/ltmain.sh \ |
394 | - $(top_srcdir)/build-aux/missing $(top_srcdir)/configure \ |
395 | - AUTHORS COPYING ChangeLog INSTALL NEWS build-aux/compile \ |
396 | - build-aux/config.guess build-aux/config.sub \ |
397 | - build-aux/install-sh build-aux/ltmain.sh build-aux/missing |
398 | + $(top_srcdir)/build-aux/missing |
399 | ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 |
400 | -am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \ |
401 | - $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ |
402 | - $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ |
403 | +am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \ |
404 | + $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ |
405 | + $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ |
406 | + $(top_srcdir)/m4/lt~obsolete.m4 \ |
407 | $(top_srcdir)/m4/manywarnings.m4 \ |
408 | $(top_srcdir)/m4/virt-compile-warnings.m4 \ |
409 | - $(top_srcdir)/m4/warnings.m4 $(top_srcdir)/configure.ac |
410 | + $(top_srcdir)/m4/virt-gettext.m4 $(top_srcdir)/m4/warnings.m4 \ |
411 | + $(top_srcdir)/configure.ac |
412 | am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ |
413 | $(ACLOCAL_M4) |
414 | am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ |
415 | @@ -98,13 +128,14 @@ |
416 | am__v_at_1 = |
417 | SOURCES = |
418 | DIST_SOURCES = |
419 | -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ |
420 | - html-recursive info-recursive install-data-recursive \ |
421 | - install-dvi-recursive install-exec-recursive \ |
422 | - install-html-recursive install-info-recursive \ |
423 | - install-pdf-recursive install-ps-recursive install-recursive \ |
424 | - installcheck-recursive installdirs-recursive pdf-recursive \ |
425 | - ps-recursive uninstall-recursive |
426 | +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ |
427 | + ctags-recursive dvi-recursive html-recursive info-recursive \ |
428 | + install-data-recursive install-dvi-recursive \ |
429 | + install-exec-recursive install-html-recursive \ |
430 | + install-info-recursive install-pdf-recursive \ |
431 | + install-ps-recursive install-recursive installcheck-recursive \ |
432 | + installdirs-recursive pdf-recursive ps-recursive \ |
433 | + tags-recursive uninstall-recursive |
434 | am__can_run_installinfo = \ |
435 | case $$AM_UPDATE_INFO_DIR in \ |
436 | n|no|NO) false;; \ |
437 | @@ -141,9 +172,30 @@ |
438 | DATA = $(pkgconfig_DATA) |
439 | RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ |
440 | distclean-recursive maintainer-clean-recursive |
441 | -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ |
442 | - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ |
443 | +am__recursive_targets = \ |
444 | + $(RECURSIVE_TARGETS) \ |
445 | + $(RECURSIVE_CLEAN_TARGETS) \ |
446 | + $(am__extra_recursive_targets) |
447 | +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ |
448 | cscope distdir dist dist-all distcheck |
449 | +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ |
450 | + $(LISP)config.h.in |
451 | +# Read a list of newline-separated strings from the standard input, |
452 | +# and print each of them once, without duplicates. Input order is |
453 | +# *not* preserved. |
454 | +am__uniquify_input = $(AWK) '\ |
455 | + BEGIN { nonempty = 0; } \ |
456 | + { items[$$0] = 1; nonempty = 1; } \ |
457 | + END { if (nonempty) { for (i in items) print i; }; } \ |
458 | +' |
459 | +# Make sure the list of sources is unique. This is necessary because, |
460 | +# e.g., the same source file might be shared among _SOURCES variables |
461 | +# for different programs/libraries. |
462 | +am__define_uniq_tagged_files = \ |
463 | + list='$(am__tagged_files)'; \ |
464 | + unique=`for i in $$list; do \ |
465 | + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
466 | + done | $(am__uniquify_input)` |
467 | ETAGS = etags |
468 | CTAGS = ctags |
469 | CSCOPE = cscope |
470 | @@ -191,6 +243,7 @@ |
471 | | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' |
472 | distcleancheck_listfiles = find . -type f -print |
473 | ACLOCAL = @ACLOCAL@ |
474 | +ALL_LINGUAS = @ALL_LINGUAS@ |
475 | AMTAR = @AMTAR@ |
476 | AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ |
477 | AR = @AR@ |
478 | @@ -211,6 +264,7 @@ |
479 | CYGWIN_EXTRA_LDFLAGS = @CYGWIN_EXTRA_LDFLAGS@ |
480 | CYGWIN_EXTRA_LIBADD = @CYGWIN_EXTRA_LIBADD@ |
481 | CYGWIN_EXTRA_PYTHON_LIBADD = @CYGWIN_EXTRA_PYTHON_LIBADD@ |
482 | +DATADIRNAME = @DATADIRNAME@ |
483 | DEFS = @DEFS@ |
484 | DEPDIR = @DEPDIR@ |
485 | DLLTOOL = @DLLTOOL@ |
486 | @@ -222,11 +276,13 @@ |
487 | EGREP = @EGREP@ |
488 | EXEEXT = @EXEEXT@ |
489 | FGREP = @FGREP@ |
490 | +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ |
491 | GIO2_CFLAGS = @GIO2_CFLAGS@ |
492 | GIO2_LIBS = @GIO2_LIBS@ |
493 | GLIB2_CFLAGS = @GLIB2_CFLAGS@ |
494 | GLIB2_LIBS = @GLIB2_LIBS@ |
495 | GLIB_MKENUMS = @GLIB_MKENUMS@ |
496 | +GMSGFMT = @GMSGFMT@ |
497 | GOBJECT2_CFLAGS = @GOBJECT2_CFLAGS@ |
498 | GOBJECT2_LIBS = @GOBJECT2_LIBS@ |
499 | GOBJECT_INTROSPECTION_CFLAGS = @GOBJECT_INTROSPECTION_CFLAGS@ |
500 | @@ -247,6 +303,14 @@ |
501 | INSTALL_PROGRAM = @INSTALL_PROGRAM@ |
502 | INSTALL_SCRIPT = @INSTALL_SCRIPT@ |
503 | INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ |
504 | +INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ |
505 | +INTLTOOL_MERGE = @INTLTOOL_MERGE@ |
506 | +INTLTOOL_PERL = @INTLTOOL_PERL@ |
507 | +INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ |
508 | +INTLTOOL_V_MERGE = @INTLTOOL_V_MERGE@ |
509 | +INTLTOOL_V_MERGE_OPTIONS = @INTLTOOL_V_MERGE_OPTIONS@ |
510 | +INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ |
511 | +INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ |
512 | LD = @LD@ |
513 | LDFLAGS = @LDFLAGS@ |
514 | LIBOBJS = @LIBOBJS@ |
515 | @@ -270,6 +334,8 @@ |
516 | MANIFEST_TOOL = @MANIFEST_TOOL@ |
517 | MINGW_EXTRA_LDFLAGS = @MINGW_EXTRA_LDFLAGS@ |
518 | MKDIR_P = @MKDIR_P@ |
519 | +MSGFMT = @MSGFMT@ |
520 | +MSGMERGE = @MSGMERGE@ |
521 | NM = @NM@ |
522 | NMEDIT = @NMEDIT@ |
523 | OBJDUMP = @OBJDUMP@ |
524 | @@ -296,10 +362,12 @@ |
525 | SET_MAKE = @SET_MAKE@ |
526 | SHELL = @SHELL@ |
527 | STRIP = @STRIP@ |
528 | +USE_NLS = @USE_NLS@ |
529 | VAPIGEN = @VAPIGEN@ |
530 | VERSION = @VERSION@ |
531 | WARN_CFLAGS = @WARN_CFLAGS@ |
532 | WARN_LDFLAGS = @WARN_LDFLAGS@ |
533 | +XGETTEXT = @XGETTEXT@ |
534 | abs_builddir = @abs_builddir@ |
535 | abs_srcdir = @abs_srcdir@ |
536 | abs_top_builddir = @abs_top_builddir@ |
537 | @@ -333,6 +401,8 @@ |
538 | includedir = @includedir@ |
539 | infodir = @infodir@ |
540 | install_sh = @install_sh@ |
541 | +intltool__v_merge_options_ = @intltool__v_merge_options_@ |
542 | +intltool__v_merge_options_0 = @intltool__v_merge_options_0@ |
543 | libdir = @libdir@ |
544 | libexecdir = @libexecdir@ |
545 | localedir = @localedir@ |
546 | @@ -353,7 +423,7 @@ |
547 | top_build_prefix = @top_build_prefix@ |
548 | top_builddir = @top_builddir@ |
549 | top_srcdir = @top_srcdir@ |
550 | -SUBDIRS = libvirt-glib libvirt-gconfig libvirt-gobject python vapi examples docs |
551 | +SUBDIRS = libvirt-glib libvirt-gconfig libvirt-gobject python vapi examples docs po |
552 | ACLOCAL_AMFLAGS = -I m4 |
553 | pkgconfigdir = $(libdir)/pkgconfig |
554 | pkgconfig_DATA = libvirt-glib-1.0.pc libvirt-gconfig-1.0.pc libvirt-gobject-1.0.pc |
555 | @@ -364,6 +434,7 @@ |
556 | GNUmakefile \ |
557 | maint.mk \ |
558 | cfg.mk \ |
559 | + AUTHORS.in \ |
560 | $(NULL) |
561 | |
562 | DISTCLEAN_FILES = $(PACKAGE).spec $(pkgconfig_DATA) |
563 | @@ -468,14 +539,13 @@ |
564 | # (1) if the variable is set in 'config.status', edit 'config.status' |
565 | # (which will cause the Makefiles to be regenerated when you run 'make'); |
566 | # (2) otherwise, pass the desired values on the 'make' command line. |
567 | -$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS): |
568 | - @fail= failcom='exit 1'; \ |
569 | - for f in x $$MAKEFLAGS; do \ |
570 | - case $$f in \ |
571 | - *=* | --[!k]*);; \ |
572 | - *k*) failcom='fail=yes';; \ |
573 | - esac; \ |
574 | - done; \ |
575 | +$(am__recursive_targets): |
576 | + @fail=; \ |
577 | + if $(am__make_keepgoing); then \ |
578 | + failcom='fail=yes'; \ |
579 | + else \ |
580 | + failcom='exit 1'; \ |
581 | + fi; \ |
582 | dot_seen=no; \ |
583 | target=`echo $@ | sed s/-recursive//`; \ |
584 | case "$@" in \ |
585 | @@ -496,31 +566,13 @@ |
586 | if test "$$dot_seen" = "no"; then \ |
587 | $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ |
588 | fi; test -z "$$fail" |
589 | -tags-recursive: |
590 | - list='$(SUBDIRS)'; for subdir in $$list; do \ |
591 | - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ |
592 | - done |
593 | -ctags-recursive: |
594 | - list='$(SUBDIRS)'; for subdir in $$list; do \ |
595 | - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ |
596 | - done |
597 | -cscopelist-recursive: |
598 | - list='$(SUBDIRS)'; for subdir in $$list; do \ |
599 | - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \ |
600 | - done |
601 | - |
602 | -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) |
603 | - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ |
604 | - unique=`for i in $$list; do \ |
605 | - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
606 | - done | \ |
607 | - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ |
608 | - END { if (nonempty) { for (i in files) print i; }; }'`; \ |
609 | - mkid -fID $$unique |
610 | -tags: TAGS |
611 | - |
612 | -TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ |
613 | - $(TAGS_FILES) $(LISP) |
614 | + |
615 | +ID: $(am__tagged_files) |
616 | + $(am__define_uniq_tagged_files); mkid -fID $$unique |
617 | +tags: tags-recursive |
618 | +TAGS: tags |
619 | + |
620 | +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) |
621 | set x; \ |
622 | here=`pwd`; \ |
623 | if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ |
624 | @@ -536,12 +588,7 @@ |
625 | set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ |
626 | fi; \ |
627 | done; \ |
628 | - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ |
629 | - unique=`for i in $$list; do \ |
630 | - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
631 | - done | \ |
632 | - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ |
633 | - END { if (nonempty) { for (i in files) print i; }; }'`; \ |
634 | + $(am__define_uniq_tagged_files); \ |
635 | shift; \ |
636 | if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ |
637 | test -n "$$unique" || unique=$$empty_fix; \ |
638 | @@ -553,15 +600,11 @@ |
639 | $$unique; \ |
640 | fi; \ |
641 | fi |
642 | -ctags: CTAGS |
643 | -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ |
644 | - $(TAGS_FILES) $(LISP) |
645 | - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ |
646 | - unique=`for i in $$list; do \ |
647 | - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ |
648 | - done | \ |
649 | - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ |
650 | - END { if (nonempty) { for (i in files) print i; }; }'`; \ |
651 | +ctags: ctags-recursive |
652 | + |
653 | +CTAGS: ctags |
654 | +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) |
655 | + $(am__define_uniq_tagged_files); \ |
656 | test -z "$(CTAGS_ARGS)$$unique" \ |
657 | || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ |
658 | $$unique |
659 | @@ -570,18 +613,16 @@ |
660 | here=`$(am__cd) $(top_builddir) && pwd` \ |
661 | && $(am__cd) $(top_srcdir) \ |
662 | && gtags -i $(GTAGS_ARGS) "$$here" |
663 | - |
664 | cscope: cscope.files |
665 | test ! -s cscope.files \ |
666 | || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS) |
667 | - |
668 | clean-cscope: |
669 | -rm -f cscope.files |
670 | - |
671 | -cscope.files: clean-cscope cscopelist-recursive cscopelist |
672 | - |
673 | -cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP) |
674 | - list='$(SOURCES) $(HEADERS) $(LISP)'; \ |
675 | +cscope.files: clean-cscope cscopelist |
676 | +cscopelist: cscopelist-recursive |
677 | + |
678 | +cscopelist-am: $(am__tagged_files) |
679 | + list='$(am__tagged_files)'; \ |
680 | case "$(srcdir)" in \ |
681 | [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ |
682 | *) sdir=$(subdir)/$(srcdir) ;; \ |
683 | @@ -718,9 +759,9 @@ |
684 | *.zip*) \ |
685 | unzip $(distdir).zip ;;\ |
686 | esac |
687 | - chmod -R a-w $(distdir); chmod u+w $(distdir) |
688 | - mkdir $(distdir)/_build |
689 | - mkdir $(distdir)/_inst |
690 | + chmod -R a-w $(distdir) |
691 | + chmod u+w $(distdir) |
692 | + mkdir $(distdir)/_build $(distdir)/_inst |
693 | chmod a-w $(distdir) |
694 | test -d $(distdir)/_build || exit 0; \ |
695 | dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ |
696 | @@ -890,34 +931,32 @@ |
697 | |
698 | uninstall-am: uninstall-pkgconfigDATA |
699 | |
700 | -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ |
701 | - cscopelist-recursive ctags-recursive install-am install-strip \ |
702 | - tags-recursive |
703 | - |
704 | -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ |
705 | - all all-am am--refresh check check-am clean clean-cscope \ |
706 | - clean-generic clean-libtool cscope cscopelist \ |
707 | - cscopelist-recursive ctags ctags-recursive dist dist-all \ |
708 | - dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar dist-tarZ \ |
709 | - dist-xz dist-zip distcheck distclean distclean-generic \ |
710 | - distclean-hdr distclean-libtool distclean-tags distcleancheck \ |
711 | - distdir distuninstallcheck dvi dvi-am html html-am info \ |
712 | - info-am install install-am install-data install-data-am \ |
713 | - install-dvi install-dvi-am install-exec install-exec-am \ |
714 | - install-html install-html-am install-info install-info-am \ |
715 | - install-man install-pdf install-pdf-am install-pkgconfigDATA \ |
716 | - install-ps install-ps-am install-strip installcheck \ |
717 | - installcheck-am installdirs installdirs-am maintainer-clean \ |
718 | - maintainer-clean-generic mostlyclean mostlyclean-generic \ |
719 | - mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ |
720 | - uninstall uninstall-am uninstall-pkgconfigDATA |
721 | - |
722 | - |
723 | -dist-hook: gen-ChangeLog |
724 | +.MAKE: $(am__recursive_targets) all install-am install-strip |
725 | + |
726 | +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ |
727 | + am--refresh check check-am clean clean-cscope clean-generic \ |
728 | + clean-libtool cscope cscopelist-am ctags ctags-am dist \ |
729 | + dist-all dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar \ |
730 | + dist-tarZ dist-xz dist-zip distcheck distclean \ |
731 | + distclean-generic distclean-hdr distclean-libtool \ |
732 | + distclean-tags distcleancheck distdir distuninstallcheck dvi \ |
733 | + dvi-am html html-am info info-am install install-am \ |
734 | + install-data install-data-am install-dvi install-dvi-am \ |
735 | + install-exec install-exec-am install-html install-html-am \ |
736 | + install-info install-info-am install-man install-pdf \ |
737 | + install-pdf-am install-pkgconfigDATA install-ps install-ps-am \ |
738 | + install-strip installcheck installcheck-am installdirs \ |
739 | + installdirs-am maintainer-clean maintainer-clean-generic \ |
740 | + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ |
741 | + ps ps-am tags tags-am uninstall uninstall-am \ |
742 | + uninstall-pkgconfigDATA |
743 | + |
744 | + |
745 | +dist-hook: gen-ChangeLog gen-AUTHORS |
746 | |
747 | # Generate the ChangeLog file (with all entries since the switch to git) |
748 | # and insert it into the directory we're about to use to create a tarball. |
749 | -.PHONY: gen-ChangeLog |
750 | +.PHONY: gen-ChangeLog gen-AUTHORS |
751 | gen-ChangeLog: |
752 | if test -d .git || test -d ../.git; then \ |
753 | $(top_srcdir)/build-aux/gitlog-to-changelog \ |
754 | @@ -926,6 +965,14 @@ |
755 | mv $(distdir)/cl-t $(distdir)/ChangeLog; \ |
756 | fi |
757 | |
758 | +gen-AUTHORS: |
759 | + $(AM_V_GEN)if test -d $(srcdir)/.git; then \ |
760 | + out="`cd $(srcdir) && git log --pretty=format:'%aN <%aE>' | sort -u`" && \ |
761 | + perl -p -e "s/#authorslist#// and print '$$out'" \ |
762 | + < $(srcdir)/AUTHORS.in > $(distdir)/AUTHORS-tmp && \ |
763 | + mv -f $(distdir)/AUTHORS-tmp $(distdir)/AUTHORS ; \ |
764 | + fi |
765 | + |
766 | # Tell versions [3.59,3.63) of GNU make to not export all variables. |
767 | # Otherwise a system limit (for SysV at least) may be exceeded. |
768 | .NOEXPORT: |
769 | |
770 | === modified file 'NEWS' |
771 | --- NEWS 2013-03-27 13:11:49 +0000 |
772 | +++ NEWS 2014-06-13 08:07:26 +0000 |
773 | @@ -1,7 +1,23 @@ |
774 | libvirt-glib News |
775 | ================= |
776 | |
777 | -0.1.6 - Mar 18, 2012 |
778 | +0.1.7 - Jul 8, 2013 |
779 | +==================== |
780 | + |
781 | +- Fix memory leaks in domain memory setters |
782 | +- Add APIs for configuration sdl/rdp/desktop graphics modes |
783 | +- Add getter APIs for domain channel devices |
784 | +- Add getter APIs for storage pools |
785 | +- Add API for getting/setting virt type |
786 | +- Add getter APIs for storage pool schema |
787 | +- Add base framework for i18n of error messages |
788 | +- Fix annotation of gvir_init_object |
789 | +- Add getter/setter APIs for disk driver format |
790 | +- Add APIs for domain snapshot schema |
791 | +- Add APIs to access domain chardev source |
792 | +- Add API to access domain device aliases |
793 | + |
794 | +0.1.6 - Mar 18, 2013 |
795 | ==================== |
796 | |
797 | - Prefer g_strlcpy over strncpy |
798 | @@ -14,7 +30,7 @@ |
799 | - Replace FSF address with URL in copyright headers |
800 | - Add API for changing Spice compression parameters. |
801 | |
802 | -0.1.5 - Jan 14, 2012 |
803 | +0.1.5 - Jan 14, 2013 |
804 | ==================== |
805 | |
806 | - Add support for bridge interface types in guest XML |
807 | |
808 | === modified file 'aclocal.m4' |
809 | --- aclocal.m4 2013-03-27 13:11:49 +0000 |
810 | +++ aclocal.m4 2014-06-13 08:07:26 +0000 |
811 | @@ -1,6 +1,6 @@ |
812 | -# generated automatically by aclocal 1.12.2 -*- Autoconf -*- |
813 | +# generated automatically by aclocal 1.13.2 -*- Autoconf -*- |
814 | |
815 | -# Copyright (C) 1996-2012 Free Software Foundation, Inc. |
816 | +# Copyright (C) 1996-2013 Free Software Foundation, Inc. |
817 | |
818 | # This file is free software; the Free Software Foundation |
819 | # gives unlimited permission to copy and/or distribute it, |
820 | @@ -11,6 +11,7 @@ |
821 | # even the implied warranty of MERCHANTABILITY or FITNESS FOR A |
822 | # PARTICULAR PURPOSE. |
823 | |
824 | +m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) |
825 | m4_ifndef([AC_AUTOCONF_VERSION], |
826 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl |
827 | m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, |
828 | @@ -58,7 +59,7 @@ |
829 | dnl don't check for glib if we build glib |
830 | if test "x$PACKAGE_NAME" != "xglib"; then |
831 | dnl don't fail if someone does not have glib |
832 | - PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0,,) |
833 | + PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0,,[:]) |
834 | fi |
835 | fi |
836 | |
837 | @@ -79,6 +80,10 @@ |
838 | enable_gtk_doc_pdf=no |
839 | fi |
840 | |
841 | + if test -z "$AM_DEFAULT_VERBOSITY"; then |
842 | + AM_DEFAULT_VERBOSITY=1 |
843 | + fi |
844 | + AC_SUBST([AM_DEFAULT_VERBOSITY]) |
845 | |
846 | AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes]) |
847 | AM_CONDITIONAL([GTK_DOC_BUILD_HTML], [test x$enable_gtk_doc_html = xyes]) |
848 | @@ -87,6 +92,39 @@ |
849 | AM_CONDITIONAL([GTK_DOC_USE_REBASE], [test -n "$GTKDOC_REBASE"]) |
850 | ]) |
851 | |
852 | +# nls.m4 serial 5 (gettext-0.18) |
853 | +dnl Copyright (C) 1995-2003, 2005-2006, 2008-2013 Free Software Foundation, |
854 | +dnl Inc. |
855 | +dnl This file is free software; the Free Software Foundation |
856 | +dnl gives unlimited permission to copy and/or distribute it, |
857 | +dnl with or without modifications, as long as this notice is preserved. |
858 | +dnl |
859 | +dnl This file can can be used in projects which are not available under |
860 | +dnl the GNU General Public License or the GNU Library General Public |
861 | +dnl License but which still want to provide support for the GNU gettext |
862 | +dnl functionality. |
863 | +dnl Please note that the actual code of the GNU gettext library is covered |
864 | +dnl by the GNU Library General Public License, and the rest of the GNU |
865 | +dnl gettext package package is covered by the GNU General Public License. |
866 | +dnl They are *not* in the public domain. |
867 | + |
868 | +dnl Authors: |
869 | +dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000. |
870 | +dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003. |
871 | + |
872 | +AC_PREREQ([2.50]) |
873 | + |
874 | +AC_DEFUN([AM_NLS], |
875 | +[ |
876 | + AC_MSG_CHECKING([whether NLS is requested]) |
877 | + dnl Default is enabled NLS |
878 | + AC_ARG_ENABLE([nls], |
879 | + [ --disable-nls do not use Native Language Support], |
880 | + USE_NLS=$enableval, USE_NLS=yes) |
881 | + AC_MSG_RESULT([$USE_NLS]) |
882 | + AC_SUBST([USE_NLS]) |
883 | +]) |
884 | + |
885 | # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- |
886 | # serial 1 (pkg-config-0.24) |
887 | # |
888 | @@ -287,24 +325,22 @@ |
889 | m4_popdef([pkg_description]) |
890 | ]) dnl PKG_NOARCH_INSTALLDIR |
891 | |
892 | -# Copyright (C) 2002-2012 Free Software Foundation, Inc. |
893 | +# Copyright (C) 2002-2013 Free Software Foundation, Inc. |
894 | # |
895 | # This file is free software; the Free Software Foundation |
896 | # gives unlimited permission to copy and/or distribute it, |
897 | # with or without modifications, as long as this notice is preserved. |
898 | |
899 | -# serial 8 |
900 | - |
901 | # AM_AUTOMAKE_VERSION(VERSION) |
902 | # ---------------------------- |
903 | # Automake X.Y traces this macro to ensure aclocal.m4 has been |
904 | # generated from the m4 files accompanying Automake X.Y. |
905 | # (This private macro should not be called outside this file.) |
906 | AC_DEFUN([AM_AUTOMAKE_VERSION], |
907 | -[am__api_version='1.12' |
908 | +[am__api_version='1.13' |
909 | dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to |
910 | dnl require some minimum version. Point them to the right macro. |
911 | -m4_if([$1], [1.12.2], [], |
912 | +m4_if([$1], [1.13.2], [], |
913 | [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl |
914 | ]) |
915 | |
916 | @@ -320,21 +356,19 @@ |
917 | # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. |
918 | # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. |
919 | AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], |
920 | -[AM_AUTOMAKE_VERSION([1.12.2])dnl |
921 | +[AM_AUTOMAKE_VERSION([1.13.2])dnl |
922 | m4_ifndef([AC_AUTOCONF_VERSION], |
923 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl |
924 | _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) |
925 | |
926 | # AM_AUX_DIR_EXPAND -*- Autoconf -*- |
927 | |
928 | -# Copyright (C) 2001-2012 Free Software Foundation, Inc. |
929 | +# Copyright (C) 2001-2013 Free Software Foundation, Inc. |
930 | # |
931 | # This file is free software; the Free Software Foundation |
932 | # gives unlimited permission to copy and/or distribute it, |
933 | # with or without modifications, as long as this notice is preserved. |
934 | |
935 | -# serial 2 |
936 | - |
937 | # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets |
938 | # $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to |
939 | # '$srcdir', '$srcdir/..', or '$srcdir/../..'. |
940 | @@ -382,14 +416,12 @@ |
941 | |
942 | # AM_CONDITIONAL -*- Autoconf -*- |
943 | |
944 | -# Copyright (C) 1997-2012 Free Software Foundation, Inc. |
945 | +# Copyright (C) 1997-2013 Free Software Foundation, Inc. |
946 | # |
947 | # This file is free software; the Free Software Foundation |
948 | # gives unlimited permission to copy and/or distribute it, |
949 | # with or without modifications, as long as this notice is preserved. |
950 | |
951 | -# serial 10 |
952 | - |
953 | # AM_CONDITIONAL(NAME, SHELL-CONDITION) |
954 | # ------------------------------------- |
955 | # Define a conditional. |
956 | @@ -415,13 +447,12 @@ |
957 | Usually this means the macro was only invoked conditionally.]]) |
958 | fi])]) |
959 | |
960 | -# Copyright (C) 1999-2012 Free Software Foundation, Inc. |
961 | +# Copyright (C) 1999-2013 Free Software Foundation, Inc. |
962 | # |
963 | # This file is free software; the Free Software Foundation |
964 | # gives unlimited permission to copy and/or distribute it, |
965 | # with or without modifications, as long as this notice is preserved. |
966 | |
967 | -# serial 17 |
968 | |
969 | # There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be |
970 | # written in clear, in which case automake, when reading aclocal.m4, |
971 | @@ -607,19 +638,18 @@ |
972 | |
973 | # Generate code to set up dependency tracking. -*- Autoconf -*- |
974 | |
975 | -# Copyright (C) 1999-2012 Free Software Foundation, Inc. |
976 | +# Copyright (C) 1999-2013 Free Software Foundation, Inc. |
977 | # |
978 | # This file is free software; the Free Software Foundation |
979 | # gives unlimited permission to copy and/or distribute it, |
980 | # with or without modifications, as long as this notice is preserved. |
981 | |
982 | -# serial 6 |
983 | |
984 | # _AM_OUTPUT_DEPENDENCY_COMMANDS |
985 | # ------------------------------ |
986 | AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], |
987 | [{ |
988 | - # Autoconf 2.62 quotes --file arguments for eval, but not when files |
989 | + # Older Autoconf quotes --file arguments for eval, but not when files |
990 | # are listed without --file. Let's play safe and only enable the eval |
991 | # if we detect the quoting. |
992 | case $CONFIG_FILES in |
993 | @@ -648,7 +678,7 @@ |
994 | DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` |
995 | test -z "$DEPDIR" && continue |
996 | am__include=`sed -n 's/^am__include = //p' < "$mf"` |
997 | - test -z "am__include" && continue |
998 | + test -z "$am__include" && continue |
999 | am__quote=`sed -n 's/^am__quote = //p' < "$mf"` |
1000 | # Find all dependency output files, they are included files with |
1001 | # $(DEPDIR) in their names. We invoke sed twice because it is the |
1002 | @@ -682,27 +712,14 @@ |
1003 | [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) |
1004 | ]) |
1005 | |
1006 | -# Copyright (C) 1996-2012 Free Software Foundation, Inc. |
1007 | -# |
1008 | -# This file is free software; the Free Software Foundation |
1009 | -# gives unlimited permission to copy and/or distribute it, |
1010 | -# with or without modifications, as long as this notice is preserved. |
1011 | - |
1012 | -# serial 8 |
1013 | - |
1014 | -# AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS. |
1015 | -AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)]) |
1016 | - |
1017 | # Do all the work for Automake. -*- Autoconf -*- |
1018 | |
1019 | -# Copyright (C) 1996-2012 Free Software Foundation, Inc. |
1020 | +# Copyright (C) 1996-2013 Free Software Foundation, Inc. |
1021 | # |
1022 | # This file is free software; the Free Software Foundation |
1023 | # gives unlimited permission to copy and/or distribute it, |
1024 | # with or without modifications, as long as this notice is preserved. |
1025 | |
1026 | -# serial 19 |
1027 | - |
1028 | # This macro actually does too much. Some checks are only needed if |
1029 | # your package does certain things. But this isn't really a big deal. |
1030 | |
1031 | @@ -718,7 +735,7 @@ |
1032 | # arguments mandatory, and then we can depend on a new Autoconf |
1033 | # release and drop the old call support. |
1034 | AC_DEFUN([AM_INIT_AUTOMAKE], |
1035 | -[AC_PREREQ([2.62])dnl |
1036 | +[AC_PREREQ([2.65])dnl |
1037 | dnl Autoconf wants to disallow AM_ names. We explicitly allow |
1038 | dnl the ones we care about. |
1039 | m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl |
1040 | @@ -748,8 +765,7 @@ |
1041 | dnl Distinguish between old-style and new-style calls. |
1042 | m4_ifval([$2], |
1043 | [AC_DIAGNOSE([obsolete], |
1044 | -[$0: two- and three-arguments forms are deprecated. For more info, see: |
1045 | -http://www.gnu.org/software/automake/manual/automake.html#Modernize-AM_INIT_AUTOMAKE-invocation]) |
1046 | + [$0: two- and three-arguments forms are deprecated.]) |
1047 | m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl |
1048 | AC_SUBST([PACKAGE], [$1])dnl |
1049 | AC_SUBST([VERSION], [$2])], |
1050 | @@ -803,18 +819,15 @@ |
1051 | [_AM_DEPENDENCIES([OBJC])], |
1052 | [m4_define([AC_PROG_OBJC], |
1053 | m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl |
1054 | -dnl Support for Objective C++ was only introduced in Autoconf 2.65, |
1055 | -dnl but we still cater to Autoconf 2.62. |
1056 | -m4_ifdef([AC_PROG_OBJCXX], |
1057 | -[AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], |
1058 | +AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], |
1059 | [_AM_DEPENDENCIES([OBJCXX])], |
1060 | [m4_define([AC_PROG_OBJCXX], |
1061 | - m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])])dnl |
1062 | + m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl |
1063 | ]) |
1064 | -_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl |
1065 | -dnl The 'parallel-tests' driver may need to know about EXEEXT, so add the |
1066 | -dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro |
1067 | -dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. |
1068 | +AC_REQUIRE([AM_SILENT_RULES])dnl |
1069 | +dnl The testsuite driver may need to know about EXEEXT, so add the |
1070 | +dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This |
1071 | +dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. |
1072 | AC_CONFIG_COMMANDS_PRE(dnl |
1073 | [m4_provide_if([_AM_COMPILER_EXEEXT], |
1074 | [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl |
1075 | @@ -848,14 +861,12 @@ |
1076 | done |
1077 | echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) |
1078 | |
1079 | -# Copyright (C) 2001-2012 Free Software Foundation, Inc. |
1080 | +# Copyright (C) 2001-2013 Free Software Foundation, Inc. |
1081 | # |
1082 | # This file is free software; the Free Software Foundation |
1083 | # gives unlimited permission to copy and/or distribute it, |
1084 | # with or without modifications, as long as this notice is preserved. |
1085 | |
1086 | -# serial 8 |
1087 | - |
1088 | # AM_PROG_INSTALL_SH |
1089 | # ------------------ |
1090 | # Define $install_sh. |
1091 | @@ -871,14 +882,12 @@ |
1092 | fi |
1093 | AC_SUBST([install_sh])]) |
1094 | |
1095 | -# Copyright (C) 2003-2012 Free Software Foundation, Inc. |
1096 | +# Copyright (C) 2003-2013 Free Software Foundation, Inc. |
1097 | # |
1098 | # This file is free software; the Free Software Foundation |
1099 | # gives unlimited permission to copy and/or distribute it, |
1100 | # with or without modifications, as long as this notice is preserved. |
1101 | |
1102 | -# serial 2 |
1103 | - |
1104 | # Check whether the underlying file-system supports filenames |
1105 | # with a leading dot. For instance MS-DOS doesn't. |
1106 | AC_DEFUN([AM_SET_LEADING_DOT], |
1107 | @@ -894,14 +903,12 @@ |
1108 | |
1109 | # Check to see how 'make' treats includes. -*- Autoconf -*- |
1110 | |
1111 | -# Copyright (C) 2001-2012 Free Software Foundation, Inc. |
1112 | +# Copyright (C) 2001-2013 Free Software Foundation, Inc. |
1113 | # |
1114 | # This file is free software; the Free Software Foundation |
1115 | # gives unlimited permission to copy and/or distribute it, |
1116 | # with or without modifications, as long as this notice is preserved. |
1117 | |
1118 | -# serial 5 |
1119 | - |
1120 | # AM_MAKE_INCLUDE() |
1121 | # ----------------- |
1122 | # Check to see how make treats includes. |
1123 | @@ -944,14 +951,12 @@ |
1124 | rm -f confinc confmf |
1125 | ]) |
1126 | |
1127 | -# Copyright (C) 1999-2012 Free Software Foundation, Inc. |
1128 | +# Copyright (C) 1999-2013 Free Software Foundation, Inc. |
1129 | # |
1130 | # This file is free software; the Free Software Foundation |
1131 | # gives unlimited permission to copy and/or distribute it, |
1132 | # with or without modifications, as long as this notice is preserved. |
1133 | |
1134 | -# serial 6 |
1135 | - |
1136 | # AM_PROG_CC_C_O |
1137 | # -------------- |
1138 | # Like AC_PROG_CC_C_O, but changed for automake. |
1139 | @@ -980,14 +985,12 @@ |
1140 | |
1141 | # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- |
1142 | |
1143 | -# Copyright (C) 1997-2012 Free Software Foundation, Inc. |
1144 | +# Copyright (C) 1997-2013 Free Software Foundation, Inc. |
1145 | # |
1146 | # This file is free software; the Free Software Foundation |
1147 | # gives unlimited permission to copy and/or distribute it, |
1148 | # with or without modifications, as long as this notice is preserved. |
1149 | |
1150 | -# serial 7 |
1151 | - |
1152 | # AM_MISSING_PROG(NAME, PROGRAM) |
1153 | # ------------------------------ |
1154 | AC_DEFUN([AM_MISSING_PROG], |
1155 | @@ -995,11 +998,10 @@ |
1156 | $1=${$1-"${am_missing_run}$2"} |
1157 | AC_SUBST($1)]) |
1158 | |
1159 | - |
1160 | # AM_MISSING_HAS_RUN |
1161 | # ------------------ |
1162 | -# Define MISSING if not defined so far and test if it supports --run. |
1163 | -# If it does, set am_missing_run to use it, otherwise, to nothing. |
1164 | +# Define MISSING if not defined so far and test if it is modern enough. |
1165 | +# If it is, set am_missing_run to use it, otherwise, to nothing. |
1166 | AC_DEFUN([AM_MISSING_HAS_RUN], |
1167 | [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl |
1168 | AC_REQUIRE_AUX_FILE([missing])dnl |
1169 | @@ -1012,8 +1014,8 @@ |
1170 | esac |
1171 | fi |
1172 | # Use eval to expand $SHELL |
1173 | -if eval "$MISSING --run true"; then |
1174 | - am_missing_run="$MISSING --run " |
1175 | +if eval "$MISSING --is-lightweight"; then |
1176 | + am_missing_run="$MISSING " |
1177 | else |
1178 | am_missing_run= |
1179 | AC_MSG_WARN(['missing' script is too old or missing]) |
1180 | @@ -1022,14 +1024,12 @@ |
1181 | |
1182 | # Helper functions for option handling. -*- Autoconf -*- |
1183 | |
1184 | -# Copyright (C) 2001-2012 Free Software Foundation, Inc. |
1185 | +# Copyright (C) 2001-2013 Free Software Foundation, Inc. |
1186 | # |
1187 | # This file is free software; the Free Software Foundation |
1188 | # gives unlimited permission to copy and/or distribute it, |
1189 | # with or without modifications, as long as this notice is preserved. |
1190 | |
1191 | -# serial 6 |
1192 | - |
1193 | # _AM_MANGLE_OPTION(NAME) |
1194 | # ----------------------- |
1195 | AC_DEFUN([_AM_MANGLE_OPTION], |
1196 | @@ -1055,14 +1055,12 @@ |
1197 | |
1198 | # Check to make sure that the build environment is sane. -*- Autoconf -*- |
1199 | |
1200 | -# Copyright (C) 1996-2012 Free Software Foundation, Inc. |
1201 | +# Copyright (C) 1996-2013 Free Software Foundation, Inc. |
1202 | # |
1203 | # This file is free software; the Free Software Foundation |
1204 | # gives unlimited permission to copy and/or distribute it, |
1205 | # with or without modifications, as long as this notice is preserved. |
1206 | |
1207 | -# serial 9 |
1208 | - |
1209 | # AM_SANITY_CHECK |
1210 | # --------------- |
1211 | AC_DEFUN([AM_SANITY_CHECK], |
1212 | @@ -1138,14 +1136,12 @@ |
1213 | rm -f conftest.file |
1214 | ]) |
1215 | |
1216 | -# Copyright (C) 2009-2012 Free Software Foundation, Inc. |
1217 | +# Copyright (C) 2009-2013 Free Software Foundation, Inc. |
1218 | # |
1219 | # This file is free software; the Free Software Foundation |
1220 | # gives unlimited permission to copy and/or distribute it, |
1221 | # with or without modifications, as long as this notice is preserved. |
1222 | |
1223 | -# serial 3 |
1224 | - |
1225 | # AM_SILENT_RULES([DEFAULT]) |
1226 | # -------------------------- |
1227 | # Enable less verbose build rules; with the default set to DEFAULT |
1228 | @@ -1200,14 +1196,12 @@ |
1229 | _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl |
1230 | ]) |
1231 | |
1232 | -# Copyright (C) 2001-2012 Free Software Foundation, Inc. |
1233 | +# Copyright (C) 2001-2013 Free Software Foundation, Inc. |
1234 | # |
1235 | # This file is free software; the Free Software Foundation |
1236 | # gives unlimited permission to copy and/or distribute it, |
1237 | # with or without modifications, as long as this notice is preserved. |
1238 | |
1239 | -# serial 2 |
1240 | - |
1241 | # AM_PROG_INSTALL_STRIP |
1242 | # --------------------- |
1243 | # One issue with vendor 'install' (even GNU) is that you can't |
1244 | @@ -1230,14 +1224,12 @@ |
1245 | INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" |
1246 | AC_SUBST([INSTALL_STRIP_PROGRAM])]) |
1247 | |
1248 | -# Copyright (C) 2006-2012 Free Software Foundation, Inc. |
1249 | +# Copyright (C) 2006-2013 Free Software Foundation, Inc. |
1250 | # |
1251 | # This file is free software; the Free Software Foundation |
1252 | # gives unlimited permission to copy and/or distribute it, |
1253 | # with or without modifications, as long as this notice is preserved. |
1254 | |
1255 | -# serial 3 |
1256 | - |
1257 | # _AM_SUBST_NOTMAKE(VARIABLE) |
1258 | # --------------------------- |
1259 | # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. |
1260 | @@ -1251,14 +1243,12 @@ |
1261 | |
1262 | # Check how to create a tarball. -*- Autoconf -*- |
1263 | |
1264 | -# Copyright (C) 2004-2012 Free Software Foundation, Inc. |
1265 | +# Copyright (C) 2004-2013 Free Software Foundation, Inc. |
1266 | # |
1267 | # This file is free software; the Free Software Foundation |
1268 | # gives unlimited permission to copy and/or distribute it, |
1269 | # with or without modifications, as long as this notice is preserved. |
1270 | |
1271 | -# serial 3 |
1272 | - |
1273 | # _AM_PROG_TAR(FORMAT) |
1274 | # -------------------- |
1275 | # Check how to create a tarball in format FORMAT. |
1276 | @@ -1272,80 +1262,119 @@ |
1277 | # Substitute a variable $(am__untar) that extract such |
1278 | # a tarball read from stdin. |
1279 | # $(am__untar) < result.tar |
1280 | +# |
1281 | AC_DEFUN([_AM_PROG_TAR], |
1282 | [# Always define AMTAR for backward compatibility. Yes, it's still used |
1283 | # in the wild :-( We should find a proper way to deprecate it ... |
1284 | AC_SUBST([AMTAR], ['$${TAR-tar}']) |
1285 | + |
1286 | +# We'll loop over all known methods to create a tar archive until one works. |
1287 | +_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' |
1288 | + |
1289 | m4_if([$1], [v7], |
1290 | - [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], |
1291 | - [m4_case([$1], [ustar],, [pax],, |
1292 | - [m4_fatal([Unknown tar format])]) |
1293 | -AC_MSG_CHECKING([how to create a $1 tar archive]) |
1294 | -# Loop over all known methods to create a tar archive until one works. |
1295 | -_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' |
1296 | -_am_tools=${am_cv_prog_tar_$1-$_am_tools} |
1297 | -# Do not fold the above two line into one, because Tru64 sh and |
1298 | -# Solaris sh will not grok spaces in the rhs of '-'. |
1299 | -for _am_tool in $_am_tools |
1300 | -do |
1301 | - case $_am_tool in |
1302 | - gnutar) |
1303 | - for _am_tar in tar gnutar gtar; |
1304 | - do |
1305 | - AM_RUN_LOG([$_am_tar --version]) && break |
1306 | - done |
1307 | - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' |
1308 | - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' |
1309 | - am__untar="$_am_tar -xf -" |
1310 | - ;; |
1311 | - plaintar) |
1312 | - # Must skip GNU tar: if it does not support --format= it doesn't create |
1313 | - # ustar tarball either. |
1314 | - (tar --version) >/dev/null 2>&1 && continue |
1315 | - am__tar='tar chf - "$$tardir"' |
1316 | - am__tar_='tar chf - "$tardir"' |
1317 | - am__untar='tar xf -' |
1318 | - ;; |
1319 | - pax) |
1320 | - am__tar='pax -L -x $1 -w "$$tardir"' |
1321 | - am__tar_='pax -L -x $1 -w "$tardir"' |
1322 | - am__untar='pax -r' |
1323 | - ;; |
1324 | - cpio) |
1325 | - am__tar='find "$$tardir" -print | cpio -o -H $1 -L' |
1326 | - am__tar_='find "$tardir" -print | cpio -o -H $1 -L' |
1327 | - am__untar='cpio -i -H $1 -d' |
1328 | - ;; |
1329 | - none) |
1330 | - am__tar=false |
1331 | - am__tar_=false |
1332 | - am__untar=false |
1333 | - ;; |
1334 | - esac |
1335 | - |
1336 | - # If the value was cached, stop now. We just wanted to have am__tar |
1337 | - # and am__untar set. |
1338 | - test -n "${am_cv_prog_tar_$1}" && break |
1339 | - |
1340 | - # tar/untar a dummy directory, and stop if the command works |
1341 | - rm -rf conftest.dir |
1342 | - mkdir conftest.dir |
1343 | - echo GrepMe > conftest.dir/file |
1344 | - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) |
1345 | - rm -rf conftest.dir |
1346 | - if test -s conftest.tar; then |
1347 | - AM_RUN_LOG([$am__untar <conftest.tar]) |
1348 | - grep GrepMe conftest.dir/file >/dev/null 2>&1 && break |
1349 | - fi |
1350 | -done |
1351 | -rm -rf conftest.dir |
1352 | - |
1353 | -AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) |
1354 | -AC_MSG_RESULT([$am_cv_prog_tar_$1])]) |
1355 | + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], |
1356 | + |
1357 | + [m4_case([$1], |
1358 | + [ustar], |
1359 | + [# The POSIX 1988 'ustar' format is defined with fixed-size fields. |
1360 | + # There is notably a 21 bits limit for the UID and the GID. In fact, |
1361 | + # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 |
1362 | + # and bug#13588). |
1363 | + am_max_uid=2097151 # 2^21 - 1 |
1364 | + am_max_gid=$am_max_uid |
1365 | + # The $UID and $GID variables are not portable, so we need to resort |
1366 | + # to the POSIX-mandated id(1) utility. Errors in the 'id' calls |
1367 | + # below are definitely unexpected, so allow the users to see them |
1368 | + # (that is, avoid stderr redirection). |
1369 | + am_uid=`id -u || echo unknown` |
1370 | + am_gid=`id -g || echo unknown` |
1371 | + AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format]) |
1372 | + if test $am_uid -le $am_max_uid; then |
1373 | + AC_MSG_RESULT([yes]) |
1374 | + else |
1375 | + AC_MSG_RESULT([no]) |
1376 | + _am_tools=none |
1377 | + fi |
1378 | + AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format]) |
1379 | + if test $am_gid -le $am_max_gid; then |
1380 | + AC_MSG_RESULT([yes]) |
1381 | + else |
1382 | + AC_MSG_RESULT([no]) |
1383 | + _am_tools=none |
1384 | + fi], |
1385 | + |
1386 | + [pax], |
1387 | + [], |
1388 | + |
1389 | + [m4_fatal([Unknown tar format])]) |
1390 | + |
1391 | + AC_MSG_CHECKING([how to create a $1 tar archive]) |
1392 | + |
1393 | + # Go ahead even if we have the value already cached. We do so because we |
1394 | + # need to set the values for the 'am__tar' and 'am__untar' variables. |
1395 | + _am_tools=${am_cv_prog_tar_$1-$_am_tools} |
1396 | + |
1397 | + for _am_tool in $_am_tools; do |
1398 | + case $_am_tool in |
1399 | + gnutar) |
1400 | + for _am_tar in tar gnutar gtar; do |
1401 | + AM_RUN_LOG([$_am_tar --version]) && break |
1402 | + done |
1403 | + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' |
1404 | + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' |
1405 | + am__untar="$_am_tar -xf -" |
1406 | + ;; |
1407 | + plaintar) |
1408 | + # Must skip GNU tar: if it does not support --format= it doesn't create |
1409 | + # ustar tarball either. |
1410 | + (tar --version) >/dev/null 2>&1 && continue |
1411 | + am__tar='tar chf - "$$tardir"' |
1412 | + am__tar_='tar chf - "$tardir"' |
1413 | + am__untar='tar xf -' |
1414 | + ;; |
1415 | + pax) |
1416 | + am__tar='pax -L -x $1 -w "$$tardir"' |
1417 | + am__tar_='pax -L -x $1 -w "$tardir"' |
1418 | + am__untar='pax -r' |
1419 | + ;; |
1420 | + cpio) |
1421 | + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' |
1422 | + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' |
1423 | + am__untar='cpio -i -H $1 -d' |
1424 | + ;; |
1425 | + none) |
1426 | + am__tar=false |
1427 | + am__tar_=false |
1428 | + am__untar=false |
1429 | + ;; |
1430 | + esac |
1431 | + |
1432 | + # If the value was cached, stop now. We just wanted to have am__tar |
1433 | + # and am__untar set. |
1434 | + test -n "${am_cv_prog_tar_$1}" && break |
1435 | + |
1436 | + # tar/untar a dummy directory, and stop if the command works. |
1437 | + rm -rf conftest.dir |
1438 | + mkdir conftest.dir |
1439 | + echo GrepMe > conftest.dir/file |
1440 | + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) |
1441 | + rm -rf conftest.dir |
1442 | + if test -s conftest.tar; then |
1443 | + AM_RUN_LOG([$am__untar <conftest.tar]) |
1444 | + AM_RUN_LOG([cat conftest.dir/file]) |
1445 | + grep GrepMe conftest.dir/file >/dev/null 2>&1 && break |
1446 | + fi |
1447 | + done |
1448 | + rm -rf conftest.dir |
1449 | + |
1450 | + AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) |
1451 | + AC_MSG_RESULT([$am_cv_prog_tar_$1])]) |
1452 | + |
1453 | AC_SUBST([am__tar]) |
1454 | AC_SUBST([am__untar]) |
1455 | ]) # _AM_PROG_TAR |
1456 | |
1457 | +m4_include([m4/intltool.m4]) |
1458 | m4_include([m4/libtool.m4]) |
1459 | m4_include([m4/ltoptions.m4]) |
1460 | m4_include([m4/ltsugar.m4]) |
1461 | @@ -1353,4 +1382,5 @@ |
1462 | m4_include([m4/lt~obsolete.m4]) |
1463 | m4_include([m4/manywarnings.m4]) |
1464 | m4_include([m4/virt-compile-warnings.m4]) |
1465 | +m4_include([m4/virt-gettext.m4]) |
1466 | m4_include([m4/warnings.m4]) |
1467 | |
1468 | === modified file 'build-aux/compile' |
1469 | --- build-aux/compile 2012-08-27 14:48:49 +0000 |
1470 | +++ build-aux/compile 2014-06-13 08:07:26 +0000 |
1471 | @@ -1,9 +1,9 @@ |
1472 | #! /bin/sh |
1473 | # Wrapper for compilers which do not understand '-c -o'. |
1474 | |
1475 | -scriptversion=2012-03-05.13; # UTC |
1476 | +scriptversion=2012-10-14.11; # UTC |
1477 | |
1478 | -# Copyright (C) 1999-2012 Free Software Foundation, Inc. |
1479 | +# Copyright (C) 1999-2013 Free Software Foundation, Inc. |
1480 | # Written by Tom Tromey <tromey@cygnus.com>. |
1481 | # |
1482 | # This program is free software; you can redistribute it and/or modify |
1483 | @@ -112,6 +112,11 @@ |
1484 | lib=$dir/$lib.lib |
1485 | break |
1486 | fi |
1487 | + if test -f "$dir/lib$lib.a"; then |
1488 | + found=yes |
1489 | + lib=$dir/lib$lib.a |
1490 | + break |
1491 | + fi |
1492 | done |
1493 | IFS=$save_IFS |
1494 | |
1495 | |
1496 | === modified file 'build-aux/config.guess' |
1497 | --- build-aux/config.guess 2012-08-27 14:48:49 +0000 |
1498 | +++ build-aux/config.guess 2014-06-13 08:07:26 +0000 |
1499 | @@ -1,14 +1,12 @@ |
1500 | #! /bin/sh |
1501 | # Attempt to guess a canonical system name. |
1502 | -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, |
1503 | -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, |
1504 | -# 2011, 2012 Free Software Foundation, Inc. |
1505 | +# Copyright 1992-2013 Free Software Foundation, Inc. |
1506 | |
1507 | -timestamp='2012-06-10' |
1508 | +timestamp='2013-04-24' |
1509 | |
1510 | # This file is free software; you can redistribute it and/or modify it |
1511 | # under the terms of the GNU General Public License as published by |
1512 | -# the Free Software Foundation; either version 2 of the License, or |
1513 | +# the Free Software Foundation; either version 3 of the License, or |
1514 | # (at your option) any later version. |
1515 | # |
1516 | # This program is distributed in the hope that it will be useful, but |
1517 | @@ -22,19 +20,17 @@ |
1518 | # As a special exception to the GNU General Public License, if you |
1519 | # distribute this file as part of a program that contains a |
1520 | # configuration script generated by Autoconf, you may include it under |
1521 | -# the same distribution terms that you use for the rest of that program. |
1522 | - |
1523 | - |
1524 | -# Originally written by Per Bothner. Please send patches (context |
1525 | -# diff format) to <config-patches@gnu.org> and include a ChangeLog |
1526 | -# entry. |
1527 | +# the same distribution terms that you use for the rest of that |
1528 | +# program. This Exception is an additional permission under section 7 |
1529 | +# of the GNU General Public License, version 3 ("GPLv3"). |
1530 | # |
1531 | -# This script attempts to guess a canonical system name similar to |
1532 | -# config.sub. If it succeeds, it prints the system name on stdout, and |
1533 | -# exits with 0. Otherwise, it exits with 1. |
1534 | +# Originally written by Per Bothner. |
1535 | # |
1536 | # You can get the latest version of this script from: |
1537 | # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD |
1538 | +# |
1539 | +# Please send patches with a ChangeLog entry to config-patches@gnu.org. |
1540 | + |
1541 | |
1542 | me=`echo "$0" | sed -e 's,.*/,,'` |
1543 | |
1544 | @@ -54,9 +50,7 @@ |
1545 | GNU config.guess ($timestamp) |
1546 | |
1547 | Originally written by Per Bothner. |
1548 | -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, |
1549 | -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 |
1550 | -Free Software Foundation, Inc. |
1551 | +Copyright 1992-2013 Free Software Foundation, Inc. |
1552 | |
1553 | This is free software; see the source for copying conditions. There is NO |
1554 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." |
1555 | @@ -200,6 +194,10 @@ |
1556 | # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. |
1557 | echo "${machine}-${os}${release}" |
1558 | exit ;; |
1559 | + *:Bitrig:*:*) |
1560 | + UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` |
1561 | + echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} |
1562 | + exit ;; |
1563 | *:OpenBSD:*:*) |
1564 | UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` |
1565 | echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} |
1566 | @@ -302,7 +300,7 @@ |
1567 | arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) |
1568 | echo arm-acorn-riscix${UNAME_RELEASE} |
1569 | exit ;; |
1570 | - arm:riscos:*:*|arm:RISCOS:*:*) |
1571 | + arm*:riscos:*:*|arm*:RISCOS:*:*) |
1572 | echo arm-unknown-riscos |
1573 | exit ;; |
1574 | SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) |
1575 | @@ -801,6 +799,9 @@ |
1576 | i*:CYGWIN*:*) |
1577 | echo ${UNAME_MACHINE}-pc-cygwin |
1578 | exit ;; |
1579 | + *:MINGW64*:*) |
1580 | + echo ${UNAME_MACHINE}-pc-mingw64 |
1581 | + exit ;; |
1582 | *:MINGW*:*) |
1583 | echo ${UNAME_MACHINE}-pc-mingw32 |
1584 | exit ;; |
1585 | @@ -882,6 +883,9 @@ |
1586 | if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi |
1587 | echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} |
1588 | exit ;; |
1589 | + arc:Linux:*:* | arceb:Linux:*:*) |
1590 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
1591 | + exit ;; |
1592 | arm*:Linux:*:*) |
1593 | eval $set_cc_for_build |
1594 | if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ |
1595 | @@ -920,6 +924,11 @@ |
1596 | #ifdef __dietlibc__ |
1597 | LIBC=dietlibc |
1598 | #endif |
1599 | + #else |
1600 | + #include <features.h> |
1601 | + #ifdef __UCLIBC__ |
1602 | + LIBC=uclibc |
1603 | + #endif |
1604 | EOF |
1605 | eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` |
1606 | echo "${UNAME_MACHINE}-pc-linux-${LIBC}" |
1607 | @@ -952,6 +961,9 @@ |
1608 | eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` |
1609 | test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } |
1610 | ;; |
1611 | + or1k:Linux:*:*) |
1612 | + echo ${UNAME_MACHINE}-unknown-linux-gnu |
1613 | + exit ;; |
1614 | or32:Linux:*:*) |
1615 | echo ${UNAME_MACHINE}-unknown-linux-gnu |
1616 | exit ;; |
1617 | @@ -994,7 +1006,9 @@ |
1618 | echo ${UNAME_MACHINE}-dec-linux-gnu |
1619 | exit ;; |
1620 | x86_64:Linux:*:*) |
1621 | - echo ${UNAME_MACHINE}-unknown-linux-gnu |
1622 | + LIBC=gnu |
1623 | + test -r /lib/libc.so && od -An -S13 /lib/libc.so | grep -q __uClibc_main && LIBC=uclibc |
1624 | + echo ${UNAME_MACHINE}-unknown-linux-${LIBC} |
1625 | exit ;; |
1626 | xtensa*:Linux:*:*) |
1627 | echo ${UNAME_MACHINE}-unknown-linux-gnu |
1628 | @@ -1201,6 +1215,9 @@ |
1629 | BePC:Haiku:*:*) # Haiku running on Intel PC compatible. |
1630 | echo i586-pc-haiku |
1631 | exit ;; |
1632 | + x86_64:Haiku:*:*) |
1633 | + echo x86_64-unknown-haiku |
1634 | + exit ;; |
1635 | SX-4:SUPER-UX:*:*) |
1636 | echo sx4-nec-superux${UNAME_RELEASE} |
1637 | exit ;; |
1638 | @@ -1330,9 +1347,6 @@ |
1639 | exit ;; |
1640 | esac |
1641 | |
1642 | -#echo '(No uname command or uname output not recognized.)' 1>&2 |
1643 | -#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 |
1644 | - |
1645 | eval $set_cc_for_build |
1646 | cat >$dummy.c <<EOF |
1647 | #ifdef _SEQUENT_ |
1648 | |
1649 | === modified file 'build-aux/config.sub' |
1650 | --- build-aux/config.sub 2012-08-27 14:48:49 +0000 |
1651 | +++ build-aux/config.sub 2014-06-13 08:07:26 +0000 |
1652 | @@ -1,24 +1,18 @@ |
1653 | #! /bin/sh |
1654 | # Configuration validation subroutine script. |
1655 | -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, |
1656 | -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, |
1657 | -# 2011, 2012 Free Software Foundation, Inc. |
1658 | - |
1659 | -timestamp='2012-04-18' |
1660 | - |
1661 | -# This file is (in principle) common to ALL GNU software. |
1662 | -# The presence of a machine in this file suggests that SOME GNU software |
1663 | -# can handle that machine. It does not imply ALL GNU software can. |
1664 | -# |
1665 | -# This file is free software; you can redistribute it and/or modify |
1666 | -# it under the terms of the GNU General Public License as published by |
1667 | -# the Free Software Foundation; either version 2 of the License, or |
1668 | +# Copyright 1992-2013 Free Software Foundation, Inc. |
1669 | + |
1670 | +timestamp='2013-04-24' |
1671 | + |
1672 | +# This file is free software; you can redistribute it and/or modify it |
1673 | +# under the terms of the GNU General Public License as published by |
1674 | +# the Free Software Foundation; either version 3 of the License, or |
1675 | # (at your option) any later version. |
1676 | # |
1677 | -# This program is distributed in the hope that it will be useful, |
1678 | -# but WITHOUT ANY WARRANTY; without even the implied warranty of |
1679 | -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
1680 | -# GNU General Public License for more details. |
1681 | +# This program is distributed in the hope that it will be useful, but |
1682 | +# WITHOUT ANY WARRANTY; without even the implied warranty of |
1683 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
1684 | +# General Public License for more details. |
1685 | # |
1686 | # You should have received a copy of the GNU General Public License |
1687 | # along with this program; if not, see <http://www.gnu.org/licenses/>. |
1688 | @@ -26,11 +20,12 @@ |
1689 | # As a special exception to the GNU General Public License, if you |
1690 | # distribute this file as part of a program that contains a |
1691 | # configuration script generated by Autoconf, you may include it under |
1692 | -# the same distribution terms that you use for the rest of that program. |
1693 | - |
1694 | - |
1695 | -# Please send patches to <config-patches@gnu.org>. Submit a context |
1696 | -# diff and a properly formatted GNU ChangeLog entry. |
1697 | +# the same distribution terms that you use for the rest of that |
1698 | +# program. This Exception is an additional permission under section 7 |
1699 | +# of the GNU General Public License, version 3 ("GPLv3"). |
1700 | + |
1701 | + |
1702 | +# Please send patches with a ChangeLog entry to config-patches@gnu.org. |
1703 | # |
1704 | # Configuration subroutine to validate and canonicalize a configuration type. |
1705 | # Supply the specified configuration type as an argument. |
1706 | @@ -73,9 +68,7 @@ |
1707 | version="\ |
1708 | GNU config.sub ($timestamp) |
1709 | |
1710 | -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, |
1711 | -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 |
1712 | -Free Software Foundation, Inc. |
1713 | +Copyright 1992-2013 Free Software Foundation, Inc. |
1714 | |
1715 | This is free software; see the source for copying conditions. There is NO |
1716 | warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." |
1717 | @@ -123,7 +116,7 @@ |
1718 | maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` |
1719 | case $maybe_os in |
1720 | nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ |
1721 | - linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ |
1722 | + linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ |
1723 | knetbsd*-gnu* | netbsd*-gnu* | \ |
1724 | kopensolaris*-gnu* | \ |
1725 | storm-chaos* | os2-emx* | rtmk-nova*) |
1726 | @@ -156,7 +149,7 @@ |
1727 | -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ |
1728 | -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ |
1729 | -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ |
1730 | - -apple | -axis | -knuth | -cray | -microblaze) |
1731 | + -apple | -axis | -knuth | -cray | -microblaze*) |
1732 | os= |
1733 | basic_machine=$1 |
1734 | ;; |
1735 | @@ -259,8 +252,10 @@ |
1736 | | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ |
1737 | | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ |
1738 | | am33_2.0 \ |
1739 | - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ |
1740 | - | be32 | be64 \ |
1741 | + | arc | arceb \ |
1742 | + | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ |
1743 | + | avr | avr32 \ |
1744 | + | be32 | be64 \ |
1745 | | bfin \ |
1746 | | c4x | clipper \ |
1747 | | d10v | d30v | dlx | dsp16xx \ |
1748 | @@ -273,7 +268,7 @@ |
1749 | | le32 | le64 \ |
1750 | | lm32 \ |
1751 | | m32c | m32r | m32rle | m68000 | m68k | m88k \ |
1752 | - | maxq | mb | microblaze | mcore | mep | metag \ |
1753 | + | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ |
1754 | | mips | mipsbe | mipseb | mipsel | mipsle \ |
1755 | | mips16 \ |
1756 | | mips64 | mips64el \ |
1757 | @@ -291,16 +286,17 @@ |
1758 | | mipsisa64r2 | mipsisa64r2el \ |
1759 | | mipsisa64sb1 | mipsisa64sb1el \ |
1760 | | mipsisa64sr71k | mipsisa64sr71kel \ |
1761 | + | mipsr5900 | mipsr5900el \ |
1762 | | mipstx39 | mipstx39el \ |
1763 | | mn10200 | mn10300 \ |
1764 | | moxie \ |
1765 | | mt \ |
1766 | | msp430 \ |
1767 | | nds32 | nds32le | nds32be \ |
1768 | - | nios | nios2 \ |
1769 | + | nios | nios2 | nios2eb | nios2el \ |
1770 | | ns16k | ns32k \ |
1771 | | open8 \ |
1772 | - | or32 \ |
1773 | + | or1k | or32 \ |
1774 | | pdp10 | pdp11 | pj | pjl \ |
1775 | | powerpc | powerpc64 | powerpc64le | powerpcle \ |
1776 | | pyramid \ |
1777 | @@ -370,7 +366,7 @@ |
1778 | | aarch64-* | aarch64_be-* \ |
1779 | | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ |
1780 | | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ |
1781 | - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ |
1782 | + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ |
1783 | | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ |
1784 | | avr-* | avr32-* \ |
1785 | | be32-* | be64-* \ |
1786 | @@ -389,7 +385,8 @@ |
1787 | | lm32-* \ |
1788 | | m32c-* | m32r-* | m32rle-* \ |
1789 | | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ |
1790 | - | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ |
1791 | + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ |
1792 | + | microblaze-* | microblazeel-* \ |
1793 | | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ |
1794 | | mips16-* \ |
1795 | | mips64-* | mips64el-* \ |
1796 | @@ -407,12 +404,13 @@ |
1797 | | mipsisa64r2-* | mipsisa64r2el-* \ |
1798 | | mipsisa64sb1-* | mipsisa64sb1el-* \ |
1799 | | mipsisa64sr71k-* | mipsisa64sr71kel-* \ |
1800 | + | mipsr5900-* | mipsr5900el-* \ |
1801 | | mipstx39-* | mipstx39el-* \ |
1802 | | mmix-* \ |
1803 | | mt-* \ |
1804 | | msp430-* \ |
1805 | | nds32-* | nds32le-* | nds32be-* \ |
1806 | - | nios-* | nios2-* \ |
1807 | + | nios-* | nios2-* | nios2eb-* | nios2el-* \ |
1808 | | none-* | np1-* | ns16k-* | ns32k-* \ |
1809 | | open8-* \ |
1810 | | orion-* \ |
1811 | @@ -788,9 +786,13 @@ |
1812 | basic_machine=ns32k-utek |
1813 | os=-sysv |
1814 | ;; |
1815 | - microblaze) |
1816 | + microblaze*) |
1817 | basic_machine=microblaze-xilinx |
1818 | ;; |
1819 | + mingw64) |
1820 | + basic_machine=x86_64-pc |
1821 | + os=-mingw64 |
1822 | + ;; |
1823 | mingw32) |
1824 | basic_machine=i386-pc |
1825 | os=-mingw32 |
1826 | @@ -1004,7 +1006,7 @@ |
1827 | ;; |
1828 | ppc64) basic_machine=powerpc64-unknown |
1829 | ;; |
1830 | - ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` |
1831 | + ppc64-* | ppc64p7-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` |
1832 | ;; |
1833 | ppc64le | powerpc64little | ppc64-le | powerpc64-little) |
1834 | basic_machine=powerpc64le-unknown |
1835 | @@ -1019,7 +1021,11 @@ |
1836 | basic_machine=i586-unknown |
1837 | os=-pw32 |
1838 | ;; |
1839 | - rdos) |
1840 | + rdos | rdos64) |
1841 | + basic_machine=x86_64-pc |
1842 | + os=-rdos |
1843 | + ;; |
1844 | + rdos32) |
1845 | basic_machine=i386-pc |
1846 | os=-rdos |
1847 | ;; |
1848 | @@ -1346,21 +1352,21 @@ |
1849 | -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ |
1850 | | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ |
1851 | | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ |
1852 | - | -sym* | -kopensolaris* \ |
1853 | + | -sym* | -kopensolaris* | -plan9* \ |
1854 | | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ |
1855 | | -aos* | -aros* \ |
1856 | | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ |
1857 | | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ |
1858 | | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ |
1859 | - | -openbsd* | -solidbsd* \ |
1860 | + | -bitrig* | -openbsd* | -solidbsd* \ |
1861 | | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ |
1862 | | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ |
1863 | | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ |
1864 | | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ |
1865 | | -chorusos* | -chorusrdb* | -cegcc* \ |
1866 | | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ |
1867 | - | -mingw32* | -linux-gnu* | -linux-android* \ |
1868 | - | -linux-newlib* | -linux-uclibc* \ |
1869 | + | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ |
1870 | + | -linux-newlib* | -linux-musl* | -linux-uclibc* \ |
1871 | | -uxpv* | -beos* | -mpeix* | -udk* \ |
1872 | | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ |
1873 | | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ |
1874 | @@ -1492,9 +1498,6 @@ |
1875 | -aros*) |
1876 | os=-aros |
1877 | ;; |
1878 | - -kaos*) |
1879 | - os=-kaos |
1880 | - ;; |
1881 | -zvmoe) |
1882 | os=-zvmoe |
1883 | ;; |
1884 | @@ -1586,6 +1589,9 @@ |
1885 | mips*-*) |
1886 | os=-elf |
1887 | ;; |
1888 | + or1k-*) |
1889 | + os=-elf |
1890 | + ;; |
1891 | or32-*) |
1892 | os=-coff |
1893 | ;; |
1894 | |
1895 | === modified file 'build-aux/depcomp' |
1896 | --- build-aux/depcomp 2012-08-27 14:48:49 +0000 |
1897 | +++ build-aux/depcomp 2014-06-13 08:07:26 +0000 |
1898 | @@ -1,9 +1,9 @@ |
1899 | #! /bin/sh |
1900 | # depcomp - compile a program generating dependencies as side-effects |
1901 | |
1902 | -scriptversion=2012-03-27.16; # UTC |
1903 | +scriptversion=2012-10-18.11; # UTC |
1904 | |
1905 | -# Copyright (C) 1999-2012 Free Software Foundation, Inc. |
1906 | +# Copyright (C) 1999-2013 Free Software Foundation, Inc. |
1907 | |
1908 | # This program is free software; you can redistribute it and/or modify |
1909 | # it under the terms of the GNU General Public License as published by |
1910 | @@ -27,9 +27,9 @@ |
1911 | |
1912 | case $1 in |
1913 | '') |
1914 | - echo "$0: No command. Try '$0 --help' for more information." 1>&2 |
1915 | - exit 1; |
1916 | - ;; |
1917 | + echo "$0: No command. Try '$0 --help' for more information." 1>&2 |
1918 | + exit 1; |
1919 | + ;; |
1920 | -h | --h*) |
1921 | cat <<\EOF |
1922 | Usage: depcomp [--help] [--version] PROGRAM [ARGS] |
1923 | @@ -56,11 +56,65 @@ |
1924 | ;; |
1925 | esac |
1926 | |
1927 | +# Get the directory component of the given path, and save it in the |
1928 | +# global variables '$dir'. Note that this directory component will |
1929 | +# be either empty or ending with a '/' character. This is deliberate. |
1930 | +set_dir_from () |
1931 | +{ |
1932 | + case $1 in |
1933 | + */*) dir=`echo "$1" | sed -e 's|/[^/]*$|/|'`;; |
1934 | + *) dir=;; |
1935 | + esac |
1936 | +} |
1937 | + |
1938 | +# Get the suffix-stripped basename of the given path, and save it the |
1939 | +# global variable '$base'. |
1940 | +set_base_from () |
1941 | +{ |
1942 | + base=`echo "$1" | sed -e 's|^.*/||' -e 's/\.[^.]*$//'` |
1943 | +} |
1944 | + |
1945 | +# If no dependency file was actually created by the compiler invocation, |
1946 | +# we still have to create a dummy depfile, to avoid errors with the |
1947 | +# Makefile "include basename.Plo" scheme. |
1948 | +make_dummy_depfile () |
1949 | +{ |
1950 | + echo "#dummy" > "$depfile" |
1951 | +} |
1952 | + |
1953 | +# Factor out some common post-processing of the generated depfile. |
1954 | +# Requires the auxiliary global variable '$tmpdepfile' to be set. |
1955 | +aix_post_process_depfile () |
1956 | +{ |
1957 | + # If the compiler actually managed to produce a dependency file, |
1958 | + # post-process it. |
1959 | + if test -f "$tmpdepfile"; then |
1960 | + # Each line is of the form 'foo.o: dependency.h'. |
1961 | + # Do two passes, one to just change these to |
1962 | + # $object: dependency.h |
1963 | + # and one to simply output |
1964 | + # dependency.h: |
1965 | + # which is needed to avoid the deleted-header problem. |
1966 | + { sed -e "s,^.*\.[$lower]*:,$object:," < "$tmpdepfile" |
1967 | + sed -e "s,^.*\.[$lower]*:[$tab ]*,," -e 's,$,:,' < "$tmpdepfile" |
1968 | + } > "$depfile" |
1969 | + rm -f "$tmpdepfile" |
1970 | + else |
1971 | + make_dummy_depfile |
1972 | + fi |
1973 | +} |
1974 | + |
1975 | # A tabulation character. |
1976 | tab=' ' |
1977 | # A newline character. |
1978 | nl=' |
1979 | ' |
1980 | +# Character ranges might be problematic outside the C locale. |
1981 | +# These definitions help. |
1982 | +upper=ABCDEFGHIJKLMNOPQRSTUVWXYZ |
1983 | +lower=abcdefghijklmnopqrstuvwxyz |
1984 | +digits=0123456789 |
1985 | +alpha=${upper}${lower} |
1986 | |
1987 | if test -z "$depmode" || test -z "$source" || test -z "$object"; then |
1988 | echo "depcomp: Variables source, object and depmode must be set" 1>&2 |
1989 | @@ -74,6 +128,9 @@ |
1990 | |
1991 | rm -f "$tmpdepfile" |
1992 | |
1993 | +# Avoid interferences from the environment. |
1994 | +gccflag= dashmflag= |
1995 | + |
1996 | # Some modes work just like other modes, but use different flags. We |
1997 | # parameterize here, but still list the modes in the big case below, |
1998 | # to make depend.m4 easier to write. Note that we *cannot* use a case |
1999 | @@ -85,32 +142,32 @@ |
2000 | fi |
2001 | |
2002 | if test "$depmode" = dashXmstdout; then |
2003 | - # This is just like dashmstdout with a different argument. |
2004 | - dashmflag=-xM |
2005 | - depmode=dashmstdout |
2006 | + # This is just like dashmstdout with a different argument. |
2007 | + dashmflag=-xM |
2008 | + depmode=dashmstdout |
2009 | fi |
2010 | |
2011 | cygpath_u="cygpath -u -f -" |
2012 | if test "$depmode" = msvcmsys; then |
2013 | - # This is just like msvisualcpp but w/o cygpath translation. |
2014 | - # Just convert the backslash-escaped backslashes to single forward |
2015 | - # slashes to satisfy depend.m4 |
2016 | - cygpath_u='sed s,\\\\,/,g' |
2017 | - depmode=msvisualcpp |
2018 | + # This is just like msvisualcpp but w/o cygpath translation. |
2019 | + # Just convert the backslash-escaped backslashes to single forward |
2020 | + # slashes to satisfy depend.m4 |
2021 | + cygpath_u='sed s,\\\\,/,g' |
2022 | + depmode=msvisualcpp |
2023 | fi |
2024 | |
2025 | if test "$depmode" = msvc7msys; then |
2026 | - # This is just like msvc7 but w/o cygpath translation. |
2027 | - # Just convert the backslash-escaped backslashes to single forward |
2028 | - # slashes to satisfy depend.m4 |
2029 | - cygpath_u='sed s,\\\\,/,g' |
2030 | - depmode=msvc7 |
2031 | + # This is just like msvc7 but w/o cygpath translation. |
2032 | + # Just convert the backslash-escaped backslashes to single forward |
2033 | + # slashes to satisfy depend.m4 |
2034 | + cygpath_u='sed s,\\\\,/,g' |
2035 | + depmode=msvc7 |
2036 | fi |
2037 | |
2038 | if test "$depmode" = xlc; then |
2039 | - # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations. |
2040 | - gccflag=-qmakedep=gcc,-MF |
2041 | - depmode=gcc |
2042 | + # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency information. |
2043 | + gccflag=-qmakedep=gcc,-MF |
2044 | + depmode=gcc |
2045 | fi |
2046 | |
2047 | case "$depmode" in |
2048 | @@ -133,8 +190,7 @@ |
2049 | done |
2050 | "$@" |
2051 | stat=$? |
2052 | - if test $stat -eq 0; then : |
2053 | - else |
2054 | + if test $stat -ne 0; then |
2055 | rm -f "$tmpdepfile" |
2056 | exit $stat |
2057 | fi |
2058 | @@ -142,13 +198,17 @@ |
2059 | ;; |
2060 | |
2061 | gcc) |
2062 | +## Note that this doesn't just cater to obsosete pre-3.x GCC compilers. |
2063 | +## but also to in-use compilers like IMB xlc/xlC and the HP C compiler. |
2064 | +## (see the conditional assignment to $gccflag above). |
2065 | ## There are various ways to get dependency output from gcc. Here's |
2066 | ## why we pick this rather obscure method: |
2067 | ## - Don't want to use -MD because we'd like the dependencies to end |
2068 | ## up in a subdir. Having to rename by hand is ugly. |
2069 | ## (We might end up doing this anyway to support other compilers.) |
2070 | ## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like |
2071 | -## -MM, not -M (despite what the docs say). |
2072 | +## -MM, not -M (despite what the docs say). Also, it might not be |
2073 | +## supported by the other compilers which use the 'gcc' depmode. |
2074 | ## - Using -M directly means running the compiler twice (even worse |
2075 | ## than renaming). |
2076 | if test -z "$gccflag"; then |
2077 | @@ -156,15 +216,14 @@ |
2078 | fi |
2079 | "$@" -Wp,"$gccflag$tmpdepfile" |
2080 | stat=$? |
2081 | - if test $stat -eq 0; then : |
2082 | - else |
2083 | + if test $stat -ne 0; then |
2084 | rm -f "$tmpdepfile" |
2085 | exit $stat |
2086 | fi |
2087 | rm -f "$depfile" |
2088 | echo "$object : \\" > "$depfile" |
2089 | - alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz |
2090 | -## The second -e expression handles DOS-style file names with drive letters. |
2091 | + # The second -e expression handles DOS-style file names with drive |
2092 | + # letters. |
2093 | sed -e 's/^[^:]*: / /' \ |
2094 | -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile" |
2095 | ## This next piece of magic avoids the "deleted header file" problem. |
2096 | @@ -173,15 +232,15 @@ |
2097 | ## typically no way to rebuild the header). We avoid this by adding |
2098 | ## dummy dependencies for each header file. Too bad gcc doesn't do |
2099 | ## this for us directly. |
2100 | - tr ' ' "$nl" < "$tmpdepfile" | |
2101 | ## Some versions of gcc put a space before the ':'. On the theory |
2102 | ## that the space means something, we add a space to the output as |
2103 | ## well. hp depmode also adds that space, but also prefixes the VPATH |
2104 | ## to the object. Take care to not repeat it in the output. |
2105 | ## Some versions of the HPUX 10.20 sed can't process this invocation |
2106 | ## correctly. Breaking it into two sed invocations is a workaround. |
2107 | - sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ |
2108 | - | sed -e 's/$/ :/' >> "$depfile" |
2109 | + tr ' ' "$nl" < "$tmpdepfile" \ |
2110 | + | sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \ |
2111 | + | sed -e 's/$/ :/' >> "$depfile" |
2112 | rm -f "$tmpdepfile" |
2113 | ;; |
2114 | |
2115 | @@ -199,8 +258,7 @@ |
2116 | "$@" -MDupdate "$tmpdepfile" |
2117 | fi |
2118 | stat=$? |
2119 | - if test $stat -eq 0; then : |
2120 | - else |
2121 | + if test $stat -ne 0; then |
2122 | rm -f "$tmpdepfile" |
2123 | exit $stat |
2124 | fi |
2125 | @@ -208,7 +266,6 @@ |
2126 | |
2127 | if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files |
2128 | echo "$object : \\" > "$depfile" |
2129 | - |
2130 | # Clip off the initial element (the dependent). Don't try to be |
2131 | # clever and replace this with sed code, as IRIX sed won't handle |
2132 | # lines with more than a fixed number of characters (4096 in |
2133 | @@ -216,19 +273,15 @@ |
2134 | # the IRIX cc adds comments like '#:fec' to the end of the |
2135 | # dependency line. |
2136 | tr ' ' "$nl" < "$tmpdepfile" \ |
2137 | - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \ |
2138 | - tr "$nl" ' ' >> "$depfile" |
2139 | + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \ |
2140 | + | tr "$nl" ' ' >> "$depfile" |
2141 | echo >> "$depfile" |
2142 | - |
2143 | # The second pass generates a dummy entry for each header file. |
2144 | tr ' ' "$nl" < "$tmpdepfile" \ |
2145 | - | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ |
2146 | - >> "$depfile" |
2147 | + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ |
2148 | + >> "$depfile" |
2149 | else |
2150 | - # The sourcefile does not contain any dependencies, so just |
2151 | - # store a dummy comment line, to avoid errors with the Makefile |
2152 | - # "include basename.Plo" scheme. |
2153 | - echo "#dummy" > "$depfile" |
2154 | + make_dummy_depfile |
2155 | fi |
2156 | rm -f "$tmpdepfile" |
2157 | ;; |
2158 | @@ -246,9 +299,8 @@ |
2159 | # current directory. Also, the AIX compiler puts '$object:' at the |
2160 | # start of each line; $object doesn't have directory information. |
2161 | # Version 6 uses the directory in both cases. |
2162 | - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` |
2163 | - test "x$dir" = "x$object" && dir= |
2164 | - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` |
2165 | + set_dir_from "$object" |
2166 | + set_base_from "$object" |
2167 | if test "$libtool" = yes; then |
2168 | tmpdepfile1=$dir$base.u |
2169 | tmpdepfile2=$base.u |
2170 | @@ -261,9 +313,7 @@ |
2171 | "$@" -M |
2172 | fi |
2173 | stat=$? |
2174 | - |
2175 | - if test $stat -eq 0; then : |
2176 | - else |
2177 | + if test $stat -ne 0; then |
2178 | rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" |
2179 | exit $stat |
2180 | fi |
2181 | @@ -272,65 +322,113 @@ |
2182 | do |
2183 | test -f "$tmpdepfile" && break |
2184 | done |
2185 | - if test -f "$tmpdepfile"; then |
2186 | - # Each line is of the form 'foo.o: dependent.h'. |
2187 | - # Do two passes, one to just change these to |
2188 | - # '$object: dependent.h' and one to simply 'dependent.h:'. |
2189 | - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" |
2190 | - sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" |
2191 | - else |
2192 | - # The sourcefile does not contain any dependencies, so just |
2193 | - # store a dummy comment line, to avoid errors with the Makefile |
2194 | - # "include basename.Plo" scheme. |
2195 | - echo "#dummy" > "$depfile" |
2196 | + aix_post_process_depfile |
2197 | + ;; |
2198 | + |
2199 | +tcc) |
2200 | + # tcc (Tiny C Compiler) understand '-MD -MF file' since version 0.9.26 |
2201 | + # FIXME: That version still under development at the moment of writing. |
2202 | + # Make that this statement remains true also for stable, released |
2203 | + # versions. |
2204 | + # It will wrap lines (doesn't matter whether long or short) with a |
2205 | + # trailing '\', as in: |
2206 | + # |
2207 | + # foo.o : \ |
2208 | + # foo.c \ |
2209 | + # foo.h \ |
2210 | + # |
2211 | + # It will put a trailing '\' even on the last line, and will use leading |
2212 | + # spaces rather than leading tabs (at least since its commit 0394caf7 |
2213 | + # "Emit spaces for -MD"). |
2214 | + "$@" -MD -MF "$tmpdepfile" |
2215 | + stat=$? |
2216 | + if test $stat -ne 0; then |
2217 | + rm -f "$tmpdepfile" |
2218 | + exit $stat |
2219 | fi |
2220 | + rm -f "$depfile" |
2221 | + # Each non-empty line is of the form 'foo.o : \' or ' dep.h \'. |
2222 | + # We have to change lines of the first kind to '$object: \'. |
2223 | + sed -e "s|.*:|$object :|" < "$tmpdepfile" > "$depfile" |
2224 | + # And for each line of the second kind, we have to emit a 'dep.h:' |
2225 | + # dummy dependency, to avoid the deleted-header problem. |
2226 | + sed -n -e 's|^ *\(.*\) *\\$|\1:|p' < "$tmpdepfile" >> "$depfile" |
2227 | rm -f "$tmpdepfile" |
2228 | ;; |
2229 | |
2230 | -icc) |
2231 | - # Intel's C compiler anf tcc (Tiny C Compiler) understand '-MD -MF file'. |
2232 | - # However on |
2233 | - # $CC -MD -MF foo.d -c -o sub/foo.o sub/foo.c |
2234 | - # ICC 7.0 will fill foo.d with something like |
2235 | - # foo.o: sub/foo.c |
2236 | - # foo.o: sub/foo.h |
2237 | - # which is wrong. We want |
2238 | - # sub/foo.o: sub/foo.c |
2239 | - # sub/foo.o: sub/foo.h |
2240 | - # sub/foo.c: |
2241 | - # sub/foo.h: |
2242 | - # ICC 7.1 will output |
2243 | +## The order of this option in the case statement is important, since the |
2244 | +## shell code in configure will try each of these formats in the order |
2245 | +## listed in this file. A plain '-MD' option would be understood by many |
2246 | +## compilers, so we must ensure this comes after the gcc and icc options. |
2247 | +pgcc) |
2248 | + # Portland's C compiler understands '-MD'. |
2249 | + # Will always output deps to 'file.d' where file is the root name of the |
2250 | + # source file under compilation, even if file resides in a subdirectory. |
2251 | + # The object file name does not affect the name of the '.d' file. |
2252 | + # pgcc 10.2 will output |
2253 | # foo.o: sub/foo.c sub/foo.h |
2254 | - # and will wrap long lines using '\': |
2255 | + # and will wrap long lines using '\' : |
2256 | # foo.o: sub/foo.c ... \ |
2257 | # sub/foo.h ... \ |
2258 | # ... |
2259 | - # tcc 0.9.26 (FIXME still under development at the moment of writing) |
2260 | - # will emit a similar output, but also prepend the continuation lines |
2261 | - # with horizontal tabulation characters. |
2262 | - "$@" -MD -MF "$tmpdepfile" |
2263 | - stat=$? |
2264 | - if test $stat -eq 0; then : |
2265 | - else |
2266 | + set_dir_from "$object" |
2267 | + # Use the source, not the object, to determine the base name, since |
2268 | + # that's sadly what pgcc will do too. |
2269 | + set_base_from "$source" |
2270 | + tmpdepfile=$base.d |
2271 | + |
2272 | + # For projects that build the same source file twice into different object |
2273 | + # files, the pgcc approach of using the *source* file root name can cause |
2274 | + # problems in parallel builds. Use a locking strategy to avoid stomping on |
2275 | + # the same $tmpdepfile. |
2276 | + lockdir=$base.d-lock |
2277 | + trap " |
2278 | + echo '$0: caught signal, cleaning up...' >&2 |
2279 | + rmdir '$lockdir' |
2280 | + exit 1 |
2281 | + " 1 2 13 15 |
2282 | + numtries=100 |
2283 | + i=$numtries |
2284 | + while test $i -gt 0; do |
2285 | + # mkdir is a portable test-and-set. |
2286 | + if mkdir "$lockdir" 2>/dev/null; then |
2287 | + # This process acquired the lock. |
2288 | + "$@" -MD |
2289 | + stat=$? |
2290 | + # Release the lock. |
2291 | + rmdir "$lockdir" |
2292 | + break |
2293 | + else |
2294 | + # If the lock is being held by a different process, wait |
2295 | + # until the winning process is done or we timeout. |
2296 | + while test -d "$lockdir" && test $i -gt 0; do |
2297 | + sleep 1 |
2298 | + i=`expr $i - 1` |
2299 | + done |
2300 | + fi |
2301 | + i=`expr $i - 1` |
2302 | + done |
2303 | + trap - 1 2 13 15 |
2304 | + if test $i -le 0; then |
2305 | + echo "$0: failed to acquire lock after $numtries attempts" >&2 |
2306 | + echo "$0: check lockdir '$lockdir'" >&2 |
2307 | + exit 1 |
2308 | + fi |
2309 | + |
2310 | + if test $stat -ne 0; then |
2311 | rm -f "$tmpdepfile" |
2312 | exit $stat |
2313 | fi |
2314 | rm -f "$depfile" |
2315 | - # Each line is of the form 'foo.o: dependent.h', |
2316 | - # or 'foo.o: dep1.h dep2.h \', or ' dep3.h dep4.h \'. |
2317 | + # Each line is of the form `foo.o: dependent.h', |
2318 | + # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'. |
2319 | # Do two passes, one to just change these to |
2320 | - # '$object: dependent.h' and one to simply 'dependent.h:'. |
2321 | - sed -e "s/^[ $tab][ $tab]*/ /" -e "s,^[^:]*:,$object :," \ |
2322 | - < "$tmpdepfile" > "$depfile" |
2323 | - sed ' |
2324 | - s/[ '"$tab"'][ '"$tab"']*/ /g |
2325 | - s/^ *// |
2326 | - s/ *\\*$// |
2327 | - s/^[^:]*: *// |
2328 | - /^$/d |
2329 | - /:$/d |
2330 | - s/$/ :/ |
2331 | - ' < "$tmpdepfile" >> "$depfile" |
2332 | + # `$object: dependent.h' and one to simply `dependent.h:'. |
2333 | + sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile" |
2334 | + # Some versions of the HPUX 10.20 sed can't process this invocation |
2335 | + # correctly. Breaking it into two sed invocations is a workaround. |
2336 | + sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \ |
2337 | + | sed -e 's/$/ :/' >> "$depfile" |
2338 | rm -f "$tmpdepfile" |
2339 | ;; |
2340 | |
2341 | @@ -341,9 +439,8 @@ |
2342 | # 'foo.d', which lands next to the object file, wherever that |
2343 | # happens to be. |
2344 | # Much of this is similar to the tru64 case; see comments there. |
2345 | - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` |
2346 | - test "x$dir" = "x$object" && dir= |
2347 | - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` |
2348 | + set_dir_from "$object" |
2349 | + set_base_from "$object" |
2350 | if test "$libtool" = yes; then |
2351 | tmpdepfile1=$dir$base.d |
2352 | tmpdepfile2=$dir.libs/$base.d |
2353 | @@ -354,8 +451,7 @@ |
2354 | "$@" +Maked |
2355 | fi |
2356 | stat=$? |
2357 | - if test $stat -eq 0; then : |
2358 | - else |
2359 | + if test $stat -ne 0; then |
2360 | rm -f "$tmpdepfile1" "$tmpdepfile2" |
2361 | exit $stat |
2362 | fi |
2363 | @@ -365,76 +461,61 @@ |
2364 | test -f "$tmpdepfile" && break |
2365 | done |
2366 | if test -f "$tmpdepfile"; then |
2367 | - sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile" |
2368 | + sed -e "s,^.*\.[$lower]*:,$object:," "$tmpdepfile" > "$depfile" |
2369 | # Add 'dependent.h:' lines. |
2370 | sed -ne '2,${ |
2371 | - s/^ *// |
2372 | - s/ \\*$// |
2373 | - s/$/:/ |
2374 | - p |
2375 | - }' "$tmpdepfile" >> "$depfile" |
2376 | + s/^ *// |
2377 | + s/ \\*$// |
2378 | + s/$/:/ |
2379 | + p |
2380 | + }' "$tmpdepfile" >> "$depfile" |
2381 | else |
2382 | - echo "#dummy" > "$depfile" |
2383 | + make_dummy_depfile |
2384 | fi |
2385 | rm -f "$tmpdepfile" "$tmpdepfile2" |
2386 | ;; |
2387 | |
2388 | tru64) |
2389 | - # The Tru64 compiler uses -MD to generate dependencies as a side |
2390 | - # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'. |
2391 | - # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put |
2392 | - # dependencies in 'foo.d' instead, so we check for that too. |
2393 | - # Subdirectories are respected. |
2394 | - dir=`echo "$object" | sed -e 's|/[^/]*$|/|'` |
2395 | - test "x$dir" = "x$object" && dir= |
2396 | - base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'` |
2397 | - |
2398 | - if test "$libtool" = yes; then |
2399 | - # With Tru64 cc, shared objects can also be used to make a |
2400 | - # static library. This mechanism is used in libtool 1.4 series to |
2401 | - # handle both shared and static libraries in a single compilation. |
2402 | - # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d. |
2403 | - # |
2404 | - # With libtool 1.5 this exception was removed, and libtool now |
2405 | - # generates 2 separate objects for the 2 libraries. These two |
2406 | - # compilations output dependencies in $dir.libs/$base.o.d and |
2407 | - # in $dir$base.o.d. We have to check for both files, because |
2408 | - # one of the two compilations can be disabled. We should prefer |
2409 | - # $dir$base.o.d over $dir.libs/$base.o.d because the latter is |
2410 | - # automatically cleaned when .libs/ is deleted, while ignoring |
2411 | - # the former would cause a distcleancheck panic. |
2412 | - tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4 |
2413 | - tmpdepfile2=$dir$base.o.d # libtool 1.5 |
2414 | - tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5 |
2415 | - tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504 |
2416 | - "$@" -Wc,-MD |
2417 | - else |
2418 | - tmpdepfile1=$dir$base.o.d |
2419 | - tmpdepfile2=$dir$base.d |
2420 | - tmpdepfile3=$dir$base.d |
2421 | - tmpdepfile4=$dir$base.d |
2422 | - "$@" -MD |
2423 | - fi |
2424 | - |
2425 | - stat=$? |
2426 | - if test $stat -eq 0; then : |
2427 | - else |
2428 | - rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" |
2429 | - exit $stat |
2430 | - fi |
2431 | - |
2432 | - for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4" |
2433 | - do |
2434 | - test -f "$tmpdepfile" && break |
2435 | - done |
2436 | - if test -f "$tmpdepfile"; then |
2437 | - sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile" |
2438 | - sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile" |
2439 | - else |
2440 | - echo "#dummy" > "$depfile" |
2441 | - fi |
2442 | - rm -f "$tmpdepfile" |
2443 | - ;; |
2444 | + # The Tru64 compiler uses -MD to generate dependencies as a side |
2445 | + # effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'. |
2446 | + # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put |
2447 | + # dependencies in 'foo.d' instead, so we check for that too. |
2448 | + # Subdirectories are respected. |
2449 | + set_dir_from "$object" |
2450 | + set_base_from "$object" |
2451 | + |
2452 | + if test "$libtool" = yes; then |
2453 | + # Libtool generates 2 separate objects for the 2 libraries. These |
2454 | + # two compilations output dependencies in $dir.libs/$base.o.d and |
2455 | + # in $dir$base.o.d. We have to check for both files, because |
2456 | + # one of the two compilations can be disabled. We should prefer |
2457 | + # $dir$base.o.d over $dir.libs/$base.o.d because the latter is |
2458 | + # automatically cleaned when .libs/ is deleted, while ignoring |
2459 | + # the former would cause a distcleancheck panic. |
2460 | + tmpdepfile1=$dir$base.o.d # libtool 1.5 |
2461 | + tmpdepfile2=$dir.libs/$base.o.d # Likewise. |
2462 | + tmpdepfile3=$dir.libs/$base.d # Compaq CCC V6.2-504 |
2463 | + "$@" -Wc,-MD |
2464 | + else |
2465 | + tmpdepfile1=$dir$base.d |
2466 | + tmpdepfile2=$dir$base.d |
2467 | + tmpdepfile3=$dir$base.d |
2468 | + "$@" -MD |
2469 | + fi |
2470 | + |
2471 | + stat=$? |
2472 | + if test $stat -ne 0; then |
2473 | + rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" |
2474 | + exit $stat |
2475 | + fi |
2476 | + |
2477 | + for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" |
2478 | + do |
2479 | + test -f "$tmpdepfile" && break |
2480 | + done |
2481 | + # Same post-processing that is required for AIX mode. |
2482 | + aix_post_process_depfile |
2483 | + ;; |
2484 | |
2485 | msvc7) |
2486 | if test "$libtool" = yes; then |
2487 | @@ -445,8 +526,7 @@ |
2488 | "$@" $showIncludes > "$tmpdepfile" |
2489 | stat=$? |
2490 | grep -v '^Note: including file: ' "$tmpdepfile" |
2491 | - if test "$stat" = 0; then : |
2492 | - else |
2493 | + if test $stat -ne 0; then |
2494 | rm -f "$tmpdepfile" |
2495 | exit $stat |
2496 | fi |
2497 | @@ -523,13 +603,14 @@ |
2498 | # in the target name. This is to cope with DOS-style filenames: |
2499 | # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise. |
2500 | "$@" $dashmflag | |
2501 | - sed 's:^['"$tab"' ]*[^:'"$tab"' ][^:][^:]*\:['"$tab"' ]*:'"$object"'\: :' > "$tmpdepfile" |
2502 | + sed "s|^[$tab ]*[^:$tab ][^:][^:]*:[$tab ]*|$object: |" > "$tmpdepfile" |
2503 | rm -f "$depfile" |
2504 | cat < "$tmpdepfile" > "$depfile" |
2505 | - tr ' ' "$nl" < "$tmpdepfile" | \ |
2506 | -## Some versions of the HPUX 10.20 sed can't process this invocation |
2507 | -## correctly. Breaking it into two sed invocations is a workaround. |
2508 | - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" |
2509 | + # Some versions of the HPUX 10.20 sed can't process this sed invocation |
2510 | + # correctly. Breaking it into two sed invocations is a workaround. |
2511 | + tr ' ' "$nl" < "$tmpdepfile" \ |
2512 | + | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ |
2513 | + | sed -e 's/$/ :/' >> "$depfile" |
2514 | rm -f "$tmpdepfile" |
2515 | ;; |
2516 | |
2517 | @@ -582,10 +663,12 @@ |
2518 | # makedepend may prepend the VPATH from the source file name to the object. |
2519 | # No need to regex-escape $object, excess matching of '.' is harmless. |
2520 | sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile" |
2521 | - sed '1,2d' "$tmpdepfile" | tr ' ' "$nl" | \ |
2522 | -## Some versions of the HPUX 10.20 sed can't process this invocation |
2523 | -## correctly. Breaking it into two sed invocations is a workaround. |
2524 | - sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile" |
2525 | + # Some versions of the HPUX 10.20 sed can't process the last invocation |
2526 | + # correctly. Breaking it into two sed invocations is a workaround. |
2527 | + sed '1,2d' "$tmpdepfile" \ |
2528 | + | tr ' ' "$nl" \ |
2529 | + | sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \ |
2530 | + | sed -e 's/$/ :/' >> "$depfile" |
2531 | rm -f "$tmpdepfile" "$tmpdepfile".bak |
2532 | ;; |
2533 | |
2534 | @@ -621,10 +704,10 @@ |
2535 | esac |
2536 | done |
2537 | |
2538 | - "$@" -E | |
2539 | - sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ |
2540 | - -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' | |
2541 | - sed '$ s: \\$::' > "$tmpdepfile" |
2542 | + "$@" -E \ |
2543 | + | sed -n -e '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ |
2544 | + -e '/^#line [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' \ |
2545 | + | sed '$ s: \\$::' > "$tmpdepfile" |
2546 | rm -f "$depfile" |
2547 | echo "$object : \\" > "$depfile" |
2548 | cat < "$tmpdepfile" >> "$depfile" |
2549 | @@ -656,15 +739,15 @@ |
2550 | shift |
2551 | ;; |
2552 | "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI") |
2553 | - set fnord "$@" |
2554 | - shift |
2555 | - shift |
2556 | - ;; |
2557 | + set fnord "$@" |
2558 | + shift |
2559 | + shift |
2560 | + ;; |
2561 | *) |
2562 | - set fnord "$@" "$arg" |
2563 | - shift |
2564 | - shift |
2565 | - ;; |
2566 | + set fnord "$@" "$arg" |
2567 | + shift |
2568 | + shift |
2569 | + ;; |
2570 | esac |
2571 | done |
2572 | "$@" -E 2>/dev/null | |
2573 | |
2574 | === modified file 'build-aux/missing' |
2575 | --- build-aux/missing 2012-08-27 14:48:49 +0000 |
2576 | +++ build-aux/missing 2014-06-13 08:07:26 +0000 |
2577 | @@ -1,10 +1,10 @@ |
2578 | #! /bin/sh |
2579 | -# Common stub for a few missing GNU programs while installing. |
2580 | - |
2581 | -scriptversion=2012-01-06.18; # UTC |
2582 | - |
2583 | -# Copyright (C) 1996-2012 Free Software Foundation, Inc. |
2584 | -# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. |
2585 | +# Common wrapper for a few potentially missing GNU programs. |
2586 | + |
2587 | +scriptversion=2012-06-26.16; # UTC |
2588 | + |
2589 | +# Copyright (C) 1996-2013 Free Software Foundation, Inc. |
2590 | +# Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. |
2591 | |
2592 | # This program is free software; you can redistribute it and/or modify |
2593 | # it under the terms of the GNU General Public License as published by |
2594 | @@ -29,61 +29,33 @@ |
2595 | exit 1 |
2596 | fi |
2597 | |
2598 | -run=: |
2599 | -sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' |
2600 | -sed_minuso='s/.* -o \([^ ]*\).*/\1/p' |
2601 | - |
2602 | -# In the cases where this matters, 'missing' is being run in the |
2603 | -# srcdir already. |
2604 | -if test -f configure.ac; then |
2605 | - configure_ac=configure.ac |
2606 | -else |
2607 | - configure_ac=configure.in |
2608 | -fi |
2609 | - |
2610 | -msg="missing on your system" |
2611 | - |
2612 | case $1 in |
2613 | ---run) |
2614 | - # Try to run requested program, and just exit if it succeeds. |
2615 | - run= |
2616 | - shift |
2617 | - "$@" && exit 0 |
2618 | - # Exit code 63 means version mismatch. This often happens |
2619 | - # when the user try to use an ancient version of a tool on |
2620 | - # a file that requires a minimum version. In this case we |
2621 | - # we should proceed has if the program had been absent, or |
2622 | - # if --run hadn't been passed. |
2623 | - if test $? = 63; then |
2624 | - run=: |
2625 | - msg="probably too old" |
2626 | - fi |
2627 | - ;; |
2628 | + |
2629 | + --is-lightweight) |
2630 | + # Used by our autoconf macros to check whether the available missing |
2631 | + # script is modern enough. |
2632 | + exit 0 |
2633 | + ;; |
2634 | + |
2635 | + --run) |
2636 | + # Back-compat with the calling convention used by older automake. |
2637 | + shift |
2638 | + ;; |
2639 | |
2640 | -h|--h|--he|--hel|--help) |
2641 | echo "\ |
2642 | $0 [OPTION]... PROGRAM [ARGUMENT]... |
2643 | |
2644 | -Handle 'PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an |
2645 | -error status if there is no known handling for PROGRAM. |
2646 | +Run 'PROGRAM [ARGUMENT]...', returning a proper advice when this fails due |
2647 | +to PROGRAM being missing or too old. |
2648 | |
2649 | Options: |
2650 | -h, --help display this help and exit |
2651 | -v, --version output version information and exit |
2652 | - --run try to run the given command, and emulate it if it fails |
2653 | |
2654 | Supported PROGRAM values: |
2655 | - aclocal touch file 'aclocal.m4' |
2656 | - autoconf touch file 'configure' |
2657 | - autoheader touch file 'config.h.in' |
2658 | - autom4te touch the output file, or create a stub one |
2659 | - automake touch all 'Makefile.in' files |
2660 | - bison create 'y.tab.[ch]', if possible, from existing .[ch] |
2661 | - flex create 'lex.yy.c', if possible, from existing .c |
2662 | - help2man touch the output file |
2663 | - lex create 'lex.yy.c', if possible, from existing .c |
2664 | - makeinfo touch the output file |
2665 | - yacc create 'y.tab.[ch]', if possible, from existing .[ch] |
2666 | + aclocal autoconf autoheader autom4te automake makeinfo |
2667 | + bison yacc flex lex help2man |
2668 | |
2669 | Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and |
2670 | 'g' are ignored when checking the name. |
2671 | @@ -98,228 +70,141 @@ |
2672 | ;; |
2673 | |
2674 | -*) |
2675 | - echo 1>&2 "$0: Unknown '$1' option" |
2676 | + echo 1>&2 "$0: unknown '$1' option" |
2677 | echo 1>&2 "Try '$0 --help' for more information" |
2678 | exit 1 |
2679 | ;; |
2680 | |
2681 | esac |
2682 | |
2683 | -# normalize program name to check for. |
2684 | -program=`echo "$1" | sed ' |
2685 | - s/^gnu-//; t |
2686 | - s/^gnu//; t |
2687 | - s/^g//; t'` |
2688 | - |
2689 | -# Now exit if we have it, but it failed. Also exit now if we |
2690 | -# don't have it and --version was passed (most likely to detect |
2691 | -# the program). This is about non-GNU programs, so use $1 not |
2692 | -# $program. |
2693 | -case $1 in |
2694 | - lex*|yacc*) |
2695 | - # Not GNU programs, they don't have --version. |
2696 | - ;; |
2697 | - |
2698 | - *) |
2699 | - if test -z "$run" && ($1 --version) > /dev/null 2>&1; then |
2700 | - # We have it, but it failed. |
2701 | - exit 1 |
2702 | - elif test "x$2" = "x--version" || test "x$2" = "x--help"; then |
2703 | - # Could not run --version or --help. This is probably someone |
2704 | - # running '$TOOL --version' or '$TOOL --help' to check whether |
2705 | - # $TOOL exists and not knowing $TOOL uses missing. |
2706 | - exit 1 |
2707 | - fi |
2708 | - ;; |
2709 | -esac |
2710 | - |
2711 | -# If it does not exist, or fails to run (possibly an outdated version), |
2712 | -# try to emulate it. |
2713 | -case $program in |
2714 | - aclocal*) |
2715 | - echo 1>&2 "\ |
2716 | -WARNING: '$1' is $msg. You should only need it if |
2717 | - you modified 'acinclude.m4' or '${configure_ac}'. You might want |
2718 | - to install the Automake and Perl packages. Grab them from |
2719 | - any GNU archive site." |
2720 | - touch aclocal.m4 |
2721 | - ;; |
2722 | - |
2723 | - autoconf*) |
2724 | - echo 1>&2 "\ |
2725 | -WARNING: '$1' is $msg. You should only need it if |
2726 | - you modified '${configure_ac}'. You might want to install the |
2727 | - Autoconf and GNU m4 packages. Grab them from any GNU |
2728 | - archive site." |
2729 | - touch configure |
2730 | - ;; |
2731 | - |
2732 | - autoheader*) |
2733 | - echo 1>&2 "\ |
2734 | -WARNING: '$1' is $msg. You should only need it if |
2735 | - you modified 'acconfig.h' or '${configure_ac}'. You might want |
2736 | - to install the Autoconf and GNU m4 packages. Grab them |
2737 | - from any GNU archive site." |
2738 | - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` |
2739 | - test -z "$files" && files="config.h" |
2740 | - touch_files= |
2741 | - for f in $files; do |
2742 | - case $f in |
2743 | - *:*) touch_files="$touch_files "`echo "$f" | |
2744 | - sed -e 's/^[^:]*://' -e 's/:.*//'`;; |
2745 | - *) touch_files="$touch_files $f.in";; |
2746 | - esac |
2747 | - done |
2748 | - touch $touch_files |
2749 | - ;; |
2750 | - |
2751 | - automake*) |
2752 | - echo 1>&2 "\ |
2753 | -WARNING: '$1' is $msg. You should only need it if |
2754 | - you modified 'Makefile.am', 'acinclude.m4' or '${configure_ac}'. |
2755 | - You might want to install the Automake and Perl packages. |
2756 | - Grab them from any GNU archive site." |
2757 | - find . -type f -name Makefile.am -print | |
2758 | - sed 's/\.am$/.in/' | |
2759 | - while read f; do touch "$f"; done |
2760 | - ;; |
2761 | - |
2762 | - autom4te*) |
2763 | - echo 1>&2 "\ |
2764 | -WARNING: '$1' is needed, but is $msg. |
2765 | - You might have modified some files without having the |
2766 | - proper tools for further handling them. |
2767 | - You can get '$1' as part of Autoconf from any GNU |
2768 | - archive site." |
2769 | - |
2770 | - file=`echo "$*" | sed -n "$sed_output"` |
2771 | - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` |
2772 | - if test -f "$file"; then |
2773 | - touch $file |
2774 | - else |
2775 | - test -z "$file" || exec >$file |
2776 | - echo "#! /bin/sh" |
2777 | - echo "# Created by GNU Automake missing as a replacement of" |
2778 | - echo "# $ $@" |
2779 | - echo "exit 0" |
2780 | - chmod +x $file |
2781 | - exit 1 |
2782 | - fi |
2783 | - ;; |
2784 | - |
2785 | - bison*|yacc*) |
2786 | - echo 1>&2 "\ |
2787 | -WARNING: '$1' $msg. You should only need it if |
2788 | - you modified a '.y' file. You may need the Bison package |
2789 | - in order for those modifications to take effect. You can get |
2790 | - Bison from any GNU archive site." |
2791 | - rm -f y.tab.c y.tab.h |
2792 | - if test $# -ne 1; then |
2793 | - eval LASTARG=\${$#} |
2794 | - case $LASTARG in |
2795 | - *.y) |
2796 | - SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` |
2797 | - if test -f "$SRCFILE"; then |
2798 | - cp "$SRCFILE" y.tab.c |
2799 | - fi |
2800 | - SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` |
2801 | - if test -f "$SRCFILE"; then |
2802 | - cp "$SRCFILE" y.tab.h |
2803 | - fi |
2804 | - ;; |
2805 | - esac |
2806 | - fi |
2807 | - if test ! -f y.tab.h; then |
2808 | - echo >y.tab.h |
2809 | - fi |
2810 | - if test ! -f y.tab.c; then |
2811 | - echo 'main() { return 0; }' >y.tab.c |
2812 | - fi |
2813 | - ;; |
2814 | - |
2815 | - lex*|flex*) |
2816 | - echo 1>&2 "\ |
2817 | -WARNING: '$1' is $msg. You should only need it if |
2818 | - you modified a '.l' file. You may need the Flex package |
2819 | - in order for those modifications to take effect. You can get |
2820 | - Flex from any GNU archive site." |
2821 | - rm -f lex.yy.c |
2822 | - if test $# -ne 1; then |
2823 | - eval LASTARG=\${$#} |
2824 | - case $LASTARG in |
2825 | - *.l) |
2826 | - SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` |
2827 | - if test -f "$SRCFILE"; then |
2828 | - cp "$SRCFILE" lex.yy.c |
2829 | - fi |
2830 | - ;; |
2831 | - esac |
2832 | - fi |
2833 | - if test ! -f lex.yy.c; then |
2834 | - echo 'main() { return 0; }' >lex.yy.c |
2835 | - fi |
2836 | - ;; |
2837 | - |
2838 | - help2man*) |
2839 | - echo 1>&2 "\ |
2840 | -WARNING: '$1' is $msg. You should only need it if |
2841 | - you modified a dependency of a manual page. You may need the |
2842 | - Help2man package in order for those modifications to take |
2843 | - effect. You can get Help2man from any GNU archive site." |
2844 | - |
2845 | - file=`echo "$*" | sed -n "$sed_output"` |
2846 | - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` |
2847 | - if test -f "$file"; then |
2848 | - touch $file |
2849 | - else |
2850 | - test -z "$file" || exec >$file |
2851 | - echo ".ab help2man is required to generate this page" |
2852 | - exit $? |
2853 | - fi |
2854 | - ;; |
2855 | - |
2856 | - makeinfo*) |
2857 | - echo 1>&2 "\ |
2858 | -WARNING: '$1' is $msg. You should only need it if |
2859 | - you modified a '.texi' or '.texinfo' file, or any other file |
2860 | - indirectly affecting the aspect of the manual. The spurious |
2861 | - call might also be the consequence of using a buggy 'make' (AIX, |
2862 | - DU, IRIX). You might want to install the Texinfo package or |
2863 | - the GNU make package. Grab either from any GNU archive site." |
2864 | - # The file to touch is that specified with -o ... |
2865 | - file=`echo "$*" | sed -n "$sed_output"` |
2866 | - test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` |
2867 | - if test -z "$file"; then |
2868 | - # ... or it is the one specified with @setfilename ... |
2869 | - infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` |
2870 | - file=`sed -n ' |
2871 | - /^@setfilename/{ |
2872 | - s/.* \([^ ]*\) *$/\1/ |
2873 | - p |
2874 | - q |
2875 | - }' $infile` |
2876 | - # ... or it is derived from the source name (dir/f.texi becomes f.info) |
2877 | - test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info |
2878 | - fi |
2879 | - # If the file does not exist, the user really needs makeinfo; |
2880 | - # let's fail without touching anything. |
2881 | - test -f $file || exit 1 |
2882 | - touch $file |
2883 | - ;; |
2884 | - |
2885 | - *) |
2886 | - echo 1>&2 "\ |
2887 | -WARNING: '$1' is needed, and is $msg. |
2888 | - You might have modified some files without having the |
2889 | - proper tools for further handling them. Check the 'README' file, |
2890 | - it often tells you about the needed prerequisites for installing |
2891 | - this package. You may also peek at any GNU archive site, in case |
2892 | - some other package would contain this missing '$1' program." |
2893 | - exit 1 |
2894 | - ;; |
2895 | -esac |
2896 | - |
2897 | -exit 0 |
2898 | +# Run the given program, remember its exit status. |
2899 | +"$@"; st=$? |
2900 | + |
2901 | +# If it succeeded, we are done. |
2902 | +test $st -eq 0 && exit 0 |
2903 | + |
2904 | +# Also exit now if we it failed (or wasn't found), and '--version' was |
2905 | +# passed; such an option is passed most likely to detect whether the |
2906 | +# program is present and works. |
2907 | +case $2 in --version|--help) exit $st;; esac |
2908 | + |
2909 | +# Exit code 63 means version mismatch. This often happens when the user |
2910 | +# tries to use an ancient version of a tool on a file that requires a |
2911 | +# minimum version. |
2912 | +if test $st -eq 63; then |
2913 | + msg="probably too old" |
2914 | +elif test $st -eq 127; then |
2915 | + # Program was missing. |
2916 | + msg="missing on your system" |
2917 | +else |
2918 | + # Program was found and executed, but failed. Give up. |
2919 | + exit $st |
2920 | +fi |
2921 | + |
2922 | +perl_URL=http://www.perl.org/ |
2923 | +flex_URL=http://flex.sourceforge.net/ |
2924 | +gnu_software_URL=http://www.gnu.org/software |
2925 | + |
2926 | +program_details () |
2927 | +{ |
2928 | + case $1 in |
2929 | + aclocal|automake) |
2930 | + echo "The '$1' program is part of the GNU Automake package:" |
2931 | + echo "<$gnu_software_URL/automake>" |
2932 | + echo "It also requires GNU Autoconf, GNU m4 and Perl in order to run:" |
2933 | + echo "<$gnu_software_URL/autoconf>" |
2934 | + echo "<$gnu_software_URL/m4/>" |
2935 | + echo "<$perl_URL>" |
2936 | + ;; |
2937 | + autoconf|autom4te|autoheader) |
2938 | + echo "The '$1' program is part of the GNU Autoconf package:" |
2939 | + echo "<$gnu_software_URL/autoconf/>" |
2940 | + echo "It also requires GNU m4 and Perl in order to run:" |
2941 | + echo "<$gnu_software_URL/m4/>" |
2942 | + echo "<$perl_URL>" |
2943 | + ;; |
2944 | + esac |
2945 | +} |
2946 | + |
2947 | +give_advice () |
2948 | +{ |
2949 | + # Normalize program name to check for. |
2950 | + normalized_program=`echo "$1" | sed ' |
2951 | + s/^gnu-//; t |
2952 | + s/^gnu//; t |
2953 | + s/^g//; t'` |
2954 | + |
2955 | + printf '%s\n' "'$1' is $msg." |
2956 | + |
2957 | + configure_deps="'configure.ac' or m4 files included by 'configure.ac'" |
2958 | + case $normalized_program in |
2959 | + autoconf*) |
2960 | + echo "You should only need it if you modified 'configure.ac'," |
2961 | + echo "or m4 files included by it." |
2962 | + program_details 'autoconf' |
2963 | + ;; |
2964 | + autoheader*) |
2965 | + echo "You should only need it if you modified 'acconfig.h' or" |
2966 | + echo "$configure_deps." |
2967 | + program_details 'autoheader' |
2968 | + ;; |
2969 | + automake*) |
2970 | + echo "You should only need it if you modified 'Makefile.am' or" |
2971 | + echo "$configure_deps." |
2972 | + program_details 'automake' |
2973 | + ;; |
2974 | + aclocal*) |
2975 | + echo "You should only need it if you modified 'acinclude.m4' or" |
2976 | + echo "$configure_deps." |
2977 | + program_details 'aclocal' |
2978 | + ;; |
2979 | + autom4te*) |
2980 | + echo "You might have modified some maintainer files that require" |
2981 | + echo "the 'automa4te' program to be rebuilt." |
2982 | + program_details 'autom4te' |
2983 | + ;; |
2984 | + bison*|yacc*) |
2985 | + echo "You should only need it if you modified a '.y' file." |
2986 | + echo "You may want to install the GNU Bison package:" |
2987 | + echo "<$gnu_software_URL/bison/>" |
2988 | + ;; |
2989 | + lex*|flex*) |
2990 | + echo "You should only need it if you modified a '.l' file." |
2991 | + echo "You may want to install the Fast Lexical Analyzer package:" |
2992 | + echo "<$flex_URL>" |
2993 | + ;; |
2994 | + help2man*) |
2995 | + echo "You should only need it if you modified a dependency" \ |
2996 | + "of a man page." |
2997 | + echo "You may want to install the GNU Help2man package:" |
2998 | + echo "<$gnu_software_URL/help2man/>" |
2999 | + ;; |
3000 | + makeinfo*) |
3001 | + echo "You should only need it if you modified a '.texi' file, or" |
3002 | + echo "any other file indirectly affecting the aspect of the manual." |
3003 | + echo "You might want to install the Texinfo package:" |
3004 | + echo "<$gnu_software_URL/texinfo/>" |
3005 | + echo "The spurious makeinfo call might also be the consequence of" |
3006 | + echo "using a buggy 'make' (AIX, DU, IRIX), in which case you might" |
3007 | + echo "want to install GNU make:" |
3008 | + echo "<$gnu_software_URL/make/>" |
3009 | + ;; |
3010 | + *) |
3011 | + echo "You might have modified some files without having the proper" |
3012 | + echo "tools for further handling them. Check the 'README' file, it" |
3013 | + echo "often tells you about the needed prerequisites for installing" |
3014 | + echo "this package. You may also peek at any GNU archive site, in" |
3015 | + echo "case some other package contains this missing '$1' program." |
3016 | + ;; |
3017 | + esac |
3018 | +} |
3019 | + |
3020 | +give_advice "$1" | sed -e '1s/^/WARNING: /' \ |
3021 | + -e '2,$s/^/ /' >&2 |
3022 | + |
3023 | +# Propagate the correct exit status (expected to be 127 for a program |
3024 | +# not found, 63 for a program that failed due to version mismatch). |
3025 | +exit $st |
3026 | |
3027 | # Local variables: |
3028 | # eval: (add-hook 'write-file-hooks 'time-stamp) |
3029 | |
3030 | === modified file 'cfg.mk' |
3031 | --- cfg.mk 2012-07-21 22:17:19 +0000 |
3032 | +++ cfg.mk 2014-06-13 08:07:26 +0000 |
3033 | @@ -18,7 +18,6 @@ |
3034 | # Tests not to run as part of "make distcheck". |
3035 | local-checks-to-skip = \ |
3036 | changelog-check \ |
3037 | - check-AUTHORS \ |
3038 | makefile-check \ |
3039 | makefile_path_separator_check \ |
3040 | patch-check \ |
3041 | @@ -109,20 +108,6 @@ |
3042 | # We don't use this feature of maint.mk. |
3043 | prev_version_file = /dev/null |
3044 | |
3045 | -# Give credit where due: |
3046 | -# Ensure that each commit author email address (possibly mapped via |
3047 | -# git log's .mailmap) appears in our AUTHORS file. |
3048 | -sc_check_author_list: |
3049 | - @fail=0; \ |
3050 | - for i in $$(git log --pretty=format:%aE%n|sort -u|grep -v '^$$'); do \ |
3051 | - sanitized=$$(echo "$$i"|LC_ALL=C sed 's/\([^a-zA-Z0-9_@-]\)/\\\1/g'); \ |
3052 | - grep -iq "<$$sanitized>" $(srcdir)/AUTHORS \ |
3053 | - || { printf '%s\n' "$$i" >&2; fail=1; }; \ |
3054 | - done; \ |
3055 | - test $$fail = 1 \ |
3056 | - && echo '$(ME): committer(s) not listed in AUTHORS' >&2; \ |
3057 | - test $$fail = 0 |
3058 | - |
3059 | |
3060 | exclude_file_name_regexp--sc_bindtextdomain = ^(libvirt-gconfig/tests|examples)/|libvirt-glib/libvirt-glib-event.c|libvirt-glib/libvirt-glib-main.c |
3061 | |
3062 | |
3063 | === modified file 'config.h.in' |
3064 | --- config.h.in 2013-03-27 13:11:49 +0000 |
3065 | +++ config.h.in 2014-06-13 08:07:26 +0000 |
3066 | @@ -7,6 +7,9 @@ |
3067 | #endif |
3068 | |
3069 | |
3070 | +/* GETTEXT package name */ |
3071 | +#undef GETTEXT_PACKAGE |
3072 | + |
3073 | /* Define to 1 if you have the <dlfcn.h> header file. */ |
3074 | #undef HAVE_DLFCN_H |
3075 | |
3076 | |
3077 | === modified file 'configure' |
3078 | --- configure 2013-03-27 13:11:49 +0000 |
3079 | +++ configure 2014-06-13 08:07:26 +0000 |
3080 | @@ -1,6 +1,6 @@ |
3081 | #! /bin/sh |
3082 | # Guess values for system-dependent variables and create Makefiles. |
3083 | -# Generated by GNU Autoconf 2.69 for libvirt-glib 0.1.6. |
3084 | +# Generated by GNU Autoconf 2.69 for libvirt-glib 0.1.7. |
3085 | # |
3086 | # |
3087 | # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. |
3088 | @@ -587,8 +587,8 @@ |
3089 | # Identity of this package. |
3090 | PACKAGE_NAME='libvirt-glib' |
3091 | PACKAGE_TARNAME='libvirt-glib' |
3092 | -PACKAGE_VERSION='0.1.6' |
3093 | -PACKAGE_STRING='libvirt-glib 0.1.6' |
3094 | +PACKAGE_VERSION='0.1.7' |
3095 | +PACKAGE_STRING='libvirt-glib 0.1.7' |
3096 | PACKAGE_BUGREPORT='' |
3097 | PACKAGE_URL='' |
3098 | |
3099 | @@ -673,6 +673,43 @@ |
3100 | GTKDOC_MKPDF |
3101 | GTKDOC_REBASE |
3102 | GTKDOC_CHECK |
3103 | +DATADIRNAME |
3104 | +ALL_LINGUAS |
3105 | +INTLTOOL_PERL |
3106 | +GMSGFMT |
3107 | +MSGFMT |
3108 | +MSGMERGE |
3109 | +XGETTEXT |
3110 | +INTLTOOL_POLICY_RULE |
3111 | +INTLTOOL_SERVICE_RULE |
3112 | +INTLTOOL_THEME_RULE |
3113 | +INTLTOOL_SCHEMAS_RULE |
3114 | +INTLTOOL_CAVES_RULE |
3115 | +INTLTOOL_XML_NOMERGE_RULE |
3116 | +INTLTOOL_XML_RULE |
3117 | +INTLTOOL_KBD_RULE |
3118 | +INTLTOOL_XAM_RULE |
3119 | +INTLTOOL_UI_RULE |
3120 | +INTLTOOL_SOUNDLIST_RULE |
3121 | +INTLTOOL_SHEET_RULE |
3122 | +INTLTOOL_SERVER_RULE |
3123 | +INTLTOOL_PONG_RULE |
3124 | +INTLTOOL_OAF_RULE |
3125 | +INTLTOOL_PROP_RULE |
3126 | +INTLTOOL_KEYS_RULE |
3127 | +INTLTOOL_DIRECTORY_RULE |
3128 | +INTLTOOL_DESKTOP_RULE |
3129 | +intltool__v_merge_options_0 |
3130 | +intltool__v_merge_options_ |
3131 | +INTLTOOL_V_MERGE_OPTIONS |
3132 | +INTLTOOL__v_MERGE_0 |
3133 | +INTLTOOL__v_MERGE_ |
3134 | +INTLTOOL_V_MERGE |
3135 | +INTLTOOL_EXTRACT |
3136 | +INTLTOOL_MERGE |
3137 | +INTLTOOL_UPDATE |
3138 | +USE_NLS |
3139 | +GETTEXT_PACKAGE |
3140 | LIBXML2_LIBS |
3141 | LIBXML2_CFLAGS |
3142 | GIO2_LIBS |
3143 | @@ -737,10 +774,6 @@ |
3144 | LIBVIRT_GLIB_MINOR_VERSION |
3145 | LIBVIRT_GLIB_MAJOR_VERSION |
3146 | LIBVIRT_REQUIRED |
3147 | -AM_BACKSLASH |
3148 | -AM_DEFAULT_VERBOSITY |
3149 | -AM_DEFAULT_V |
3150 | -AM_V |
3151 | host_os |
3152 | host_vendor |
3153 | host_cpu |
3154 | @@ -749,6 +782,10 @@ |
3155 | build_vendor |
3156 | build_cpu |
3157 | build |
3158 | +AM_BACKSLASH |
3159 | +AM_DEFAULT_VERBOSITY |
3160 | +AM_DEFAULT_V |
3161 | +AM_V |
3162 | am__untar |
3163 | am__tar |
3164 | AMTAR |
3165 | @@ -823,6 +860,7 @@ |
3166 | with_sysroot |
3167 | enable_libtool_lock |
3168 | enable_werror |
3169 | +enable_nls |
3170 | with_html_dir |
3171 | enable_gtk_doc |
3172 | enable_gtk_doc_html |
3173 | @@ -1400,7 +1438,7 @@ |
3174 | # Omit some internal or obsolete options to make the list less imposing. |
3175 | # This message is too long to be a string in the A/UX 3.1 sh. |
3176 | cat <<_ACEOF |
3177 | -\`configure' configures libvirt-glib 0.1.6 to adapt to many kinds of systems. |
3178 | +\`configure' configures libvirt-glib 0.1.7 to adapt to many kinds of systems. |
3179 | |
3180 | Usage: $0 [OPTION]... [VAR=VALUE]... |
3181 | |
3182 | @@ -1470,7 +1508,7 @@ |
3183 | |
3184 | if test -n "$ac_init_help"; then |
3185 | case $ac_init_help in |
3186 | - short | recursive ) echo "Configuration of libvirt-glib 0.1.6:";; |
3187 | + short | recursive ) echo "Configuration of libvirt-glib 0.1.7:";; |
3188 | esac |
3189 | cat <<\_ACEOF |
3190 | |
3191 | @@ -1485,11 +1523,12 @@ |
3192 | --disable-dependency-tracking |
3193 | speeds up one-time build |
3194 | --enable-shared[=PKGS] build shared libraries [default=yes] |
3195 | - --enable-static[=PKGS] build static libraries [default=yes] |
3196 | + --enable-static[=PKGS] build static libraries [default=no] |
3197 | --enable-fast-install[=PKGS] |
3198 | optimize for fast installation [default=yes] |
3199 | --disable-libtool-lock avoid locking (might break parallel builds) |
3200 | --enable-werror Use -Werror (if supported) |
3201 | + --disable-nls do not use Native Language Support |
3202 | --enable-gtk-doc use gtk-doc to build documentation [[default=no]] |
3203 | --enable-gtk-doc-html build documentation in html format [[default=yes]] |
3204 | --enable-gtk-doc-pdf build documentation in pdf format [[default=no]] |
3205 | @@ -1619,7 +1658,7 @@ |
3206 | test -n "$ac_init_help" && exit $ac_status |
3207 | if $ac_init_version; then |
3208 | cat <<\_ACEOF |
3209 | -libvirt-glib configure 0.1.6 |
3210 | +libvirt-glib configure 0.1.7 |
3211 | generated by GNU Autoconf 2.69 |
3212 | |
3213 | Copyright (C) 2012 Free Software Foundation, Inc. |
3214 | @@ -1897,7 +1936,7 @@ |
3215 | This file contains any messages produced by compilers while |
3216 | running configure, to aid debugging if configure makes a mistake. |
3217 | |
3218 | -It was created by libvirt-glib $as_me 0.1.6, which was |
3219 | +It was created by libvirt-glib $as_me 0.1.7, which was |
3220 | generated by GNU Autoconf 2.69. Invocation command line was |
3221 | |
3222 | $ $0 $@ |
3223 | @@ -2278,7 +2317,7 @@ |
3224 | ac_config_headers="$ac_config_headers config.h" |
3225 | |
3226 | |
3227 | -am__api_version='1.12' |
3228 | +am__api_version='1.13' |
3229 | |
3230 | # Find a good install program. We prefer a C program (faster), |
3231 | # so one script is as good as another. But avoid the broken or |
3232 | @@ -2462,8 +2501,8 @@ |
3233 | esac |
3234 | fi |
3235 | # Use eval to expand $SHELL |
3236 | -if eval "$MISSING --run true"; then |
3237 | - am_missing_run="$MISSING --run " |
3238 | +if eval "$MISSING --is-lightweight"; then |
3239 | + am_missing_run="$MISSING " |
3240 | else |
3241 | am_missing_run= |
3242 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 |
3243 | @@ -2703,6 +2742,45 @@ |
3244 | fi |
3245 | rmdir .tst 2>/dev/null |
3246 | |
3247 | +# Check whether --enable-silent-rules was given. |
3248 | +if test "${enable_silent_rules+set}" = set; then : |
3249 | + enableval=$enable_silent_rules; |
3250 | +fi |
3251 | + |
3252 | +case $enable_silent_rules in # ((( |
3253 | + yes) AM_DEFAULT_VERBOSITY=0;; |
3254 | + no) AM_DEFAULT_VERBOSITY=1;; |
3255 | + *) AM_DEFAULT_VERBOSITY=1;; |
3256 | +esac |
3257 | +am_make=${MAKE-make} |
3258 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 |
3259 | +$as_echo_n "checking whether $am_make supports nested variables... " >&6; } |
3260 | +if ${am_cv_make_support_nested_variables+:} false; then : |
3261 | + $as_echo_n "(cached) " >&6 |
3262 | +else |
3263 | + if $as_echo 'TRUE=$(BAR$(V)) |
3264 | +BAR0=false |
3265 | +BAR1=true |
3266 | +V=1 |
3267 | +am__doit: |
3268 | + @$(TRUE) |
3269 | +.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then |
3270 | + am_cv_make_support_nested_variables=yes |
3271 | +else |
3272 | + am_cv_make_support_nested_variables=no |
3273 | +fi |
3274 | +fi |
3275 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 |
3276 | +$as_echo "$am_cv_make_support_nested_variables" >&6; } |
3277 | +if test $am_cv_make_support_nested_variables = yes; then |
3278 | + AM_V='$(V)' |
3279 | + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' |
3280 | +else |
3281 | + AM_V=$AM_DEFAULT_VERBOSITY |
3282 | + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY |
3283 | +fi |
3284 | +AM_BACKSLASH='\' |
3285 | + |
3286 | if test "`cd $srcdir && pwd`" != "`pwd`"; then |
3287 | # Use -I$(srcdir) only when $(srcdir) != ., so that make's output |
3288 | # is not polluted with repeated "-I." |
3289 | @@ -2725,7 +2803,7 @@ |
3290 | |
3291 | # Define the identity of the package. |
3292 | PACKAGE='libvirt-glib' |
3293 | - VERSION='0.1.6' |
3294 | + VERSION='0.1.7' |
3295 | |
3296 | |
3297 | cat >>confdefs.h <<_ACEOF |
3298 | @@ -2765,12 +2843,17 @@ |
3299 | # in the wild :-( We should find a proper way to deprecate it ... |
3300 | AMTAR='$${TAR-tar}' |
3301 | |
3302 | + |
3303 | +# We'll loop over all known methods to create a tar archive until one works. |
3304 | +_am_tools='gnutar pax cpio none' |
3305 | + |
3306 | am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' |
3307 | |
3308 | |
3309 | |
3310 | |
3311 | |
3312 | + |
3313 | # Make sure we can run config.sub. |
3314 | $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || |
3315 | as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 |
3316 | @@ -2894,9 +2977,46 @@ |
3317 | LIBVIRT_GLIB_MINOR_VERSION=`echo $VERSION | awk -F. '{print $2}'` |
3318 | LIBVIRT_GLIB_MICRO_VERSION=`echo $VERSION | awk -F. '{print $3}'` |
3319 | LIBVIRT_GLIB_VERSION=$LIBVIRT_GLIB_MAJOR_VERSION.$LIBVIRT_GLIB_MINOR_VERSION.$LIBVIRT_GLIB_MICRO_VERSION$LIBVIRT_GLIB_MICRO_VERSION_SUFFIX |
3320 | -LIBVIRT_GLIB_VERSION_INFO=`expr $LIBVIRT_GLIB_MAJOR_VERSION + $LIBVIRT_GLIB_MINOR_VERSION`:$LIBVIRT_GLIB_MICRO_VERSION:$LIBVIRT_GLIB_MINOR_VERSION |
3321 | LIBVIRT_GLIB_VERSION_NUMBER=`expr $LIBVIRT_GLIB_MAJOR_VERSION \* 1000000 + $LIBVIRT_GLIB_MINOR_VERSION \* 1000 + $LIBVIRT_GLIB_MICRO_VERSION` |
3322 | |
3323 | +# In libtool terminology we need to figure out: |
3324 | +# |
3325 | +# CURRENT |
3326 | +# The most recent interface number that this library implements. |
3327 | +# |
3328 | +# REVISION |
3329 | +# The implementation number of the CURRENT interface. |
3330 | +# |
3331 | +# AGE |
3332 | +# The difference between the newest and oldest interfaces that this |
3333 | +# library implements. |
3334 | +# |
3335 | +# In other words, the library implements all the interface numbers |
3336 | +# in the range from number `CURRENT - AGE' to `CURRENT'. |
3337 | +# |
3338 | +# Libtool assigns the soname version from `CURRENT - AGE', and we |
3339 | +# don't want that to ever change in libvirt-glib, unless we need |
3340 | +# to break ABI for some rason. |
3341 | +# |
3342 | +# We would, however, like the libvirt-glib version number reflected |
3343 | +# in the so version'd symlinks, and this is based on AGE.REVISION |
3344 | +# eg libvirt-glib.so.0.AGE.REVISION |
3345 | +# |
3346 | +# Assuming we do ever want to break soname version, this can |
3347 | +# toggled. But seriously, don't ever touch this. |
3348 | +LIBVIRT_GLIB_SONUM=0 |
3349 | + |
3350 | +# The following examples show what libtool will do |
3351 | +# |
3352 | +# Input: 0.9.14 -> libvirt-glib.so.0.9.14 |
3353 | +# Input: 1.0.0 -> libvirt-glib.so.0.1000.0 |
3354 | +# Input: 2.5.8 -> libvirt-glib.so.0.2005.8 |
3355 | +# |
3356 | +AGE=`expr $LIBVIRT_GLIB_MAJOR_VERSION '*' 1000 + $LIBVIRT_GLIB_MINOR_VERSION` |
3357 | +REVISION=$LIBVIRT_GLIB_MICRO_VERSION |
3358 | +CURRENT=`expr $LIBVIRT_GLIB_SONUM + $AGE` |
3359 | +LIBVIRT_GLIB_VERSION_INFO=$CURRENT:$REVISION:$AGE |
3360 | + |
3361 | |
3362 | |
3363 | |
3364 | @@ -4011,309 +4131,6 @@ |
3365 | |
3366 | |
3367 | |
3368 | -enable_win32_dll=yes |
3369 | - |
3370 | -case $host in |
3371 | -*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*) |
3372 | - if test -n "$ac_tool_prefix"; then |
3373 | - # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. |
3374 | -set dummy ${ac_tool_prefix}as; ac_word=$2 |
3375 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3376 | -$as_echo_n "checking for $ac_word... " >&6; } |
3377 | -if ${ac_cv_prog_AS+:} false; then : |
3378 | - $as_echo_n "(cached) " >&6 |
3379 | -else |
3380 | - if test -n "$AS"; then |
3381 | - ac_cv_prog_AS="$AS" # Let the user override the test. |
3382 | -else |
3383 | -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
3384 | -for as_dir in $PATH |
3385 | -do |
3386 | - IFS=$as_save_IFS |
3387 | - test -z "$as_dir" && as_dir=. |
3388 | - for ac_exec_ext in '' $ac_executable_extensions; do |
3389 | - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
3390 | - ac_cv_prog_AS="${ac_tool_prefix}as" |
3391 | - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
3392 | - break 2 |
3393 | - fi |
3394 | -done |
3395 | - done |
3396 | -IFS=$as_save_IFS |
3397 | - |
3398 | -fi |
3399 | -fi |
3400 | -AS=$ac_cv_prog_AS |
3401 | -if test -n "$AS"; then |
3402 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AS" >&5 |
3403 | -$as_echo "$AS" >&6; } |
3404 | -else |
3405 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
3406 | -$as_echo "no" >&6; } |
3407 | -fi |
3408 | - |
3409 | - |
3410 | -fi |
3411 | -if test -z "$ac_cv_prog_AS"; then |
3412 | - ac_ct_AS=$AS |
3413 | - # Extract the first word of "as", so it can be a program name with args. |
3414 | -set dummy as; ac_word=$2 |
3415 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3416 | -$as_echo_n "checking for $ac_word... " >&6; } |
3417 | -if ${ac_cv_prog_ac_ct_AS+:} false; then : |
3418 | - $as_echo_n "(cached) " >&6 |
3419 | -else |
3420 | - if test -n "$ac_ct_AS"; then |
3421 | - ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test. |
3422 | -else |
3423 | -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
3424 | -for as_dir in $PATH |
3425 | -do |
3426 | - IFS=$as_save_IFS |
3427 | - test -z "$as_dir" && as_dir=. |
3428 | - for ac_exec_ext in '' $ac_executable_extensions; do |
3429 | - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
3430 | - ac_cv_prog_ac_ct_AS="as" |
3431 | - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
3432 | - break 2 |
3433 | - fi |
3434 | -done |
3435 | - done |
3436 | -IFS=$as_save_IFS |
3437 | - |
3438 | -fi |
3439 | -fi |
3440 | -ac_ct_AS=$ac_cv_prog_ac_ct_AS |
3441 | -if test -n "$ac_ct_AS"; then |
3442 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5 |
3443 | -$as_echo "$ac_ct_AS" >&6; } |
3444 | -else |
3445 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
3446 | -$as_echo "no" >&6; } |
3447 | -fi |
3448 | - |
3449 | - if test "x$ac_ct_AS" = x; then |
3450 | - AS="false" |
3451 | - else |
3452 | - case $cross_compiling:$ac_tool_warned in |
3453 | -yes:) |
3454 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
3455 | -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
3456 | -ac_tool_warned=yes ;; |
3457 | -esac |
3458 | - AS=$ac_ct_AS |
3459 | - fi |
3460 | -else |
3461 | - AS="$ac_cv_prog_AS" |
3462 | -fi |
3463 | - |
3464 | - if test -n "$ac_tool_prefix"; then |
3465 | - # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. |
3466 | -set dummy ${ac_tool_prefix}dlltool; ac_word=$2 |
3467 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3468 | -$as_echo_n "checking for $ac_word... " >&6; } |
3469 | -if ${ac_cv_prog_DLLTOOL+:} false; then : |
3470 | - $as_echo_n "(cached) " >&6 |
3471 | -else |
3472 | - if test -n "$DLLTOOL"; then |
3473 | - ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. |
3474 | -else |
3475 | -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
3476 | -for as_dir in $PATH |
3477 | -do |
3478 | - IFS=$as_save_IFS |
3479 | - test -z "$as_dir" && as_dir=. |
3480 | - for ac_exec_ext in '' $ac_executable_extensions; do |
3481 | - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
3482 | - ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" |
3483 | - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
3484 | - break 2 |
3485 | - fi |
3486 | -done |
3487 | - done |
3488 | -IFS=$as_save_IFS |
3489 | - |
3490 | -fi |
3491 | -fi |
3492 | -DLLTOOL=$ac_cv_prog_DLLTOOL |
3493 | -if test -n "$DLLTOOL"; then |
3494 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 |
3495 | -$as_echo "$DLLTOOL" >&6; } |
3496 | -else |
3497 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
3498 | -$as_echo "no" >&6; } |
3499 | -fi |
3500 | - |
3501 | - |
3502 | -fi |
3503 | -if test -z "$ac_cv_prog_DLLTOOL"; then |
3504 | - ac_ct_DLLTOOL=$DLLTOOL |
3505 | - # Extract the first word of "dlltool", so it can be a program name with args. |
3506 | -set dummy dlltool; ac_word=$2 |
3507 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3508 | -$as_echo_n "checking for $ac_word... " >&6; } |
3509 | -if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : |
3510 | - $as_echo_n "(cached) " >&6 |
3511 | -else |
3512 | - if test -n "$ac_ct_DLLTOOL"; then |
3513 | - ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. |
3514 | -else |
3515 | -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
3516 | -for as_dir in $PATH |
3517 | -do |
3518 | - IFS=$as_save_IFS |
3519 | - test -z "$as_dir" && as_dir=. |
3520 | - for ac_exec_ext in '' $ac_executable_extensions; do |
3521 | - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
3522 | - ac_cv_prog_ac_ct_DLLTOOL="dlltool" |
3523 | - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
3524 | - break 2 |
3525 | - fi |
3526 | -done |
3527 | - done |
3528 | -IFS=$as_save_IFS |
3529 | - |
3530 | -fi |
3531 | -fi |
3532 | -ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL |
3533 | -if test -n "$ac_ct_DLLTOOL"; then |
3534 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 |
3535 | -$as_echo "$ac_ct_DLLTOOL" >&6; } |
3536 | -else |
3537 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
3538 | -$as_echo "no" >&6; } |
3539 | -fi |
3540 | - |
3541 | - if test "x$ac_ct_DLLTOOL" = x; then |
3542 | - DLLTOOL="false" |
3543 | - else |
3544 | - case $cross_compiling:$ac_tool_warned in |
3545 | -yes:) |
3546 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
3547 | -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
3548 | -ac_tool_warned=yes ;; |
3549 | -esac |
3550 | - DLLTOOL=$ac_ct_DLLTOOL |
3551 | - fi |
3552 | -else |
3553 | - DLLTOOL="$ac_cv_prog_DLLTOOL" |
3554 | -fi |
3555 | - |
3556 | - if test -n "$ac_tool_prefix"; then |
3557 | - # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. |
3558 | -set dummy ${ac_tool_prefix}objdump; ac_word=$2 |
3559 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3560 | -$as_echo_n "checking for $ac_word... " >&6; } |
3561 | -if ${ac_cv_prog_OBJDUMP+:} false; then : |
3562 | - $as_echo_n "(cached) " >&6 |
3563 | -else |
3564 | - if test -n "$OBJDUMP"; then |
3565 | - ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. |
3566 | -else |
3567 | -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
3568 | -for as_dir in $PATH |
3569 | -do |
3570 | - IFS=$as_save_IFS |
3571 | - test -z "$as_dir" && as_dir=. |
3572 | - for ac_exec_ext in '' $ac_executable_extensions; do |
3573 | - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
3574 | - ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" |
3575 | - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
3576 | - break 2 |
3577 | - fi |
3578 | -done |
3579 | - done |
3580 | -IFS=$as_save_IFS |
3581 | - |
3582 | -fi |
3583 | -fi |
3584 | -OBJDUMP=$ac_cv_prog_OBJDUMP |
3585 | -if test -n "$OBJDUMP"; then |
3586 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 |
3587 | -$as_echo "$OBJDUMP" >&6; } |
3588 | -else |
3589 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
3590 | -$as_echo "no" >&6; } |
3591 | -fi |
3592 | - |
3593 | - |
3594 | -fi |
3595 | -if test -z "$ac_cv_prog_OBJDUMP"; then |
3596 | - ac_ct_OBJDUMP=$OBJDUMP |
3597 | - # Extract the first word of "objdump", so it can be a program name with args. |
3598 | -set dummy objdump; ac_word=$2 |
3599 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3600 | -$as_echo_n "checking for $ac_word... " >&6; } |
3601 | -if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then : |
3602 | - $as_echo_n "(cached) " >&6 |
3603 | -else |
3604 | - if test -n "$ac_ct_OBJDUMP"; then |
3605 | - ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test. |
3606 | -else |
3607 | -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
3608 | -for as_dir in $PATH |
3609 | -do |
3610 | - IFS=$as_save_IFS |
3611 | - test -z "$as_dir" && as_dir=. |
3612 | - for ac_exec_ext in '' $ac_executable_extensions; do |
3613 | - if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
3614 | - ac_cv_prog_ac_ct_OBJDUMP="objdump" |
3615 | - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
3616 | - break 2 |
3617 | - fi |
3618 | -done |
3619 | - done |
3620 | -IFS=$as_save_IFS |
3621 | - |
3622 | -fi |
3623 | -fi |
3624 | -ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP |
3625 | -if test -n "$ac_ct_OBJDUMP"; then |
3626 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 |
3627 | -$as_echo "$ac_ct_OBJDUMP" >&6; } |
3628 | -else |
3629 | - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
3630 | -$as_echo "no" >&6; } |
3631 | -fi |
3632 | - |
3633 | - if test "x$ac_ct_OBJDUMP" = x; then |
3634 | - OBJDUMP="false" |
3635 | - else |
3636 | - case $cross_compiling:$ac_tool_warned in |
3637 | -yes:) |
3638 | -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
3639 | -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
3640 | -ac_tool_warned=yes ;; |
3641 | -esac |
3642 | - OBJDUMP=$ac_ct_OBJDUMP |
3643 | - fi |
3644 | -else |
3645 | - OBJDUMP="$ac_cv_prog_OBJDUMP" |
3646 | -fi |
3647 | - |
3648 | - ;; |
3649 | -esac |
3650 | - |
3651 | -test -z "$AS" && AS=as |
3652 | - |
3653 | - |
3654 | - |
3655 | - |
3656 | - |
3657 | -test -z "$DLLTOOL" && DLLTOOL=dlltool |
3658 | - |
3659 | - |
3660 | - |
3661 | - |
3662 | - |
3663 | -test -z "$OBJDUMP" && OBJDUMP=objdump |
3664 | - |
3665 | - |
3666 | - |
3667 | - |
3668 | - |
3669 | - |
3670 | - |
3671 | case `pwd` in |
3672 | *\ * | *\ *) |
3673 | { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Libtool does not cope well with whitespace in \`pwd\`" >&5 |
3674 | @@ -7816,14 +7633,7 @@ |
3675 | |
3676 | |
3677 | # Set options |
3678 | - |
3679 | - |
3680 | - |
3681 | - enable_dlopen=no |
3682 | - |
3683 | - |
3684 | - |
3685 | - # Check whether --enable-shared was given. |
3686 | +# Check whether --enable-shared was given. |
3687 | if test "${enable_shared+set}" = set; then : |
3688 | enableval=$enable_shared; p=${PACKAGE-default} |
3689 | case $enableval in |
3690 | @@ -7852,9 +7662,7 @@ |
3691 | |
3692 | |
3693 | |
3694 | - |
3695 | - |
3696 | - # Check whether --enable-static was given. |
3697 | +# Check whether --enable-static was given. |
3698 | if test "${enable_static+set}" = set; then : |
3699 | enableval=$enable_static; p=${PACKAGE-default} |
3700 | case $enableval in |
3701 | @@ -7874,12 +7682,319 @@ |
3702 | ;; |
3703 | esac |
3704 | else |
3705 | - enable_static=yes |
3706 | -fi |
3707 | - |
3708 | - |
3709 | - |
3710 | - |
3711 | + enable_static=no |
3712 | +fi |
3713 | + |
3714 | + |
3715 | + |
3716 | + |
3717 | + |
3718 | + |
3719 | + |
3720 | +enable_win32_dll=yes |
3721 | + |
3722 | +case $host in |
3723 | +*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*) |
3724 | + if test -n "$ac_tool_prefix"; then |
3725 | + # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args. |
3726 | +set dummy ${ac_tool_prefix}as; ac_word=$2 |
3727 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3728 | +$as_echo_n "checking for $ac_word... " >&6; } |
3729 | +if ${ac_cv_prog_AS+:} false; then : |
3730 | + $as_echo_n "(cached) " >&6 |
3731 | +else |
3732 | + if test -n "$AS"; then |
3733 | + ac_cv_prog_AS="$AS" # Let the user override the test. |
3734 | +else |
3735 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
3736 | +for as_dir in $PATH |
3737 | +do |
3738 | + IFS=$as_save_IFS |
3739 | + test -z "$as_dir" && as_dir=. |
3740 | + for ac_exec_ext in '' $ac_executable_extensions; do |
3741 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
3742 | + ac_cv_prog_AS="${ac_tool_prefix}as" |
3743 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
3744 | + break 2 |
3745 | + fi |
3746 | +done |
3747 | + done |
3748 | +IFS=$as_save_IFS |
3749 | + |
3750 | +fi |
3751 | +fi |
3752 | +AS=$ac_cv_prog_AS |
3753 | +if test -n "$AS"; then |
3754 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AS" >&5 |
3755 | +$as_echo "$AS" >&6; } |
3756 | +else |
3757 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
3758 | +$as_echo "no" >&6; } |
3759 | +fi |
3760 | + |
3761 | + |
3762 | +fi |
3763 | +if test -z "$ac_cv_prog_AS"; then |
3764 | + ac_ct_AS=$AS |
3765 | + # Extract the first word of "as", so it can be a program name with args. |
3766 | +set dummy as; ac_word=$2 |
3767 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3768 | +$as_echo_n "checking for $ac_word... " >&6; } |
3769 | +if ${ac_cv_prog_ac_ct_AS+:} false; then : |
3770 | + $as_echo_n "(cached) " >&6 |
3771 | +else |
3772 | + if test -n "$ac_ct_AS"; then |
3773 | + ac_cv_prog_ac_ct_AS="$ac_ct_AS" # Let the user override the test. |
3774 | +else |
3775 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
3776 | +for as_dir in $PATH |
3777 | +do |
3778 | + IFS=$as_save_IFS |
3779 | + test -z "$as_dir" && as_dir=. |
3780 | + for ac_exec_ext in '' $ac_executable_extensions; do |
3781 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
3782 | + ac_cv_prog_ac_ct_AS="as" |
3783 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
3784 | + break 2 |
3785 | + fi |
3786 | +done |
3787 | + done |
3788 | +IFS=$as_save_IFS |
3789 | + |
3790 | +fi |
3791 | +fi |
3792 | +ac_ct_AS=$ac_cv_prog_ac_ct_AS |
3793 | +if test -n "$ac_ct_AS"; then |
3794 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AS" >&5 |
3795 | +$as_echo "$ac_ct_AS" >&6; } |
3796 | +else |
3797 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
3798 | +$as_echo "no" >&6; } |
3799 | +fi |
3800 | + |
3801 | + if test "x$ac_ct_AS" = x; then |
3802 | + AS="false" |
3803 | + else |
3804 | + case $cross_compiling:$ac_tool_warned in |
3805 | +yes:) |
3806 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
3807 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
3808 | +ac_tool_warned=yes ;; |
3809 | +esac |
3810 | + AS=$ac_ct_AS |
3811 | + fi |
3812 | +else |
3813 | + AS="$ac_cv_prog_AS" |
3814 | +fi |
3815 | + |
3816 | + if test -n "$ac_tool_prefix"; then |
3817 | + # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args. |
3818 | +set dummy ${ac_tool_prefix}dlltool; ac_word=$2 |
3819 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3820 | +$as_echo_n "checking for $ac_word... " >&6; } |
3821 | +if ${ac_cv_prog_DLLTOOL+:} false; then : |
3822 | + $as_echo_n "(cached) " >&6 |
3823 | +else |
3824 | + if test -n "$DLLTOOL"; then |
3825 | + ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test. |
3826 | +else |
3827 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
3828 | +for as_dir in $PATH |
3829 | +do |
3830 | + IFS=$as_save_IFS |
3831 | + test -z "$as_dir" && as_dir=. |
3832 | + for ac_exec_ext in '' $ac_executable_extensions; do |
3833 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
3834 | + ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" |
3835 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
3836 | + break 2 |
3837 | + fi |
3838 | +done |
3839 | + done |
3840 | +IFS=$as_save_IFS |
3841 | + |
3842 | +fi |
3843 | +fi |
3844 | +DLLTOOL=$ac_cv_prog_DLLTOOL |
3845 | +if test -n "$DLLTOOL"; then |
3846 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5 |
3847 | +$as_echo "$DLLTOOL" >&6; } |
3848 | +else |
3849 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
3850 | +$as_echo "no" >&6; } |
3851 | +fi |
3852 | + |
3853 | + |
3854 | +fi |
3855 | +if test -z "$ac_cv_prog_DLLTOOL"; then |
3856 | + ac_ct_DLLTOOL=$DLLTOOL |
3857 | + # Extract the first word of "dlltool", so it can be a program name with args. |
3858 | +set dummy dlltool; ac_word=$2 |
3859 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3860 | +$as_echo_n "checking for $ac_word... " >&6; } |
3861 | +if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then : |
3862 | + $as_echo_n "(cached) " >&6 |
3863 | +else |
3864 | + if test -n "$ac_ct_DLLTOOL"; then |
3865 | + ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test. |
3866 | +else |
3867 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
3868 | +for as_dir in $PATH |
3869 | +do |
3870 | + IFS=$as_save_IFS |
3871 | + test -z "$as_dir" && as_dir=. |
3872 | + for ac_exec_ext in '' $ac_executable_extensions; do |
3873 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
3874 | + ac_cv_prog_ac_ct_DLLTOOL="dlltool" |
3875 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
3876 | + break 2 |
3877 | + fi |
3878 | +done |
3879 | + done |
3880 | +IFS=$as_save_IFS |
3881 | + |
3882 | +fi |
3883 | +fi |
3884 | +ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL |
3885 | +if test -n "$ac_ct_DLLTOOL"; then |
3886 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5 |
3887 | +$as_echo "$ac_ct_DLLTOOL" >&6; } |
3888 | +else |
3889 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
3890 | +$as_echo "no" >&6; } |
3891 | +fi |
3892 | + |
3893 | + if test "x$ac_ct_DLLTOOL" = x; then |
3894 | + DLLTOOL="false" |
3895 | + else |
3896 | + case $cross_compiling:$ac_tool_warned in |
3897 | +yes:) |
3898 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
3899 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
3900 | +ac_tool_warned=yes ;; |
3901 | +esac |
3902 | + DLLTOOL=$ac_ct_DLLTOOL |
3903 | + fi |
3904 | +else |
3905 | + DLLTOOL="$ac_cv_prog_DLLTOOL" |
3906 | +fi |
3907 | + |
3908 | + if test -n "$ac_tool_prefix"; then |
3909 | + # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args. |
3910 | +set dummy ${ac_tool_prefix}objdump; ac_word=$2 |
3911 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3912 | +$as_echo_n "checking for $ac_word... " >&6; } |
3913 | +if ${ac_cv_prog_OBJDUMP+:} false; then : |
3914 | + $as_echo_n "(cached) " >&6 |
3915 | +else |
3916 | + if test -n "$OBJDUMP"; then |
3917 | + ac_cv_prog_OBJDUMP="$OBJDUMP" # Let the user override the test. |
3918 | +else |
3919 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
3920 | +for as_dir in $PATH |
3921 | +do |
3922 | + IFS=$as_save_IFS |
3923 | + test -z "$as_dir" && as_dir=. |
3924 | + for ac_exec_ext in '' $ac_executable_extensions; do |
3925 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
3926 | + ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" |
3927 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
3928 | + break 2 |
3929 | + fi |
3930 | +done |
3931 | + done |
3932 | +IFS=$as_save_IFS |
3933 | + |
3934 | +fi |
3935 | +fi |
3936 | +OBJDUMP=$ac_cv_prog_OBJDUMP |
3937 | +if test -n "$OBJDUMP"; then |
3938 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OBJDUMP" >&5 |
3939 | +$as_echo "$OBJDUMP" >&6; } |
3940 | +else |
3941 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
3942 | +$as_echo "no" >&6; } |
3943 | +fi |
3944 | + |
3945 | + |
3946 | +fi |
3947 | +if test -z "$ac_cv_prog_OBJDUMP"; then |
3948 | + ac_ct_OBJDUMP=$OBJDUMP |
3949 | + # Extract the first word of "objdump", so it can be a program name with args. |
3950 | +set dummy objdump; ac_word=$2 |
3951 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
3952 | +$as_echo_n "checking for $ac_word... " >&6; } |
3953 | +if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then : |
3954 | + $as_echo_n "(cached) " >&6 |
3955 | +else |
3956 | + if test -n "$ac_ct_OBJDUMP"; then |
3957 | + ac_cv_prog_ac_ct_OBJDUMP="$ac_ct_OBJDUMP" # Let the user override the test. |
3958 | +else |
3959 | +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
3960 | +for as_dir in $PATH |
3961 | +do |
3962 | + IFS=$as_save_IFS |
3963 | + test -z "$as_dir" && as_dir=. |
3964 | + for ac_exec_ext in '' $ac_executable_extensions; do |
3965 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
3966 | + ac_cv_prog_ac_ct_OBJDUMP="objdump" |
3967 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
3968 | + break 2 |
3969 | + fi |
3970 | +done |
3971 | + done |
3972 | +IFS=$as_save_IFS |
3973 | + |
3974 | +fi |
3975 | +fi |
3976 | +ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP |
3977 | +if test -n "$ac_ct_OBJDUMP"; then |
3978 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_OBJDUMP" >&5 |
3979 | +$as_echo "$ac_ct_OBJDUMP" >&6; } |
3980 | +else |
3981 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
3982 | +$as_echo "no" >&6; } |
3983 | +fi |
3984 | + |
3985 | + if test "x$ac_ct_OBJDUMP" = x; then |
3986 | + OBJDUMP="false" |
3987 | + else |
3988 | + case $cross_compiling:$ac_tool_warned in |
3989 | +yes:) |
3990 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 |
3991 | +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} |
3992 | +ac_tool_warned=yes ;; |
3993 | +esac |
3994 | + OBJDUMP=$ac_ct_OBJDUMP |
3995 | + fi |
3996 | +else |
3997 | + OBJDUMP="$ac_cv_prog_OBJDUMP" |
3998 | +fi |
3999 | + |
4000 | + ;; |
4001 | +esac |
4002 | + |
4003 | +test -z "$AS" && AS=as |
4004 | + |
4005 | + |
4006 | + |
4007 | + |
4008 | + |
4009 | +test -z "$DLLTOOL" && DLLTOOL=dlltool |
4010 | + |
4011 | + |
4012 | + |
4013 | + |
4014 | + |
4015 | +test -z "$OBJDUMP" && OBJDUMP=objdump |
4016 | + |
4017 | + |
4018 | + |
4019 | + |
4020 | + |
4021 | + |
4022 | + |
4023 | + enable_dlopen=no |
4024 | |
4025 | |
4026 | |
4027 | @@ -13407,6 +13522,596 @@ |
4028 | fi |
4029 | |
4030 | |
4031 | + GETTEXT_PACKAGE=libvirt-glib |
4032 | + |
4033 | + |
4034 | +cat >>confdefs.h <<_ACEOF |
4035 | +#define GETTEXT_PACKAGE "$GETTEXT_PACKAGE" |
4036 | +_ACEOF |
4037 | + |
4038 | + |
4039 | + |
4040 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5 |
4041 | +$as_echo_n "checking whether NLS is requested... " >&6; } |
4042 | + # Check whether --enable-nls was given. |
4043 | +if test "${enable_nls+set}" = set; then : |
4044 | + enableval=$enable_nls; USE_NLS=$enableval |
4045 | +else |
4046 | + USE_NLS=yes |
4047 | +fi |
4048 | + |
4049 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_NLS" >&5 |
4050 | +$as_echo "$USE_NLS" >&6; } |
4051 | + |
4052 | + |
4053 | + |
4054 | + |
4055 | +case "$am__api_version" in |
4056 | + 1.01234) |
4057 | + as_fn_error $? "Automake 1.5 or newer is required to use intltool" "$LINENO" 5 |
4058 | + ;; |
4059 | + *) |
4060 | + ;; |
4061 | +esac |
4062 | + |
4063 | +INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.35.0 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` |
4064 | +INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` |
4065 | +INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` |
4066 | +if test -n "0.35.0"; then |
4067 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for intltool >= 0.35.0" >&5 |
4068 | +$as_echo_n "checking for intltool >= 0.35.0... " >&6; } |
4069 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_APPLIED_VERSION found" >&5 |
4070 | +$as_echo "$INTLTOOL_APPLIED_VERSION found" >&6; } |
4071 | + test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || |
4072 | + as_fn_error $? "Your intltool is too old. You need intltool 0.35.0 or later." "$LINENO" 5 |
4073 | +fi |
4074 | + |
4075 | +# Extract the first word of "intltool-update", so it can be a program name with args. |
4076 | +set dummy intltool-update; ac_word=$2 |
4077 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
4078 | +$as_echo_n "checking for $ac_word... " >&6; } |
4079 | +if ${ac_cv_path_INTLTOOL_UPDATE+:} false; then : |
4080 | + $as_echo_n "(cached) " >&6 |
4081 | +else |
4082 | + case $INTLTOOL_UPDATE in |
4083 | + [\\/]* | ?:[\\/]*) |
4084 | + ac_cv_path_INTLTOOL_UPDATE="$INTLTOOL_UPDATE" # Let the user override the test with a path. |
4085 | + ;; |
4086 | + *) |
4087 | + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
4088 | +for as_dir in $PATH |
4089 | +do |
4090 | + IFS=$as_save_IFS |
4091 | + test -z "$as_dir" && as_dir=. |
4092 | + for ac_exec_ext in '' $ac_executable_extensions; do |
4093 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
4094 | + ac_cv_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext" |
4095 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
4096 | + break 2 |
4097 | + fi |
4098 | +done |
4099 | + done |
4100 | +IFS=$as_save_IFS |
4101 | + |
4102 | + ;; |
4103 | +esac |
4104 | +fi |
4105 | +INTLTOOL_UPDATE=$ac_cv_path_INTLTOOL_UPDATE |
4106 | +if test -n "$INTLTOOL_UPDATE"; then |
4107 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_UPDATE" >&5 |
4108 | +$as_echo "$INTLTOOL_UPDATE" >&6; } |
4109 | +else |
4110 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
4111 | +$as_echo "no" >&6; } |
4112 | +fi |
4113 | + |
4114 | + |
4115 | +# Extract the first word of "intltool-merge", so it can be a program name with args. |
4116 | +set dummy intltool-merge; ac_word=$2 |
4117 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
4118 | +$as_echo_n "checking for $ac_word... " >&6; } |
4119 | +if ${ac_cv_path_INTLTOOL_MERGE+:} false; then : |
4120 | + $as_echo_n "(cached) " >&6 |
4121 | +else |
4122 | + case $INTLTOOL_MERGE in |
4123 | + [\\/]* | ?:[\\/]*) |
4124 | + ac_cv_path_INTLTOOL_MERGE="$INTLTOOL_MERGE" # Let the user override the test with a path. |
4125 | + ;; |
4126 | + *) |
4127 | + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
4128 | +for as_dir in $PATH |
4129 | +do |
4130 | + IFS=$as_save_IFS |
4131 | + test -z "$as_dir" && as_dir=. |
4132 | + for ac_exec_ext in '' $ac_executable_extensions; do |
4133 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
4134 | + ac_cv_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext" |
4135 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
4136 | + break 2 |
4137 | + fi |
4138 | +done |
4139 | + done |
4140 | +IFS=$as_save_IFS |
4141 | + |
4142 | + ;; |
4143 | +esac |
4144 | +fi |
4145 | +INTLTOOL_MERGE=$ac_cv_path_INTLTOOL_MERGE |
4146 | +if test -n "$INTLTOOL_MERGE"; then |
4147 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_MERGE" >&5 |
4148 | +$as_echo "$INTLTOOL_MERGE" >&6; } |
4149 | +else |
4150 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
4151 | +$as_echo "no" >&6; } |
4152 | +fi |
4153 | + |
4154 | + |
4155 | +# Extract the first word of "intltool-extract", so it can be a program name with args. |
4156 | +set dummy intltool-extract; ac_word=$2 |
4157 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
4158 | +$as_echo_n "checking for $ac_word... " >&6; } |
4159 | +if ${ac_cv_path_INTLTOOL_EXTRACT+:} false; then : |
4160 | + $as_echo_n "(cached) " >&6 |
4161 | +else |
4162 | + case $INTLTOOL_EXTRACT in |
4163 | + [\\/]* | ?:[\\/]*) |
4164 | + ac_cv_path_INTLTOOL_EXTRACT="$INTLTOOL_EXTRACT" # Let the user override the test with a path. |
4165 | + ;; |
4166 | + *) |
4167 | + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
4168 | +for as_dir in $PATH |
4169 | +do |
4170 | + IFS=$as_save_IFS |
4171 | + test -z "$as_dir" && as_dir=. |
4172 | + for ac_exec_ext in '' $ac_executable_extensions; do |
4173 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
4174 | + ac_cv_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext" |
4175 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
4176 | + break 2 |
4177 | + fi |
4178 | +done |
4179 | + done |
4180 | +IFS=$as_save_IFS |
4181 | + |
4182 | + ;; |
4183 | +esac |
4184 | +fi |
4185 | +INTLTOOL_EXTRACT=$ac_cv_path_INTLTOOL_EXTRACT |
4186 | +if test -n "$INTLTOOL_EXTRACT"; then |
4187 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_EXTRACT" >&5 |
4188 | +$as_echo "$INTLTOOL_EXTRACT" >&6; } |
4189 | +else |
4190 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
4191 | +$as_echo "no" >&6; } |
4192 | +fi |
4193 | + |
4194 | + |
4195 | +if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then |
4196 | + as_fn_error $? "The intltool scripts were not found. Please install intltool." "$LINENO" 5 |
4197 | +fi |
4198 | + |
4199 | +if test -z "$AM_DEFAULT_VERBOSITY"; then |
4200 | + AM_DEFAULT_VERBOSITY=1 |
4201 | +fi |
4202 | + |
4203 | + |
4204 | +INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))' |
4205 | +INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))' |
4206 | +INTLTOOL__v_MERGE_0='@echo " ITMRG " $@;' |
4207 | + |
4208 | + |
4209 | + |
4210 | + |
4211 | +INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))' |
4212 | +intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))' |
4213 | +intltool__v_merge_options_0='-q' |
4214 | + |
4215 | + |
4216 | + |
4217 | + |
4218 | + INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' |
4219 | +INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' |
4220 | + INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' |
4221 | + INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' |
4222 | + INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< $@' |
4223 | + INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' |
4224 | + INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' |
4225 | + INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' |
4226 | +INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' |
4227 | + INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' |
4228 | + INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' |
4229 | +if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then |
4230 | + INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< $@' |
4231 | +else |
4232 | + INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.$$RANDOM && mkdir $$_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u $$_it_tmp_dir $< $@ && rmdir $$_it_tmp_dir' |
4233 | +fi |
4234 | + INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' |
4235 | + INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' |
4236 | + INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' |
4237 | + INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' |
4238 | + INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' |
4239 | + INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' |
4240 | + INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@' |
4241 | + |
4242 | + |
4243 | + |
4244 | + |
4245 | + |
4246 | + |
4247 | + |
4248 | + |
4249 | + |
4250 | + |
4251 | + |
4252 | + |
4253 | + |
4254 | + |
4255 | + |
4256 | + |
4257 | + |
4258 | + |
4259 | + |
4260 | + |
4261 | + |
4262 | + |
4263 | + |
4264 | + |
4265 | + |
4266 | + |
4267 | + |
4268 | + |
4269 | + |
4270 | + |
4271 | + |
4272 | + |
4273 | + |
4274 | + |
4275 | + |
4276 | + |
4277 | + |
4278 | + |
4279 | + |
4280 | + |
4281 | + |
4282 | + |
4283 | + |
4284 | + |
4285 | + |
4286 | + |
4287 | + |
4288 | + |
4289 | + |
4290 | + |
4291 | + |
4292 | + |
4293 | + |
4294 | + |
4295 | + |
4296 | + |
4297 | + |
4298 | + |
4299 | + |
4300 | + |
4301 | + |
4302 | + |
4303 | + |
4304 | + |
4305 | + |
4306 | + |
4307 | + |
4308 | + |
4309 | + |
4310 | + |
4311 | + |
4312 | + |
4313 | + |
4314 | + |
4315 | + |
4316 | + |
4317 | + |
4318 | + |
4319 | + |
4320 | + |
4321 | + |
4322 | + |
4323 | + |
4324 | + |
4325 | + |
4326 | + |
4327 | + |
4328 | + |
4329 | + |
4330 | + |
4331 | + |
4332 | + |
4333 | + |
4334 | + |
4335 | + |
4336 | + |
4337 | + |
4338 | +# Check the gettext tools to make sure they are GNU |
4339 | +# Extract the first word of "xgettext", so it can be a program name with args. |
4340 | +set dummy xgettext; ac_word=$2 |
4341 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
4342 | +$as_echo_n "checking for $ac_word... " >&6; } |
4343 | +if ${ac_cv_path_XGETTEXT+:} false; then : |
4344 | + $as_echo_n "(cached) " >&6 |
4345 | +else |
4346 | + case $XGETTEXT in |
4347 | + [\\/]* | ?:[\\/]*) |
4348 | + ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. |
4349 | + ;; |
4350 | + *) |
4351 | + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
4352 | +for as_dir in $PATH |
4353 | +do |
4354 | + IFS=$as_save_IFS |
4355 | + test -z "$as_dir" && as_dir=. |
4356 | + for ac_exec_ext in '' $ac_executable_extensions; do |
4357 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
4358 | + ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext" |
4359 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
4360 | + break 2 |
4361 | + fi |
4362 | +done |
4363 | + done |
4364 | +IFS=$as_save_IFS |
4365 | + |
4366 | + ;; |
4367 | +esac |
4368 | +fi |
4369 | +XGETTEXT=$ac_cv_path_XGETTEXT |
4370 | +if test -n "$XGETTEXT"; then |
4371 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XGETTEXT" >&5 |
4372 | +$as_echo "$XGETTEXT" >&6; } |
4373 | +else |
4374 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
4375 | +$as_echo "no" >&6; } |
4376 | +fi |
4377 | + |
4378 | + |
4379 | +# Extract the first word of "msgmerge", so it can be a program name with args. |
4380 | +set dummy msgmerge; ac_word=$2 |
4381 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
4382 | +$as_echo_n "checking for $ac_word... " >&6; } |
4383 | +if ${ac_cv_path_MSGMERGE+:} false; then : |
4384 | + $as_echo_n "(cached) " >&6 |
4385 | +else |
4386 | + case $MSGMERGE in |
4387 | + [\\/]* | ?:[\\/]*) |
4388 | + ac_cv_path_MSGMERGE="$MSGMERGE" # Let the user override the test with a path. |
4389 | + ;; |
4390 | + *) |
4391 | + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
4392 | +for as_dir in $PATH |
4393 | +do |
4394 | + IFS=$as_save_IFS |
4395 | + test -z "$as_dir" && as_dir=. |
4396 | + for ac_exec_ext in '' $ac_executable_extensions; do |
4397 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
4398 | + ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext" |
4399 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
4400 | + break 2 |
4401 | + fi |
4402 | +done |
4403 | + done |
4404 | +IFS=$as_save_IFS |
4405 | + |
4406 | + ;; |
4407 | +esac |
4408 | +fi |
4409 | +MSGMERGE=$ac_cv_path_MSGMERGE |
4410 | +if test -n "$MSGMERGE"; then |
4411 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGMERGE" >&5 |
4412 | +$as_echo "$MSGMERGE" >&6; } |
4413 | +else |
4414 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
4415 | +$as_echo "no" >&6; } |
4416 | +fi |
4417 | + |
4418 | + |
4419 | +# Extract the first word of "msgfmt", so it can be a program name with args. |
4420 | +set dummy msgfmt; ac_word=$2 |
4421 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
4422 | +$as_echo_n "checking for $ac_word... " >&6; } |
4423 | +if ${ac_cv_path_MSGFMT+:} false; then : |
4424 | + $as_echo_n "(cached) " >&6 |
4425 | +else |
4426 | + case $MSGFMT in |
4427 | + [\\/]* | ?:[\\/]*) |
4428 | + ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. |
4429 | + ;; |
4430 | + *) |
4431 | + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
4432 | +for as_dir in $PATH |
4433 | +do |
4434 | + IFS=$as_save_IFS |
4435 | + test -z "$as_dir" && as_dir=. |
4436 | + for ac_exec_ext in '' $ac_executable_extensions; do |
4437 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
4438 | + ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext" |
4439 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
4440 | + break 2 |
4441 | + fi |
4442 | +done |
4443 | + done |
4444 | +IFS=$as_save_IFS |
4445 | + |
4446 | + ;; |
4447 | +esac |
4448 | +fi |
4449 | +MSGFMT=$ac_cv_path_MSGFMT |
4450 | +if test -n "$MSGFMT"; then |
4451 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSGFMT" >&5 |
4452 | +$as_echo "$MSGFMT" >&6; } |
4453 | +else |
4454 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
4455 | +$as_echo "no" >&6; } |
4456 | +fi |
4457 | + |
4458 | + |
4459 | +# Extract the first word of "gmsgfmt", so it can be a program name with args. |
4460 | +set dummy gmsgfmt; ac_word=$2 |
4461 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
4462 | +$as_echo_n "checking for $ac_word... " >&6; } |
4463 | +if ${ac_cv_path_GMSGFMT+:} false; then : |
4464 | + $as_echo_n "(cached) " >&6 |
4465 | +else |
4466 | + case $GMSGFMT in |
4467 | + [\\/]* | ?:[\\/]*) |
4468 | + ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. |
4469 | + ;; |
4470 | + *) |
4471 | + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
4472 | +for as_dir in $PATH |
4473 | +do |
4474 | + IFS=$as_save_IFS |
4475 | + test -z "$as_dir" && as_dir=. |
4476 | + for ac_exec_ext in '' $ac_executable_extensions; do |
4477 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
4478 | + ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" |
4479 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
4480 | + break 2 |
4481 | + fi |
4482 | +done |
4483 | + done |
4484 | +IFS=$as_save_IFS |
4485 | + |
4486 | + test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" |
4487 | + ;; |
4488 | +esac |
4489 | +fi |
4490 | +GMSGFMT=$ac_cv_path_GMSGFMT |
4491 | +if test -n "$GMSGFMT"; then |
4492 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GMSGFMT" >&5 |
4493 | +$as_echo "$GMSGFMT" >&6; } |
4494 | +else |
4495 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
4496 | +$as_echo "no" >&6; } |
4497 | +fi |
4498 | + |
4499 | + |
4500 | +if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then |
4501 | + as_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5 |
4502 | +fi |
4503 | +xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`" |
4504 | +mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`" |
4505 | +mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`" |
4506 | +if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then |
4507 | + as_fn_error $? "GNU gettext tools not found; required for intltool" "$LINENO" 5 |
4508 | +fi |
4509 | + |
4510 | +# Extract the first word of "perl", so it can be a program name with args. |
4511 | +set dummy perl; ac_word=$2 |
4512 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 |
4513 | +$as_echo_n "checking for $ac_word... " >&6; } |
4514 | +if ${ac_cv_path_INTLTOOL_PERL+:} false; then : |
4515 | + $as_echo_n "(cached) " >&6 |
4516 | +else |
4517 | + case $INTLTOOL_PERL in |
4518 | + [\\/]* | ?:[\\/]*) |
4519 | + ac_cv_path_INTLTOOL_PERL="$INTLTOOL_PERL" # Let the user override the test with a path. |
4520 | + ;; |
4521 | + *) |
4522 | + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
4523 | +for as_dir in $PATH |
4524 | +do |
4525 | + IFS=$as_save_IFS |
4526 | + test -z "$as_dir" && as_dir=. |
4527 | + for ac_exec_ext in '' $ac_executable_extensions; do |
4528 | + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
4529 | + ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext" |
4530 | + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 |
4531 | + break 2 |
4532 | + fi |
4533 | +done |
4534 | + done |
4535 | +IFS=$as_save_IFS |
4536 | + |
4537 | + ;; |
4538 | +esac |
4539 | +fi |
4540 | +INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL |
4541 | +if test -n "$INTLTOOL_PERL"; then |
4542 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_PERL" >&5 |
4543 | +$as_echo "$INTLTOOL_PERL" >&6; } |
4544 | +else |
4545 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
4546 | +$as_echo "no" >&6; } |
4547 | +fi |
4548 | + |
4549 | + |
4550 | +if test -z "$INTLTOOL_PERL"; then |
4551 | + as_fn_error $? "perl not found" "$LINENO" 5 |
4552 | +fi |
4553 | +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl >= 5.8.1" >&5 |
4554 | +$as_echo_n "checking for perl >= 5.8.1... " >&6; } |
4555 | +$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1 |
4556 | +if test $? -ne 0; then |
4557 | + as_fn_error $? "perl 5.8.1 is required for intltool" "$LINENO" 5 |
4558 | +else |
4559 | + IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"` |
4560 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5 |
4561 | +$as_echo "$IT_PERL_VERSION" >&6; } |
4562 | +fi |
4563 | +if test "x" != "xno-xml"; then |
4564 | + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML::Parser" >&5 |
4565 | +$as_echo_n "checking for XML::Parser... " >&6; } |
4566 | + if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then |
4567 | + { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 |
4568 | +$as_echo "ok" >&6; } |
4569 | + else |
4570 | + as_fn_error $? "XML::Parser perl module is required for intltool" "$LINENO" 5 |
4571 | + fi |
4572 | +fi |
4573 | + |
4574 | +# Substitute ALL_LINGUAS so we can use it in po/Makefile |
4575 | + |
4576 | + |
4577 | +# Set DATADIRNAME correctly if it is not set yet |
4578 | +# (copied from glib-gettext.m4) |
4579 | +if test -z "$DATADIRNAME"; then |
4580 | + cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
4581 | +/* end confdefs.h. */ |
4582 | + |
4583 | +int |
4584 | +main () |
4585 | +{ |
4586 | +extern int _nl_msg_cat_cntr; |
4587 | + return _nl_msg_cat_cntr |
4588 | + ; |
4589 | + return 0; |
4590 | +} |
4591 | +_ACEOF |
4592 | +if ac_fn_c_try_link "$LINENO"; then : |
4593 | + DATADIRNAME=share |
4594 | +else |
4595 | + case $host in |
4596 | + *-*-solaris*) |
4597 | + ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" |
4598 | +if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then : |
4599 | + DATADIRNAME=share |
4600 | +else |
4601 | + DATADIRNAME=lib |
4602 | +fi |
4603 | + |
4604 | + ;; |
4605 | + *) |
4606 | + DATADIRNAME=lib |
4607 | + ;; |
4608 | + esac |
4609 | +fi |
4610 | +rm -f core conftest.err conftest.$ac_objext \ |
4611 | + conftest$ac_exeext conftest.$ac_ext |
4612 | +fi |
4613 | + |
4614 | + |
4615 | + |
4616 | + |
4617 | + |
4618 | + |
4619 | + |
4620 | + |
4621 | |
4622 | |
4623 | # Extract the first word of "gtkdoc-check", so it can be a program name with args. |
4624 | @@ -13626,31 +14331,11 @@ |
4625 | # Put the nasty error message in config.log where it belongs |
4626 | echo "$GTKDOC_DEPS_PKG_ERRORS" >&5 |
4627 | |
4628 | - as_fn_error $? "Package requirements (glib-2.0 >= 2.10.0 gobject-2.0 >= 2.10.0) were not met: |
4629 | - |
4630 | -$GTKDOC_DEPS_PKG_ERRORS |
4631 | - |
4632 | -Consider adjusting the PKG_CONFIG_PATH environment variable if you |
4633 | -installed software in a non-standard prefix. |
4634 | - |
4635 | -Alternatively, you may set the environment variables GTKDOC_DEPS_CFLAGS |
4636 | -and GTKDOC_DEPS_LIBS to avoid the need to call pkg-config. |
4637 | -See the pkg-config man page for more details." "$LINENO" 5 |
4638 | + : |
4639 | elif test $pkg_failed = untried; then |
4640 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 |
4641 | $as_echo "no" >&6; } |
4642 | - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 |
4643 | -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} |
4644 | -as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it |
4645 | -is in your PATH or set the PKG_CONFIG environment variable to the full |
4646 | -path to pkg-config. |
4647 | - |
4648 | -Alternatively, you may set the environment variables GTKDOC_DEPS_CFLAGS |
4649 | -and GTKDOC_DEPS_LIBS to avoid the need to call pkg-config. |
4650 | -See the pkg-config man page for more details. |
4651 | - |
4652 | -To get pkg-config, see <http://pkg-config.freedesktop.org/>. |
4653 | -See \`config.log' for more details" "$LINENO" 5; } |
4654 | + : |
4655 | else |
4656 | GTKDOC_DEPS_CFLAGS=$pkg_cv_GTKDOC_DEPS_CFLAGS |
4657 | GTKDOC_DEPS_LIBS=$pkg_cv_GTKDOC_DEPS_LIBS |
4658 | @@ -13685,6 +14370,10 @@ |
4659 | enable_gtk_doc_pdf=no |
4660 | fi |
4661 | |
4662 | + if test -z "$AM_DEFAULT_VERBOSITY"; then |
4663 | + AM_DEFAULT_VERBOSITY=1 |
4664 | + fi |
4665 | + |
4666 | |
4667 | if test x$enable_gtk_doc = xyes; then |
4668 | ENABLE_GTK_DOC_TRUE= |
4669 | @@ -14174,7 +14863,7 @@ |
4670 | fi |
4671 | |
4672 | |
4673 | -ac_config_files="$ac_config_files Makefile libvirt-glib/Makefile libvirt-gconfig/Makefile libvirt-gconfig/tests/Makefile libvirt-gobject/Makefile examples/Makefile python/Makefile vapi/Makefile docs/Makefile docs/libvirt-glib/Makefile docs/libvirt-glib/version.xml docs/libvirt-gobject/Makefile docs/libvirt-gconfig/Makefile libvirt-glib-1.0.pc libvirt-gconfig-1.0.pc libvirt-gobject-1.0.pc libvirt-glib.spec mingw-libvirt-glib.spec" |
4674 | +ac_config_files="$ac_config_files Makefile libvirt-glib/Makefile libvirt-gconfig/Makefile libvirt-gconfig/tests/Makefile libvirt-gobject/Makefile examples/Makefile python/Makefile vapi/Makefile docs/Makefile docs/libvirt-glib/Makefile docs/libvirt-glib/version.xml docs/libvirt-gobject/Makefile docs/libvirt-gconfig/Makefile po/Makefile.in libvirt-glib-1.0.pc libvirt-gconfig-1.0.pc libvirt-gobject-1.0.pc libvirt-glib.spec mingw-libvirt-glib.spec" |
4675 | |
4676 | cat >confcache <<\_ACEOF |
4677 | # This file is a shell script that caches the results of configure |
4678 | @@ -14309,6 +14998,10 @@ |
4679 | as_fn_error $? "conditional \"am__fastdepCC\" was never defined. |
4680 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
4681 | fi |
4682 | + |
4683 | + ac_config_commands="$ac_config_commands po/stamp-it" |
4684 | + |
4685 | + |
4686 | if test -z "${ENABLE_GTK_DOC_TRUE}" && test -z "${ENABLE_GTK_DOC_FALSE}"; then |
4687 | as_fn_error $? "conditional \"ENABLE_GTK_DOC\" was never defined. |
4688 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
4689 | @@ -14738,7 +15431,7 @@ |
4690 | # report actual input values of CONFIG_FILES etc. instead of their |
4691 | # values after options handling. |
4692 | ac_log=" |
4693 | -This file was extended by libvirt-glib $as_me 0.1.6, which was |
4694 | +This file was extended by libvirt-glib $as_me 0.1.7, which was |
4695 | generated by GNU Autoconf 2.69. Invocation command line was |
4696 | |
4697 | CONFIG_FILES = $CONFIG_FILES |
4698 | @@ -14808,7 +15501,7 @@ |
4699 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
4700 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" |
4701 | ac_cs_version="\\ |
4702 | -libvirt-glib config.status 0.1.6 |
4703 | +libvirt-glib config.status 0.1.7 |
4704 | configured by $0, generated by GNU Autoconf 2.69, |
4705 | with options \\"\$ac_cs_config\\" |
4706 | |
4707 | @@ -14937,13 +15630,13 @@ |
4708 | sed_quote_subst='$sed_quote_subst' |
4709 | double_quote_subst='$double_quote_subst' |
4710 | delay_variable_subst='$delay_variable_subst' |
4711 | -AS='`$ECHO "$AS" | $SED "$delay_single_quote_subst"`' |
4712 | -DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' |
4713 | -OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' |
4714 | macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`' |
4715 | macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`' |
4716 | enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`' |
4717 | enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`' |
4718 | +AS='`$ECHO "$AS" | $SED "$delay_single_quote_subst"`' |
4719 | +DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`' |
4720 | +OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`' |
4721 | pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`' |
4722 | enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' |
4723 | SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' |
4724 | @@ -15234,11 +15927,13 @@ |
4725 | "docs/libvirt-glib/version.xml") CONFIG_FILES="$CONFIG_FILES docs/libvirt-glib/version.xml" ;; |
4726 | "docs/libvirt-gobject/Makefile") CONFIG_FILES="$CONFIG_FILES docs/libvirt-gobject/Makefile" ;; |
4727 | "docs/libvirt-gconfig/Makefile") CONFIG_FILES="$CONFIG_FILES docs/libvirt-gconfig/Makefile" ;; |
4728 | + "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;; |
4729 | "libvirt-glib-1.0.pc") CONFIG_FILES="$CONFIG_FILES libvirt-glib-1.0.pc" ;; |
4730 | "libvirt-gconfig-1.0.pc") CONFIG_FILES="$CONFIG_FILES libvirt-gconfig-1.0.pc" ;; |
4731 | "libvirt-gobject-1.0.pc") CONFIG_FILES="$CONFIG_FILES libvirt-gobject-1.0.pc" ;; |
4732 | "libvirt-glib.spec") CONFIG_FILES="$CONFIG_FILES libvirt-glib.spec" ;; |
4733 | "mingw-libvirt-glib.spec") CONFIG_FILES="$CONFIG_FILES mingw-libvirt-glib.spec" ;; |
4734 | + "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;; |
4735 | |
4736 | *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; |
4737 | esac |
4738 | @@ -15867,7 +16562,7 @@ |
4739 | |
4740 | case $ac_file$ac_mode in |
4741 | "depfiles":C) test x"$AMDEP_TRUE" != x"" || { |
4742 | - # Autoconf 2.62 quotes --file arguments for eval, but not when files |
4743 | + # Older Autoconf quotes --file arguments for eval, but not when files |
4744 | # are listed without --file. Let's play safe and only enable the eval |
4745 | # if we detect the quoting. |
4746 | case $CONFIG_FILES in |
4747 | @@ -15918,7 +16613,7 @@ |
4748 | DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` |
4749 | test -z "$DEPDIR" && continue |
4750 | am__include=`sed -n 's/^am__include = //p' < "$mf"` |
4751 | - test -z "am__include" && continue |
4752 | + test -z "$am__include" && continue |
4753 | am__quote=`sed -n 's/^am__quote = //p' < "$mf"` |
4754 | # Find all dependency output files, they are included files with |
4755 | # $(DEPDIR) in their names. We invoke sed twice because it is the |
4756 | @@ -16013,15 +16708,6 @@ |
4757 | |
4758 | # ### BEGIN LIBTOOL CONFIG |
4759 | |
4760 | -# Assembler program. |
4761 | -AS=$lt_AS |
4762 | - |
4763 | -# DLL creation program. |
4764 | -DLLTOOL=$lt_DLLTOOL |
4765 | - |
4766 | -# Object dumper program. |
4767 | -OBJDUMP=$lt_OBJDUMP |
4768 | - |
4769 | # Which release of libtool.m4 was used? |
4770 | macro_version=$macro_version |
4771 | macro_revision=$macro_revision |
4772 | @@ -16032,6 +16718,15 @@ |
4773 | # Whether or not to build static libraries. |
4774 | build_old_libs=$enable_static |
4775 | |
4776 | +# Assembler program. |
4777 | +AS=$lt_AS |
4778 | + |
4779 | +# DLL creation program. |
4780 | +DLLTOOL=$lt_DLLTOOL |
4781 | + |
4782 | +# Object dumper program. |
4783 | +OBJDUMP=$lt_OBJDUMP |
4784 | + |
4785 | # What type of objects to build. |
4786 | pic_mode=$pic_mode |
4787 | |
4788 | @@ -16592,6 +17287,26 @@ |
4789 | chmod +x "$ofile" |
4790 | |
4791 | ;; |
4792 | + "po/stamp-it":C) |
4793 | + if ! grep "^# INTLTOOL_MAKEFILE$" "po/Makefile.in" > /dev/null ; then |
4794 | + as_fn_error $? "po/Makefile.in.in was not created by intltoolize." "$LINENO" 5 |
4795 | + fi |
4796 | + rm -f "po/stamp-it" "po/stamp-it.tmp" "po/POTFILES" "po/Makefile.tmp" |
4797 | + >"po/stamp-it.tmp" |
4798 | + sed '/^#/d |
4799 | + s/^[[].*] *// |
4800 | + /^[ ]*$/d |
4801 | + '"s|^| $ac_top_srcdir/|" \ |
4802 | + "$srcdir/po/POTFILES.in" | sed '$!s/$/ \\/' >"po/POTFILES" |
4803 | + |
4804 | + sed '/^POTFILES =/,/[^\\]$/ { |
4805 | + /^POTFILES =/!d |
4806 | + r po/POTFILES |
4807 | + } |
4808 | + ' "po/Makefile.in" >"po/Makefile" |
4809 | + rm -f "po/Makefile.tmp" |
4810 | + mv "po/stamp-it.tmp" "po/stamp-it" |
4811 | + ;; |
4812 | |
4813 | esac |
4814 | done # for ac_tag |
4815 | |
4816 | === modified file 'configure.ac' |
4817 | --- configure.ac 2013-03-27 13:11:49 +0000 |
4818 | +++ configure.ac 2014-06-13 08:07:26 +0000 |
4819 | @@ -1,7 +1,7 @@ |
4820 | -AC_INIT(libvirt-glib, 0.1.6) |
4821 | +AC_INIT(libvirt-glib, 0.1.7) |
4822 | AC_CONFIG_SRCDIR(libvirt-glib/libvirt-glib-main.c) |
4823 | AC_CONFIG_AUX_DIR([build-aux]) |
4824 | -AM_CONFIG_HEADER(config.h) |
4825 | +AC_CONFIG_HEADERS([config.h]) |
4826 | AC_CONFIG_MACRO_DIR([m4]) |
4827 | dnl Make automake keep quiet about wildcards & other GNUmake-isms |
4828 | AM_INIT_AUTOMAKE([-Wno-portability]) |
4829 | @@ -21,9 +21,46 @@ |
4830 | LIBVIRT_GLIB_MINOR_VERSION=`echo $VERSION | awk -F. '{print $2}'` |
4831 | LIBVIRT_GLIB_MICRO_VERSION=`echo $VERSION | awk -F. '{print $3}'` |
4832 | LIBVIRT_GLIB_VERSION=$LIBVIRT_GLIB_MAJOR_VERSION.$LIBVIRT_GLIB_MINOR_VERSION.$LIBVIRT_GLIB_MICRO_VERSION$LIBVIRT_GLIB_MICRO_VERSION_SUFFIX |
4833 | -LIBVIRT_GLIB_VERSION_INFO=`expr $LIBVIRT_GLIB_MAJOR_VERSION + $LIBVIRT_GLIB_MINOR_VERSION`:$LIBVIRT_GLIB_MICRO_VERSION:$LIBVIRT_GLIB_MINOR_VERSION |
4834 | LIBVIRT_GLIB_VERSION_NUMBER=`expr $LIBVIRT_GLIB_MAJOR_VERSION \* 1000000 + $LIBVIRT_GLIB_MINOR_VERSION \* 1000 + $LIBVIRT_GLIB_MICRO_VERSION` |
4835 | |
4836 | +# In libtool terminology we need to figure out: |
4837 | +# |
4838 | +# CURRENT |
4839 | +# The most recent interface number that this library implements. |
4840 | +# |
4841 | +# REVISION |
4842 | +# The implementation number of the CURRENT interface. |
4843 | +# |
4844 | +# AGE |
4845 | +# The difference between the newest and oldest interfaces that this |
4846 | +# library implements. |
4847 | +# |
4848 | +# In other words, the library implements all the interface numbers |
4849 | +# in the range from number `CURRENT - AGE' to `CURRENT'. |
4850 | +# |
4851 | +# Libtool assigns the soname version from `CURRENT - AGE', and we |
4852 | +# don't want that to ever change in libvirt-glib, unless we need |
4853 | +# to break ABI for some rason. |
4854 | +# |
4855 | +# We would, however, like the libvirt-glib version number reflected |
4856 | +# in the so version'd symlinks, and this is based on AGE.REVISION |
4857 | +# eg libvirt-glib.so.0.AGE.REVISION |
4858 | +# |
4859 | +# Assuming we do ever want to break soname version, this can |
4860 | +# toggled. But seriously, don't ever touch this. |
4861 | +LIBVIRT_GLIB_SONUM=0 |
4862 | + |
4863 | +# The following examples show what libtool will do |
4864 | +# |
4865 | +# Input: 0.9.14 -> libvirt-glib.so.0.9.14 |
4866 | +# Input: 1.0.0 -> libvirt-glib.so.0.1000.0 |
4867 | +# Input: 2.5.8 -> libvirt-glib.so.0.2005.8 |
4868 | +# |
4869 | +AGE=`expr $LIBVIRT_GLIB_MAJOR_VERSION '*' 1000 + $LIBVIRT_GLIB_MINOR_VERSION` |
4870 | +REVISION=$LIBVIRT_GLIB_MICRO_VERSION |
4871 | +CURRENT=`expr $LIBVIRT_GLIB_SONUM + $AGE` |
4872 | +LIBVIRT_GLIB_VERSION_INFO=$CURRENT:$REVISION:$AGE |
4873 | + |
4874 | AC_SUBST([LIBVIRT_GLIB_MAJOR_VERSION]) |
4875 | AC_SUBST([LIBVIRT_GLIB_MINOR_VERSION]) |
4876 | AC_SUBST([LIBVIRT_GLIB_MICRO_VERSION]) |
4877 | @@ -34,8 +71,7 @@ |
4878 | AC_PROG_CC |
4879 | AM_PROG_CC_C_O |
4880 | |
4881 | -AC_LIBTOOL_WIN32_DLL |
4882 | -AC_PROG_LIBTOOL |
4883 | +LT_INIT([shared disable-static win32-dll]) |
4884 | |
4885 | dnl AC_CONFIG_LIBOBJ_DIR([src]) |
4886 | |
4887 | @@ -61,6 +97,12 @@ |
4888 | PKG_CHECK_MODULES(GIO2, gio-2.0 >= $GLIB2_REQUIRED) |
4889 | PKG_CHECK_MODULES(LIBXML2, libxml-2.0 >= $LIBXML2_REQUIRED) |
4890 | |
4891 | +LIBVIRT_GLIB_GETTEXT |
4892 | +dnl Should be in m4/virt-gettext.m4 but intltoolize is too |
4893 | +dnl dumb to find it there |
4894 | +IT_PROG_INTLTOOL([0.35.0]) |
4895 | + |
4896 | + |
4897 | GTK_DOC_CHECK([1.10],[--flavour no-tmpl]) |
4898 | |
4899 | # Setup GLIB_MKENUMS to use glib-mkenums even if GLib is uninstalled. |
4900 | @@ -263,6 +305,7 @@ |
4901 | docs/libvirt-glib/version.xml |
4902 | docs/libvirt-gobject/Makefile |
4903 | docs/libvirt-gconfig/Makefile |
4904 | + po/Makefile.in |
4905 | libvirt-glib-1.0.pc |
4906 | libvirt-gconfig-1.0.pc |
4907 | libvirt-gobject-1.0.pc |
4908 | |
4909 | === modified file 'debian/changelog' |
4910 | --- debian/changelog 2014-01-18 15:28:27 +0000 |
4911 | +++ debian/changelog 2014-06-13 08:07:26 +0000 |
4912 | @@ -1,3 +1,41 @@ |
4913 | +libvirt-glib (0.1.7-2.1ubuntu1) utopic; urgency=medium |
4914 | + |
4915 | + * Merge from debian. Remaining changes: |
4916 | + - Build using dh-autoreconf. |
4917 | + - Build-depend on gtk-doc-tools. |
4918 | + |
4919 | + -- Jackson Doak <noskcaj@ubuntu.com> Fri, 13 Jun 2014 17:55:41 +1000 |
4920 | + |
4921 | +libvirt-glib (0.1.7-2.1) unstable; urgency=medium |
4922 | + |
4923 | + * Non-maintainer upload. |
4924 | + * Disable parallel build (Closes: #739787) |
4925 | + - there's no big gain for such a small package to use parallel builds, |
4926 | + but more importantly not worth the risk of triggering FTBFS bugs. |
4927 | + |
4928 | + -- Andreas Henriksson <andreas@fatal.se> Tue, 01 Apr 2014 21:20:41 +0200 |
4929 | + |
4930 | +libvirt-glib (0.1.7-2) unstable; urgency=medium |
4931 | + |
4932 | + * Upload to unstable (Closes: #726582) |
4933 | + * [6e4b1b8] Mention that the API/ABI is not considered stable yet |
4934 | + |
4935 | + -- Guido Günther <agx@sigxcpu.org> Sun, 16 Feb 2014 17:53:07 +0100 |
4936 | + |
4937 | +libvirt-glib (0.1.7-1) experimental; urgency=low |
4938 | + |
4939 | + * Upload to experimental |
4940 | + * [04ac4ee] Allow for parallel builds |
4941 | + * [778d444] New upstream version (Closes: #726582) |
4942 | + * [03ae3ed] Update symbols |
4943 | + * [b68d2cb] Build-Dep on intltool |
4944 | + * [b2e9891] Don't ship static libs |
4945 | + * [4d5162d] Remove gvir_config_domain_source_pty_set_path from exported |
4946 | + symbols. The function got accidentally exported under the wrong name |
4947 | + upstream. |
4948 | + |
4949 | + -- Guido Günther <agx@sigxcpu.org> Mon, 06 Jan 2014 14:50:36 +0100 |
4950 | + |
4951 | libvirt-glib (0.1.6-1ubuntu2) trusty; urgency=medium |
4952 | |
4953 | * Build-depend on gtk-doc-tools. |
4954 | |
4955 | === modified file 'debian/control' |
4956 | --- debian/control 2014-01-18 15:28:27 +0000 |
4957 | +++ debian/control 2014-06-13 08:07:26 +0000 |
4958 | @@ -1,8 +1,11 @@ |
4959 | Source: libvirt-glib |
4960 | Section: libs |
4961 | Priority: extra |
4962 | -Maintainer: Guido Günther <agx@sigxcpu.org> |
4963 | -Build-Depends: debhelper (>= 7.0.50~), pkg-config, dh-autoreconf, gtk-doc-tools, |
4964 | +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> |
4965 | +XSBC-Original-Maintainer: Guido Günther <agx@sigxcpu.org> |
4966 | +Build-Depends: debhelper (>= 7.0.50~), dh-autoreconf, gtk-doc-tools, |
4967 | + intltool, |
4968 | + pkg-config, |
4969 | libvirt-dev (>= 0.10.2), libglib2.0-dev (>= 2.10), |
4970 | libxml2-dev, libgirepository1.0-dev, gobject-introspection, |
4971 | # when building from git: |
4972 | @@ -22,6 +25,8 @@ |
4973 | Description: libvirt glib mainloop integration |
4974 | This shared library eases integration of libvirt's events into programs using |
4975 | a glib mainloop. |
4976 | + . |
4977 | + The API/ABI of this library are still considered unstable. |
4978 | |
4979 | Package: libvirt-glib-1.0-0-dbg |
4980 | Architecture: any |
4981 | @@ -44,6 +49,8 @@ |
4982 | a glib mainloop. |
4983 | . |
4984 | This package contains the development headers and the Vala bindings. |
4985 | + . |
4986 | + The API/ABI of this library are still considered unstable. |
4987 | |
4988 | Package: gir1.2-libvirt-glib-1.0 |
4989 | Architecture: any |
4990 | |
4991 | === modified file 'debian/libvirt-glib-1.0-0.symbols' |
4992 | --- debian/libvirt-glib-1.0-0.symbols 2013-03-27 13:11:49 +0000 |
4993 | +++ debian/libvirt-glib-1.0-0.symbols 2014-06-13 08:07:26 +0000 |
4994 | @@ -6,6 +6,7 @@ |
4995 | *@LIBVIRT_GCONFIG_0.1.4 0.1.6 |
4996 | *@LIBVIRT_GCONFIG_0.1.5 0.1.6 |
4997 | *@LIBVIRT_GCONFIG_0.1.6 0.1.6 |
4998 | + *@LIBVIRT_GCONFIG_0.1.7 0.1.7 |
4999 | gvir_config_capabilities_cpu_add_feature@LIBVIRT_GCONFIG_0.1.0 0.1.2~ |
5000 | gvir_config_capabilities_cpu_feature_get_name@LIBVIRT_GCONFIG_0.0.9 0.1.2~ |
The diff has been truncated for viewing.