Imported Upstream version 0.6.0
Laurent Léonard
9 years ago
18 | 18 | Guido Günther <agx@sigxcpu.org> |
19 | 19 | Hans de Goede <hdegoede@redhat.com> |
20 | 20 | Jiri Denemark <Jiri.Denemark@gmail.com> |
21 | Jonathon Jongsma <jjongsma@redhat.com> | |
22 | Ján Tomko <jtomko@redhat.com> | |
21 | 23 | Marc-André Lureau <marcandre.lureau@redhat.com> |
22 | 24 | Martin Kletzander <mkletzan@redhat.com> |
23 | 25 | Michal Privoznik <mprivozn@redhat.com> |
0 | 2014-01-24 Daniel P. Berrange <berrange@redhat.com> | |
1 | ||
2 | Update for 0.6.0 release | |
3 | ||
4 | Refresh translations | |
5 | ||
6 | Fix virt-viewer.exe on win32 | |
7 | Libvirt uses gnulib for making winsock look like POSIX | |
8 | sockets. This means that in the libvirt event handle | |
9 | callbacks the application will be given a file descriptor | |
10 | rather than a winsock HANDLE object. The g_io_channel_unix_new | |
11 | method will detect that it is an FD and delegate to the | |
12 | g_io_channel_win32_new_fd method. Unfortunately the glib Win32 | |
13 | event loop impl is not very good at dealing with FD objects, | |
14 | simulating poll() by doing a read() on the FD :-( | |
15 | ||
16 | The API docs for g_io_channel_win32_new_fd say | |
17 | ||
18 | "All reads from the file descriptor should be done by | |
19 | this internal GLib thread. Your code should call only | |
20 | g_io_channel_read()." | |
21 | ||
22 | This isn't going to fly for libvirt, since it has zero | |
23 | knowledge of glib at all, so is just doing normal read(). | |
24 | ||
25 | Fortunately we can work around this problem by turning | |
26 | the FD we get from libvirt back into a HANDLE using the | |
27 | _get_osfhandle() method. | |
28 | ||
29 | Don't use --nodeps for developer builds | |
30 | Only use --nodeps when running under the autobuild engine | |
31 | ||
32 | 2014-01-20 Jonathon Jongsma <jjongsma@redhat.com> | |
33 | ||
34 | Load ui files first from installed location | |
35 | virt_viewer_util_load_ui() looks first in the current directory, and then looks | |
36 | in the system data dirs for a ui file to load, but if you install virt-viewer in | |
37 | a different prefix, it will load the system UI file rather than the one from the | |
38 | install prefix. Try to load the ui file from pkgdatadir first. | |
39 | ||
40 | 2014-01-07 Marc-André Lureau <marcandre.lureau@gmail.com> | |
41 | ||
42 | Clear global zoom-reset hotkey too | |
43 | ||
44 | Fix rebuild of accelerators menu when loading from file | |
45 | It's not enough to set the property to notify of its change. Add a | |
46 | virt_viewer_app_set_enable_accel() helper, and call it after the changes | |
47 | to accelerators are made when loading from file. | |
48 | ||
49 | I verified the menu is correctly built when connection from controller | |
50 | or command line too. | |
51 | ||
52 | 2013-12-19 Christophe Fergeau <cfergeau@redhat.com> | |
53 | ||
54 | Disable mime database update during make distcheck | |
55 | Updating the mime database creates files in the install directory, and | |
56 | these files are not cleaned up on make uninstall, so this causes a make | |
57 | distcheck failure. | |
58 | ||
59 | 2013-12-18 Christophe Fergeau <cfergeau@redhat.com> | |
60 | ||
61 | spec: Get BuildRequires min versions from configure.ac | |
62 | We currently duplicate the minimum requirements for the various virt-viewer | |
63 | dependencies in configure.ac, virt-viewer.spec.in and mingw-virt-viewer.spec.in | |
64 | This commit uses the versions set in configure.ac in the 2 .spec.in files | |
65 | so that it's easier to keep them in sync | |
66 | ||
67 | Before/after diff of the .spec files are: | |
68 | ||
69 | --- virt-viewer.spec.or 2013-12-18 14:14:14.304285905 +0100 | |
70 | +++ virt-viewer.spec 2013-12-18 14:19:20.217072678 +0100 | |
71 | @@ -47,14 +47,14 @@ | |
72 | BuildRequires: libtool | |
73 | %endif | |
74 | ||
75 | -BuildRequires: glib2-devel >= 2.22 | |
76 | +BuildRequires: glib2-devel >= 2.22.0 | |
77 | %if %{with_gtk3} | |
78 | -BuildRequires: gtk3-devel >= 3.0.0 | |
79 | +BuildRequires: gtk3-devel >= 3.0 | |
80 | %else | |
81 | -BuildRequires: gtk2-devel >= 2.12.0 | |
82 | +BuildRequires: gtk2-devel >= 2.18.0 | |
83 | %endif | |
84 | -BuildRequires: libvirt-devel >= 0.9.7 | |
85 | -BuildRequires: libxml2-devel | |
86 | +BuildRequires: libvirt-devel >= 0.10.0 | |
87 | +BuildRequires: libxml2-devel >= 2.6.0 | |
88 | %if %{with_gtk3} | |
89 | BuildRequires: gtk-vnc2-devel >= 0.4.0 | |
90 | %else | |
91 | ||
92 | --- mingw-virt-viewer.spec.or 2013-12-18 14:14:23.656401693 +0100 | |
93 | +++ mingw-virt-viewer.spec 2013-12-18 14:20:57.007270507 +0100 | |
94 | @@ -12,22 +12,22 @@ | |
95 | ||
96 | BuildRequires: mingw32-filesystem >= 23 | |
97 | BuildRequires: mingw64-filesystem >= 23 | |
98 | -BuildRequires: mingw32-glib2 >= 2.22 | |
99 | -BuildRequires: mingw64-glib2 >= 2.22 | |
100 | +BuildRequires: mingw32-glib2 >= 2.22.0 | |
101 | +BuildRequires: mingw64-glib2 >= 2.22.0 | |
102 | BuildRequires: mingw32-gstreamer-plugins-bad-free | |
103 | BuildRequires: mingw64-gstreamer-plugins-bad-free | |
104 | BuildRequires: mingw32-gstreamer-plugins-good | |
105 | BuildRequires: mingw64-gstreamer-plugins-good | |
106 | -BuildRequires: mingw32-gtk2 | |
107 | -BuildRequires: mingw64-gtk2 | |
108 | +BuildRequires: mingw32-gtk2 >= 2.18.0 | |
109 | +BuildRequires: mingw64-gtk2 >= 2.18.0 | |
110 | BuildRequires: mingw32-libusbx | |
111 | BuildRequires: mingw64-libusbx | |
112 | -BuildRequires: mingw32-libvirt >= 0.9.7 | |
113 | -BuildRequires: mingw64-libvirt >= 0.9.7 | |
114 | -BuildRequires: mingw32-libxml2 | |
115 | -BuildRequires: mingw64-libxml2 | |
116 | -BuildRequires: mingw32-gtk-vnc >= 0.4.3 | |
117 | -BuildRequires: mingw64-gtk-vnc >= 0.4.3 | |
118 | +BuildRequires: mingw32-libvirt >= 0.10.0 | |
119 | +BuildRequires: mingw64-libvirt >= 0.10.0 | |
120 | +BuildRequires: mingw32-libxml2 >= 2.6.0 | |
121 | +BuildRequires: mingw64-libxml2 >= 2.6.0 | |
122 | +BuildRequires: mingw32-gtk-vnc >= 0.3.8 | |
123 | +BuildRequires: mingw64-gtk-vnc >= 0.3.8 | |
124 | BuildRequires: mingw32-readline | |
125 | BuildRequires: mingw64-readline | |
126 | BuildRequires: mingw32-spice-glib | |
127 | ||
128 | Update spice-gtk requirement everywhere | |
129 | d1c2bc1 updated configure.ac spice-gtk requirement to 0.22, but did not | |
130 | update the various places which duplicated this requirement, namely the | |
131 | .spec.in files and the README file. | |
132 | ||
133 | Update shared mime database on install/uninstall | |
134 | remomte-viewer installs a file to $datadir/share/mime to register a | |
135 | mime-type for its .vv files. However, after installing this file, | |
136 | update-mime-database must be run in order to update the shared mime | |
137 | database. This commit (inspired by what Nautilus/planner are doing) adds | |
138 | what is needed for that. | |
139 | If the mime type is not correctly registered, gvfs-info console.vv will not | |
140 | return the correct mime type, and xdg-open console.vv will fail to start | |
141 | remote-viewer, and will fall back to running gedit as the .vv file is a | |
142 | text file. | |
143 | ||
144 | https://bugzilla.redhat.com/show_bug.cgi?id=1044209 | |
145 | ||
146 | 2013-12-16 Jonathon Jongsma <jjongsma@redhat.com> | |
147 | ||
148 | Enable the display before showing the window | |
149 | This ensures that the display is enabled when it gets its first Allocate event | |
150 | (which causes a display reconfiguration). If the display is not enabled at this | |
151 | point, it won't send down a new monitors_config message until the second | |
152 | allocation, which may result in the display being disabled until a window is | |
153 | resized. | |
154 | ||
155 | 2013-12-16 Marc-André Lureau <marcandre.lureau@gmail.com> | |
156 | ||
157 | build-sys: require spice-gtk >= 0.22 | |
158 | Require 0.22 fro spice_uuid_to_string() | |
159 | ||
160 | 2013-12-13 Christophe Fergeau <cfergeau@redhat.com> | |
161 | ||
162 | Disable govirt support on f19 | |
163 | The govirt package in f19 is an older one, and does not have some of the | |
164 | functions used since the switch to govirt 0.3.0. As 0.3.0 broke ABI, it's | |
165 | not convenient to backport it to f19. | |
166 | Update the spec file to reflect the fact that oVirt support in git is no | |
167 | longer buildable on f19. | |
168 | ||
169 | 2013-12-10 Marc-André Lureau <marcandre.lureau@gmail.com> | |
170 | ||
171 | app: remove useless warning | |
172 | This warning should have been removed with 20eb200c. | |
173 | ||
174 | https://bugzilla.redhat.com/show_bug.cgi?id=1021350 | |
175 | ||
176 | remote-viewer: add desktop icon | |
177 | Associate an icon to desktop menu entry. | |
178 | https://bugzilla.redhat.com/show_bug.cgi?id=1020359 | |
179 | ||
180 | 2013-12-10 Jonathon Jongsma <jjongsma@redhat.com> | |
181 | ||
182 | Remove obsolete function declaration | |
183 | This function was removed in bd914bdea2e85d62d5f67eb567ce200f526c6bab, but the | |
184 | declaration was missed. | |
185 | ||
186 | 2013-11-27 Jonathon Jongsma <jjongsma@redhat.com> | |
187 | ||
188 | Create a sparse array for monitor-geometry-changed | |
189 | It's possible to have only display N enabled without having all of the displays | |
190 | before it. I experienced this a couple times with a windows guest where display | |
191 | 1 would show up before display 0 and we'd hit a warning that nth is not less | |
192 | than nmonitors. So find the highest display ID and then create an array of that | |
193 | size, leaving missing displays initialized to 0 | |
194 | ||
195 | Don't re-configure displays when show-hint changes | |
196 | This caused secondary displays on a windows guest to flicker under some | |
197 | circumstances. The old code didn't re-configure displays in this case either, so | |
198 | it shouldn't have been included in the display alignment refactor. | |
199 | ||
200 | Do all display alignment in virt-viewer | |
201 | Don't rely on spice-gtk to do any alignment of displays. This patch sets the | |
202 | disable-display-align property on the SpiceMainChannel, and makes the | |
203 | VirtViewerSession in charge of doing all alignment. This means that every | |
204 | display has to tell the VirtViewerSession when its "virtual monitor" has changed | |
205 | configuration (and wants to reconfigure its display on the guest), rather than | |
206 | sending it directly to the Main Channel. The session will then align the | |
207 | displays (if necessary), and the spice session will send down new configuration | |
208 | for all displays at once. This solves a couple of problems: | |
209 | ||
210 | 1. It allows the session to send down absolute coordinates only in the case | |
211 | where *all* windows are fullscreen (so that we can still support | |
212 | vertically-stacked displays, etc). But it auto-aligns displays if only a | |
213 | subset of the displays are in fullscreen mode. This solves the problem of | |
214 | overlapping regions on different displays when one monitor is in fullscreen | |
215 | because only one monitor's configuration was updated and the others were not | |
216 | aligned. | |
217 | 2. Allows us to always align based on the current position of each display. This | |
218 | contrasts with the earlier behavior where the position used for alignment was | |
219 | the window's position at the time when it was last resized. This caused | |
220 | displays to be arranged in a seemingly non-deterministic manner if one window | |
221 | was moved and then another window was resized (causing a display | |
222 | re-configuration). | |
223 | ||
224 | Solves rhbz#1002156 | |
225 | ||
226 | 2013-11-21 Jonathon Jongsma <jjongsma@redhat.com> | |
227 | ||
228 | Ensure all windows obey initial --zoom setting | |
229 | There are cases where multiple VirtViewerWindow objects are created before the | |
230 | VirtViewerApp constructor has a chance to run. Since the constructor has not yet | |
231 | run, priv->main_window will still be NULL, the test in | |
232 | virt_viewer_app_window_new() will fail, and they will not get their initial zoom | |
233 | level set. When the constructor finally runs, it set the zoom level of the main | |
234 | window to the value set on the command line, but all other windows that had | |
235 | already been created retained the default 100% zoom level. | |
236 | ||
237 | By creating the main_window in the instance init function, we ensure that the | |
238 | main window is created before we get any 'session-display-added' signals and all | |
239 | displays will start out with consistent zoom levels. | |
240 | ||
241 | Remove non-functional VIRT_VIEWER_HIDE env behavior | |
242 | VIRT_VIEWER_HIDE could be set as an environment variable to (theoretically) hide | |
243 | displays whenever they were not ready. Unfortunately, this bit of functionality | |
244 | appears bitrotten and doesn't work anymore (it prevents windows from opening | |
245 | when you click 'view > displays > display 2', for instance). | |
246 | ||
247 | 2013-11-20 Jonathon Jongsma <jjongsma@redhat.com> | |
248 | ||
249 | separate fullscreen_set_active into a separate function | |
250 | ||
251 | Ensure auto-conf is only done once | |
252 | Auto-conf should only happen at startup. It is triggered from several places due | |
253 | to the somewhat unreliable ordering of events, but that doesn't mean we want to | |
254 | run it several times. This patch ensures that we only do it once. | |
255 | ||
256 | Add ability to define custom display->monitor mapping per vm | |
257 | Fullscreen mode generally just assigns display 1 to monitor 1, display 2 to | |
258 | monitor 2, etc. For custom setups, you can define a monitor mapping in the | |
259 | settings keyfile per-vm. This requires a vm uuid (so only works in virt-viewer | |
260 | or on versions of spice-server that send the uuid over the wire). The format is | |
261 | pretty basic: | |
262 | ||
263 | [6485b20f-e9da-614c-72b0-60a7857e7886] | |
264 | monitor-mapping=2;3 | |
265 | ||
266 | The group name ("6485b20f-e9da-614c-72b0-60a7857e7886") is the uuid id of the | |
267 | vm. This group has a single key: monitor-mapping. This key is an array of | |
268 | integers describing the order in which to assign the monitors to a guest | |
269 | display. Any monitors that are not listed in this array will not be configured | |
270 | at startup. For instance: | |
271 | ||
272 | monitor-mapping=2;1 | |
273 | ||
274 | will attempt to configure 2 displays on the guest and assign the first display | |
275 | to monitor 2 and the second display to monitor 1. | |
276 | ||
277 | monitor-mapping=2 | |
278 | ||
279 | will only configure a single display on the guest and place it on the second | |
280 | monitor. Any monitor numbers listed in the keyfile are greater than the number | |
281 | of monitors that are physically present, they will be ignored. | |
282 | ||
283 | 2013-11-20 Christophe Fergeau <cfergeau@redhat.com> | |
284 | ||
285 | Fix leak of VirtViewerApp::windows hash table key | |
286 | The VirtViewerApp::windows hash table owns the memory for both the keys | |
287 | and values it stores. virt_viewer_app_remove_nth_window() uses | |
288 | g_hash_table_steal() which does not call the 'free' function neither for | |
289 | the key nor for the value. This method takes care of releasing the | |
290 | reference for the value it extracted from the hash table, but not for the | |
291 | key. | |
292 | This commit fixes by explicitly taking a reference on the value rather than | |
293 | stealing the one held by the hash table. We can then replace the use of | |
294 | g_hash_table_steal() with g_hash_table_remove() which will take care of | |
295 | freeing the removed key. | |
296 | ||
297 | session: Don't hold VirtViewerDisplay refs on channel destroy | |
298 | VirtViewerSessionSpice creates a reference-holding VirtViewerDisplay | |
299 | array and associates it with the display SpiceChannel with | |
300 | g_object_set_data(channel, "virt-viewer-displays"). | |
301 | ||
302 | When virt_viewer_session_spice_channel_destroy() is called and the display | |
303 | channel is being destroyed, we should ensure these VirtViewerDisplay | |
304 | references are dropped or the displays could outlive the session. | |
305 | ||
306 | In my testing (start qemu with a f20 live cd, connect to it, when the | |
307 | kernel has started booting and qxl is initialized (4 displays listed in the | |
308 | display submenu), kill qemu), I was getting "invalid unclassed pointer in | |
309 | cast to 'VirtViewerSessionSpice'" warnings through | |
310 | ||
311 | #0 0x00000035bac504e9 in g_logv (log_domain=0x35bb039aa4 "GLib-GObject", | |
312 | log_level=G_LOG_LEVEL_WARNING, format=<optimized out>, | |
313 | args=args@entry=0x7fffffffc7c0) at gmessages.c:989 | |
314 | #1 0x00000035bac5063f in g_log ( | |
315 | log_domain=log_domain@entry=0x35bb039aa4 "GLib-GObject", | |
316 | log_level=log_level@entry=G_LOG_LEVEL_WARNING, | |
317 | format=format@entry=0x35bb041010 "invalid unclassed pointer in cast to '%s'") | |
318 | at gmessages.c:1025 | |
319 | #2 0x00000035bb032e09 in g_type_check_instance_cast (type_instance=0x665580, | |
320 | iface_type=<optimized out>) at gtype.c:4025 | |
321 | #3 0x0000000000426e9f in get_main (self=0x894190) at virt-viewer-display-spice.c:92 | |
322 | #4 0x0000000000426ece in show_hint_changed (self=0x894190) | |
323 | at virt-viewer-display-spice.c:100 | |
324 | #5 0x00000035bb010298 in g_closure_invoke (closure=0x9f47c0, | |
325 | return_value=return_value@entry=0x0, n_param_values=2, | |
326 | param_values=param_values@entry=0x7fffffffcad0, | |
327 | invocation_hint=invocation_hint@entry=0x7fffffffca70) at gclosure.c:777 | |
328 | #6 0x00000035bb02235d in signal_emit_unlocked_R (node=node@entry=0x651f60, | |
329 | detail=detail@entry=1782, instance=instance@entry=0x894190, | |
330 | emission_return=emission_return@entry=0x0, | |
331 | instance_and_params=instance_and_params@entry=0x7fffffffcad0) at gsignal.c:3586 | |
332 | #7 0x00000035bb02a0f2 in g_signal_emit_valist (instance=<optimized out>, | |
333 | signal_id=<optimized out>, detail=<optimized out>, | |
334 | var_args=var_args@entry=0x7fffffffcc60) at gsignal.c:3330 | |
335 | #8 0x00000035bb02a3af in g_signal_emit (instance=<optimized out>, | |
336 | signal_id=<optimized out>, detail=<optimized out>) at gsignal.c:3386 | |
337 | #9 0x00000035bb014945 in g_object_dispatch_properties_changed (object=0x894190, | |
338 | n_pspecs=92, pspecs=0x0) at gobject.c:1047 | |
339 | #10 0x00000035bb017019 in g_object_notify_by_spec_internal (pspec=<optimized out>, | |
340 | object=0x894190) at gobject.c:1141 | |
341 | #11 g_object_notify (object=0x894190, property_name=<optimized out>) at gobject.c:1183 | |
342 | #12 0x000000000041b617 in virt_viewer_display_set_show_hint (self=0x894190, mask=1, | |
343 | enable=0) at virt-viewer-display.c:659 | |
344 | #13 0x000000000042712c in update_display_ready (self=0x894190) | |
345 | at virt-viewer-display-spice.c:156 | |
346 | #14 0x00000035bb010298 in g_closure_invoke (closure=0x6ba480, | |
347 | return_value=return_value@entry=0x0, n_param_values=2, | |
348 | param_values=param_values@entry=0x7fffffffcfb0, | |
349 | invocation_hint=invocation_hint@entry=0x7fffffffcf50) at gclosure.c:777 | |
350 | #15 0x00000035bb02235d in signal_emit_unlocked_R (node=node@entry=0x651f60, | |
351 | detail=detail@entry=1798, instance=instance@entry=0xa2c250, | |
352 | emission_return=emission_return@entry=0x0, | |
353 | instance_and_params=instance_and_params@entry=0x7fffffffcfb0) at gsignal.c:3586 | |
354 | #16 0x00000035bb02a0f2 in g_signal_emit_valist (instance=<optimized out>, | |
355 | signal_id=<optimized out>, detail=<optimized out>, | |
356 | var_args=var_args@entry=0x7fffffffd140) at gsignal.c:3330 | |
357 | #17 0x00000035bb02a3af in g_signal_emit (instance=<optimized out>, | |
358 | signal_id=<optimized out>, detail=<optimized out>) at gsignal.c:3386 | |
359 | #18 0x00000035bb014945 in g_object_dispatch_properties_changed (object=0xa2c250, | |
360 | n_pspecs=92, pspecs=0x0) at gobject.c:1047 | |
361 | #19 0x00000035bb017019 in g_object_notify_by_spec_internal (pspec=<optimized out>, | |
362 | object=0xa2c250) at gobject.c:1141 | |
363 | #20 g_object_notify (object=0xa2c250, property_name=<optimized out>) at gobject.c:1183 | |
364 | #21 0x00007ffff7044d9a in update_ready (display=0xa2c250) at spice-widget.c:257 | |
365 | #22 0x00007ffff7044df0 in set_monitor_ready (self=0xa2c250, ready=0) | |
366 | at spice-widget.c:265 | |
367 | #23 0x00007ffff7049bb3 in primary_destroy (channel=0x9f40b0, data=0xa2c250) | |
368 | at spice-widget.c:2131 | |
369 | #24 0x00007ffff704afd5 in channel_destroy (s=0x892880, channel=0x9f40b0, data=0xa2c250) | |
370 | at spice-widget.c:2444 | |
371 | #25 0x00000035bb010298 in g_closure_invoke (closure=0xa27850, | |
372 | return_value=return_value@entry=0x0, n_param_values=2, | |
373 | param_values=param_values@entry=0x7fffffffd570, | |
374 | invocation_hint=invocation_hint@entry=0x7fffffffd510) at gclosure.c:777 | |
375 | #26 0x00000035bb02235d in signal_emit_unlocked_R (node=node@entry=0x7cf600, | |
376 | detail=detail@entry=0, instance=instance@entry=0x892880, | |
377 | emission_return=emission_return@entry=0x0, | |
378 | instance_and_params=instance_and_params@entry=0x7fffffffd570) at gsignal.c:3586 | |
379 | #27 0x00000035bb02a0f2 in g_signal_emit_valist (instance=<optimized out>, | |
380 | signal_id=<optimized out>, detail=<optimized out>, | |
381 | var_args=var_args@entry=0x7fffffffd700) at gsignal.c:3330 | |
382 | #28 0x00000035bb02a3af in g_signal_emit (instance=<optimized out>, | |
383 | signal_id=<optimized out>, detail=<optimized out>) at gsignal.c:3386 | |
384 | #29 0x00007ffff6ceba87 in spice_session_channel_destroy (session=0x892880, | |
385 | channel=0x9f40b0) at spice-session.c:1923 | |
386 | #30 0x00007ffff6cecf05 in spice_channel_dispose (gobject=0x9f40b0) | |
387 | at spice-channel.c:149 | |
388 | #31 0x00007ffff6cf912c in spice_display_channel_dispose (object=0x9f40b0) | |
389 | at channel-display.c:136 | |
390 | #32 0x00000035bb014ee8 in g_object_unref (_object=0x9f40b0) at gobject.c:3160 | |
391 | #33 0x00007ffff6cf300c in spice_channel_delayed_unref (data=0x9f40b0) | |
392 | at spice-channel.c:2135 | |
393 | #34 0x00000035bac492a6 in g_main_dispatch (context=0x67a6b0) at gmain.c:3066 | |
394 | #35 g_main_context_dispatch (context=context@entry=0x67a6b0) at gmain.c:3642 | |
395 | #36 0x00000035bac49628 in g_main_context_iterate (context=0x67a6b0, | |
396 | block=block@entry=1, dispatch=dispatch@entry=1, self=<optimized out>) | |
397 | at gmain.c:3713 | |
398 | #37 0x00000035bac49a3a in g_main_loop_run (loop=0x7baf60) at gmain.c:3907 | |
399 | #38 0x00000035bfdaa2d5 in gtk_main () at gtkmain.c:1158 | |
400 | #39 0x000000000042caf1 in main (argc=1, argv=0x7fffffffdc78) at remote-viewer-main.c:179 | |
401 | ||
402 | In that backtrace, the last ref to the VirtViewerDisplay instances is held by the | |
403 | SpiceChannel:virt-viewer-displays object data which will only be released after | |
404 | completion of spice_display_channel_dispose() | |
405 | ||
406 | Remove obsolete use of SpiceChannel:virt-viewer-display object data | |
407 | Commit 0d58d9c72 removed the setting of the | |
408 | SpiceChannel:virt-viewer-display object data, but there was still a | |
409 | call to g_object_get_data() trying to use it. Since it's only used to | |
410 | output a debug log, we can remove this call and fix up the debug log. | |
411 | ||
412 | 2013-11-13 Christophe Fergeau <cfergeau@redhat.com> | |
413 | ||
414 | Hide all windows on disconnection | |
415 | When starting remote-viewer without argument, we are showing a | |
416 | window where the user can enter connection details. We then | |
417 | go on to try and connect to the URI the user specified, and if | |
418 | the connection fails, we disconnect from the remote server, and then | |
419 | we show again the connection window so that the user can correct the | |
420 | URI if he entered it wrong. | |
421 | However, when this happens, the window for the previous connection | |
422 | will still be visible even if connection failed. To avoid this, | |
423 | this commit makes sure we hide all windows when we get a disconnection | |
424 | event. | |
425 | ||
426 | Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1024309 | |
427 | ||
428 | Reshow connection dialog on errors | |
429 | remote-viewer behaviour is currently inconsistent in the connection dialog: | |
430 | if the user enters a valid URI, but then remote-viewer fails to connect | |
431 | to it, then we'll show again the connection dialog through a call | |
432 | to virt_viewer_app_start() in remote_viewer_deactivated(). If instead we | |
433 | enter an invalid URI in the connection dialog, then remote-viewer will | |
434 | report an error and quit. | |
435 | ||
436 | This commit makes sure in the latter case, we report the error and show | |
437 | again the connection dialog. The user can press 'Cancel' in the | |
438 | connection dialog to get out of remote-viewer as in this case, we | |
439 | return directly FALSE rather than going through the cleanup: label | |
440 | and looping. | |
441 | ||
442 | Handle virt_viewer_app_start() errors | |
443 | remote_viewer_deactivated() can be calling virt_viewer_app_start() | |
444 | without checking whether it returns TRUE or FALSE. It returns FALSE | |
445 | when it was not successful (when it failed to parse the URI to connect | |
446 | to for example, or whe the user presses Cancel in the connection dialog). | |
447 | ||
448 | This means that if the user starts remote-viewer, enters a valid URI | |
449 | in the connection dialog to which it cannot connect to | |
450 | (spice://example.com:999) and then presses Cancel in the connection | |
451 | dialog that appears after the connection failure, then remote-viewer | |
452 | will be sitting there with an empty window doing nothing. | |
453 | ||
454 | This commit ensures we chain to the parent class when | |
455 | virt_viewer_app_start() returns FALSE, which causes remote-viewer to | |
456 | exit. | |
457 | ||
458 | Fix window title after failed connection | |
459 | When using the connection dialog, if the user picks an invalid | |
460 | URI first causing a failed connection, and then picks/enters a valid | |
461 | URI, remote-viewer window title will be set to the first invalid URI, | |
462 | not to the second one which was entered. | |
463 | ||
464 | As the user may have specified a window title to use on the command | |
465 | line (-t option), we need to be careful not to override that when | |
466 | setting the window title on the second attempt. | |
467 | ||
468 | Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1024309 | |
469 | ||
470 | build-sys: Use gtk+ 3.0 by default | |
471 | virt-viewer currenty builds with gtk+ 2.0 by default. Nowadays, gtk+ 2.0 is | |
472 | legacy, and this default is inconsistent with spice-gtk which defaults to | |
473 | gtk+ 3.0. This commit switches the default to gtk+ 3.0 | |
474 | ||
475 | 2013-11-13 Jonathon Jongsma <jjongsma@redhat.com> | |
476 | ||
477 | Disconnect fullscreen map-event handler when leaving fullscreen | |
478 | When we enter fullscreen mode before the window is shown, we set up a signal | |
479 | handler to enter fullscreen mode when the window is mapped. If we then leave | |
480 | fullscreen mode before the window is mapped, we don't disconnect this handler, | |
481 | so it will still enter fullscreen mode when it is shown. | |
482 | ||
483 | Fixes rhbz #1009513 | |
484 | ||
485 | Drop basic fullscreen mode | |
486 | Remove the distinction between --full-screen and --full-screen=auto-conf. Just | |
487 | make --full-screen behave like auto-conf did. There's really no advantage to | |
488 | having two slightly different fullscreen startup modes. | |
489 | ||
490 | 2013-11-07 Marc-André Lureau <marcandre.lureau@gmail.com> | |
491 | ||
492 | Unify configured hotkey behaviour | |
493 | Whether the hotkeys are set through command line, controller or file, we | |
494 | should get the same keybinding result (clear unspecified, and enable | |
495 | global bindings) | |
496 | ||
497 | However, when started from command line arguments, without --hotkey | |
498 | argument, it will have basic non-global default bindings. | |
499 | ||
500 | https://bugzilla.redhat.com/show_bug.cgi?id=1023447 | |
501 | ||
502 | file: learn to set secure-attention hotkey | |
503 | ||
504 | Rename internal toggle-fullscreen menu accel name | |
505 | This avoid confusion with other fullscreen state property | |
506 | ||
507 | file: factor a bit setting accelerators code | |
508 | ||
509 | 2013-10-30 Christophe Fergeau <cfergeau@redhat.com> | |
510 | ||
511 | ovirt: Only set SPICE CA cert if it's non NULL | |
512 | We currently reuse the oVirt CA cert for SPICE connection as well, | |
513 | but it may not be set. When this happens, we don't want to try to use | |
514 | it. | |
515 | ||
516 | ovirt: Don't automatically download CA certificate | |
517 | The CA certificate to use to authenticate the various hosts in | |
518 | an oVirt instance can be fetched from https://ovirt.example.com/ca.crt. | |
519 | However, the gio API we are using does not seem to be checking the | |
520 | server-side certificate of ovirt.example.com before connecting to it, | |
521 | which could lead to man-in-the-middle attacks. Now that the CA | |
522 | certificate to use can be specified from the command line using | |
523 | --ovirt-ca-file, we can remove this automatic fetching of the CA | |
524 | certificate. | |
525 | ||
526 | ovirt: Honour oVirt command line options | |
527 | libgovirt 0.3.0 and newer can be passed from the commandline a CA | |
528 | certificate to use during SSL communications. This commit adds support | |
529 | for this option to remote-viewer. | |
530 | ||
531 | ovirt: Remove use of deprecated APIs | |
532 | ovirt_proxy_fetch_vms/ovirt_proxy_lookup_vm have been deprecated | |
533 | in govirt 0.3.0 | |
534 | ||
535 | 2013-10-29 Christophe Fergeau <cfergeau@redhat.com> | |
536 | ||
537 | Clean-up spaces before/after URI in connection dialog | |
538 | When starting remote-viewer with no argument, a connection dialog | |
539 | is shown. If the URI the user types in this dialog as trailing | |
540 | or leading spaces, then connection will fail because remote-viewer | |
541 | will keep them as if they were significant. | |
542 | This commit makes sure we remove spaces at the beginning/end of | |
543 | the URI before trying to use it. | |
544 | ||
545 | This fixes https://bugzilla.redhat.com/show_bug.cgi?id=1024199 | |
546 | ||
547 | Fix 'quiting' typo in VirtViewerApp private member | |
548 | ||
549 | Fix typo in manpage | |
550 | This fixes https://bugzilla.redhat.com/show_bug.cgi?id=823916 | |
551 | ||
552 | 2013-10-18 Jonathon Jongsma <jjongsma@redhat.com> | |
553 | ||
554 | Make 'Send' menu items with defined accels work in fullscreen | |
555 | ||
556 | Set Spice display to fullscreen if owning window is pending fullscreen | |
557 | When you call virt_viewer_window_enter_fullscreen() on a hidden window, it | |
558 | didn't actually change its fullscreen state. Instead, it sets up a map-event | |
559 | handler to enter fullscreen after it is shown. When _set_display() is called on | |
560 | a window that is pending fullscreen status, it initially sets the fullscreen | |
561 | state of the display to FALSE, which can cause an unwanted resize to be sent | |
562 | down to the guest. This patch changes the behavior to set its fullscreen state | |
563 | to TRUE even before the window is shown. | |
564 | ||
565 | Don't freeze property notifications when adding new displays | |
566 | Freezing property notifications prevents VirtViewerDisplaySpice from | |
567 | synchronizing its fullscreen/auto-resize state with the base class until after | |
568 | the notifications are thawed. During the time that notifications were frozen, | |
569 | an allocation happens. The action we take on an allocation event depends on the | |
570 | current state of the auto_resize variable, so this can result in an unwanted | |
571 | resize. | |
572 | ||
573 | VirtViewerDisplaySpice: use enum type for auto_resize | |
574 | Instead of storing the auto_resize member as an integer, use the enum, it makes | |
575 | it slightly easier for debugging. Also, explicitly initialize the value. | |
576 | ||
577 | Avoid extra zoom-level property notifications | |
578 | When setting a display's zoom level to the same level as the current setting, | |
579 | return early so that we don't notify about a property change | |
580 | ||
581 | Don't disable fullscreen if kiosk mode is off | |
582 | This conflicts with the --full-screen switch, because if kiosk mode is disabled, | |
583 | it sets disables fullscreen mode, which overrides the earlier call to enable | |
584 | fullscreen. | |
585 | ||
586 | 2013-10-16 Christophe Fergeau <cfergeau@redhat.com> | |
587 | ||
588 | Make 'Cancel' the default action in exit dialog | |
589 | In the 'Do you want to close the session dialog?', the default focus | |
590 | is currently on the 'Do not ask me again' checkbox. | |
591 | The purpose of this dialog is to make sure that the user does not | |
592 | inadvertantly exit remote-viewer, this commit changes the default | |
593 | action in this dialog to be 'cancel' rather than switching the | |
594 | 'Do not ask me again 'checkbox. | |
595 | ||
596 | vnc: Clear all displays before creating dummy display | |
597 | If VirtViewerSessionVnc::disconnected is called because of an | |
598 | authentication failure, we get: | |
599 | ||
600 | (remote-viewer:29588): gtk-vnc-DEBUG: vncdisplay.c Disconnected from VNC server | |
601 | ||
602 | (remote-viewer:29588): Gtk-WARNING **: Attempting to add a widget with type | |
603 | VncDisplay to a container of type VirtViewerDisplayVnc, but the widget is | |
604 | already inside a container of type VirtViewerDisplayVnc, please use | |
605 | gtk_widget_reparent() | |
606 | ||
607 | #0 0x0000003136e50499 in g_logv (log_domain=0x3f2e13e143 "Gtk", | |
608 | log_level=G_LOG_LEVEL_WARNING, format=<optimized out>, | |
609 | args=args@entry=0x7fffffffd210) at gmessages.c:989 | |
610 | #1 0x0000003136e505ef in g_log (log_domain=<optimized out>, log_level=<optimized out>, | |
611 | format=<optimized out>) at gmessages.c:1025 | |
612 | #2 0x00000000004230eb in virt_viewer_display_vnc_new (vnc=0x8a8250) | |
613 | at virt-viewer-display-vnc.c:169 | |
614 | #3 0x0000000000422191 in virt_viewer_session_vnc_disconnected (vnc=0x8a8250, | |
615 | session=0x86bf00) at virt-viewer-session-vnc.c:113 | |
616 | #4 0x00000031372104c7 in _g_closure_invoke_va (closure=closure@entry=0x8ad2b0, | |
617 | return_value=return_value@entry=0x0, instance=instance@entry=0x8a8250, | |
618 | args=args@entry=0x7fffffffd530, n_params=0, param_types=0x0) at gclosure.c:840 | |
619 | #5 0x0000003137229749 in g_signal_emit_valist (instance=0x8a8250, | |
620 | signal_id=<optimized out>, detail=0, var_args=var_args@entry=0x7fffffffd530) | |
621 | at gsignal.c:3238 | |
622 | #6 0x000000313722a3af in g_signal_emit (instance=<optimized out>, | |
623 | signal_id=<optimized out>, detail=<optimized out>) at gsignal.c:3386 | |
624 | #7 0x00007ffff7dbeb5a in on_disconnected (conn=0x8b5aa0, opaque=0x8a8250) | |
625 | at vncdisplay.c:1563 | |
626 | #8 0x00000031372104c7 in _g_closure_invoke_va (closure=closure@entry=0x7d55f0, | |
627 | return_value=return_value@entry=0x0, instance=instance@entry=0x8b5aa0, | |
628 | args=args@entry=0x7fffffffd820, n_params=0, param_types=0x0) at gclosure.c:840 | |
629 | #9 0x0000003137229749 in g_signal_emit_valist (instance=0x8b5aa0, | |
630 | signal_id=<optimized out>, detail=0, var_args=var_args@entry=0x7fffffffd820) | |
631 | at gsignal.c:3238 | |
632 | #10 0x000000313722a3af in g_signal_emit (instance=<optimized out>, | |
633 | signal_id=<optimized out>, detail=<optimized out>) at gsignal.c:3386 | |
634 | #11 0x00007ffff7b97308 in do_vnc_connection_emit_main_context (opaque=0x7fffe3c91f40) | |
635 | at vncconnection.c:578 | |
636 | #12 0x0000003136e49256 in g_main_dispatch (context=0x681840) at gmain.c:3065 | |
637 | #13 g_main_context_dispatch (context=context@entry=0x681840) at gmain.c:3641 | |
638 | #14 0x0000003136e495d8 in g_main_context_iterate (context=0x681840, | |
639 | block=block@entry=1, dispatch=dispatch@entry=1, self=<optimized out>) | |
640 | at gmain.c:3712 | |
641 | #15 0x0000003136e499ea in g_main_loop_run (loop=0x830430) at gmain.c:3906 | |
642 | #16 0x0000003f2dfa8f75 in gtk_main () at gtkmain.c:1158 | |
643 | #17 0x0000000000429bf3 in main (argc=1, argv=0x7fffffffdcd8) at remote-viewer-main.c:179 | |
644 | ||
645 | This commit calls virt_viewer_session_clear_displays() before creating a dummy VNC display with | |
646 | virt_viewer_display_vnc_new(), which avoids this warning. | |
647 | ||
648 | 2013-09-26 Marc-André Lureau <marcandre.lureau@gmail.com> | |
649 | ||
650 | hotkeys: send modifiers before non-modifier key | |
651 | This fixes the "send menu" for hotkeys set with non-modifiers keys. The | |
652 | current order of press events is wrong, as it sends first non-modifiers | |
653 | keys, and in general ctrl+t will work, t+ctrl will not. | |
654 | ||
655 | https://bugzilla.redhat.com/show_bug.cgi?id=846006 | |
656 | ||
657 | 2013-09-13 Christophe Fergeau <cfergeau@redhat.com> | |
658 | ||
659 | spec: Enable ovirt support on RHEL7 as well | |
660 | ||
661 | spec: Group %define spice together | |
662 | The rhel and fedora %define for enabling spice were separated, we | |
663 | can group them for better readability. | |
664 | ||
665 | spec: Build with gtk+3 on rhel7+ | |
666 | ||
667 | 2013-09-10 Jonathon Jongsma <jjongsma@redhat.com> | |
668 | ||
669 | Update hotkeys documentation in manpage | |
670 | Describe the expected behavior of the hotkey bindings in a bit more detail. | |
671 | ||
672 | Add ability to use 'End' key in hotkeys | |
673 | ctrl_key_to_gtk_key() capitalizes all key names not explicitly specified in the | |
674 | translation table. So 'end' becomes 'END', which is not a valid key name | |
675 | according to GTK+. Un-comment out the 'end' item from the table and set it to | |
676 | the properly capitalized key name ("End"). | |
677 | ||
678 | This allows users to specify e.g. "ctrl+alt+end" as a hotkey for | |
679 | sending the secure attention sequence. | |
680 | ||
681 | Add ability to send Secure attention sequence via keyboard | |
682 | On Windows, the OS doesn't allow applications to handle Ctrl+Alt+Del, because | |
683 | it's handled by the OS at a much lower level. Although we have a menu item to | |
684 | send this sequence to the guest, it's not possible to send via the keyboard (in | |
685 | the windows client). So add an alternative key sequence (defaulting to | |
686 | Ctrl+Alt+End) to send this sequence to the guest. | |
687 | ||
688 | 2013-08-20 Marc-André Lureau <marcandre.lureau@gmail.com> | |
689 | ||
690 | kiosk: explicit resize window to fullscreen size | |
691 | Allow to run the client in kiosk mode with window-manager-less | |
692 | environment. | |
693 | ||
694 | This was a conditional workaroud on win32. I am making it | |
695 | non-conditional to make fullscreen work on non-wm environment. Hence | |
696 | I don't see the need to refer explicitely to the bug workaround, since | |
697 | it is no longer something that should be removed, even when bgo 652049 | |
698 | is fixed. | |
699 | ||
700 | kiosk: don't open extra monitors | |
701 | In kiosk mode, we don't want new monitors windows that wouldn't fit on | |
702 | the client monitors to come up. | |
703 | ||
704 | kiosk: warn and prevent if app want to quit or window to hide | |
705 | These condition shouldn't happen, they are here for debugging | |
706 | purposes (ie file a bug if it happens). | |
707 | ||
708 | kiosk: add --kiosk-quit option | |
709 | In kiosk mode, it's useful to keep the app alive, even if the remote | |
710 | session ended for example. Ie, we want to prevent the app from quiting | |
711 | itself, even if the remote end closed, lost network, or crashed etc. | |
712 | ||
713 | kiosk: teach a window to become kiosk-mode | |
714 | Remove the toolbar, disable modifiers. | |
715 | ||
716 | kiosk: keep a reference on the toolbar | |
717 | We are going to change the container content dynamically, so we need a | |
718 | strong reference. | |
719 | ||
720 | kiosk: use less verbose window/display status | |
721 | We want extra windows to remain blank after connection. | |
722 | ||
723 | For example, if the remote has a single monitor, and client has more, we | |
724 | don't want extra client monitors to say "Connected to graphic server" | |
725 | all the time on other monitors. Instead, we leave them empty/black in | |
726 | kiosk mode. | |
727 | ||
728 | kiosk: open a window on each client monitor | |
729 | Open a window on each client monitor in fullscreen. If the remote | |
730 | display has less monitors than the client, the extra client monitors | |
731 | will still be used to prevent the user from accessing the windows or | |
732 | desktop below, and also to show some status messages when necessary. | |
733 | ||
734 | kiosk: add app kiosk option, pass it down to window | |
735 | See man page update for details. | |
736 | ||
737 | Return existing window in app_window_new() | |
738 | Since the returned window is weak, it can already returns existing | |
739 | windows (instead of creating one and failing to insert). | |
740 | ||
741 | This allows the following set_kiosk() function to create a main window | |
742 | before the app constructor is called. | |
743 | ||
744 | Define the min/max zoom levels, so all values are sync | |
745 | ||
746 | Try to share more GOption code between r-v and v-v | |
747 | ||
748 | 2013-08-14 Marc-André Lureau <marcandre.lureau@gmail.com> | |
749 | ||
750 | remote-viewer: remove -d direct option | |
751 | remote-viewer currently doesn't provide automatic ssh tunnels, and even if | |
752 | it would, that would be explicit in the url given to remote-viewer (such | |
753 | as spice+ssh://...) | |
754 | ||
755 | https://bugzilla.redhat.com/show_bug.cgi?id=991261 | |
756 | ||
757 | 2013-08-08 Marc-André Lureau <marcandre.lureau@gmail.com> | |
758 | ||
759 | man: add application/x-virt-viewer file format description | |
760 | https://bugzilla.redhat.com/show_bug.cgi?id=970825 | |
761 | ||
762 | spice: show an error dialog if password is invalid | |
763 | Error message should show up when input the wrong password for spice | |
764 | guests as vnc guests. | |
765 | ||
766 | https://bugzilla.redhat.com/show_bug.cgi?id=990883 | |
767 | ||
768 | 2013-07-31 Daniel P. Berrange <berrange@redhat.com> | |
769 | ||
770 | Update NEWS for 0.5.7 release | |
771 | ||
772 | Update min spice-gtk dep to 0.20 | |
773 | The spice_smartcard_manager_get_readers method was only added | |
774 | in spice-gtk 0.20. | |
775 | ||
776 | 2013-07-31 Christophe Fergeau <cfergeau@redhat.com> | |
777 | ||
778 | Enable smartcard shortcuts when a software reader is present | |
779 | At the moment, smartcard keyboard accelerators are always enabled when | |
780 | specified, even if no software smartcard reader is in use. This commit only | |
781 | enables the smartcard keyboard accelerators when a smartcard reader | |
782 | has been found. This fixes rhbz#866944 | |
783 | ||
784 | Add VirtViewerSession::software-smartcard-reader property | |
785 | This property will be set to TRUE when a software smartcard reader | |
786 | is available, and FALSE otherwise. This property can only be TRUE | |
787 | when using SPICE and when smartcard support is enabled, and when | |
788 | both smartcard certificates and smartcard db directory are set. | |
789 | ||
790 | 2013-07-31 Daniel P. Berrange <berrange@redhat.com> | |
791 | ||
792 | Fix two type cast problems | |
793 | The g_array_free() return value is 'char *' rather than 'void *' | |
794 | so must be explicitly cast to 'uint8 *'. | |
795 | ||
796 | The accelerator menu callback data is a GtkMenu rather GtkWidget | |
797 | ||
798 | 2013-07-30 Marc-André Lureau <marcandre.lureau@gmail.com> | |
799 | ||
800 | window: auto-add hot key combos to "Send key" menu | |
801 | Auto-add hotkey combos to "Send key" menu. Because they are captured by | |
802 | virt-viewer, there is currently no way to pass them to the guest. | |
803 | ||
804 | https://bugzilla.redhat.com/show_bug.cgi?id=846006 | |
805 | ||
806 | window: use dynamically generated menu | |
807 | Remove the static Glade menu in favour of the one generated dynamically | |
808 | already used for the toolbar. | |
809 | ||
810 | window: use a menu item property for key combos | |
811 | Allow to add dynamically generated key combos later on. | |
812 | ||
813 | This also removes the extra combo lookup, which used to be problematic | |
814 | due to translations etc. | |
815 | ||
816 | compat: add a few GDK_Key defines | |
817 | ||
818 | file: add missing field comment | |
819 | ||
820 | Remove restore window location code | |
821 | It turns out gdk on win32 already restores properly the window | |
822 | size/positon when leaving fullscreen. On non-win32, the WM should | |
823 | do the job. | |
824 | ||
825 | This solves the first window having too small size after leaving fullscreen: | |
826 | https://bugzilla.redhat.com/show_bug.cgi?id=978362 | |
827 | ||
828 | win32: fix first window un-shrinkable at start | |
829 | The fix 0dca975d64fcf0782ec7b3e3bd965f1bcf47c528 make the first window | |
830 | unshrinkable right after start. Wait until the window is mapped and | |
831 | remove the dirty-resizable state after (win32/gtk2). | |
832 | ||
833 | Make zoom-reset a global key binding | |
834 | ||
835 | spice: if zoom-level is changed, resize guest, even in fullscreen | |
836 | ||
837 | spice: factor out spice resize code from gtk signal handler | |
838 | This will allow that part of the code to be called with a different | |
839 | resize-guest setting. | |
840 | ||
841 | msi: use ProductVersion compatible with Windows Installer | |
842 | Windows Installer expects version of form major.minor.build in order to | |
843 | perform updates. | |
844 | ||
845 | Following Daniel Berrange suggestion, compute a ProductVersion | |
846 | compatible with this scheme by shifting virt-viewer "micro" release | |
847 | number and adding the extra "buildid". | |
848 | ||
849 | wxs: add usb.ids and keyboard-shortcuts.png | |
850 | ||
851 | Hide extra monitors that don't fit in auto-conf | |
852 | Virt-viewer sometimes opens one too many windows if the guest is | |
853 | configured with more monitors than the client (the spice monitor | |
854 | configuration request and the current config aren't related, so there is | |
855 | some race). Instead, let's hide extra monitors that wouldn't fit in | |
856 | auto-conf. | |
857 | ||
858 | https://bugzilla.redhat.com/show_bug.cgi?id=985898 | |
859 | ||
860 | Realize the display when it's added to the window | |
861 | Make sure the widget get some dimensions, so if the display is enabled | |
862 | before it is actually shown, it will have non-zero size | |
863 | ||
864 | Initialize fullscreen_monitor to invalid value | |
865 | This makes it easier to debug when a window has no associated monitor. | |
866 | ||
867 | Disable auto-conf when user toggle display | |
868 | Let's get out of auto-conf mode whenever user tricks display visibility. | |
869 | ||
870 | Remove dead function | |
871 | ||
872 | 2013-07-29 Daniel P. Berrange <berrange@redhat.com> | |
873 | ||
874 | Remove typo \\n in de.po translation | |
875 | ||
876 | 2013-07-29 Ján Tomko <jtomko@redhat.com> | |
877 | ||
878 | Unregister events and callbacks on dispose | |
879 | Without these libvirtd reports an error on virt-viewer shutdown: | |
880 | virNetSocketReadWire:1377 : End of file while reading data: Input/output | |
881 | error | |
882 | ||
883 | 2013-07-11 Christophe Fergeau <cfergeau@redhat.com> | |
884 | ||
885 | virt-viewer: Allow TLS-only SPICE connections | |
886 | When trying to connect to a VM which uses SPICE with only a tls port | |
887 | set: | |
888 | <graphics type='spice' tlsPort='-1' autoport='no' listen='0' keymap='en-us'> | |
889 | <listen type='address' address='0'/> | |
890 | </graphics> | |
891 | the connection will fail with | |
892 | "Cannot determine the graphic address for the guest spice" | |
893 | ||
894 | virt_viewer_extract_connect_info() indeed assumes that if no | |
895 | non-TLS port is set, then this means we are trying to connect through | |
896 | an already open socket, and otherwise the connection fails. | |
897 | The presence of a TLS port is only checked when a non-TLS port is set. | |
898 | ||
899 | This commit reworks that logic to start by extracting both the non-TLS | |
900 | and TLS ports (only when using SPICE for the latter), and by only trying | |
901 | to parse the socket to use if none of these 2 ports is set | |
902 | ||
903 | This fixes rhbz#982840 | |
904 | ||
905 | 2013-07-09 Daniel P. Berrange <berrange@redhat.com> | |
906 | ||
907 | Refresh translations from transifex | |
908 | ||
909 | 2013-07-08 Marc-André Lureau <marcandre.lureau@gmail.com> | |
910 | ||
911 | vnc: implement release_cursor() | |
912 | Error reported in: | |
913 | https://bugzilla.redhat.com/show_bug.cgi?id=904094 | |
914 | ||
915 | app: always use maybe_quit() | |
916 | Now that closing a window is like quiting, there is no reason to ask or | |
917 | skip the confirm dialog depending on how you quit (menu/toolbar/window). | |
918 | ||
919 | https://bugzilla.redhat.com/show_bug.cgi?id=905684 | |
920 | ||
921 | 2013-07-06 Hans de Goede <hdegoede@redhat.com> | |
922 | ||
923 | usbredir: Don't depend on channel ordering | |
924 | Before this patch-set virt-viewer was calling spice_session_has_channel_type( | |
925 | session, SPICE_CHANNEL_USBREDIR) from the session-initialized signal handler, | |
926 | ||
927 | So as soon as the display channel gets added to the session, the check was | |
928 | done. This causes the check to return FALSE for usbredir capable vms if | |
929 | the usbredir channel(s) get added to the session after the display channed. | |
930 | ||
931 | This patch refactors things to not depend on channel creation order. | |
932 | ||
933 | 2013-07-05 Marc-André Lureau <marcandre.lureau@gmail.com> | |
934 | ||
935 | Use display fullscreen state instead of app state | |
936 | This is a recent regression introduced by independant fullscreen windows | |
937 | support, which reopened the bug "Resolution higher than native could not | |
938 | be set in fullscreen" | |
939 | ||
940 | https://bugzilla.redhat.com/show_bug.cgi?id=864929 | |
941 | ||
942 | window: set display fullscreen state | |
943 | ||
944 | display: add fullscreen property | |
945 | Now that fullscreen state is no longer global to application, we need to | |
946 | have the current state per display | |
947 | ||
948 | Remove debugging leftover | |
949 | ||
950 | 2013-07-04 Marc-André Lureau <marcandre.lureau@gmail.com> | |
951 | ||
952 | data/remote-viewer.desktop: Fix missing trailing ; | |
953 | data/remote-viewer.desktop: error: value | |
954 | "x-scheme-handler/spice;application/x-virt-viewer" for string list key | |
955 | "MimeType" in group "Desktop Entry" does not have a semicolon (';') as | |
956 | trailing character | |
957 | ||
958 | 2013-07-03 Christophe Fergeau <cfergeau@redhat.com> | |
959 | ||
960 | Use -H instead of -h for the short --hotkeys | |
961 | -h conflicts with the short version of --help. | |
962 | ||
963 | Fixes rhbz#980846 | |
964 | ||
965 | 2013-06-28 Marc-André Lureau <marcandre.lureau@redhat.com> | |
966 | ||
967 | Fix build --without-spice-gtk | |
968 | ||
969 | 2013-06-26 Guido Günther <agx@sigxcpu.org> | |
970 | ||
971 | Use format string | |
972 | to fix | |
973 | ||
974 | virt-viewer.c: In function 'virt_viewer_connect': | |
975 | virt-viewer.c:686:13: error: format not a string literal and no format arguments [-Werror=format-security] | |
976 | g_warning(error->message); | |
977 | ||
978 | 2013-06-11 Christophe Fergeau <cfergeau@redhat.com> | |
979 | ||
980 | ovirt: Set host subject if needed | |
981 | For some VMs, setting host subject on SpiceSession is needed to | |
982 | be able to connect to it using SPICE/SSL. Until recently, this | |
983 | was not exposed in oVirt REST API/libgovirt. Since | |
984 | oVirt 3.2/libgovirt 0.1.0, the host subject is available, this | |
985 | patch makes use of it. | |
986 | This should fix connection to oVirt VMs that were migrated to a | |
987 | different host than the one they were started on. | |
988 | ||
989 | 2013-06-04 Christophe Fergeau <cfergeau@redhat.com> | |
990 | ||
991 | spec: Add missing % in %if 0{?fedora} | |
992 | This was missing in previous commit. | |
993 | ||
994 | spec: Deprecate spice-client | |
995 | This has been true for quite some time, it's high time we stop | |
996 | building spicec and have remote-viewer replace it on upgrades. | |
997 | ||
998 | 2013-05-27 Marc-André Lureau <marcandre.lureau@gmail.com> | |
999 | ||
1000 | Support Spice controller "auto-display-res" flag | |
1001 | The controller "auto-display-res" flag should be use to reconfigure | |
1002 | guest to match client configuration. This is what the | |
1003 | --fullscreen=auto-conf option is already made for. | |
1004 | ||
1005 | https://bugzilla.redhat.com/show_bug.cgi?id=967154 | |
1006 | ||
1007 | 2013-05-24 Marc-André Lureau <marcandre.lureau@gmail.com> | |
1008 | ||
1009 | man: document auto-conf fullscreen option | |
1010 | https://bugzilla.redhat.com/show_bug.cgi?id=875559 | |
1011 | ||
1012 | 2013-05-23 Marc-André Lureau <marcandre.lureau@gmail.com> | |
1013 | ||
1014 | Use a more descriptive FileDescription | |
1015 | This field is used to invite the user to close running instances, when | |
1016 | updating the installation with an MSI. "A remote desktop client" isn't | |
1017 | specific enough, use a VirtViewer specific description. | |
1018 | ||
1019 | build-sys: add debug-helper rule | |
1020 | ||
1021 | 2013-05-22 Marc-André Lureau <marcandre.lureau@gmail.com> | |
1022 | ||
1023 | app: move display on client monitors with --full-screen | |
1024 | There used to be a check to fullscreen the only visible display on | |
1025 | current monitor, by checking the number of visible monitors. Now that | |
1026 | fullscreen is independant for each display, and goes on current monitor, | |
1027 | it's useless. | |
1028 | ||
1029 | However, this code path is still used for the app --full-screen, at | |
1030 | startup time. And it is still nicer to open the display on respective | |
1031 | client monitors, rather than all on current monitor. | |
1032 | ||
1033 | 2013-05-21 Marc-André Lureau <marcandre.lureau@gmail.com> | |
1034 | ||
1035 | Fix trivial critical | |
1036 | GLib-CRITICAL **: g_strv_length: assertion `str_array != NULL' | |
1037 | ||
1038 | Committed without review under trivial rule. | |
1039 | ||
1040 | 2013-05-17 Marc-André Lureau <marcandre.lureau@gmail.com> | |
1041 | ||
1042 | Show connect dialog again if connection from dialog failed | |
1043 | https://bugzilla.redhat.com/show_bug.cgi?id=864026 | |
1044 | ||
1045 | spice-session: use a more robust signal connect | |
1046 | The Spice session may outlive the virt-viewer session, due to it's async | |
1047 | nature. Use the more robust virt_viewer_signal_connect_object() to fix | |
1048 | delayed potential crashes. | |
1049 | ||
1050 | Move connect dialog to remote-viewer.c | |
1051 | ||
1052 | 2013-05-16 Marc-André Lureau <marcandre.lureau@redhat.com> | |
1053 | ||
1054 | Silence unused arguments warnings | |
1055 | In file included from virt-viewer-session-spice.c:41: | |
1056 | gbinding.c: In function 'on_source_notify': | |
1057 | gbinding.c:381: warning: unused parameter 'gobject' | |
1058 | gbinding.c: In function 'on_target_notify': | |
1059 | gbinding.c:422: warning: unused parameter 'gobject' | |
1060 | gbinding.c: In function 'g_binding_init': | |
1061 | gbinding.c:709: warning: unused parameter 'binding' | |
1062 | ||
1063 | Rename variable, fix gcc warning | |
1064 | virt-viewer-main.c:61: warning: declaration of 'basename' shadows a global declaration | |
1065 | ||
1066 | Remove the "container" logic used by legacy browser plugin | |
1067 | ||
1068 | window: wait until mapped before fullscreen | |
1069 | On RHEL6, when starting virt-viewer --full-screen, metacity will | |
1070 | remaximize & force-fullscreen when leaving fullscreen, which prevents | |
1071 | user from accessing window titlebar, and end up with an incorrect | |
1072 | fullscreen state. | |
1073 | ||
1074 | Thanks Owen Taylor for help debugging this: | |
1075 | ||
1076 | <owen> elmarco: So the interesting thing here is that the "legacy" isn't | |
1077 | triggered off a configure request to a particular size, mutter seems to | |
1078 | constrain the window back to fullscreen size on its own when it sees a | |
1079 | change to WM_NORMAL_HINTS | |
1080 | <owen> commit 4943d79d6844af3f7fc0a15ceadb69d95c4c5c61 | |
1081 | <owen> Author: Peter Bloomfield <PeterBloomfield@BellSouth.net> | |
1082 | <owen> Date: Wed Jan 20 10:59:07 2010 -0500 | |
1083 | <owen> prevent window self-maximisation | |
1084 | <owen> Is not in rhel6 metacity | |
1085 | <owen> So probably that's the main difference | |
1086 | <owen> can you just make your program not fullscreen initially but wait until | |
1087 | it's mapped? (gets map-event on the toplevel) | |
1088 | <elmarco> owen that seems to work | |
1089 | <owen> I don't have a better solution to offer - sorry for the ugliness (code and | |
1090 | initial mapping appearance) | |
1091 | ||
1092 | https://bugzilla.redhat.com/show_bug.cgi?id=876445 | |
1093 | ||
1094 | Only fullscreen the new window | |
1095 | The current code will forcefully reset fullscreen all windows | |
1096 | when a new window is created | |
1097 | ||
1098 | 2013-05-14 Marc-André Lureau <marcandre.lureau@gmail.com> | |
1099 | ||
1100 | window: leave fullscreen on current window | |
1101 | Since fdaa9b0ca, virt-viewer allows to fullscreen a single window. It | |
1102 | feels more symetric to leave a single window from fullscreen as well, | |
1103 | unless the application was started in fullscreen. | |
1104 | ||
1105 | 2013-05-14 Marc-André Lureau <marcandre.lureau@redhat.com> | |
1106 | ||
1107 | window: fix send key menu popup position | |
1108 | Fix send key menu popup position. | |
1109 | ||
1110 | The current code wasn't correctly translating the menu coordinates | |
1111 | based on the toplevel windows position, it was always using origin 0. | |
1112 | ||
1113 | https://bugzilla.redhat.com/show_bug.cgi?id=913601 | |
1114 | ||
1115 | 2013-05-13 Marc-André Lureau <marcandre.lureau@gmail.com> | |
1116 | ||
1117 | man: document running remote-viewer without URI | |
1118 | https://bugzilla.redhat.com/show_bug.cgi?id=882133 | |
1119 | ||
1120 | Add -- to seperate program arguments to server in man / --help | |
1121 | Since some of the arguments are expecting following value, make it more | |
1122 | explicit in the man and --help that -- can seperate options from server | |
1123 | name or location. | |
1124 | ||
1125 | https://bugzilla.redhat.com/show_bug.cgi?id=843103 | |
1126 | ||
1127 | Allow to fullscreen and position display independently | |
1128 | Currently, going from window to fullscreen mode changes all display to | |
1129 | fullscreen and realize automatic positionning on corresponding client | |
1130 | monitor. However, it allows for much more flexibility to allow entering | |
1131 | fullscreen on the current monitor each windows seperately. This way the | |
1132 | user can decide on arbitrary monitor arrangement. | |
1133 | ||
1134 | https://bugzilla.redhat.com/show_bug.cgi?id=558241 | |
1135 | ||
1136 | spice: make sure display ready hint is sync after creation | |
1137 | The ready state can be set during construction time and | |
1138 | not notified immediately. | |
1139 | ||
1140 | misc: fix typo | |
1141 | ||
1142 | Do not restrict disabling display to != 0 | |
1143 | Virt-viewer hides the display window 0, but doesn't disable the display. | |
1144 | This is inconsistent with other displays, and prevent the guest OS from | |
1145 | reconfiguring the main display. | |
1146 | ||
1147 | (for monitor 0 to be really disabled in multi-monitor guest, the agent | |
1148 | need to support sparse monitor config. If not, the first display windows | |
1149 | will be reopened to match the new un-sparse configuration) | |
1150 | ||
1151 | Note also the current Linux vdagent crashes when disabling 1st monitor, | |
1152 | to be solved seperately. | |
1153 | ||
1154 | Related bug: | |
1155 | https://bugzilla.redhat.com/show_bug.cgi?id=958550 | |
1156 | ||
1157 | 2013-05-03 Marc-André Lureau <marcandre.lureau@gmail.com> | |
1158 | ||
1159 | remote-viewer: set auto-conf before fullscreen | |
1160 | If a monitor is already in fullscreen, setting auto-conf to true will | |
1161 | not move it until it is re-fullscreen | |
1162 | ||
1163 | This was unnoticed, because usually, the first client window is opened | |
1164 | on the first monitor. Also we may argue than relying on g_object_set() | |
1165 | property order is lame and fragile, we better split it in two seperate | |
1166 | calls as this might break upstream. | |
1167 | ||
1168 | https://bugzilla.redhat.com/show_bug.cgi?id=872288 | |
1169 | ||
0 | 1170 | 2013-05-01 Daniel P. Berrange <berrange@redhat.com> |
1171 | ||
1172 | Sync spec with Fedora | |
1173 | ||
1174 | Post release version bump | |
1 | 1175 | |
2 | 1176 | Set PKG_CONFIG_LIBDIR variable for mingw builds |
3 | 1177 | To avoid pkg-config accidentally falling back to |
0 | 0 | Installation Instructions |
1 | 1 | ************************* |
2 | 2 | |
3 | Copyright (C) 1994-1996, 1999-2002, 2004-2012 Free Software Foundation, | |
3 | Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation, | |
4 | 4 | Inc. |
5 | 5 | |
6 | 6 | Copying and distribution of this file, with or without modification, |
3 | 3 | |
4 | 4 | SUBDIRS = icons src man po data |
5 | 5 | |
6 | AM_DISTCHECK_CONFIGURE_FLAGS = --disable-update-mimedb | |
6 | 7 | EXTRA_DIST = \ |
7 | 8 | $(PACKAGE).spec \ |
8 | 9 | intltool-extract.in \ |
0 | # Makefile.in generated by automake 1.13.1 from Makefile.am. | |
0 | # Makefile.in generated by automake 1.13.4 from Makefile.am. | |
1 | 1 | # @configure_input@ |
2 | 2 | |
3 | # Copyright (C) 1994-2012 Free Software Foundation, Inc. | |
3 | # Copyright (C) 1994-2013 Free Software Foundation, Inc. | |
4 | 4 | |
5 | 5 | # This Makefile.in is free software; the Free Software Foundation |
6 | 6 | # gives unlimited permission to copy and/or distribute it, |
13 | 13 | |
14 | 14 | @SET_MAKE@ |
15 | 15 | VPATH = @srcdir@ |
16 | am__make_dryrun = \ | |
17 | { \ | |
18 | am__dry=no; \ | |
16 | am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' | |
17 | am__make_running_with_option = \ | |
18 | case $${target_option-} in \ | |
19 | ?) ;; \ | |
20 | *) echo "am__make_running_with_option: internal error: invalid" \ | |
21 | "target option '$${target_option-}' specified" >&2; \ | |
22 | exit 1;; \ | |
23 | esac; \ | |
24 | has_opt=no; \ | |
25 | sane_makeflags=$$MAKEFLAGS; \ | |
26 | if $(am__is_gnu_make); then \ | |
27 | sane_makeflags=$$MFLAGS; \ | |
28 | else \ | |
19 | 29 | case $$MAKEFLAGS in \ |
20 | 30 | *\\[\ \ ]*) \ |
21 | echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ | |
22 | | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ | |
23 | *) \ | |
24 | for am__flg in $$MAKEFLAGS; do \ | |
25 | case $$am__flg in \ | |
26 | *=*|--*) ;; \ | |
27 | *n*) am__dry=yes; break;; \ | |
28 | esac; \ | |
29 | done;; \ | |
31 | bs=\\; \ | |
32 | sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ | |
33 | | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ | |
30 | 34 | esac; \ |
31 | test $$am__dry = yes; \ | |
32 | } | |
35 | fi; \ | |
36 | skip_next=no; \ | |
37 | strip_trailopt () \ | |
38 | { \ | |
39 | flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ | |
40 | }; \ | |
41 | for flg in $$sane_makeflags; do \ | |
42 | test $$skip_next = yes && { skip_next=no; continue; }; \ | |
43 | case $$flg in \ | |
44 | *=*|--*) continue;; \ | |
45 | -*I) strip_trailopt 'I'; skip_next=yes;; \ | |
46 | -*I?*) strip_trailopt 'I';; \ | |
47 | -*O) strip_trailopt 'O'; skip_next=yes;; \ | |
48 | -*O?*) strip_trailopt 'O';; \ | |
49 | -*l) strip_trailopt 'l'; skip_next=yes;; \ | |
50 | -*l?*) strip_trailopt 'l';; \ | |
51 | -[dEDm]) skip_next=yes;; \ | |
52 | -[JT]) skip_next=yes;; \ | |
53 | esac; \ | |
54 | case $$flg in \ | |
55 | *$$target_option*) has_opt=yes; break;; \ | |
56 | esac; \ | |
57 | done; \ | |
58 | test $$has_opt = yes | |
59 | am__make_dryrun = (target_option=n; $(am__make_running_with_option)) | |
60 | am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) | |
33 | 61 | pkgdatadir = $(datadir)/@PACKAGE@ |
34 | 62 | pkgincludedir = $(includedir)/@PACKAGE@ |
35 | 63 | pkglibdir = $(libdir)/@PACKAGE@ |
184 | 212 | AUTOHEADER = @AUTOHEADER@ |
185 | 213 | AUTOMAKE = @AUTOMAKE@ |
186 | 214 | AWK = @AWK@ |
215 | BUILDID = @BUILDID@ | |
187 | 216 | CATALOGS = @CATALOGS@ |
188 | 217 | CATOBJEXT = @CATOBJEXT@ |
189 | 218 | CC = @CC@ |
207 | 236 | GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ |
208 | 237 | GLIB2_CFLAGS = @GLIB2_CFLAGS@ |
209 | 238 | GLIB2_LIBS = @GLIB2_LIBS@ |
239 | GLIB2_REQUIRED = @GLIB2_REQUIRED@ | |
210 | 240 | GLIB_MKENUMS = @GLIB_MKENUMS@ |
211 | 241 | GMOFILES = @GMOFILES@ |
212 | 242 | GMSGFMT = @GMSGFMT@ |
243 | GOVIRT_REQUIRED = @GOVIRT_REQUIRED@ | |
213 | 244 | GREP = @GREP@ |
245 | GTK2_REQUIRED = @GTK2_REQUIRED@ | |
246 | GTK3_REQUIRED = @GTK3_REQUIRED@ | |
214 | 247 | GTK_API_VERSION = @GTK_API_VERSION@ |
215 | 248 | GTK_CFLAGS = @GTK_CFLAGS@ |
216 | 249 | GTK_LIBS = @GTK_LIBS@ |
217 | 250 | GTK_REQUIRED = @GTK_REQUIRED@ |
251 | GTK_VNC1_REQUIRED = @GTK_VNC1_REQUIRED@ | |
252 | GTK_VNC2_REQUIRED = @GTK_VNC2_REQUIRED@ | |
218 | 253 | GTK_VNC_API_VERSION = @GTK_VNC_API_VERSION@ |
219 | 254 | GTK_VNC_CFLAGS = @GTK_VNC_CFLAGS@ |
220 | 255 | GTK_VNC_LIBS = @GTK_VNC_LIBS@ |
241 | 276 | LIBTOOL = @LIBTOOL@ |
242 | 277 | LIBVIRT_CFLAGS = @LIBVIRT_CFLAGS@ |
243 | 278 | LIBVIRT_LIBS = @LIBVIRT_LIBS@ |
279 | LIBVIRT_REQUIRED = @LIBVIRT_REQUIRED@ | |
244 | 280 | LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ |
245 | 281 | LIBXML2_LIBS = @LIBXML2_LIBS@ |
282 | LIBXML2_REQUIRED = @LIBXML2_REQUIRED@ | |
246 | 283 | LIPO = @LIPO@ |
247 | 284 | LN_S = @LN_S@ |
248 | 285 | LTLIBOBJS = @LTLIBOBJS@ |
284 | 321 | SPICE_CONTROLLER_LIBS = @SPICE_CONTROLLER_LIBS@ |
285 | 322 | SPICE_GTK_CFLAGS = @SPICE_GTK_CFLAGS@ |
286 | 323 | SPICE_GTK_LIBS = @SPICE_GTK_LIBS@ |
324 | SPICE_GTK_REQUIRED = @SPICE_GTK_REQUIRED@ | |
287 | 325 | SPICE_PROTOCOL_CFLAGS = @SPICE_PROTOCOL_CFLAGS@ |
288 | 326 | SPICE_PROTOCOL_LIBS = @SPICE_PROTOCOL_LIBS@ |
327 | SPICE_PROTOCOL_REQUIRED = @SPICE_PROTOCOL_REQUIRED@ | |
289 | 328 | STRIP = @STRIP@ |
329 | UPDATE_MIME_DATABASE = @UPDATE_MIME_DATABASE@ | |
290 | 330 | USE_NLS = @USE_NLS@ |
291 | 331 | VERSION = @VERSION@ |
292 | 332 | WARN_CFLAGS = @WARN_CFLAGS@ |
333 | WINDOWS_PRODUCTVERSION = @WINDOWS_PRODUCTVERSION@ | |
293 | 334 | WINDRES = @WINDRES@ |
294 | 335 | WIXL_ARCH = @WIXL_ARCH@ |
295 | 336 | XGETTEXT = @XGETTEXT@ |
350 | 391 | NULL = |
351 | 392 | ACLOCAL_AMFLAGS = -I m4 |
352 | 393 | SUBDIRS = icons src man po data |
394 | AM_DISTCHECK_CONFIGURE_FLAGS = --disable-update-mimedb | |
353 | 395 | EXTRA_DIST = \ |
354 | 396 | $(PACKAGE).spec \ |
355 | 397 | intltool-extract.in \ |
465 | 507 | # (which will cause the Makefiles to be regenerated when you run 'make'); |
466 | 508 | # (2) otherwise, pass the desired values on the 'make' command line. |
467 | 509 | $(am__recursive_targets): |
468 | @fail= failcom='exit 1'; \ | |
469 | for f in x $$MAKEFLAGS; do \ | |
470 | case $$f in \ | |
471 | *=* | --[!k]*);; \ | |
472 | *k*) failcom='fail=yes';; \ | |
473 | esac; \ | |
474 | done; \ | |
510 | @fail=; \ | |
511 | if $(am__make_keepgoing); then \ | |
512 | failcom='fail=yes'; \ | |
513 | else \ | |
514 | failcom='exit 1'; \ | |
515 | fi; \ | |
475 | 516 | dot_seen=no; \ |
476 | 517 | target=`echo $@ | sed s/-recursive//`; \ |
477 | 518 | case "$@" in \ |
0 | 0 | Virt Viewer News |
1 | 1 | ================ |
2 | ||
3 | 0.6.0: Jan 24, 2014 | |
4 | ------------------- | |
5 | ||
6 | - Require govirt 0.3.0 | |
7 | - Require spice-gtk 0.22 | |
8 | - Show error dialog if password is wrong | |
9 | - Document application/x-virt-viewer file format | |
10 | - Remove unused '-d' option from remote-viewer | |
11 | - Add a kiosk mode | |
12 | - Add menu for sending Ctrl+Alt+Delete | |
13 | - Add Ctrl+Alt+End as accelerator for Ctrl+Alt+Delete | |
14 | - Send modifiers before the non-modifier key in send | |
15 | key menu | |
16 | - Fix GTK warning when disconnecting from VNC due to | |
17 | auth error | |
18 | - Make 'Cancel' default button in exit dialog | |
19 | - Make send key menu accelerators work in fullscreen | |
20 | - Remove insecure fetching of oVirt CA cert | |
21 | - Build for GTK 3 by default | |
22 | - Fix title bar after failed connection | |
23 | - Reshow remote-viewer connection dialog upon error | |
24 | - Hide all windows upon disconnect | |
25 | - Add ability to define custom monitor mapping | |
26 | - Ensure all windows obey command line zoom level | |
27 | - Add an icon to the desktop file | |
28 | - Fix event loop implementation on Win32 platforms | |
29 | - Misc other bug fixes | |
30 | ||
31 | 0.5.7: Jul 31, 2013 | |
32 | ------------------- | |
33 | ||
34 | - Many fixes to full screen / window positioning handling | |
35 | - Reshow connect dialog if connection fails | |
36 | - Misc man page fixes | |
37 | - Mark RPM as obsoleting spice-client | |
38 | - Set the host subject to fix SSL connections with ovirt | |
39 | - Use -H as short variant of --hotkeys | |
40 | - Add missing trailing ';' in desktop file | |
41 | - Allow TLS only SPICE connections | |
42 | - Use dynamic key send menu | |
43 | - Enable smartcard shortcuts only when smartcard reader is present | |
44 | - Misc other bug fixes | |
2 | 45 | |
3 | 46 | 0.5.6: Apr 12, 2013 |
4 | 47 | ------------------- |
18 | 18 | |
19 | 19 | http://gtk-vnc.sourceforge.net/ |
20 | 20 | |
21 | Virt Viewer uses the SPICE-GTK (>= 0.16.26) widget to provide a | |
21 | Virt Viewer uses the SPICE-GTK (>= 0.22) widget to provide a | |
22 | 22 | display of the SPICE protocol, which is available from: |
23 | 23 | |
24 | 24 | http://spice-space.org/page/Spice-Gtk |
0 | # generated automatically by aclocal 1.13.1 -*- Autoconf -*- | |
1 | ||
2 | # Copyright (C) 1996-2012 Free Software Foundation, Inc. | |
0 | # generated automatically by aclocal 1.13.4 -*- Autoconf -*- | |
1 | ||
2 | # Copyright (C) 1996-2013 Free Software Foundation, Inc. | |
3 | 3 | |
4 | 4 | # This file is free software; the Free Software Foundation |
5 | 5 | # gives unlimited permission to copy and/or distribute it, |
336 | 336 | dnl |
337 | 337 | glib_DEFUN([GLIB_GNU_GETTEXT], |
338 | 338 | [AC_REQUIRE([AC_PROG_CC])dnl |
339 | AC_REQUIRE([AC_HEADER_STDC])dnl | |
340 | 339 | |
341 | 340 | GLIB_LC_MESSAGES |
342 | 341 | GLIB_WITH_NLS |
689 | 688 | m4_popdef([pkg_description]) |
690 | 689 | ]) dnl PKG_NOARCH_INSTALLDIR |
691 | 690 | |
691 | ||
692 | # PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, | |
693 | # [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) | |
694 | # ------------------------------------------- | |
695 | # Retrieves the value of the pkg-config variable for the given module. | |
696 | AC_DEFUN([PKG_CHECK_VAR], | |
697 | [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl | |
698 | AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl | |
699 | ||
700 | _PKG_CONFIG([$1], [variable="][$3]["], [$2]) | |
701 | AS_VAR_COPY([$1], [pkg_cv_][$1]) | |
702 | ||
703 | AS_VAR_IF([$1], [""], [$5], [$4])dnl | |
704 | ])# PKG_CHECK_VAR | |
705 | ||
692 | 706 | # Copyright (C) 2002-2013 Free Software Foundation, Inc. |
693 | 707 | # |
694 | 708 | # This file is free software; the Free Software Foundation |
704 | 718 | [am__api_version='1.13' |
705 | 719 | dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to |
706 | 720 | dnl require some minimum version. Point them to the right macro. |
707 | m4_if([$1], [1.13.1], [], | |
721 | m4_if([$1], [1.13.4], [], | |
708 | 722 | [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl |
709 | 723 | ]) |
710 | 724 | |
720 | 734 | # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. |
721 | 735 | # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. |
722 | 736 | AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], |
723 | [AM_AUTOMAKE_VERSION([1.13.1])dnl | |
737 | [AM_AUTOMAKE_VERSION([1.13.4])dnl | |
724 | 738 | m4_ifndef([AC_AUTOCONF_VERSION], |
725 | 739 | [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl |
726 | 740 | _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) |
1042 | 1056 | DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` |
1043 | 1057 | test -z "$DEPDIR" && continue |
1044 | 1058 | am__include=`sed -n 's/^am__include = //p' < "$mf"` |
1045 | test -z "am__include" && continue | |
1059 | test -z "$am__include" && continue | |
1046 | 1060 | am__quote=`sed -n 's/^am__quote = //p' < "$mf"` |
1047 | 1061 | # Find all dependency output files, they are included files with |
1048 | 1062 | # $(DEPDIR) in their names. We invoke sed twice because it is the |
1626 | 1640 | # Substitute a variable $(am__untar) that extract such |
1627 | 1641 | # a tarball read from stdin. |
1628 | 1642 | # $(am__untar) < result.tar |
1643 | # | |
1629 | 1644 | AC_DEFUN([_AM_PROG_TAR], |
1630 | 1645 | [# Always define AMTAR for backward compatibility. Yes, it's still used |
1631 | 1646 | # in the wild :-( We should find a proper way to deprecate it ... |
1632 | 1647 | AC_SUBST([AMTAR], ['$${TAR-tar}']) |
1648 | ||
1649 | # We'll loop over all known methods to create a tar archive until one works. | |
1650 | _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' | |
1651 | ||
1633 | 1652 | m4_if([$1], [v7], |
1634 | [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], | |
1635 | [m4_case([$1], [ustar],, [pax],, | |
1636 | [m4_fatal([Unknown tar format])]) | |
1637 | AC_MSG_CHECKING([how to create a $1 tar archive]) | |
1638 | # Loop over all known methods to create a tar archive until one works. | |
1639 | _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' | |
1640 | _am_tools=${am_cv_prog_tar_$1-$_am_tools} | |
1641 | # Do not fold the above two line into one, because Tru64 sh and | |
1642 | # Solaris sh will not grok spaces in the rhs of '-'. | |
1643 | for _am_tool in $_am_tools | |
1644 | do | |
1645 | case $_am_tool in | |
1646 | gnutar) | |
1647 | for _am_tar in tar gnutar gtar; | |
1648 | do | |
1649 | AM_RUN_LOG([$_am_tar --version]) && break | |
1650 | done | |
1651 | am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' | |
1652 | am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' | |
1653 | am__untar="$_am_tar -xf -" | |
1654 | ;; | |
1655 | plaintar) | |
1656 | # Must skip GNU tar: if it does not support --format= it doesn't create | |
1657 | # ustar tarball either. | |
1658 | (tar --version) >/dev/null 2>&1 && continue | |
1659 | am__tar='tar chf - "$$tardir"' | |
1660 | am__tar_='tar chf - "$tardir"' | |
1661 | am__untar='tar xf -' | |
1662 | ;; | |
1663 | pax) | |
1664 | am__tar='pax -L -x $1 -w "$$tardir"' | |
1665 | am__tar_='pax -L -x $1 -w "$tardir"' | |
1666 | am__untar='pax -r' | |
1667 | ;; | |
1668 | cpio) | |
1669 | am__tar='find "$$tardir" -print | cpio -o -H $1 -L' | |
1670 | am__tar_='find "$tardir" -print | cpio -o -H $1 -L' | |
1671 | am__untar='cpio -i -H $1 -d' | |
1672 | ;; | |
1673 | none) | |
1674 | am__tar=false | |
1675 | am__tar_=false | |
1676 | am__untar=false | |
1677 | ;; | |
1678 | esac | |
1679 | ||
1680 | # If the value was cached, stop now. We just wanted to have am__tar | |
1681 | # and am__untar set. | |
1682 | test -n "${am_cv_prog_tar_$1}" && break | |
1683 | ||
1684 | # tar/untar a dummy directory, and stop if the command works | |
1653 | [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], | |
1654 | ||
1655 | [m4_case([$1], | |
1656 | [ustar], | |
1657 | [# The POSIX 1988 'ustar' format is defined with fixed-size fields. | |
1658 | # There is notably a 21 bits limit for the UID and the GID. In fact, | |
1659 | # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 | |
1660 | # and bug#13588). | |
1661 | am_max_uid=2097151 # 2^21 - 1 | |
1662 | am_max_gid=$am_max_uid | |
1663 | # The $UID and $GID variables are not portable, so we need to resort | |
1664 | # to the POSIX-mandated id(1) utility. Errors in the 'id' calls | |
1665 | # below are definitely unexpected, so allow the users to see them | |
1666 | # (that is, avoid stderr redirection). | |
1667 | am_uid=`id -u || echo unknown` | |
1668 | am_gid=`id -g || echo unknown` | |
1669 | AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format]) | |
1670 | if test $am_uid -le $am_max_uid; then | |
1671 | AC_MSG_RESULT([yes]) | |
1672 | else | |
1673 | AC_MSG_RESULT([no]) | |
1674 | _am_tools=none | |
1675 | fi | |
1676 | AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format]) | |
1677 | if test $am_gid -le $am_max_gid; then | |
1678 | AC_MSG_RESULT([yes]) | |
1679 | else | |
1680 | AC_MSG_RESULT([no]) | |
1681 | _am_tools=none | |
1682 | fi], | |
1683 | ||
1684 | [pax], | |
1685 | [], | |
1686 | ||
1687 | [m4_fatal([Unknown tar format])]) | |
1688 | ||
1689 | AC_MSG_CHECKING([how to create a $1 tar archive]) | |
1690 | ||
1691 | # Go ahead even if we have the value already cached. We do so because we | |
1692 | # need to set the values for the 'am__tar' and 'am__untar' variables. | |
1693 | _am_tools=${am_cv_prog_tar_$1-$_am_tools} | |
1694 | ||
1695 | for _am_tool in $_am_tools; do | |
1696 | case $_am_tool in | |
1697 | gnutar) | |
1698 | for _am_tar in tar gnutar gtar; do | |
1699 | AM_RUN_LOG([$_am_tar --version]) && break | |
1700 | done | |
1701 | am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' | |
1702 | am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' | |
1703 | am__untar="$_am_tar -xf -" | |
1704 | ;; | |
1705 | plaintar) | |
1706 | # Must skip GNU tar: if it does not support --format= it doesn't create | |
1707 | # ustar tarball either. | |
1708 | (tar --version) >/dev/null 2>&1 && continue | |
1709 | am__tar='tar chf - "$$tardir"' | |
1710 | am__tar_='tar chf - "$tardir"' | |
1711 | am__untar='tar xf -' | |
1712 | ;; | |
1713 | pax) | |
1714 | am__tar='pax -L -x $1 -w "$$tardir"' | |
1715 | am__tar_='pax -L -x $1 -w "$tardir"' | |
1716 | am__untar='pax -r' | |
1717 | ;; | |
1718 | cpio) | |
1719 | am__tar='find "$$tardir" -print | cpio -o -H $1 -L' | |
1720 | am__tar_='find "$tardir" -print | cpio -o -H $1 -L' | |
1721 | am__untar='cpio -i -H $1 -d' | |
1722 | ;; | |
1723 | none) | |
1724 | am__tar=false | |
1725 | am__tar_=false | |
1726 | am__untar=false | |
1727 | ;; | |
1728 | esac | |
1729 | ||
1730 | # If the value was cached, stop now. We just wanted to have am__tar | |
1731 | # and am__untar set. | |
1732 | test -n "${am_cv_prog_tar_$1}" && break | |
1733 | ||
1734 | # tar/untar a dummy directory, and stop if the command works. | |
1735 | rm -rf conftest.dir | |
1736 | mkdir conftest.dir | |
1737 | echo GrepMe > conftest.dir/file | |
1738 | AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) | |
1739 | rm -rf conftest.dir | |
1740 | if test -s conftest.tar; then | |
1741 | AM_RUN_LOG([$am__untar <conftest.tar]) | |
1742 | AM_RUN_LOG([cat conftest.dir/file]) | |
1743 | grep GrepMe conftest.dir/file >/dev/null 2>&1 && break | |
1744 | fi | |
1745 | done | |
1685 | 1746 | rm -rf conftest.dir |
1686 | mkdir conftest.dir | |
1687 | echo GrepMe > conftest.dir/file | |
1688 | AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) | |
1689 | rm -rf conftest.dir | |
1690 | if test -s conftest.tar; then | |
1691 | AM_RUN_LOG([$am__untar <conftest.tar]) | |
1692 | grep GrepMe conftest.dir/file >/dev/null 2>&1 && break | |
1693 | fi | |
1694 | done | |
1695 | rm -rf conftest.dir | |
1696 | ||
1697 | AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) | |
1698 | AC_MSG_RESULT([$am_cv_prog_tar_$1])]) | |
1747 | ||
1748 | AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) | |
1749 | AC_MSG_RESULT([$am_cv_prog_tar_$1])]) | |
1750 | ||
1699 | 1751 | AC_SUBST([am__tar]) |
1700 | 1752 | AC_SUBST([am__untar]) |
1701 | 1753 | ]) # _AM_PROG_TAR |
0 | 0 | #! /bin/sh |
1 | 1 | # depcomp - compile a program generating dependencies as side-effects |
2 | 2 | |
3 | scriptversion=2012-10-18.11; # UTC | |
3 | scriptversion=2013-05-30.07; # UTC | |
4 | 4 | |
5 | 5 | # Copyright (C) 1999-2013 Free Software Foundation, Inc. |
6 | 6 | |
551 | 551 | G |
552 | 552 | p |
553 | 553 | }' >> "$depfile" |
554 | echo >> "$depfile" # make sure the fragment doesn't end with a backslash | |
554 | 555 | rm -f "$tmpdepfile" |
555 | 556 | ;; |
556 | 557 |
81 | 81 | PACKAGE=libtool |
82 | 82 | VERSION=2.4.2 |
83 | 83 | TIMESTAMP="" |
84 | : ${DD=dd} | |
85 | 84 | package_revision=1.3337 |
86 | 85 | |
87 | 86 | # Be Bourne compatible |
1224 | 1223 | ## Main. ## |
1225 | 1224 | ## ----------- ## |
1226 | 1225 | |
1227 | # func_try_sizelim file n | |
1228 | # try to write at most the first N bytes from FILE to the standard output when | |
1229 | # possible, otherwise put whole file | |
1230 | func_try_sizelim () | |
1231 | { | |
1232 | if test -n "$DD"; then | |
1233 | $DD if="$1" bs=$2 count=1 2>/dev/null | |
1234 | if test $? -eq 127; then | |
1235 | cat "$1" 2>/dev/null | |
1236 | fi | |
1237 | else | |
1238 | cat "$1" 2>/dev/null | |
1239 | fi | |
1240 | } | |
1241 | ||
1242 | 1226 | # func_lalib_p file |
1243 | 1227 | # True iff FILE is a libtool `.la' library or `.lo' object file. |
1244 | 1228 | # This function is only a basic sanity check; it will hardly flush out |
1246 | 1230 | func_lalib_p () |
1247 | 1231 | { |
1248 | 1232 | test -f "$1" && |
1249 | func_try_sizelim "$1" 4096 | $SED -e 4q 2>/dev/null \ | |
1233 | $SED -e 4q "$1" 2>/dev/null \ | |
1250 | 1234 | | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1 |
1251 | 1235 | } |
1252 | 1236 |
0 | 0 | #! /bin/sh |
1 | 1 | # Guess values for system-dependent variables and create Makefiles. |
2 | # Generated by GNU Autoconf 2.69 for virt-viewer 0.5.6. | |
2 | # Generated by GNU Autoconf 2.69 for virt-viewer 0.6.0. | |
3 | 3 | # |
4 | 4 | # |
5 | 5 | # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. |
586 | 586 | # Identity of this package. |
587 | 587 | PACKAGE_NAME='virt-viewer' |
588 | 588 | PACKAGE_TARNAME='virt-viewer' |
589 | PACKAGE_VERSION='0.5.6' | |
590 | PACKAGE_STRING='virt-viewer 0.5.6' | |
589 | PACKAGE_VERSION='0.6.0' | |
590 | PACKAGE_STRING='virt-viewer 0.6.0' | |
591 | 591 | PACKAGE_BUGREPORT='' |
592 | 592 | PACKAGE_URL='' |
593 | 593 | |
633 | 633 | am__EXEEXT_TRUE |
634 | 634 | LTLIBOBJS |
635 | 635 | LIBOBJS |
636 | ENABLE_UPDATE_MIMEDB_FALSE | |
637 | ENABLE_UPDATE_MIMEDB_TRUE | |
638 | UPDATE_MIME_DATABASE | |
639 | WINDOWS_PRODUCTVERSION | |
640 | BUILDID | |
636 | 641 | OVIRT_LIBS |
637 | 642 | OVIRT_CFLAGS |
638 | 643 | HAVE_SPICE_GTK_FALSE |
761 | 766 | OS_WIN32_FALSE |
762 | 767 | OS_WIN32_TRUE |
763 | 768 | WIXL_ARCH |
769 | GOVIRT_REQUIRED | |
770 | SPICE_PROTOCOL_REQUIRED | |
771 | SPICE_GTK_REQUIRED | |
772 | GTK_VNC2_REQUIRED | |
773 | GTK_VNC1_REQUIRED | |
774 | GTK3_REQUIRED | |
775 | GTK2_REQUIRED | |
776 | LIBVIRT_REQUIRED | |
777 | LIBXML2_REQUIRED | |
778 | GLIB2_REQUIRED | |
764 | 779 | host_os |
765 | 780 | host_vendor |
766 | 781 | host_cpu |
855 | 870 | with_spice_gtk |
856 | 871 | with_ovirt |
857 | 872 | with_buildid |
873 | enable_update_mimedb | |
858 | 874 | ' |
859 | 875 | ac_precious_vars='build_alias |
860 | 876 | host_alias |
1426 | 1442 | # Omit some internal or obsolete options to make the list less imposing. |
1427 | 1443 | # This message is too long to be a string in the A/UX 3.1 sh. |
1428 | 1444 | cat <<_ACEOF |
1429 | \`configure' configures virt-viewer 0.5.6 to adapt to many kinds of systems. | |
1445 | \`configure' configures virt-viewer 0.6.0 to adapt to many kinds of systems. | |
1430 | 1446 | |
1431 | 1447 | Usage: $0 [OPTION]... [VAR=VALUE]... |
1432 | 1448 | |
1496 | 1512 | |
1497 | 1513 | if test -n "$ac_init_help"; then |
1498 | 1514 | case $ac_init_help in |
1499 | short | recursive ) echo "Configuration of virt-viewer 0.5.6:";; | |
1515 | short | recursive ) echo "Configuration of virt-viewer 0.6.0:";; | |
1500 | 1516 | esac |
1501 | 1517 | cat <<\_ACEOF |
1502 | 1518 | |
1519 | 1535 | Turn on compiler warnings |
1520 | 1536 | --enable-iso-c Try to warn if code is not ISO C |
1521 | 1537 | --disable-nls do not use Native Language Support |
1538 | --disable-update-mimedb disable the update-mime-database after install | |
1539 | [default=no] | |
1522 | 1540 | |
1523 | 1541 | Optional Packages: |
1524 | 1542 | --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] |
1529 | 1547 | --with-sysroot=DIR Search for dependent libraries within DIR |
1530 | 1548 | (or the compiler's sysroot if not specified). |
1531 | 1549 | --without-libvirt Ignore presence of libvirt and disable it |
1532 | --with-gtk=2.0|3.0 which gtk+ version to compile against (default: 2.0) | |
1550 | --with-gtk=2.0|3.0 which gtk+ version to compile against (default: 3.0) | |
1533 | 1551 | --without-gtk-vnc Ignore presence of gtk-vnc and disable it |
1534 | 1552 | --without-spice-gtk Ignore presence of spice-gtk and disable it |
1535 | 1553 | --without-ovirt Ignore presence of librest and disable oVirt support |
1648 | 1666 | test -n "$ac_init_help" && exit $ac_status |
1649 | 1667 | if $ac_init_version; then |
1650 | 1668 | cat <<\_ACEOF |
1651 | virt-viewer configure 0.5.6 | |
1669 | virt-viewer configure 0.6.0 | |
1652 | 1670 | generated by GNU Autoconf 2.69 |
1653 | 1671 | |
1654 | 1672 | Copyright (C) 2012 Free Software Foundation, Inc. |
2013 | 2031 | This file contains any messages produced by compilers while |
2014 | 2032 | running configure, to aid debugging if configure makes a mistake. |
2015 | 2033 | |
2016 | It was created by virt-viewer $as_me 0.5.6, which was | |
2034 | It was created by virt-viewer $as_me 0.6.0, which was | |
2017 | 2035 | generated by GNU Autoconf 2.69. Invocation command line was |
2018 | 2036 | |
2019 | 2037 | $ $0 $@ |
2880 | 2898 | |
2881 | 2899 | # Define the identity of the package. |
2882 | 2900 | PACKAGE='virt-viewer' |
2883 | VERSION='0.5.6' | |
2901 | VERSION='0.6.0' | |
2884 | 2902 | |
2885 | 2903 | |
2886 | 2904 | cat >>confdefs.h <<_ACEOF |
2920 | 2938 | # in the wild :-( We should find a proper way to deprecate it ... |
2921 | 2939 | AMTAR='$${TAR-tar}' |
2922 | 2940 | |
2941 | ||
2942 | # We'll loop over all known methods to create a tar archive until one works. | |
2943 | _am_tools='gnutar pax cpio none' | |
2944 | ||
2923 | 2945 | am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' |
2946 | ||
2924 | 2947 | |
2925 | 2948 | |
2926 | 2949 | |
3047 | 3070 | GTK3_REQUIRED="3.0" |
3048 | 3071 | GTK_VNC1_REQUIRED="0.3.8" |
3049 | 3072 | GTK_VNC2_REQUIRED="0.4.0" |
3050 | SPICE_GTK_REQUIRED="0.16.26" | |
3073 | SPICE_GTK_REQUIRED="0.22" | |
3051 | 3074 | SPICE_PROTOCOL_REQUIRED="0.10.1" |
3075 | GOVIRT_REQUIRED="0.3.0" | |
3076 | ||
3077 | ||
3078 | ||
3079 | ||
3080 | ||
3081 | ||
3082 | ||
3083 | ||
3084 | ||
3085 | ||
3086 | ||
3052 | 3087 | |
3053 | 3088 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for native Win32" >&5 |
3054 | 3089 | $as_echo_n "checking for native Win32... " >&6; } |
6525 | 6560 | rm -rf conftest* |
6526 | 6561 | ;; |
6527 | 6562 | |
6528 | x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ | |
6563 | x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \ | |
6529 | 6564 | s390*-*linux*|s390*-*tpf*|sparc*-*linux*) |
6530 | 6565 | # Find out which ABI we are using. |
6531 | 6566 | echo 'int i;' > conftest.$ac_ext |
6543 | 6578 | x86_64-*linux*) |
6544 | 6579 | LD="${LD-ld} -m elf_i386" |
6545 | 6580 | ;; |
6546 | ppc64-*linux*|powerpc64-*linux*) | |
6581 | powerpcle-*linux*) | |
6582 | LD="${LD-ld} -m elf32lppclinux" | |
6583 | ;; | |
6584 | powerpc-*linux*) | |
6547 | 6585 | LD="${LD-ld} -m elf32ppclinux" |
6548 | 6586 | ;; |
6549 | 6587 | s390x-*linux*) |
6562 | 6600 | x86_64-*linux*) |
6563 | 6601 | LD="${LD-ld} -m elf_x86_64" |
6564 | 6602 | ;; |
6565 | ppc*-*linux*|powerpc*-*linux*) | |
6603 | powerpcle-*linux*) | |
6604 | LD="${LD-ld} -m elf64lppc" | |
6605 | ;; | |
6606 | powerpc-*linux*) | |
6566 | 6607 | LD="${LD-ld} -m elf64ppc" |
6567 | 6608 | ;; |
6568 | 6609 | s390*-*linux*|s390*-*tpf*) |
13681 | 13722 | *) as_fn_error $? "invalid gtk version specified" "$LINENO" 5 ;; |
13682 | 13723 | esac |
13683 | 13724 | else |
13684 | with_gtk=2.0 | |
13725 | with_gtk=3.0 | |
13685 | 13726 | fi |
13686 | 13727 | |
13687 | 13728 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_gtk" >&5 |
14219 | 14260 | pkg_cv_OVIRT_CFLAGS="$OVIRT_CFLAGS" |
14220 | 14261 | elif test -n "$PKG_CONFIG"; then |
14221 | 14262 | if test -n "$PKG_CONFIG" && \ |
14222 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"govirt-1.0\""; } >&5 | |
14223 | ($PKG_CONFIG --exists --print-errors "govirt-1.0") 2>&5 | |
14263 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"govirt-1.0 >= \$GOVIRT_REQUIRED\""; } >&5 | |
14264 | ($PKG_CONFIG --exists --print-errors "govirt-1.0 >= $GOVIRT_REQUIRED") 2>&5 | |
14224 | 14265 | ac_status=$? |
14225 | 14266 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
14226 | 14267 | test $ac_status = 0; }; then |
14227 | pkg_cv_OVIRT_CFLAGS=`$PKG_CONFIG --cflags "govirt-1.0" 2>/dev/null` | |
14268 | pkg_cv_OVIRT_CFLAGS=`$PKG_CONFIG --cflags "govirt-1.0 >= $GOVIRT_REQUIRED" 2>/dev/null` | |
14228 | 14269 | test "x$?" != "x0" && pkg_failed=yes |
14229 | 14270 | else |
14230 | 14271 | pkg_failed=yes |
14236 | 14277 | pkg_cv_OVIRT_LIBS="$OVIRT_LIBS" |
14237 | 14278 | elif test -n "$PKG_CONFIG"; then |
14238 | 14279 | if test -n "$PKG_CONFIG" && \ |
14239 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"govirt-1.0\""; } >&5 | |
14240 | ($PKG_CONFIG --exists --print-errors "govirt-1.0") 2>&5 | |
14280 | { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"govirt-1.0 >= \$GOVIRT_REQUIRED\""; } >&5 | |
14281 | ($PKG_CONFIG --exists --print-errors "govirt-1.0 >= $GOVIRT_REQUIRED") 2>&5 | |
14241 | 14282 | ac_status=$? |
14242 | 14283 | $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 |
14243 | 14284 | test $ac_status = 0; }; then |
14244 | pkg_cv_OVIRT_LIBS=`$PKG_CONFIG --libs "govirt-1.0" 2>/dev/null` | |
14285 | pkg_cv_OVIRT_LIBS=`$PKG_CONFIG --libs "govirt-1.0 >= $GOVIRT_REQUIRED" 2>/dev/null` | |
14245 | 14286 | test "x$?" != "x0" && pkg_failed=yes |
14246 | 14287 | else |
14247 | 14288 | pkg_failed=yes |
14262 | 14303 | _pkg_short_errors_supported=no |
14263 | 14304 | fi |
14264 | 14305 | if test $_pkg_short_errors_supported = yes; then |
14265 | OVIRT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "govirt-1.0" 2>&1` | |
14306 | OVIRT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "govirt-1.0 >= $GOVIRT_REQUIRED" 2>&1` | |
14266 | 14307 | else |
14267 | OVIRT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "govirt-1.0" 2>&1` | |
14308 | OVIRT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "govirt-1.0 >= $GOVIRT_REQUIRED" 2>&1` | |
14268 | 14309 | fi |
14269 | 14310 | # Put the nasty error message in config.log where it belongs |
14270 | 14311 | echo "$OVIRT_PKG_ERRORS" >&5 |
14338 | 14379 | cat >>confdefs.h <<_ACEOF |
14339 | 14380 | #define BUILDID "$with_buildid" |
14340 | 14381 | _ACEOF |
14382 | ||
14383 | if test "x$with_buildid" != x; then | |
14384 | BUILDID="-$with_buildid" | |
14385 | ||
14386 | fi | |
14387 | ||
14388 | major=`echo $PACKAGE_VERSION | cut -d. -f1` | |
14389 | minor=`echo $PACKAGE_VERSION | cut -d. -f2` | |
14390 | micro=`echo $PACKAGE_VERSION | cut -d. -f3` | |
14391 | buildid=`echo $with_buildid | cut -d. -f1` | |
14392 | if test "x$buildid" = x; then | |
14393 | buildid=0 | |
14394 | fi | |
14395 | build=`expr $micro \* 256 + $buildid` | |
14396 | WINDOWS_PRODUCTVERSION="$major.$minor.$build" | |
14397 | ||
14398 | ||
14399 | ||
14400 | # Extract the first word of "update-mime-database", so it can be a program name with args. | |
14401 | set dummy update-mime-database; ac_word=$2 | |
14402 | { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 | |
14403 | $as_echo_n "checking for $ac_word... " >&6; } | |
14404 | if ${ac_cv_path_UPDATE_MIME_DATABASE+:} false; then : | |
14405 | $as_echo_n "(cached) " >&6 | |
14406 | else | |
14407 | case $UPDATE_MIME_DATABASE in | |
14408 | [\\/]* | ?:[\\/]*) | |
14409 | ac_cv_path_UPDATE_MIME_DATABASE="$UPDATE_MIME_DATABASE" # Let the user override the test with a path. | |
14410 | ;; | |
14411 | *) | |
14412 | as_save_IFS=$IFS; IFS=$PATH_SEPARATOR | |
14413 | for as_dir in $PATH | |
14414 | do | |
14415 | IFS=$as_save_IFS | |
14416 | test -z "$as_dir" && as_dir=. | |
14417 | for ac_exec_ext in '' $ac_executable_extensions; do | |
14418 | if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then | |
14419 | ac_cv_path_UPDATE_MIME_DATABASE="$as_dir/$ac_word$ac_exec_ext" | |
14420 | $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 | |
14421 | break 2 | |
14422 | fi | |
14423 | done | |
14424 | done | |
14425 | IFS=$as_save_IFS | |
14426 | ||
14427 | test -z "$ac_cv_path_UPDATE_MIME_DATABASE" && ac_cv_path_UPDATE_MIME_DATABASE="no" | |
14428 | ;; | |
14429 | esac | |
14430 | fi | |
14431 | UPDATE_MIME_DATABASE=$ac_cv_path_UPDATE_MIME_DATABASE | |
14432 | if test -n "$UPDATE_MIME_DATABASE"; then | |
14433 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: $UPDATE_MIME_DATABASE" >&5 | |
14434 | $as_echo "$UPDATE_MIME_DATABASE" >&6; } | |
14435 | else | |
14436 | { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 | |
14437 | $as_echo "no" >&6; } | |
14438 | fi | |
14439 | ||
14440 | ||
14441 | ||
14442 | # Check whether --enable-update-mimedb was given. | |
14443 | if test "${enable_update_mimedb+set}" = set; then : | |
14444 | enableval=$enable_update_mimedb; | |
14445 | else | |
14446 | enable_update_mimedb=yes | |
14447 | fi | |
14448 | ||
14449 | if test x$enable_update_mimedb = xyes; then | |
14450 | ENABLE_UPDATE_MIMEDB_TRUE= | |
14451 | ENABLE_UPDATE_MIMEDB_FALSE='#' | |
14452 | else | |
14453 | ENABLE_UPDATE_MIMEDB_TRUE='#' | |
14454 | ENABLE_UPDATE_MIMEDB_FALSE= | |
14455 | fi | |
14456 | ||
14341 | 14457 | |
14342 | 14458 | |
14343 | 14459 | ac_config_files="$ac_config_files Makefile data/Makefile data/virt-viewer.wxs data/virt-viewer.nsis data/virt-viewer-debug.nsis icons/Makefile icons/16x16/Makefile icons/22x22/Makefile icons/24x24/Makefile icons/32x32/Makefile icons/48x48/Makefile icons/256x256/Makefile man/Makefile mingw-virt-viewer.spec po/Makefile.in src/Makefile src/virt-viewer.rc virt-viewer.spec" |
14503 | 14619 | as_fn_error $? "conditional \"HAVE_SPICE_GTK\" was never defined. |
14504 | 14620 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 |
14505 | 14621 | fi |
14622 | if test -z "${ENABLE_UPDATE_MIMEDB_TRUE}" && test -z "${ENABLE_UPDATE_MIMEDB_FALSE}"; then | |
14623 | as_fn_error $? "conditional \"ENABLE_UPDATE_MIMEDB\" was never defined. | |
14624 | Usually this means the macro was only invoked conditionally." "$LINENO" 5 | |
14625 | fi | |
14506 | 14626 | |
14507 | 14627 | : "${CONFIG_STATUS=./config.status}" |
14508 | 14628 | ac_write_fail=0 |
14900 | 15020 | # report actual input values of CONFIG_FILES etc. instead of their |
14901 | 15021 | # values after options handling. |
14902 | 15022 | ac_log=" |
14903 | This file was extended by virt-viewer $as_me 0.5.6, which was | |
15023 | This file was extended by virt-viewer $as_me 0.6.0, which was | |
14904 | 15024 | generated by GNU Autoconf 2.69. Invocation command line was |
14905 | 15025 | |
14906 | 15026 | CONFIG_FILES = $CONFIG_FILES |
14970 | 15090 | cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 |
14971 | 15091 | ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" |
14972 | 15092 | ac_cs_version="\\ |
14973 | virt-viewer config.status 0.5.6 | |
15093 | virt-viewer config.status 0.6.0 | |
14974 | 15094 | configured by $0, generated by GNU Autoconf 2.69, |
14975 | 15095 | with options \\"\$ac_cs_config\\" |
14976 | 15096 | |
16081 | 16201 | DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` |
16082 | 16202 | test -z "$DEPDIR" && continue |
16083 | 16203 | am__include=`sed -n 's/^am__include = //p' < "$mf"` |
16084 | test -z "am__include" && continue | |
16204 | test -z "$am__include" && continue | |
16085 | 16205 | am__quote=`sed -n 's/^am__quote = //p' < "$mf"` |
16086 | 16206 | # Find all dependency output files, they are included files with |
16087 | 16207 | # $(DEPDIR) in their names. We invoke sed twice because it is the |
0 | 0 | |
1 | AC_INIT([virt-viewer],[0.5.6]) | |
1 | AC_INIT([virt-viewer],[0.6.0]) | |
2 | 2 | AC_CONFIG_SRCDIR(src/virt-viewer-main.c) |
3 | 3 | AC_CONFIG_MACRO_DIR([m4]) |
4 | 4 | AC_CONFIG_AUX_DIR([build-aux]) |
18 | 18 | GTK3_REQUIRED="3.0" |
19 | 19 | GTK_VNC1_REQUIRED="0.3.8" |
20 | 20 | GTK_VNC2_REQUIRED="0.4.0" |
21 | SPICE_GTK_REQUIRED="0.16.26" | |
21 | SPICE_GTK_REQUIRED="0.22" | |
22 | 22 | SPICE_PROTOCOL_REQUIRED="0.10.1" |
23 | GOVIRT_REQUIRED="0.3.0" | |
24 | ||
25 | AC_SUBST([GLIB2_REQUIRED]) | |
26 | AC_SUBST([LIBXML2_REQUIRED]) | |
27 | AC_SUBST([LIBVIRT_REQUIRED]) | |
28 | AC_SUBST([GTK2_REQUIRED]) | |
29 | AC_SUBST([GTK3_REQUIRED]) | |
30 | AC_SUBST([GTK_VNC1_REQUIRED]) | |
31 | AC_SUBST([GTK_VNC2_REQUIRED]) | |
32 | AC_SUBST([SPICE_GTK_REQUIRED]) | |
33 | AC_SUBST([SPICE_PROTOCOL_REQUIRED]) | |
34 | AC_SUBST([GOVIRT_REQUIRED]) | |
23 | 35 | |
24 | 36 | AC_MSG_CHECKING([for native Win32]) |
25 | 37 | case "$host_os" in |
106 | 118 | |
107 | 119 | AC_MSG_CHECKING([which gtk+ version to compile against]) |
108 | 120 | AC_ARG_WITH([gtk], |
109 | [AS_HELP_STRING([--with-gtk=2.0|3.0],[which gtk+ version to compile against (default: 2.0)])], | |
121 | [AS_HELP_STRING([--with-gtk=2.0|3.0],[which gtk+ version to compile against (default: 3.0)])], | |
110 | 122 | [case "$with_gtk" in |
111 | 123 | 2.0|3.0) ;; |
112 | 124 | *) AC_MSG_ERROR([invalid gtk version specified]) ;; |
113 | 125 | esac], |
114 | [with_gtk=2.0]) | |
126 | [with_gtk=3.0]) | |
115 | 127 | AC_MSG_RESULT([$with_gtk]) |
116 | 128 | |
117 | 129 | case "$with_gtk" in |
177 | 189 | AS_HELP_STRING([--without-ovirt], [Ignore presence of librest and disable oVirt support])) |
178 | 190 | |
179 | 191 | AS_IF([test "x$with_ovirt" != "xno"], |
180 | [PKG_CHECK_MODULES([OVIRT], [govirt-1.0], | |
192 | [PKG_CHECK_MODULES([OVIRT], [govirt-1.0 >= $GOVIRT_REQUIRED], | |
181 | 193 | [have_ovirt=yes], [have_ovirt=no])], |
182 | 194 | [have_ovirt=no]) |
183 | 195 | |
200 | 212 | AC_ARG_WITH([buildid], |
201 | 213 | AS_HELP_STRING([--with-buildid=id], [Set additional build version details])) |
202 | 214 | AC_DEFINE_UNQUOTED([BUILDID], "$with_buildid", [Build version details]) |
215 | if test "x$with_buildid" != x; then | |
216 | AC_SUBST([BUILDID], "-$with_buildid") | |
217 | fi | |
218 | ||
219 | major=`echo $PACKAGE_VERSION | cut -d. -f1` | |
220 | minor=`echo $PACKAGE_VERSION | cut -d. -f2` | |
221 | micro=`echo $PACKAGE_VERSION | cut -d. -f3` | |
222 | buildid=`echo $with_buildid | cut -d. -f1` | |
223 | if test "x$buildid" = x; then | |
224 | buildid=0 | |
225 | fi | |
226 | build=`expr $micro \* 256 + $buildid` | |
227 | WINDOWS_PRODUCTVERSION="$major.$minor.$build" | |
228 | AC_SUBST([WINDOWS_PRODUCTVERSION]) | |
229 | ||
230 | ||
231 | AC_PATH_PROG(UPDATE_MIME_DATABASE, update-mime-database, no) | |
232 | ||
233 | AC_ARG_ENABLE(update-mimedb, | |
234 | AS_HELP_STRING([--disable-update-mimedb], | |
235 | [disable the update-mime-database after install [default=no]]),, | |
236 | enable_update_mimedb=yes) | |
237 | AM_CONDITIONAL(ENABLE_UPDATE_MIMEDB, test x$enable_update_mimedb = xyes) | |
238 | ||
203 | 239 | |
204 | 240 | AC_CONFIG_FILES([ |
205 | 241 | Makefile |
18 | 18 | $(AM_V_GEN)rpm -qa | grep $(host_os) | sort | unix2dos > $@ |
19 | 19 | |
20 | 20 | virt-viewer-$(VERSION).exe: virt-viewer.nsis deps.txt |
21 | $(AM_V_GEN)DESTDIR=`mktemp -d` && \ | |
22 | make -C $(top_builddir) install DESTDIR=$$DESTDIR >/dev/null && \ | |
23 | makensis -NOCD -DDESTDIR=$$DESTDIR $< >/dev/null && \ | |
24 | rm -rf $$DESTDIR | |
25 | ||
26 | virt-viewer-debug-$(VERSION).exe: virt-viewer-debug.nsis | |
21 | 27 | $(AM_V_GEN)DESTDIR=`mktemp -d` && \ |
22 | 28 | make -C $(top_builddir) install DESTDIR=$$DESTDIR >/dev/null && \ |
23 | 29 | makensis -NOCD -DDESTDIR=$$DESTDIR $< >/dev/null && \ |
56 | 62 | mime_DATA = virt-viewer-mime.xml |
57 | 63 | @INTLTOOL_XML_RULE@ |
58 | 64 | |
65 | install-data-hook: | |
66 | if ENABLE_UPDATE_MIMEDB | |
67 | @if $(AM_V_P); then set -x; else echo " INSTALL update-mime-database"; fi; \ | |
68 | $(UPDATE_MIME_DATABASE) "$(DESTDIR)$(datadir)/mime"; | |
69 | endif | |
70 | ||
71 | uninstall-hook: | |
72 | if ENABLE_UPDATE_MIMEDB | |
73 | @if $(AM_V_P); then set -x; else echo " UNINSTALL update-mime-database"; fi; \ | |
74 | $(UPDATE_MIME_DATABASE) "$(DESTDIR)$(datadir)/mime"; | |
75 | endif | |
76 | ||
59 | 77 | CLEANFILES += $(mime_DATA) $(desktop_DATA) |
60 | 78 | EXTRA_DIST += $(MIMEFILES) $(DESKTOPFILES) |
61 | 79 |
0 | # Makefile.in generated by automake 1.13.1 from Makefile.am. | |
0 | # Makefile.in generated by automake 1.13.4 from Makefile.am. | |
1 | 1 | # @configure_input@ |
2 | 2 | |
3 | # Copyright (C) 1994-2012 Free Software Foundation, Inc. | |
3 | # Copyright (C) 1994-2013 Free Software Foundation, Inc. | |
4 | 4 | |
5 | 5 | # This Makefile.in is free software; the Free Software Foundation |
6 | 6 | # gives unlimited permission to copy and/or distribute it, |
14 | 14 | @SET_MAKE@ |
15 | 15 | |
16 | 16 | VPATH = @srcdir@ |
17 | am__make_dryrun = \ | |
18 | { \ | |
19 | am__dry=no; \ | |
17 | am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' | |
18 | am__make_running_with_option = \ | |
19 | case $${target_option-} in \ | |
20 | ?) ;; \ | |
21 | *) echo "am__make_running_with_option: internal error: invalid" \ | |
22 | "target option '$${target_option-}' specified" >&2; \ | |
23 | exit 1;; \ | |
24 | esac; \ | |
25 | has_opt=no; \ | |
26 | sane_makeflags=$$MAKEFLAGS; \ | |
27 | if $(am__is_gnu_make); then \ | |
28 | sane_makeflags=$$MFLAGS; \ | |
29 | else \ | |
20 | 30 | case $$MAKEFLAGS in \ |
21 | 31 | *\\[\ \ ]*) \ |
22 | echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ | |
23 | | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ | |
24 | *) \ | |
25 | for am__flg in $$MAKEFLAGS; do \ | |
26 | case $$am__flg in \ | |
27 | *=*|--*) ;; \ | |
28 | *n*) am__dry=yes; break;; \ | |
29 | esac; \ | |
30 | done;; \ | |
32 | bs=\\; \ | |
33 | sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ | |
34 | | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ | |
31 | 35 | esac; \ |
32 | test $$am__dry = yes; \ | |
33 | } | |
36 | fi; \ | |
37 | skip_next=no; \ | |
38 | strip_trailopt () \ | |
39 | { \ | |
40 | flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ | |
41 | }; \ | |
42 | for flg in $$sane_makeflags; do \ | |
43 | test $$skip_next = yes && { skip_next=no; continue; }; \ | |
44 | case $$flg in \ | |
45 | *=*|--*) continue;; \ | |
46 | -*I) strip_trailopt 'I'; skip_next=yes;; \ | |
47 | -*I?*) strip_trailopt 'I';; \ | |
48 | -*O) strip_trailopt 'O'; skip_next=yes;; \ | |
49 | -*O?*) strip_trailopt 'O';; \ | |
50 | -*l) strip_trailopt 'l'; skip_next=yes;; \ | |
51 | -*l?*) strip_trailopt 'l';; \ | |
52 | -[dEDm]) skip_next=yes;; \ | |
53 | -[JT]) skip_next=yes;; \ | |
54 | esac; \ | |
55 | case $$flg in \ | |
56 | *$$target_option*) has_opt=yes; break;; \ | |
57 | esac; \ | |
58 | done; \ | |
59 | test $$has_opt = yes | |
60 | am__make_dryrun = (target_option=n; $(am__make_running_with_option)) | |
61 | am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) | |
34 | 62 | pkgdatadir = $(datadir)/@PACKAGE@ |
35 | 63 | pkgincludedir = $(includedir)/@PACKAGE@ |
36 | 64 | pkglibdir = $(libdir)/@PACKAGE@ |
133 | 161 | AUTOHEADER = @AUTOHEADER@ |
134 | 162 | AUTOMAKE = @AUTOMAKE@ |
135 | 163 | AWK = @AWK@ |
164 | BUILDID = @BUILDID@ | |
136 | 165 | CATALOGS = @CATALOGS@ |
137 | 166 | CATOBJEXT = @CATOBJEXT@ |
138 | 167 | CC = @CC@ |
156 | 185 | GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ |
157 | 186 | GLIB2_CFLAGS = @GLIB2_CFLAGS@ |
158 | 187 | GLIB2_LIBS = @GLIB2_LIBS@ |
188 | GLIB2_REQUIRED = @GLIB2_REQUIRED@ | |
159 | 189 | GLIB_MKENUMS = @GLIB_MKENUMS@ |
160 | 190 | GMOFILES = @GMOFILES@ |
161 | 191 | GMSGFMT = @GMSGFMT@ |
192 | GOVIRT_REQUIRED = @GOVIRT_REQUIRED@ | |
162 | 193 | GREP = @GREP@ |
194 | GTK2_REQUIRED = @GTK2_REQUIRED@ | |
195 | GTK3_REQUIRED = @GTK3_REQUIRED@ | |
163 | 196 | GTK_API_VERSION = @GTK_API_VERSION@ |
164 | 197 | GTK_CFLAGS = @GTK_CFLAGS@ |
165 | 198 | GTK_LIBS = @GTK_LIBS@ |
166 | 199 | GTK_REQUIRED = @GTK_REQUIRED@ |
200 | GTK_VNC1_REQUIRED = @GTK_VNC1_REQUIRED@ | |
201 | GTK_VNC2_REQUIRED = @GTK_VNC2_REQUIRED@ | |
167 | 202 | GTK_VNC_API_VERSION = @GTK_VNC_API_VERSION@ |
168 | 203 | GTK_VNC_CFLAGS = @GTK_VNC_CFLAGS@ |
169 | 204 | GTK_VNC_LIBS = @GTK_VNC_LIBS@ |
190 | 225 | LIBTOOL = @LIBTOOL@ |
191 | 226 | LIBVIRT_CFLAGS = @LIBVIRT_CFLAGS@ |
192 | 227 | LIBVIRT_LIBS = @LIBVIRT_LIBS@ |
228 | LIBVIRT_REQUIRED = @LIBVIRT_REQUIRED@ | |
193 | 229 | LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ |
194 | 230 | LIBXML2_LIBS = @LIBXML2_LIBS@ |
231 | LIBXML2_REQUIRED = @LIBXML2_REQUIRED@ | |
195 | 232 | LIPO = @LIPO@ |
196 | 233 | LN_S = @LN_S@ |
197 | 234 | LTLIBOBJS = @LTLIBOBJS@ |
233 | 270 | SPICE_CONTROLLER_LIBS = @SPICE_CONTROLLER_LIBS@ |
234 | 271 | SPICE_GTK_CFLAGS = @SPICE_GTK_CFLAGS@ |
235 | 272 | SPICE_GTK_LIBS = @SPICE_GTK_LIBS@ |
273 | SPICE_GTK_REQUIRED = @SPICE_GTK_REQUIRED@ | |
236 | 274 | SPICE_PROTOCOL_CFLAGS = @SPICE_PROTOCOL_CFLAGS@ |
237 | 275 | SPICE_PROTOCOL_LIBS = @SPICE_PROTOCOL_LIBS@ |
276 | SPICE_PROTOCOL_REQUIRED = @SPICE_PROTOCOL_REQUIRED@ | |
238 | 277 | STRIP = @STRIP@ |
278 | UPDATE_MIME_DATABASE = @UPDATE_MIME_DATABASE@ | |
239 | 279 | USE_NLS = @USE_NLS@ |
240 | 280 | VERSION = @VERSION@ |
241 | 281 | WARN_CFLAGS = @WARN_CFLAGS@ |
282 | WINDOWS_PRODUCTVERSION = @WINDOWS_PRODUCTVERSION@ | |
242 | 283 | WINDRES = @WINDRES@ |
243 | 284 | WIXL_ARCH = @WIXL_ARCH@ |
244 | 285 | XGETTEXT = @XGETTEXT@ |
470 | 511 | maintainer-clean-generic: |
471 | 512 | @echo "This command is intended for maintainers to use" |
472 | 513 | @echo "it deletes files that may require special tools to rebuild." |
514 | @OS_WIN32_TRUE@install-data-hook: | |
515 | @OS_WIN32_TRUE@uninstall-hook: | |
473 | 516 | clean: clean-am |
474 | 517 | |
475 | 518 | clean-am: clean-generic clean-libtool mostlyclean-am |
491 | 534 | info-am: |
492 | 535 | |
493 | 536 | install-data-am: install-desktopDATA install-mimeDATA |
494 | ||
537 | @$(NORMAL_INSTALL) | |
538 | $(MAKE) $(AM_MAKEFLAGS) install-data-hook | |
495 | 539 | install-dvi: install-dvi-am |
496 | 540 | |
497 | 541 | install-dvi-am: |
535 | 579 | ps-am: |
536 | 580 | |
537 | 581 | uninstall-am: uninstall-desktopDATA uninstall-mimeDATA |
538 | ||
539 | .MAKE: install-am install-strip | |
582 | @$(NORMAL_INSTALL) | |
583 | $(MAKE) $(AM_MAKEFLAGS) uninstall-hook | |
584 | .MAKE: install-am install-data-am install-strip uninstall-am | |
540 | 585 | |
541 | 586 | .PHONY: all all-am all-local check check-am clean clean-generic \ |
542 | 587 | clean-libtool cscopelist-am ctags-am distclean \ |
543 | 588 | distclean-generic distclean-libtool distdir dvi dvi-am html \ |
544 | 589 | html-am info info-am install install-am install-data \ |
545 | install-data-am install-desktopDATA install-dvi install-dvi-am \ | |
546 | install-exec install-exec-am install-html install-html-am \ | |
547 | install-info install-info-am install-man install-mimeDATA \ | |
548 | install-pdf install-pdf-am install-ps install-ps-am \ | |
549 | install-strip installcheck installcheck-am installdirs \ | |
550 | maintainer-clean maintainer-clean-generic mostlyclean \ | |
551 | mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ | |
552 | tags-am uninstall uninstall-am uninstall-desktopDATA \ | |
590 | install-data-am install-data-hook install-desktopDATA \ | |
591 | install-dvi install-dvi-am install-exec install-exec-am \ | |
592 | install-html install-html-am install-info install-info-am \ | |
593 | install-man install-mimeDATA install-pdf install-pdf-am \ | |
594 | install-ps install-ps-am install-strip installcheck \ | |
595 | installcheck-am installdirs maintainer-clean \ | |
596 | maintainer-clean-generic mostlyclean mostlyclean-generic \ | |
597 | mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ | |
598 | uninstall-am uninstall-desktopDATA uninstall-hook \ | |
553 | 599 | uninstall-mimeDATA |
554 | 600 | |
555 | 601 | |
561 | 607 | @OS_WIN32_TRUE@ $(AM_V_GEN)rpm -qa | grep $(host_os) | sort | unix2dos > $@ |
562 | 608 | |
563 | 609 | @OS_WIN32_TRUE@virt-viewer-$(VERSION).exe: virt-viewer.nsis deps.txt |
610 | @OS_WIN32_TRUE@ $(AM_V_GEN)DESTDIR=`mktemp -d` && \ | |
611 | @OS_WIN32_TRUE@ make -C $(top_builddir) install DESTDIR=$$DESTDIR >/dev/null && \ | |
612 | @OS_WIN32_TRUE@ makensis -NOCD -DDESTDIR=$$DESTDIR $< >/dev/null && \ | |
613 | @OS_WIN32_TRUE@ rm -rf $$DESTDIR | |
614 | ||
615 | @OS_WIN32_TRUE@virt-viewer-debug-$(VERSION).exe: virt-viewer-debug.nsis | |
564 | 616 | @OS_WIN32_TRUE@ $(AM_V_GEN)DESTDIR=`mktemp -d` && \ |
565 | 617 | @OS_WIN32_TRUE@ make -C $(top_builddir) install DESTDIR=$$DESTDIR >/dev/null && \ |
566 | 618 | @OS_WIN32_TRUE@ makensis -NOCD -DDESTDIR=$$DESTDIR $< >/dev/null && \ |
583 | 635 | @OS_WIN32_FALSE@@INTLTOOL_DESKTOP_RULE@ |
584 | 636 | @OS_WIN32_FALSE@@INTLTOOL_XML_RULE@ |
585 | 637 | |
638 | @OS_WIN32_FALSE@install-data-hook: | |
639 | @ENABLE_UPDATE_MIMEDB_TRUE@@OS_WIN32_FALSE@ @if $(AM_V_P); then set -x; else echo " INSTALL update-mime-database"; fi; \ | |
640 | @ENABLE_UPDATE_MIMEDB_TRUE@@OS_WIN32_FALSE@ $(UPDATE_MIME_DATABASE) "$(DESTDIR)$(datadir)/mime"; | |
641 | ||
642 | @OS_WIN32_FALSE@uninstall-hook: | |
643 | @ENABLE_UPDATE_MIMEDB_TRUE@@OS_WIN32_FALSE@ @if $(AM_V_P); then set -x; else echo " UNINSTALL update-mime-database"; fi; \ | |
644 | @ENABLE_UPDATE_MIMEDB_TRUE@@OS_WIN32_FALSE@ $(UPDATE_MIME_DATABASE) "$(DESTDIR)$(datadir)/mime"; | |
645 | ||
586 | 646 | -include $(top_srcdir)/git.mk |
587 | 647 | |
588 | 648 | # Tell versions [3.59,3.63) of GNU make to not export all variables. |
3 | 3 | Exec=remote-viewer %u |
4 | 4 | Type=Application |
5 | 5 | Terminal=false |
6 | MimeType=x-scheme-handler/spice;application/x-virt-viewer | |
6 | MimeType=x-scheme-handler/spice;application/x-virt-viewer; | |
7 | 7 | StartupNotify=true |
8 | 8 | Categories=GNOME;GTK;Network;RemoteAccess; |
9 | Icon=virt-viewer |
1 | 1 | |
2 | 2 | <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> |
3 | 3 | |
4 | <?define Version = "@VERSION@"?> | |
4 | <?define Version = "@WINDOWS_PRODUCTVERSION@"?> | |
5 | 5 | <?define Arch = "@WIXL_ARCH@"?> |
6 | 6 | <?if $(var.Arch) = "x64"?> |
7 | 7 | <?define GLIB_ARCH = "win64"?> |
21 | 21 | |
22 | 22 | <?define UpgradeCode = "5B027138-1A63-49E6-877E-055E5EEC1903"?> |
23 | 23 | <Product Id="*" |
24 | Name="VirtViewer $(var.Version) ($(var.ArchString))" | |
24 | Name="VirtViewer @VERSION@@BUILDID@ ($(var.ArchString))" | |
25 | 25 | Manufacturer="$(env.MANUFACTURER)" |
26 | 26 | Version="$(var.Version)" |
27 | 27 | UpgradeCode="$(var.UpgradeCode)" |
75 | 75 | </Directory> |
76 | 76 | </Directory> |
77 | 77 | |
78 | <DirectoryRef Id="INSTALLDIR"> | |
79 | <Directory Id="DirShare" Name="share"> | |
80 | <Directory Id="DirHwdata" Name="hwdata"> | |
81 | <Component Id="CHwdataUSB" Guid="*"> | |
82 | <File Id="FHwdataUSB" KeyPath="yes" Source="/usr/share/hwdata/usb.ids"/> | |
83 | </Component> | |
84 | </Directory> | |
85 | ||
86 | <Directory Id="DirIcons" Name="icons"> | |
87 | <Directory Id="DirIconsHi" Name="hicolor"> | |
88 | <Directory Id="DirIconsHi16x16" Name="16x16"> | |
89 | <Directory Id="DirIconsHi16x16Apps" Name="apps"> | |
90 | <Component Id="CIconsHi16x16Apps" Guid="*"> | |
91 | <File Id="FIconskeyboardshortcuts" KeyPath="yes" | |
92 | Source="/usr/share/icons/gnome/16x16/apps/preferences-desktop-keyboard-shortcuts.png"/> | |
93 | </Component> | |
94 | </Directory> | |
95 | </Directory> | |
96 | </Directory> | |
97 | </Directory> | |
98 | </Directory> | |
99 | </DirectoryRef> | |
100 | ||
78 | 101 | <DirectoryRef Id="MENUDIR"> |
79 | 102 | <Component Id="CShortcut" Guid="*"> |
80 | 103 | <Shortcut Id="ApplicationStartMenuShortcut" |
96 | 119 | <ComponentRef Id="CShortcut"/> |
97 | 120 | <ComponentRef Id="CRegistryEntries"/> |
98 | 121 | <ComponentRef Id="CProgIds"/> |
122 | <ComponentRef Id="CIconsHi16x16Apps"/> | |
123 | <ComponentRef Id="CHwdataUSB"/> | |
99 | 124 | </Feature> |
100 | 125 | |
101 | 126 | <InstallExecuteSequence> |
0 | # Makefile.in generated by automake 1.13.1 from Makefile.am. | |
0 | # Makefile.in generated by automake 1.13.4 from Makefile.am. | |
1 | 1 | # @configure_input@ |
2 | 2 | |
3 | # Copyright (C) 1994-2012 Free Software Foundation, Inc. | |
3 | # Copyright (C) 1994-2013 Free Software Foundation, Inc. | |
4 | 4 | |
5 | 5 | # This Makefile.in is free software; the Free Software Foundation |
6 | 6 | # gives unlimited permission to copy and/or distribute it, |
14 | 14 | @SET_MAKE@ |
15 | 15 | |
16 | 16 | VPATH = @srcdir@ |
17 | am__make_dryrun = \ | |
18 | { \ | |
19 | am__dry=no; \ | |
17 | am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' | |
18 | am__make_running_with_option = \ | |
19 | case $${target_option-} in \ | |
20 | ?) ;; \ | |
21 | *) echo "am__make_running_with_option: internal error: invalid" \ | |
22 | "target option '$${target_option-}' specified" >&2; \ | |
23 | exit 1;; \ | |
24 | esac; \ | |
25 | has_opt=no; \ | |
26 | sane_makeflags=$$MAKEFLAGS; \ | |
27 | if $(am__is_gnu_make); then \ | |
28 | sane_makeflags=$$MFLAGS; \ | |
29 | else \ | |
20 | 30 | case $$MAKEFLAGS in \ |
21 | 31 | *\\[\ \ ]*) \ |
22 | echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ | |
23 | | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ | |
24 | *) \ | |
25 | for am__flg in $$MAKEFLAGS; do \ | |
26 | case $$am__flg in \ | |
27 | *=*|--*) ;; \ | |
28 | *n*) am__dry=yes; break;; \ | |
29 | esac; \ | |
30 | done;; \ | |
32 | bs=\\; \ | |
33 | sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ | |
34 | | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ | |
31 | 35 | esac; \ |
32 | test $$am__dry = yes; \ | |
33 | } | |
36 | fi; \ | |
37 | skip_next=no; \ | |
38 | strip_trailopt () \ | |
39 | { \ | |
40 | flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ | |
41 | }; \ | |
42 | for flg in $$sane_makeflags; do \ | |
43 | test $$skip_next = yes && { skip_next=no; continue; }; \ | |
44 | case $$flg in \ | |
45 | *=*|--*) continue;; \ | |
46 | -*I) strip_trailopt 'I'; skip_next=yes;; \ | |
47 | -*I?*) strip_trailopt 'I';; \ | |
48 | -*O) strip_trailopt 'O'; skip_next=yes;; \ | |
49 | -*O?*) strip_trailopt 'O';; \ | |
50 | -*l) strip_trailopt 'l'; skip_next=yes;; \ | |
51 | -*l?*) strip_trailopt 'l';; \ | |
52 | -[dEDm]) skip_next=yes;; \ | |
53 | -[JT]) skip_next=yes;; \ | |
54 | esac; \ | |
55 | case $$flg in \ | |
56 | *$$target_option*) has_opt=yes; break;; \ | |
57 | esac; \ | |
58 | done; \ | |
59 | test $$has_opt = yes | |
60 | am__make_dryrun = (target_option=n; $(am__make_running_with_option)) | |
61 | am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) | |
34 | 62 | pkgdatadir = $(datadir)/@PACKAGE@ |
35 | 63 | pkgincludedir = $(includedir)/@PACKAGE@ |
36 | 64 | pkglibdir = $(libdir)/@PACKAGE@ |
122 | 150 | AUTOHEADER = @AUTOHEADER@ |
123 | 151 | AUTOMAKE = @AUTOMAKE@ |
124 | 152 | AWK = @AWK@ |
153 | BUILDID = @BUILDID@ | |
125 | 154 | CATALOGS = @CATALOGS@ |
126 | 155 | CATOBJEXT = @CATOBJEXT@ |
127 | 156 | CC = @CC@ |
145 | 174 | GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ |
146 | 175 | GLIB2_CFLAGS = @GLIB2_CFLAGS@ |
147 | 176 | GLIB2_LIBS = @GLIB2_LIBS@ |
177 | GLIB2_REQUIRED = @GLIB2_REQUIRED@ | |
148 | 178 | GLIB_MKENUMS = @GLIB_MKENUMS@ |
149 | 179 | GMOFILES = @GMOFILES@ |
150 | 180 | GMSGFMT = @GMSGFMT@ |
181 | GOVIRT_REQUIRED = @GOVIRT_REQUIRED@ | |
151 | 182 | GREP = @GREP@ |
183 | GTK2_REQUIRED = @GTK2_REQUIRED@ | |
184 | GTK3_REQUIRED = @GTK3_REQUIRED@ | |
152 | 185 | GTK_API_VERSION = @GTK_API_VERSION@ |
153 | 186 | GTK_CFLAGS = @GTK_CFLAGS@ |
154 | 187 | GTK_LIBS = @GTK_LIBS@ |
155 | 188 | GTK_REQUIRED = @GTK_REQUIRED@ |
189 | GTK_VNC1_REQUIRED = @GTK_VNC1_REQUIRED@ | |
190 | GTK_VNC2_REQUIRED = @GTK_VNC2_REQUIRED@ | |
156 | 191 | GTK_VNC_API_VERSION = @GTK_VNC_API_VERSION@ |
157 | 192 | GTK_VNC_CFLAGS = @GTK_VNC_CFLAGS@ |
158 | 193 | GTK_VNC_LIBS = @GTK_VNC_LIBS@ |
179 | 214 | LIBTOOL = @LIBTOOL@ |
180 | 215 | LIBVIRT_CFLAGS = @LIBVIRT_CFLAGS@ |
181 | 216 | LIBVIRT_LIBS = @LIBVIRT_LIBS@ |
217 | LIBVIRT_REQUIRED = @LIBVIRT_REQUIRED@ | |
182 | 218 | LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ |
183 | 219 | LIBXML2_LIBS = @LIBXML2_LIBS@ |
220 | LIBXML2_REQUIRED = @LIBXML2_REQUIRED@ | |
184 | 221 | LIPO = @LIPO@ |
185 | 222 | LN_S = @LN_S@ |
186 | 223 | LTLIBOBJS = @LTLIBOBJS@ |
222 | 259 | SPICE_CONTROLLER_LIBS = @SPICE_CONTROLLER_LIBS@ |
223 | 260 | SPICE_GTK_CFLAGS = @SPICE_GTK_CFLAGS@ |
224 | 261 | SPICE_GTK_LIBS = @SPICE_GTK_LIBS@ |
262 | SPICE_GTK_REQUIRED = @SPICE_GTK_REQUIRED@ | |
225 | 263 | SPICE_PROTOCOL_CFLAGS = @SPICE_PROTOCOL_CFLAGS@ |
226 | 264 | SPICE_PROTOCOL_LIBS = @SPICE_PROTOCOL_LIBS@ |
265 | SPICE_PROTOCOL_REQUIRED = @SPICE_PROTOCOL_REQUIRED@ | |
227 | 266 | STRIP = @STRIP@ |
267 | UPDATE_MIME_DATABASE = @UPDATE_MIME_DATABASE@ | |
228 | 268 | USE_NLS = @USE_NLS@ |
229 | 269 | VERSION = @VERSION@ |
230 | 270 | WARN_CFLAGS = @WARN_CFLAGS@ |
271 | WINDOWS_PRODUCTVERSION = @WINDOWS_PRODUCTVERSION@ | |
231 | 272 | WINDRES = @WINDRES@ |
232 | 273 | WIXL_ARCH = @WIXL_ARCH@ |
233 | 274 | XGETTEXT = @XGETTEXT@ |
0 | # Makefile.in generated by automake 1.13.1 from Makefile.am. | |
0 | # Makefile.in generated by automake 1.13.4 from Makefile.am. | |
1 | 1 | # @configure_input@ |
2 | 2 | |
3 | # Copyright (C) 1994-2012 Free Software Foundation, Inc. | |
3 | # Copyright (C) 1994-2013 Free Software Foundation, Inc. | |
4 | 4 | |
5 | 5 | # This Makefile.in is free software; the Free Software Foundation |
6 | 6 | # gives unlimited permission to copy and/or distribute it, |
14 | 14 | @SET_MAKE@ |
15 | 15 | |
16 | 16 | VPATH = @srcdir@ |
17 | am__make_dryrun = \ | |
18 | { \ | |
19 | am__dry=no; \ | |
17 | am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' | |
18 | am__make_running_with_option = \ | |
19 | case $${target_option-} in \ | |
20 | ?) ;; \ | |
21 | *) echo "am__make_running_with_option: internal error: invalid" \ | |
22 | "target option '$${target_option-}' specified" >&2; \ | |
23 | exit 1;; \ | |
24 | esac; \ | |
25 | has_opt=no; \ | |
26 | sane_makeflags=$$MAKEFLAGS; \ | |
27 | if $(am__is_gnu_make); then \ | |
28 | sane_makeflags=$$MFLAGS; \ | |
29 | else \ | |
20 | 30 | case $$MAKEFLAGS in \ |
21 | 31 | *\\[\ \ ]*) \ |
22 | echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ | |
23 | | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ | |
24 | *) \ | |
25 | for am__flg in $$MAKEFLAGS; do \ | |
26 | case $$am__flg in \ | |
27 | *=*|--*) ;; \ | |
28 | *n*) am__dry=yes; break;; \ | |
29 | esac; \ | |
30 | done;; \ | |
32 | bs=\\; \ | |
33 | sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ | |
34 | | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ | |
31 | 35 | esac; \ |
32 | test $$am__dry = yes; \ | |
33 | } | |
36 | fi; \ | |
37 | skip_next=no; \ | |
38 | strip_trailopt () \ | |
39 | { \ | |
40 | flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ | |
41 | }; \ | |
42 | for flg in $$sane_makeflags; do \ | |
43 | test $$skip_next = yes && { skip_next=no; continue; }; \ | |
44 | case $$flg in \ | |
45 | *=*|--*) continue;; \ | |
46 | -*I) strip_trailopt 'I'; skip_next=yes;; \ | |
47 | -*I?*) strip_trailopt 'I';; \ | |
48 | -*O) strip_trailopt 'O'; skip_next=yes;; \ | |
49 | -*O?*) strip_trailopt 'O';; \ | |
50 | -*l) strip_trailopt 'l'; skip_next=yes;; \ | |
51 | -*l?*) strip_trailopt 'l';; \ | |
52 | -[dEDm]) skip_next=yes;; \ | |
53 | -[JT]) skip_next=yes;; \ | |
54 | esac; \ | |
55 | case $$flg in \ | |
56 | *$$target_option*) has_opt=yes; break;; \ | |
57 | esac; \ | |
58 | done; \ | |
59 | test $$has_opt = yes | |
60 | am__make_dryrun = (target_option=n; $(am__make_running_with_option)) | |
61 | am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) | |
34 | 62 | pkgdatadir = $(datadir)/@PACKAGE@ |
35 | 63 | pkgincludedir = $(includedir)/@PACKAGE@ |
36 | 64 | pkglibdir = $(libdir)/@PACKAGE@ |
122 | 150 | AUTOHEADER = @AUTOHEADER@ |
123 | 151 | AUTOMAKE = @AUTOMAKE@ |
124 | 152 | AWK = @AWK@ |
153 | BUILDID = @BUILDID@ | |
125 | 154 | CATALOGS = @CATALOGS@ |
126 | 155 | CATOBJEXT = @CATOBJEXT@ |
127 | 156 | CC = @CC@ |
145 | 174 | GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ |
146 | 175 | GLIB2_CFLAGS = @GLIB2_CFLAGS@ |
147 | 176 | GLIB2_LIBS = @GLIB2_LIBS@ |
177 | GLIB2_REQUIRED = @GLIB2_REQUIRED@ | |
148 | 178 | GLIB_MKENUMS = @GLIB_MKENUMS@ |
149 | 179 | GMOFILES = @GMOFILES@ |
150 | 180 | GMSGFMT = @GMSGFMT@ |
181 | GOVIRT_REQUIRED = @GOVIRT_REQUIRED@ | |
151 | 182 | GREP = @GREP@ |
183 | GTK2_REQUIRED = @GTK2_REQUIRED@ | |
184 | GTK3_REQUIRED = @GTK3_REQUIRED@ | |
152 | 185 | GTK_API_VERSION = @GTK_API_VERSION@ |
153 | 186 | GTK_CFLAGS = @GTK_CFLAGS@ |
154 | 187 | GTK_LIBS = @GTK_LIBS@ |
155 | 188 | GTK_REQUIRED = @GTK_REQUIRED@ |
189 | GTK_VNC1_REQUIRED = @GTK_VNC1_REQUIRED@ | |
190 | GTK_VNC2_REQUIRED = @GTK_VNC2_REQUIRED@ | |
156 | 191 | GTK_VNC_API_VERSION = @GTK_VNC_API_VERSION@ |
157 | 192 | GTK_VNC_CFLAGS = @GTK_VNC_CFLAGS@ |
158 | 193 | GTK_VNC_LIBS = @GTK_VNC_LIBS@ |
179 | 214 | LIBTOOL = @LIBTOOL@ |
180 | 215 | LIBVIRT_CFLAGS = @LIBVIRT_CFLAGS@ |
181 | 216 | LIBVIRT_LIBS = @LIBVIRT_LIBS@ |
217 | LIBVIRT_REQUIRED = @LIBVIRT_REQUIRED@ | |
182 | 218 | LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ |
183 | 219 | LIBXML2_LIBS = @LIBXML2_LIBS@ |
220 | LIBXML2_REQUIRED = @LIBXML2_REQUIRED@ | |
184 | 221 | LIPO = @LIPO@ |
185 | 222 | LN_S = @LN_S@ |
186 | 223 | LTLIBOBJS = @LTLIBOBJS@ |
222 | 259 | SPICE_CONTROLLER_LIBS = @SPICE_CONTROLLER_LIBS@ |
223 | 260 | SPICE_GTK_CFLAGS = @SPICE_GTK_CFLAGS@ |
224 | 261 | SPICE_GTK_LIBS = @SPICE_GTK_LIBS@ |
262 | SPICE_GTK_REQUIRED = @SPICE_GTK_REQUIRED@ | |
225 | 263 | SPICE_PROTOCOL_CFLAGS = @SPICE_PROTOCOL_CFLAGS@ |
226 | 264 | SPICE_PROTOCOL_LIBS = @SPICE_PROTOCOL_LIBS@ |
265 | SPICE_PROTOCOL_REQUIRED = @SPICE_PROTOCOL_REQUIRED@ | |
227 | 266 | STRIP = @STRIP@ |
267 | UPDATE_MIME_DATABASE = @UPDATE_MIME_DATABASE@ | |
228 | 268 | USE_NLS = @USE_NLS@ |
229 | 269 | VERSION = @VERSION@ |
230 | 270 | WARN_CFLAGS = @WARN_CFLAGS@ |
271 | WINDOWS_PRODUCTVERSION = @WINDOWS_PRODUCTVERSION@ | |
231 | 272 | WINDRES = @WINDRES@ |
232 | 273 | WIXL_ARCH = @WIXL_ARCH@ |
233 | 274 | XGETTEXT = @XGETTEXT@ |
0 | # Makefile.in generated by automake 1.13.1 from Makefile.am. | |
0 | # Makefile.in generated by automake 1.13.4 from Makefile.am. | |
1 | 1 | # @configure_input@ |
2 | 2 | |
3 | # Copyright (C) 1994-2012 Free Software Foundation, Inc. | |
3 | # Copyright (C) 1994-2013 Free Software Foundation, Inc. | |
4 | 4 | |
5 | 5 | # This Makefile.in is free software; the Free Software Foundation |
6 | 6 | # gives unlimited permission to copy and/or distribute it, |
14 | 14 | @SET_MAKE@ |
15 | 15 | |
16 | 16 | VPATH = @srcdir@ |
17 | am__make_dryrun = \ | |
18 | { \ | |
19 | am__dry=no; \ | |
17 | am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' | |
18 | am__make_running_with_option = \ | |
19 | case $${target_option-} in \ | |
20 | ?) ;; \ | |
21 | *) echo "am__make_running_with_option: internal error: invalid" \ | |
22 | "target option '$${target_option-}' specified" >&2; \ | |
23 | exit 1;; \ | |
24 | esac; \ | |
25 | has_opt=no; \ | |
26 | sane_makeflags=$$MAKEFLAGS; \ | |
27 | if $(am__is_gnu_make); then \ | |
28 | sane_makeflags=$$MFLAGS; \ | |
29 | else \ | |
20 | 30 | case $$MAKEFLAGS in \ |
21 | 31 | *\\[\ \ ]*) \ |
22 | echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ | |
23 | | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ | |
24 | *) \ | |
25 | for am__flg in $$MAKEFLAGS; do \ | |
26 | case $$am__flg in \ | |
27 | *=*|--*) ;; \ | |
28 | *n*) am__dry=yes; break;; \ | |
29 | esac; \ | |
30 | done;; \ | |
32 | bs=\\; \ | |
33 | sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ | |
34 | | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ | |
31 | 35 | esac; \ |
32 | test $$am__dry = yes; \ | |
33 | } | |
36 | fi; \ | |
37 | skip_next=no; \ | |
38 | strip_trailopt () \ | |
39 | { \ | |
40 | flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ | |
41 | }; \ | |
42 | for flg in $$sane_makeflags; do \ | |
43 | test $$skip_next = yes && { skip_next=no; continue; }; \ | |
44 | case $$flg in \ | |
45 | *=*|--*) continue;; \ | |
46 | -*I) strip_trailopt 'I'; skip_next=yes;; \ | |
47 | -*I?*) strip_trailopt 'I';; \ | |
48 | -*O) strip_trailopt 'O'; skip_next=yes;; \ | |
49 | -*O?*) strip_trailopt 'O';; \ | |
50 | -*l) strip_trailopt 'l'; skip_next=yes;; \ | |
51 | -*l?*) strip_trailopt 'l';; \ | |
52 | -[dEDm]) skip_next=yes;; \ | |
53 | -[JT]) skip_next=yes;; \ | |
54 | esac; \ | |
55 | case $$flg in \ | |
56 | *$$target_option*) has_opt=yes; break;; \ | |
57 | esac; \ | |
58 | done; \ | |
59 | test $$has_opt = yes | |
60 | am__make_dryrun = (target_option=n; $(am__make_running_with_option)) | |
61 | am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) | |
34 | 62 | pkgdatadir = $(datadir)/@PACKAGE@ |
35 | 63 | pkgincludedir = $(includedir)/@PACKAGE@ |
36 | 64 | pkglibdir = $(libdir)/@PACKAGE@ |
122 | 150 | AUTOHEADER = @AUTOHEADER@ |
123 | 151 | AUTOMAKE = @AUTOMAKE@ |
124 | 152 | AWK = @AWK@ |
153 | BUILDID = @BUILDID@ | |
125 | 154 | CATALOGS = @CATALOGS@ |
126 | 155 | CATOBJEXT = @CATOBJEXT@ |
127 | 156 | CC = @CC@ |
145 | 174 | GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ |
146 | 175 | GLIB2_CFLAGS = @GLIB2_CFLAGS@ |
147 | 176 | GLIB2_LIBS = @GLIB2_LIBS@ |
177 | GLIB2_REQUIRED = @GLIB2_REQUIRED@ | |
148 | 178 | GLIB_MKENUMS = @GLIB_MKENUMS@ |
149 | 179 | GMOFILES = @GMOFILES@ |
150 | 180 | GMSGFMT = @GMSGFMT@ |
181 | GOVIRT_REQUIRED = @GOVIRT_REQUIRED@ | |
151 | 182 | GREP = @GREP@ |
183 | GTK2_REQUIRED = @GTK2_REQUIRED@ | |
184 | GTK3_REQUIRED = @GTK3_REQUIRED@ | |
152 | 185 | GTK_API_VERSION = @GTK_API_VERSION@ |
153 | 186 | GTK_CFLAGS = @GTK_CFLAGS@ |
154 | 187 | GTK_LIBS = @GTK_LIBS@ |
155 | 188 | GTK_REQUIRED = @GTK_REQUIRED@ |
189 | GTK_VNC1_REQUIRED = @GTK_VNC1_REQUIRED@ | |
190 | GTK_VNC2_REQUIRED = @GTK_VNC2_REQUIRED@ | |
156 | 191 | GTK_VNC_API_VERSION = @GTK_VNC_API_VERSION@ |
157 | 192 | GTK_VNC_CFLAGS = @GTK_VNC_CFLAGS@ |
158 | 193 | GTK_VNC_LIBS = @GTK_VNC_LIBS@ |
179 | 214 | LIBTOOL = @LIBTOOL@ |
180 | 215 | LIBVIRT_CFLAGS = @LIBVIRT_CFLAGS@ |
181 | 216 | LIBVIRT_LIBS = @LIBVIRT_LIBS@ |
217 | LIBVIRT_REQUIRED = @LIBVIRT_REQUIRED@ | |
182 | 218 | LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ |
183 | 219 | LIBXML2_LIBS = @LIBXML2_LIBS@ |
220 | LIBXML2_REQUIRED = @LIBXML2_REQUIRED@ | |
184 | 221 | LIPO = @LIPO@ |
185 | 222 | LN_S = @LN_S@ |
186 | 223 | LTLIBOBJS = @LTLIBOBJS@ |
222 | 259 | SPICE_CONTROLLER_LIBS = @SPICE_CONTROLLER_LIBS@ |
223 | 260 | SPICE_GTK_CFLAGS = @SPICE_GTK_CFLAGS@ |
224 | 261 | SPICE_GTK_LIBS = @SPICE_GTK_LIBS@ |
262 | SPICE_GTK_REQUIRED = @SPICE_GTK_REQUIRED@ | |
225 | 263 | SPICE_PROTOCOL_CFLAGS = @SPICE_PROTOCOL_CFLAGS@ |
226 | 264 | SPICE_PROTOCOL_LIBS = @SPICE_PROTOCOL_LIBS@ |
265 | SPICE_PROTOCOL_REQUIRED = @SPICE_PROTOCOL_REQUIRED@ | |
227 | 266 | STRIP = @STRIP@ |
267 | UPDATE_MIME_DATABASE = @UPDATE_MIME_DATABASE@ | |
228 | 268 | USE_NLS = @USE_NLS@ |
229 | 269 | VERSION = @VERSION@ |
230 | 270 | WARN_CFLAGS = @WARN_CFLAGS@ |
271 | WINDOWS_PRODUCTVERSION = @WINDOWS_PRODUCTVERSION@ | |
231 | 272 | WINDRES = @WINDRES@ |
232 | 273 | WIXL_ARCH = @WIXL_ARCH@ |
233 | 274 | XGETTEXT = @XGETTEXT@ |
0 | # Makefile.in generated by automake 1.13.1 from Makefile.am. | |
0 | # Makefile.in generated by automake 1.13.4 from Makefile.am. | |
1 | 1 | # @configure_input@ |
2 | 2 | |
3 | # Copyright (C) 1994-2012 Free Software Foundation, Inc. | |
3 | # Copyright (C) 1994-2013 Free Software Foundation, Inc. | |
4 | 4 | |
5 | 5 | # This Makefile.in is free software; the Free Software Foundation |
6 | 6 | # gives unlimited permission to copy and/or distribute it, |
14 | 14 | @SET_MAKE@ |
15 | 15 | |
16 | 16 | VPATH = @srcdir@ |
17 | am__make_dryrun = \ | |
18 | { \ | |
19 | am__dry=no; \ | |
17 | am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' | |
18 | am__make_running_with_option = \ | |
19 | case $${target_option-} in \ | |
20 | ?) ;; \ | |
21 | *) echo "am__make_running_with_option: internal error: invalid" \ | |
22 | "target option '$${target_option-}' specified" >&2; \ | |
23 | exit 1;; \ | |
24 | esac; \ | |
25 | has_opt=no; \ | |
26 | sane_makeflags=$$MAKEFLAGS; \ | |
27 | if $(am__is_gnu_make); then \ | |
28 | sane_makeflags=$$MFLAGS; \ | |
29 | else \ | |
20 | 30 | case $$MAKEFLAGS in \ |
21 | 31 | *\\[\ \ ]*) \ |
22 | echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ | |
23 | | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ | |
24 | *) \ | |
25 | for am__flg in $$MAKEFLAGS; do \ | |
26 | case $$am__flg in \ | |
27 | *=*|--*) ;; \ | |
28 | *n*) am__dry=yes; break;; \ | |
29 | esac; \ | |
30 | done;; \ | |
32 | bs=\\; \ | |
33 | sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ | |
34 | | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ | |
31 | 35 | esac; \ |
32 | test $$am__dry = yes; \ | |
33 | } | |
36 | fi; \ | |
37 | skip_next=no; \ | |
38 | strip_trailopt () \ | |
39 | { \ | |
40 | flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ | |
41 | }; \ | |
42 | for flg in $$sane_makeflags; do \ | |
43 | test $$skip_next = yes && { skip_next=no; continue; }; \ | |
44 | case $$flg in \ | |
45 | *=*|--*) continue;; \ | |
46 | -*I) strip_trailopt 'I'; skip_next=yes;; \ | |
47 | -*I?*) strip_trailopt 'I';; \ | |
48 | -*O) strip_trailopt 'O'; skip_next=yes;; \ | |
49 | -*O?*) strip_trailopt 'O';; \ | |
50 | -*l) strip_trailopt 'l'; skip_next=yes;; \ | |
51 | -*l?*) strip_trailopt 'l';; \ | |
52 | -[dEDm]) skip_next=yes;; \ | |
53 | -[JT]) skip_next=yes;; \ | |
54 | esac; \ | |
55 | case $$flg in \ | |
56 | *$$target_option*) has_opt=yes; break;; \ | |
57 | esac; \ | |
58 | done; \ | |
59 | test $$has_opt = yes | |
60 | am__make_dryrun = (target_option=n; $(am__make_running_with_option)) | |
61 | am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) | |
34 | 62 | pkgdatadir = $(datadir)/@PACKAGE@ |
35 | 63 | pkgincludedir = $(includedir)/@PACKAGE@ |
36 | 64 | pkglibdir = $(libdir)/@PACKAGE@ |
122 | 150 | AUTOHEADER = @AUTOHEADER@ |
123 | 151 | AUTOMAKE = @AUTOMAKE@ |
124 | 152 | AWK = @AWK@ |
153 | BUILDID = @BUILDID@ | |
125 | 154 | CATALOGS = @CATALOGS@ |
126 | 155 | CATOBJEXT = @CATOBJEXT@ |
127 | 156 | CC = @CC@ |
145 | 174 | GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ |
146 | 175 | GLIB2_CFLAGS = @GLIB2_CFLAGS@ |
147 | 176 | GLIB2_LIBS = @GLIB2_LIBS@ |
177 | GLIB2_REQUIRED = @GLIB2_REQUIRED@ | |
148 | 178 | GLIB_MKENUMS = @GLIB_MKENUMS@ |
149 | 179 | GMOFILES = @GMOFILES@ |
150 | 180 | GMSGFMT = @GMSGFMT@ |
181 | GOVIRT_REQUIRED = @GOVIRT_REQUIRED@ | |
151 | 182 | GREP = @GREP@ |
183 | GTK2_REQUIRED = @GTK2_REQUIRED@ | |
184 | GTK3_REQUIRED = @GTK3_REQUIRED@ | |
152 | 185 | GTK_API_VERSION = @GTK_API_VERSION@ |
153 | 186 | GTK_CFLAGS = @GTK_CFLAGS@ |
154 | 187 | GTK_LIBS = @GTK_LIBS@ |
155 | 188 | GTK_REQUIRED = @GTK_REQUIRED@ |
189 | GTK_VNC1_REQUIRED = @GTK_VNC1_REQUIRED@ | |
190 | GTK_VNC2_REQUIRED = @GTK_VNC2_REQUIRED@ | |
156 | 191 | GTK_VNC_API_VERSION = @GTK_VNC_API_VERSION@ |
157 | 192 | GTK_VNC_CFLAGS = @GTK_VNC_CFLAGS@ |
158 | 193 | GTK_VNC_LIBS = @GTK_VNC_LIBS@ |
179 | 214 | LIBTOOL = @LIBTOOL@ |
180 | 215 | LIBVIRT_CFLAGS = @LIBVIRT_CFLAGS@ |
181 | 216 | LIBVIRT_LIBS = @LIBVIRT_LIBS@ |
217 | LIBVIRT_REQUIRED = @LIBVIRT_REQUIRED@ | |
182 | 218 | LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ |
183 | 219 | LIBXML2_LIBS = @LIBXML2_LIBS@ |
220 | LIBXML2_REQUIRED = @LIBXML2_REQUIRED@ | |
184 | 221 | LIPO = @LIPO@ |
185 | 222 | LN_S = @LN_S@ |
186 | 223 | LTLIBOBJS = @LTLIBOBJS@ |
222 | 259 | SPICE_CONTROLLER_LIBS = @SPICE_CONTROLLER_LIBS@ |
223 | 260 | SPICE_GTK_CFLAGS = @SPICE_GTK_CFLAGS@ |
224 | 261 | SPICE_GTK_LIBS = @SPICE_GTK_LIBS@ |
262 | SPICE_GTK_REQUIRED = @SPICE_GTK_REQUIRED@ | |
225 | 263 | SPICE_PROTOCOL_CFLAGS = @SPICE_PROTOCOL_CFLAGS@ |
226 | 264 | SPICE_PROTOCOL_LIBS = @SPICE_PROTOCOL_LIBS@ |
265 | SPICE_PROTOCOL_REQUIRED = @SPICE_PROTOCOL_REQUIRED@ | |
227 | 266 | STRIP = @STRIP@ |
267 | UPDATE_MIME_DATABASE = @UPDATE_MIME_DATABASE@ | |
228 | 268 | USE_NLS = @USE_NLS@ |
229 | 269 | VERSION = @VERSION@ |
230 | 270 | WARN_CFLAGS = @WARN_CFLAGS@ |
271 | WINDOWS_PRODUCTVERSION = @WINDOWS_PRODUCTVERSION@ | |
231 | 272 | WINDRES = @WINDRES@ |
232 | 273 | WIXL_ARCH = @WIXL_ARCH@ |
233 | 274 | XGETTEXT = @XGETTEXT@ |
0 | # Makefile.in generated by automake 1.13.1 from Makefile.am. | |
0 | # Makefile.in generated by automake 1.13.4 from Makefile.am. | |
1 | 1 | # @configure_input@ |
2 | 2 | |
3 | # Copyright (C) 1994-2012 Free Software Foundation, Inc. | |
3 | # Copyright (C) 1994-2013 Free Software Foundation, Inc. | |
4 | 4 | |
5 | 5 | # This Makefile.in is free software; the Free Software Foundation |
6 | 6 | # gives unlimited permission to copy and/or distribute it, |
14 | 14 | @SET_MAKE@ |
15 | 15 | |
16 | 16 | VPATH = @srcdir@ |
17 | am__make_dryrun = \ | |
18 | { \ | |
19 | am__dry=no; \ | |
17 | am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' | |
18 | am__make_running_with_option = \ | |
19 | case $${target_option-} in \ | |
20 | ?) ;; \ | |
21 | *) echo "am__make_running_with_option: internal error: invalid" \ | |
22 | "target option '$${target_option-}' specified" >&2; \ | |
23 | exit 1;; \ | |
24 | esac; \ | |
25 | has_opt=no; \ | |
26 | sane_makeflags=$$MAKEFLAGS; \ | |
27 | if $(am__is_gnu_make); then \ | |
28 | sane_makeflags=$$MFLAGS; \ | |
29 | else \ | |
20 | 30 | case $$MAKEFLAGS in \ |
21 | 31 | *\\[\ \ ]*) \ |
22 | echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ | |
23 | | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ | |
24 | *) \ | |
25 | for am__flg in $$MAKEFLAGS; do \ | |
26 | case $$am__flg in \ | |
27 | *=*|--*) ;; \ | |
28 | *n*) am__dry=yes; break;; \ | |
29 | esac; \ | |
30 | done;; \ | |
32 | bs=\\; \ | |
33 | sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ | |
34 | | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ | |
31 | 35 | esac; \ |
32 | test $$am__dry = yes; \ | |
33 | } | |
36 | fi; \ | |
37 | skip_next=no; \ | |
38 | strip_trailopt () \ | |
39 | { \ | |
40 | flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ | |
41 | }; \ | |
42 | for flg in $$sane_makeflags; do \ | |
43 | test $$skip_next = yes && { skip_next=no; continue; }; \ | |
44 | case $$flg in \ | |
45 | *=*|--*) continue;; \ | |
46 | -*I) strip_trailopt 'I'; skip_next=yes;; \ | |
47 | -*I?*) strip_trailopt 'I';; \ | |
48 | -*O) strip_trailopt 'O'; skip_next=yes;; \ | |
49 | -*O?*) strip_trailopt 'O';; \ | |
50 | -*l) strip_trailopt 'l'; skip_next=yes;; \ | |
51 | -*l?*) strip_trailopt 'l';; \ | |
52 | -[dEDm]) skip_next=yes;; \ | |
53 | -[JT]) skip_next=yes;; \ | |
54 | esac; \ | |
55 | case $$flg in \ | |
56 | *$$target_option*) has_opt=yes; break;; \ | |
57 | esac; \ | |
58 | done; \ | |
59 | test $$has_opt = yes | |
60 | am__make_dryrun = (target_option=n; $(am__make_running_with_option)) | |
61 | am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) | |
34 | 62 | pkgdatadir = $(datadir)/@PACKAGE@ |
35 | 63 | pkgincludedir = $(includedir)/@PACKAGE@ |
36 | 64 | pkglibdir = $(libdir)/@PACKAGE@ |
122 | 150 | AUTOHEADER = @AUTOHEADER@ |
123 | 151 | AUTOMAKE = @AUTOMAKE@ |
124 | 152 | AWK = @AWK@ |
153 | BUILDID = @BUILDID@ | |
125 | 154 | CATALOGS = @CATALOGS@ |
126 | 155 | CATOBJEXT = @CATOBJEXT@ |
127 | 156 | CC = @CC@ |
145 | 174 | GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ |
146 | 175 | GLIB2_CFLAGS = @GLIB2_CFLAGS@ |
147 | 176 | GLIB2_LIBS = @GLIB2_LIBS@ |
177 | GLIB2_REQUIRED = @GLIB2_REQUIRED@ | |
148 | 178 | GLIB_MKENUMS = @GLIB_MKENUMS@ |
149 | 179 | GMOFILES = @GMOFILES@ |
150 | 180 | GMSGFMT = @GMSGFMT@ |
181 | GOVIRT_REQUIRED = @GOVIRT_REQUIRED@ | |
151 | 182 | GREP = @GREP@ |
183 | GTK2_REQUIRED = @GTK2_REQUIRED@ | |
184 | GTK3_REQUIRED = @GTK3_REQUIRED@ | |
152 | 185 | GTK_API_VERSION = @GTK_API_VERSION@ |
153 | 186 | GTK_CFLAGS = @GTK_CFLAGS@ |
154 | 187 | GTK_LIBS = @GTK_LIBS@ |
155 | 188 | GTK_REQUIRED = @GTK_REQUIRED@ |
189 | GTK_VNC1_REQUIRED = @GTK_VNC1_REQUIRED@ | |
190 | GTK_VNC2_REQUIRED = @GTK_VNC2_REQUIRED@ | |
156 | 191 | GTK_VNC_API_VERSION = @GTK_VNC_API_VERSION@ |
157 | 192 | GTK_VNC_CFLAGS = @GTK_VNC_CFLAGS@ |
158 | 193 | GTK_VNC_LIBS = @GTK_VNC_LIBS@ |
179 | 214 | LIBTOOL = @LIBTOOL@ |
180 | 215 | LIBVIRT_CFLAGS = @LIBVIRT_CFLAGS@ |
181 | 216 | LIBVIRT_LIBS = @LIBVIRT_LIBS@ |
217 | LIBVIRT_REQUIRED = @LIBVIRT_REQUIRED@ | |
182 | 218 | LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ |
183 | 219 | LIBXML2_LIBS = @LIBXML2_LIBS@ |
220 | LIBXML2_REQUIRED = @LIBXML2_REQUIRED@ | |
184 | 221 | LIPO = @LIPO@ |
185 | 222 | LN_S = @LN_S@ |
186 | 223 | LTLIBOBJS = @LTLIBOBJS@ |
222 | 259 | SPICE_CONTROLLER_LIBS = @SPICE_CONTROLLER_LIBS@ |
223 | 260 | SPICE_GTK_CFLAGS = @SPICE_GTK_CFLAGS@ |
224 | 261 | SPICE_GTK_LIBS = @SPICE_GTK_LIBS@ |
262 | SPICE_GTK_REQUIRED = @SPICE_GTK_REQUIRED@ | |
225 | 263 | SPICE_PROTOCOL_CFLAGS = @SPICE_PROTOCOL_CFLAGS@ |
226 | 264 | SPICE_PROTOCOL_LIBS = @SPICE_PROTOCOL_LIBS@ |
265 | SPICE_PROTOCOL_REQUIRED = @SPICE_PROTOCOL_REQUIRED@ | |
227 | 266 | STRIP = @STRIP@ |
267 | UPDATE_MIME_DATABASE = @UPDATE_MIME_DATABASE@ | |
228 | 268 | USE_NLS = @USE_NLS@ |
229 | 269 | VERSION = @VERSION@ |
230 | 270 | WARN_CFLAGS = @WARN_CFLAGS@ |
271 | WINDOWS_PRODUCTVERSION = @WINDOWS_PRODUCTVERSION@ | |
231 | 272 | WINDRES = @WINDRES@ |
232 | 273 | WIXL_ARCH = @WIXL_ARCH@ |
233 | 274 | XGETTEXT = @XGETTEXT@ |
0 | # Makefile.in generated by automake 1.13.1 from Makefile.am. | |
0 | # Makefile.in generated by automake 1.13.4 from Makefile.am. | |
1 | 1 | # @configure_input@ |
2 | 2 | |
3 | # Copyright (C) 1994-2012 Free Software Foundation, Inc. | |
3 | # Copyright (C) 1994-2013 Free Software Foundation, Inc. | |
4 | 4 | |
5 | 5 | # This Makefile.in is free software; the Free Software Foundation |
6 | 6 | # gives unlimited permission to copy and/or distribute it, |
14 | 14 | @SET_MAKE@ |
15 | 15 | |
16 | 16 | VPATH = @srcdir@ |
17 | am__make_dryrun = \ | |
18 | { \ | |
19 | am__dry=no; \ | |
17 | am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' | |
18 | am__make_running_with_option = \ | |
19 | case $${target_option-} in \ | |
20 | ?) ;; \ | |
21 | *) echo "am__make_running_with_option: internal error: invalid" \ | |
22 | "target option '$${target_option-}' specified" >&2; \ | |
23 | exit 1;; \ | |
24 | esac; \ | |
25 | has_opt=no; \ | |
26 | sane_makeflags=$$MAKEFLAGS; \ | |
27 | if $(am__is_gnu_make); then \ | |
28 | sane_makeflags=$$MFLAGS; \ | |
29 | else \ | |
20 | 30 | case $$MAKEFLAGS in \ |
21 | 31 | *\\[\ \ ]*) \ |
22 | echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ | |
23 | | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ | |
24 | *) \ | |
25 | for am__flg in $$MAKEFLAGS; do \ | |
26 | case $$am__flg in \ | |
27 | *=*|--*) ;; \ | |
28 | *n*) am__dry=yes; break;; \ | |
29 | esac; \ | |
30 | done;; \ | |
32 | bs=\\; \ | |
33 | sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ | |
34 | | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ | |
31 | 35 | esac; \ |
32 | test $$am__dry = yes; \ | |
33 | } | |
36 | fi; \ | |
37 | skip_next=no; \ | |
38 | strip_trailopt () \ | |
39 | { \ | |
40 | flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ | |
41 | }; \ | |
42 | for flg in $$sane_makeflags; do \ | |
43 | test $$skip_next = yes && { skip_next=no; continue; }; \ | |
44 | case $$flg in \ | |
45 | *=*|--*) continue;; \ | |
46 | -*I) strip_trailopt 'I'; skip_next=yes;; \ | |
47 | -*I?*) strip_trailopt 'I';; \ | |
48 | -*O) strip_trailopt 'O'; skip_next=yes;; \ | |