Codebase list virt-viewer / f00b1ca
New upstream version 4.0 Guido Günther 7 years ago
203 changed file(s) with 48870 addition(s) and 39485 deletion(s). Raw diff Collapse all Expand all
+4
-0
AUTHORS less more
1010
1111 With additional patches & translations from:
1212
13 Charles Arnold <carnold@suse.com>
1314 Christophe Fergeau <cfergeau@redhat.com>
1415 Daniel P. Berrange <berrange@redhat.com>
1516 Dave Allan <dallan@redhat.com>
1617 Doug Goldstein <cardoe@cardoe.com>
1718 Eduardo Lima (Etrunko) <etrunko@redhat.com>
1819 Fabiano Fidêncio <fidencio@redhat.com>
20 Frediano Ziglio <fziglio@redhat.com>
1921 Guannan Ren <gren@redhat.com>
2022 Guido Günther <agx@sigxcpu.org>
2123 Hans de Goede <hdegoede@redhat.com>
2325 Jonathon Jongsma <jjongsma@redhat.com>
2426 Ján Tomko <jtomko@redhat.com>
2527 Lukas Venhoda <lvenhoda@redhat.com>
28 Lukáš Venhoda <lvenhoda@redhat.com>
2629 Marc-André Lureau <marcandre.lureau@redhat.com>
2730 Martin Kletzander <mkletzan@redhat.com>
2831 Michal Privoznik <mprivozn@redhat.com>
3336 Richard W.M. Jones <rjones@redhat.com>
3437 Ronnie Sahlberg <ronniesahlberg@gmail.com>
3538 Sandy Stutsman <sstutsma@redhat.com>
39 Uri Lublin <uril@redhat.com>
3640 Victor Toso <victortoso@redhat.com>
3741 Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
3842 Yonit Halperin <yhalperi@redhat.com>
+960
-3
ChangeLog less more
0 2015-12-17 Daniel P. Berrange <berrange@redhat.com>
1
2 Update for release 3.1
0 2016-06-30 Daniel P. Berrange <berrange@redhat.com>
1
2 Update NEWS for 4.0 release
33
44 Refresh translations from zanata
5
6 2016-06-30 Eduardo Lima (Etrunko) <etrunko@redhat.com>
7
8 Adjust timer to refresh ovirt foreign menu
9 This is a temporary solution, as discussed in the bug. We will adjust
10 the timer to refresh the ISO list from 15 seconds to 5 minutes (300
11 seconds), while reworking in the UI to replace the menu with a dialog,
12 which seems a saner way to display the list.
13
14 Resolves: rhbz#1347726
15
16 2016-06-30 Fabiano Fidêncio <fidencio@redhat.com>
17
18 ui: Use mnemonics for remote-viewer connection UI
19 Here we added mnemonics for the buttons "Cancel" and "Connect" and also
20 for the "Connection Address" entry (as it was before moving this dialog
21 to a .ui file).
22
23 The "Recent connections" widget is left behind as GtkRecentChooserWidget
24 isn't suitable for mnemonic activation.
25
26 Resolves: rhbz#1351487
27
28 Acked-by: Pavel Grunt <pgrunt@redhat.com>
29
30 timed-revealer: listen to the "grab-notify" signal
31 The "grab-notify" signal lets us know when our widget becomes
32 shadowed by a Gtk+ grab on another widget, or when it becomes unshadowed
33 due to a grab being removed.
34
35 That's exactly the case we face when dealing with "usb-redirection" and
36 "close" items of the fullscreen toolbar. And, currently, when these
37 widgets get closed the timed-revealer stays there forever. From now on
38 let's take advantage of the "grab-notify" signal and schedule a timeout
39 for the revealer when these widgets' windows get closed.
40
41 Acked-by: Christophe Fergeau <cfergeau@redhat.com>
42 Acked-by: Eduardo Lima (Etrunko) <etrunko@redhat.com>
43
44 2016-06-29 Eduardo Lima (Etrunko) <etrunko@redhat.com>
45
46 Get rid of deprecated functions to customize widget colors
47 Since commit cc455b7f916110d7cfae6b7af753349e070c9494, the background
48 color has not been set correctly for Gtk+ 3.18 (Fedora 23), while it was
49 working fine for more recent version 3.20 (Fedora 24). Tracked down to
50 some changes in GtkNotebook code which can not be easily backported.
51
52 Instead of customizing background and foreground colors, let's just
53 stick with the default colors provided by theme.
54
55 Related https://bugs.freedesktop.org/show_bug.cgi?id=94276
56
57 2016-06-29 Lukáš Venhoda <lvenhoda@redhat.com>
58
59 package: Add appdata metadata for Gnome Software
60 Adds metadata to be used with Gnome Software.
61 Includes name, summary, description and a few screenshots of remote-viewer.
62
63 Acked-by: Daniel P. Berrange <berrange@redhat.com>
64 Acked-by: Fabiano Fidêncio <fidencio@redhat.com>
65
66 2016-06-29 Christophe Fergeau <cfergeau@redhat.com>
67
68 window: Don't take a reference on 'toolbar'
69 VirtViewerTimedRevealer now derives from GtkEventBox/GtkContainer, so
70 it follows GTK+ conventions and takes ownership of the floating ref on
71 'toolbar'. Since VirtViewerWindow and VirtViewerTimedRevealer will have
72 the same lifespan, we don't need to own a reference on toolbar in
73 VirtViewerWindow.
74
75 Acked-by: Fabiano Fidêncio <fidencio@redhat.com>
76
77 2016-06-29 Fabiano Fidêncio <fidencio@redhat.com>
78
79 timed-revealer: Inherit from GtkEventBox
80 As suggested by Christophe, inheriting from GtkEventBox instead of
81 having one instance of it as a member can help us to get rid of
82 virt_viewer_timed_revealer_get_overlay_widget().
83
84 Acked-by: Christophe Fergeau <cfergeau@redhat.com>
85
86 2016-06-29 Christophe Fergeau <cfergeau@redhat.com>
87
88 timed-revealer: Don't release reference we don't own
89 VirtViewerTimedRevealer::evBox is created in
90 virt_viewer_timed_revealer_new() and will be passed to
91 gtk_container_add() through gtk_overlay_add_overlay(overlay,
92 virt_viewer_timed_revealer_get_overlay_widget(priv->revealer))
93
94 This means VirtViewerTimedRevealer does not own a reference on evBox,
95 and that it should not try to release it in
96 VirtViewerTimedRevealer::dispose()
97
98 Backtrace for the crash:
99 #0 0x00007ffff3e92c9d in g_type_check_instance_is_fundamentally_a () at /lib64/libgobject-2.0.so.0
100 #1 0x00007ffff3e722a5 in g_object_unref () at /lib64/libgobject-2.0.so.0
101 #2 0x000000000041ebe3 in virt_viewer_timed_revealer_dispose (object=0x1127320) at virt-viewer-timed-revealer.c:128
102 #3 0x00007ffff3e723b6 in g_object_unref () at /lib64/libgobject-2.0.so.0
103 #4 0x000000000041c040 in virt_viewer_window_dispose (object=0x981f70) at virt-viewer-window.c:191
104 #5 0x00007ffff3e723b6 in g_object_unref () at /lib64/libgobject-2.0.so.0
105 #6 0x0000000000413a58 in virt_viewer_app_display_removed (nth=<optimized out>, self=0x680330) at virt-viewer-app.c:989
106 #7 0x0000000000413a58 in virt_viewer_app_display_removed (session=<optimized out>, display=<optimized out>, self=0x680330) at virt-viewer-app.c:1000
107 #8 0x00007ffff3e705e0 in g_cclosure_marshal_VOID__OBJECTv () at /lib64/libgobject-2.0.so.0 #9 0x00007ffff3e6d784 in _g_closure_invoke_va () at /lib64/libgobject-2.0.so.0
108 #10 0x00007ffff3e88cd9 in g_signal_emit_valist () at /lib64/libgobject-2.0.so.0
109 #11 0x00007ffff3e897eb in g_signal_emit_by_name () at /lib64/libgobject-2.0.so.0
110 #12 0x0000000000418973 in virt_viewer_session_remove_display (session=0x9c6de0, display=0x961a90) at virt-viewer-session.c:463
111 #13 0x0000000000420934 in destroy_display (data=<optimized out>) at virt-viewer-session-spice.c:851
112 #14 0x00007ffff3b6d0eb in g_ptr_array_foreach () at /lib64/libglib-2.0.so.0
113 #15 0x00007ffff3b6d180 in ptr_array_free () at /lib64/libglib-2.0.so.0
114 #16 0x000000000042072a in virt_viewer_session_spice_clear_displays (self=0x9c6de0) at virt-viewer-session-spice.c:94
115 #17 0x000000000042240d in virt_viewer_session_spice_close (session=<optimized out>) at virt-viewer-session-spice.c:459
116 #18 0x0000000000414be5 in virt_viewer_app_quit (self=self@entry=0x680330) at virt-viewer-app.c:285
117 #19 0x0000000000415500 in virt_viewer_app_maybe_quit (self=0x680330, window=window@entry=0x981a90) at virt-viewer-app.c:481
118 #20 0x000000000041c4ad in virt_viewer_window_delete (src=<optimized out>, dummy=<optimized out>, self=0x981a90) at virt-viewer-window.c:771
119 #21 0x00007ffff61807f1 in _gtk_marshal_BOOLEAN__BOXEDv () at /lib64/libgtk-3.so.0
120 #22 0x00007ffff3e6d784 in _g_closure_invoke_va () at /lib64/libgobject-2.0.so.0
121 #23 0x00007ffff3e887b3 in g_signal_emit_valist () at /lib64/libgobject-2.0.so.0
122 #24 0x00007ffff3e8933f in g_signal_emit () at /lib64/libgobject-2.0.so.0
123 #25 0x00007ffff62dde6c in gtk_widget_event_internal () at /lib64/libgtk-3.so.0
124 #26 0x00007ffff617f5ef in gtk_main_do_event () at /lib64/libgtk-3.so.0
125 #27 0x00007ffff5c7dd25 in _gdk_event_emit () at /lib64/libgdk-3.so.0
126 #28 0x00007ffff5cae672 in gdk_event_source_dispatch () at /lib64/libgdk-3.so.0
127 #29 0x00007ffff3b9895a in g_main_context_dispatch () at /lib64/libglib-2.0.so.0
128 #30 0x00007ffff3b98d10 in g_main_context_iterate.isra () at /lib64/libglib-2.0.so.0
129 #31 0x00007ffff3b98dbc in g_main_context_iteration () at /lib64/libglib-2.0.so.0
130 #32 0x00007ffff41643cd in g_application_run () at /lib64/libgio-2.0.so.0
131 #33 0x000000000040fc1a in main (argc=3, argv=0x7fffffffdec8) at virt-viewer-main.c:41
132
133 Acked-by: Fabiano Fidêncio <fidencio@redhat.com>
134
135 timed-revealer: Fix "revealer" refcounting
136 virt_viewer_timed_revealer_new calls gtk_container_add on the instance
137 returned by gtk_revealer_new so VirtViewerTimedRevealer does not own any
138 ref on this GtkRevealer instance. Unrefing it in _dispose() is thus wrong.
139
140 Acked-by: Fabiano Fidêncio <fidencio@redhat.com>
141
142 2016-06-24 Eduardo Lima (Etrunko) <etrunko@redhat.com>
143
144 Use more accurate debug messages for foreign menu
145 Acked-by: Christophe Fergeau <cfergeau@redhat.com>
146 Acked-by: Fabiano Fidêncio <fidencio@redhat.com>
147
148 Get ovirt foreign menu item from UI file
149 Currently the menu item is created manually, while this patch changes it to be
150 retrieved from the UI file, and decides if it needs to be shown or hidden if the
151 ISO list is received from ovirt.
152
153 This a preparation for a upcoming UI change that will present the ISO list in a
154 separate dialog, instead of a submenu.
155
156 Acked-by: Christophe Fergeau <cfergeau@redhat.com>
157 Acked-by: Fabiano Fidêncio <fidencio@redhat.com>
158
159 2016-06-23 Fabiano Fidêncio <fidencio@redhat.com>
160
161 window: Replace autoDrawer with native Gtk widgets
162 GtkRevealer was intrudced in Gtk+ 3.10 and, combined with Gtk Overlay
163 (intoduced in Gtk+ 3.2), can provide a more sustainably implementation
164 of the AutoDrawer functionality.
165
166 This approach is completely based on the approach taken by virt-manager:
167 https://github.com/virt-manager/virt-manager/commit/dc05600324f6b9a82b68581fc0a9c145f9889ce9
168
169 Resolves: https://bugs.freedesktop.org/show_bug.cgi?id=94495
170
171 Acked-by: Eduardo Lima (Etrunko) <etrunko@redhat.com>
172
173 mingw,spec: Bump msitools version
174 Fedora 24 has GLib 2.48.0, which brings a new dependency: PCRE.
175 The new dependency is already added to the wxi file (in msitools) and a
176 new msitools build including the fix is already done [0].
177
178 Let's just bump the version in our spec file and make sure we will be
179 using the msitools which includes the fix.
180
181 [0]: https://bodhi.fedoraproject.org/updates/FEDORA-2016-a7a2db6109
182
183 Acked-by: Eduardo Lima (Etrunko) <etrunko@redhat.com>
184
185 2016-06-22 Pavel Grunt <pgrunt@redhat.com>
186
187 Fix missing field initializers
188 Spotted by clang
189
190 window: Use loop instead of multiple ifs
191 Binds modifier's mask and key, also fixes a compile time warning
192 spotted by clang:
193 warning: cast from 'gchar *' (aka 'char *') to 'guint *' (aka 'unsigned
194 int *') increases required alignment from 1 to 4 [-Wcast-align]
195 return (guint*)g_array_free(a, FALSE);
196
197 window: Move definition from header
198
199 window: Use a predefined macro instead of constant
200
201 2016-06-21 Fabiano Fidêncio <fidencio@redhat.com>
202
203 util: Fix resource path
204 Since commit 1f6f1a48 the resource path for icons has been broken.
205 The reason is that when moving the .ui files to $(srcdir)/resources/ui
206 the define used for the resources was changed to reflect the new
207 directory. However, this change wasn't needed by the icons and ended
208 up with virt-viewer not displaying a few icons.
209
210 Let's fix the issue by setting back the define to the previous one and
211 then tweaking the virt_viewer_util_load_ui() to add "ui" to the resource
212 path, for loading the ui files.
213
214 Acked-by: Eduardo Lima (Etrunko) <etrunko@redhat.com>
215
216 2016-06-20 Fabiano Fidêncio <fidencio@redhat.com>
217
218 ui: Move ui files to $(srcdir)/resources/ui
219 I'd like to keep our resources all in the same place. In the future we
220 will be able to have:
221 $(srcdir)
222 |_ resources
223 |_ ui: for our {remote,virt}-viewer ui specific files
224 |_ gtk: for files that can be automatically handled by Gtk (like
225 | app-menu).
226 |_ css: for custom themes (like:
227 https://bugs.freedesktop.org/show_bug.cgi?id=94276)
228
229 Acked-by: Jonathon Jongsma <jjongsma@redhat.com>
230
231 ui: Rename UI files to .ui (instead of .xml)
232 When using GtkApplication, Gtk automatically searches for the menus of
233 the application at "org/example/app/gtk/menus.ui".
234
235 Currently we don't have a "menus.ui", but try to see this commit is a
236 first step in order to use app-menu.
237
238 For now, let's standardize that all our UI files will have the ".ui"
239 extension instead of the ".xml" one.
240
241 Acked-by: Jonathon Jongsma <jjongsma@redhat.com>
242
243 remote-viewer: Add missing chain-up to parent's window_added() method
244 It hasn't bitten us (so hard) so far but would from the moment we add
245 support to app-menu/headerbar.
246
247 By not chaining-up to the parent's method, gtk_window_set_application()
248 is never called. This causes GApplication object not being able to load
249 the app-menu, but using the "fallback" which only contains the "Quit"
250 item.
251
252 By chaining-up to the parent's method, g_application_hold() call on
253 virt-viewer-app.c can be removed, as it is already called by the
254 parent's window_added() method.
255
256 Acked-by: Eduardo Lima (Etrunko) <etrunko@redhat.com>
257 Acked-by: Jonathon Jongsma <jjongsma@redhat.com>
258
259 window: remove unneeded GTK_WIDGET() casts
260 Acked-by: Jonathon Jongsma <jjongsma@redhat.com>
261
262 display: use MIN_DISPLAY_{WIDTH, HEIGHT} as the minimum possible value
263 Acked-by: Pavel Grunt <pgrunt@redhat.com>
264
265 display: Only queue a resize on zoom-level changes
266 By the comment in the code:
267 "For the gtk2 build, we need to queue a resize even if the zoom level
268 hasn't changed. This is due to the fact that VirtViewerWindow will
269 queue a resize event for itself immediately after calling this
270 function (in order to shrink the window to fit the new display size
271 if necessary). If we don't queue a resize here, the window will become
272 tiny because we will only request 50x50 during the window resize."
273
274 And it doesn't happen on gtk3 at all. So, let's just remove the comment
275 and just quere the resize when zoom-changes actually happen.
276
277 Acked-by: Jonathon Jongsma <jjongsma@redhat.com>
278
279 2016-06-20 Pavel Grunt <pgrunt@redhat.com>
280
281 monitor-alignment: Do not crash on NULL display
282 Since commit 01b66ef88bc142d6716b40b1e384e94a2629a99f virt-viewer
283 does not crash on connection to a guest using an invalid display
284 configuration (eg. Cirrus & QXL vga). That commit allowed existence
285 of NULL display, however the code handling monitors alignment does
286 not expect this and crashes when virt-viewer is shifting/aligning
287 its windows.
288
289 Avoid crashing by returning early on NULL display.
290
291 #0 0x0000000000411d0a in displays_cmp (p1=p1@entry=0xbad940, p2=p2@entry=0xbad944, user_data=user_data@entry=0x8eb180) at virt-viewer-util.c:544
292 #1 0x00007ffff3f16ac5 in msort_with_tmp (p=0x7fffffffd670, b=0xbad940, n=2) at gqsort.c:93
293 #2 0x00007ffff3f16ded in msort_r (b=b@entry=0xbad940, n=n@entry=2, s=s@entry=4, cmp=cmp@entry=0x411ce0 <displays_cmp>, arg=arg@entry=0x8eb180) at gqsort.c:278
294 #3 0x00007ffff3f16e78 in g_qsort_with_data (pbase=pbase@entry=0xbad940, total_elems=total_elems@entry=2, size=size@entry=4, compare_func=compare_func@entry=0x411ce0 <displays_cmp>, user_data=user_data@entry=0x8eb180) at gqsort.c:303
295 #4 0x000000000041277c in virt_viewer_align_monitors_linear (displays=displays@entry=0x8eb180 = {...}) at virt-viewer-util.c:586
296 #5 0x000000000041a92d in virt_viewer_session_on_monitor_geometry_changed (self=0x8f38a0 [VirtViewerSessionSpice], display=<optimized out>) at virt-viewer-session.c:373
297 #6 0x00007ffff4415908 in g_closure_invoke (closure=0x9306c0, return_value=return_value@entry=0x0, n_param_values=2, param_values=param_values@entry=0x7fffffffd960, invocation_hint=invocation_hint@entry=0x7fffffffd900) at gclosure.c:801
298 #7 0x00007ffff4427a1d in signal_emit_unlocked_R (node=node@entry=0x668f80, detail=detail@entry=1551, instance=instance@entry=0x930440, emission_return=emission_return@entry=0x0, instance_and_params=instance_and_params@entry=0x7fffffffd960) at gsignal.c:3627
299 #8 0x00007ffff442fab1 in g_signal_emit_valist (instance=<optimized out>, signal_id=<optimized out>, detail=<optimized out>, var_args=var_args@entry=0x7fffffffdaf0) at gsignal.c:3383
300 #9 0x00007ffff442fd9f in <emit signal notify:agent-connected on instance 0x930440 [SpiceMainChannel]> (instance=instance@entry=0x930440, signal_id=<optimized out>, detail=<optimized out>) at gsignal.c:3439
301 #10 0x00007ffff4419fd4 in g_object_dispatch_properties_changed (object=0x930440 [SpiceMainChannel], n_pspecs=<optimized out>, pspecs=<optimized out> at gobject.c:1061
302 #11 0x00007ffff441c4f9 in g_object_notify (pspec=<optimized out>, object=0x930440 [SpiceMainChannel]) at gobject.c:1155
303 #12 0x00007ffff441c4f9 in g_object_notify (object=0x930440 [SpiceMainChannel], property_name=<optimized out>) at gobject.c:1202
304 #13 0x00007ffff5a63dd0 in notify_main_context (opaque=0x7fffd6fde990) at gio-coroutine.c:240
305 #14 0x00007ffff3f07d7a in g_main_context_dispatch (context=0x68da40) at gmain.c:3152
306 #15 0x00007ffff3f07d7a in g_main_context_dispatch (context=context@entry=0x68da40) at gmain.c:3767
307 #16 0x00007ffff3f080b8 in g_main_context_iterate (context=0x68da40, block=block@entry=1, dispatch=dispatch@entry=1, self=<optimized out>) at gmain.c:3838
308 #17 0x00007ffff3f0838a in g_main_loop_run (loop=0x710de0) at gmain.c:4032
309 #18 0x00007ffff5f53045 in gtk_main () at gtkmain.c:1207
310 #19 0x0000000000411a22 in main (argc=1, argv=0x7fffffffdfa8)
311
312 Resolves: rhbz#1250820
313
314 Acked-by: Fabiano Fidêncio <fidencio@redhat.com>
315
316 Add tests for monitor alignment
317 Related: rhbz#1250820
318
319 Acked-by: Fabiano Fidêncio <fidencio@redhat.com>
320
321 2016-06-20 Charles Arnold <carnold@suse.com>
322
323 window: Fix segault on zooming operations
324 When virt-viewer is "Waiting for guest domain to start" and
325 the Ctrl- or Ctrl+ keys are pressed to zoom the blank display
326 virt-viewer will crash in virt_viewer_display_get_desktop_size
327 because of a NULL display pointer. To reproduce start virt-viewer
328 on a VM not running and zoom the display.
329
330 Acked-by: Fabiano Fidêncio <fidencio@redhat.com>
331 Acked-by: Pavel Grunt <pgrunt@redhat.com>
332
333 2016-06-16 Frediano Ziglio <fziglio@redhat.com>
334
335 Revert "Disable IME to allow receiving all keys"
336 This reverts commit 191f9a8ab49f56aa48781b5eeaa4a1a65d626627.
337
338 This fixes https://bugzilla.redhat.com/show_bug.cgi?id=1342984.
339
340 Calling ImmDisableIME disable IME for the entire program.
341 On Windows 7 this also hide the keyboard application from the task bar
342 making impossible to switch keyboard while using remote viewer.
343 A recent commit in spice-gtk (7d881d2193bf5598b888a48bb4d8d7ad2e62f443,
344 "widget: Disable IME context on display widget") disable IME processing
345 just for SpiceDisplay. This avoid the above regression on Windows 7.
346
347 Not having this spice-gtk commit is not going to cause a huge
348 regression, so it's fine not to add strong coupling between this
349 commit and the spice-gtk commit which fixes this differently.
350
351 Acked-by: Christophe Fergeau <cfergeau@redhat.com>
352
353 2016-06-04 Michal Privoznik <mprivozn@redhat.com>
354
355 tests: Fix VPATH build
356 So test-hotkeys include virt-viewer-app.h which includes
357 virt-viewer-window.h which includes virt-viewer-display.h which
358 in turn wants to include virt-viewer-enums.h. But, the enums
359 header file is generated at build time into builddir not srcdir.
360 Therefore it may happen if the two are distinct that compiler
361 fails to find the enums file:
362
363 In file included from ../../src/virt-viewer-window.h:29:0,
364 from ../../src/virt-viewer-app.h:28,
365 from ../../tests/test-hotkeys.c:27:
366 ../../src/virt-viewer-display.h:28:31: fatal error: virt-viewer-enums.h: No such file or directory
367 #include "virt-viewer-enums.h"
368 ^
369 compilation terminated.
370
371 The fix is to include builddir into paths where header files are
372 looked for.
373
374 Acked-by: Fabiano Fidêncio <fidencio@redhat.com>
375
376 virt-viewer-display-vnc: Include virt-viewer-util.h
377 In function virt_viewer_display_vnc_new() we are calling
378 virt_viewer_signal_connect_object() which is defined in
379 virt-viewer-util module. However, the header file for the module
380 is never included.
381
382 CC libvirt_viewer_la-virt-viewer-display-vnc.lo
383 virt-viewer-display-vnc.c: In function 'virt_viewer_display_vnc_new':
384 virt-viewer-display-vnc.c:251:5: warning: implicit declaration of function 'virt_viewer_signal_connect_object' [-Wimplicit-function-declaration]
385 virt_viewer_signal_connect_object(app, "notify::enable-accel",
386 ^
387 virt-viewer-display-vnc.c:251:5: warning: nested extern declaration of 'virt_viewer_signal_connect_object' [-Wnested-externs]
388
389 Acked-by: Fabiano Fidêncio <fidencio@redhat.com>
390
391 2016-06-02 Pavel Grunt <pgrunt@redhat.com>
392
393 app: Check validity of hotkey
394 The hotkey is valid if it has a valid value. The value is valid if it is
395 not empty and is successfully parsed by gtk_accelerator_parse().
396
397 These hotkeys formats are considered invalid:
398 "key" - missing value
399 "key=" - missing value
400 "key=abcd" - value cannot be parsed by gtk_accelerator_parse()
401
402 Resolves: rhbz#1339572
403
404 Acked-by: Fabiano Fidêncio <fidencio@redhat.com>
405
406 tests: Add hotkeys test
407 Check if expected g_warning messages are logged.
408
409 Related: rhbz#1339572
410
411 Acked-by: Fabiano Fidêncio <fidencio@redhat.com>
412
413 app: Use debug to inform about smartcard shortcuts state
414 Related: rhbz#1339572
415
416 Acked-by: Fabiano Fidêncio <fidencio@redhat.com>
417
418 vnc-display: Disable default grab sequence
419 It should be enabled only if the "release-cursor" sequence was not
420 specified (by using "--hotkeys=release-cursor=sequence"), otherwise
421 both sequences would release the cursor.
422
423 The solution is taken from the spice-display code.
424
425 Resolves: rhbz#1339575
426
427 Acked-by: Fabiano Fidêncio <fidencio@redhat.com>
428
429 2016-05-31 Pavel Grunt <pgrunt@redhat.com>
430
431 Include virt-viewer-util.h only in source files
432 It doesn't have any symbols to be used in headers
433
434 Acked-by: Fabiano Fidêncio <fidencio@redhat.com>
435
436 Add mnemonics for each display item
437 Related: rhbz#1332545
438
439 Acked-by: Fabiano Fidêncio <fidencio@redhat.com>
440
441 2016-05-10 Christophe Fergeau <cfergeau@redhat.com>
442
443 ovirt: Use sso-token when set in .vv file
444 Starting with oVirt 4.0, this replaces the jsessionid field for
445 automatic authentication with oVirt instances for REST communication.
446
447 vv-file: Add support for 'sso-token' field in [ovirt]
448 This is the new way of authenticating with remote oVirt instance
449 starting with oVirt 4.0.
450
451 ovirt: Fix OvirtApi memory handling
452 The oVirt integration code in remote-viewer assumes that
453 the caller owns a reference on the OvirtApi instance returned
454 by ovirt_proxy_fetch_api{,finish}.
455 This is incorrect as these 2 API calls have always been documented as
456 being (transfer none). This was working so far because libgovirt was
457 leaking an OvirtApi reference. This bug is fixed upstream, so we now get
458 a warning on remote-viewer exit about trying to unref an invalid object.
459
460 This commit fixes that by taking the ref we expect in OvirtForeignMenu,
461 and by not releasing a ref we do not own in remote-viewer.c
462
463 ovirt: Error reporting improvements on invalid VM name
464
465 ovirt: Don't try to use [ovirt] if jsessionid is not set
466 If jsessionid is not set in the .vv file and we try to use anyway the
467 REST API, an authentication dialog will be shown by remote-viewer, which
468 is very unwelcome. If we don't have a jsessionid set, we know we won't
469 be able to silently login to the REST API, so don't try to set a foreign
470 menu when it's not set.
471
472 2016-05-04 Frediano Ziglio <fziglio@redhat.com>
473
474 Add a program to test redirection on Windows
475 This program attempt multiple redirection combination:
476 - passing handles using either CreateProcess or SetStdHandle;
477 - having a console or not;
478 - redirection stdout/stderr yes or not.
479
480 Worth to mention that for running this test program the user will need
481 either a native MingW or Wine (with .exe executables enabled in Linux
482 binfmt).
483
484 Acked-by: Fabiano Fidêncio <fidencio@redhat.com>
485
486 Manage redirection in a way similar to Unix
487 This patch allows remote-viewer to redirect output/error streams to
488 files.
489 Also if launched from a console program (for instance from the command
490 prompt) you are able to see output from the console where you launch
491 the program.
492 This allow to launch the program with a syntax like:
493 > remote-viewer.exe --debug > log.txt 2>&1
494 or simply:
495 > remote-viewer.exe --debug
496
497 Acked-by: Fabiano Fidêncio <fidencio@redhat.com>
498
499 2016-05-03 Jonathon Jongsma <jjongsma@redhat.com>
500
501 Add some missing mnemonics to menu items
502 Fixes: rhbz#1332545
503
504 2016-05-03 Fabiano Fidêncio <fidencio@redhat.com>
505
506 msi: Depend on mingw-adwaita-icon-theme
507 Instead of maintain a file which includes every single icon that we use
508 from adwaita-icon-theme (adwaita-icons-needed.wxi.in), let's depend on
509 mingw-adwaita-icon-theme directly.
510 It reduces considerably the maintainability and the risk to have missing
511 icons. Although, the size of the final binary gets increased from ~35MB
512 to ~50MB.
513
514 Resolves: rhbz#1301064
515 Acked-by: Christophe Fergeau <cfergeau@redhat.com>
516
517 Remove nsis installer
518 The only reason for us to keep maintaining the nsis installer was the
519 activex plugin (spicex), which requires those nsis based installers.
520 As the next release of RHEV/oVirt won't use the activex plugin (spicex)
521 let's completely remove the nsis installer from our tree and focus on
522 only maintain the msi installer.
523 oVirt/RHEV is shipping virt-viewer based on 2.0 release and, if needed,
524 they can stick to 3.0 branch in a future update (in case their plan goes
525 wrong and they end up needing the nsis support).
526
527 Related: rhbz#1324885 and rhbz#1316560
528 Acked-by: Christophe Fergeau <cfergeau@redhat.com>
529
530 2016-05-03 Jonathon Jongsma <jjongsma@redhat.com>
531
532 Add some timeouts to file transfer dialog
533 In order to avoid the situation where a dialog flashes onto the screen
534 and then is immediately hidden, I've added a couple timeouts to the
535 dialog.
536
537 The first is a 250ms timeout before showing the dialog. This avoids
538 showing the dialog at all for very small, quick transfers.
539
540 There is also a 500ms timeout before hiding a finished task. This
541 ensures that even transfers that only take e.g. 251ms to transfer will
542 get shown to the user for at least 500ms rather than being hidden 1ms
543 after showing the dialog.
544
545 Related: rhbz#1332180, rhbz#1324521
546 Acked-by: Fabiano Fidêncio <fidencio@redhat.com>
547 Acked-by: Victor Toso <victortoso@redhat.com>
548
549 Add file transfer dialog
550 This dialog will show the progress of files being transferred from the
551 client to the guest and allows the user to cancel ongoing file transfer
552 tasks. The user can cancel each transfer individually, or cancel all
553 ongoing transfers at once.
554
555 Resolves: rhbz#1332180, rhbz#1324521
556 Acked-by: Fabiano Fidêncio <fidencio@redhat.com>
557
558 2016-04-26 Fabiano Fidêncio <fidencio@redhat.com>
559
560 spice: avoid crashing when using invalid video config
561 virt-viewer _only_ supports guests that have either:
562
563 A) a signle graphics device with multiple displays (monitorid=0,
564 displayid=(0,1,2,3)).
565
566 B) multiple graphics device with a single display each
567 (monitorid=(0,1,2,3), displayid=0).
568
569 From now on, avoid crashing connecting to a guest which has a graphics
570 configuration that violates A or B. However, even avoiding the crash, we
571 cannot ensure the guest will work as expected.
572
573 Resolves: rhbz#1250820
574
575 2016-04-22 Pavel Grunt <pgrunt@redhat.com>
576
577 manpage: Mention spice-gtk in See also section
578
579 2016-04-19 Christophe Fergeau <cfergeau@redhat.com>
580
581 Disable IME to allow receiving all keys
582 This fixes https://bugzilla.redhat.com/show_bug.cgi?id=1297640
583
584 Acked-by: Frediano Ziglio <fziglio@redhat.com>
585 Acked-by: Pavel Grunt <pgrunt@redhat.com>
586
587 2016-04-15 Christophe Fergeau <cfergeau@redhat.com>
588
589 spec: Use pkgconfig() in BuildRequires
590 This is better than hardcoding the name of the development package as
591 this will not be impacted by package renames.
592
593 2016-03-24 Eduardo Lima (Etrunko) <etrunko@redhat.com>
594
595 configure: cleanup {GLIB2, GTK}_CFLAGS
596 Also, remove unecessary AC_SUBST calls, as {GLIB2,GTK}_LIBS are never
597 touched.
598
599 Fix spice includes
600 Spice release version 0.31 requires that only spice-client.h or
601 spice-client-gtk.h should be included directly. As a result,
602 compilation is now throwing warnings like:
603
604 warning: #warning "Only <spice-client.h> can be included directly" [-Wcpp]
605 warning: #warning "Only <spice-client-gtk.h> can be included directly" [-Wcpp]
606
607 This patch also bumps spice version requirement to 0.31, to ensure
608 those files are available.
609
610 2016-03-15 Pavel Grunt <pgrunt@redhat.com>
611
612 util: Remove unused GHashTable key/value
613
614 2016-03-14 Pavel Grunt <pgrunt@redhat.com>
615
616 Move tests under /tests directory
617 Keep tests separated from the code
618
619 Add libvirt-viewer-util library an use it in tests
620
621 2016-03-09 Christophe Fergeau <cfergeau@redhat.com>
622
623 Don't include libvirt.h in virt-viewer-auth.h
624 virt-viewer-auth.h does not use any libvirt types, so the #include is
625 not needed, and virt-viewer-auth.h is used while building remote-viewer,
626 which do not use libvirt compilation flags. This caused failures on
627 a freshly installed box without libvirt headers.
628
629 ovirt: Only use active ISO domains for foreign menu
630 oVirt storage domains can be in various states (inactive, in
631 maintainance, ...). We only want to show the ISOs it contains in the
632 foreign menu when the storage domain is actually active, not in the
633 other states.
634
635 https://bugzilla.redhat.com/show_bug.cgi?id=1310450
636
637 2016-03-08 Pavel Grunt <pgrunt@redhat.com>
638
639 test: Add tests for monitor mapping
640
641 virt_viewer_parse_monitor_mappings: Add parameter for client monitors
642 Drop dependency on gdk. it allows to write tests not depending
643 on the client's configuration.
644
645 Move monitor mapping parsing from app to util
646 It is not specific to VirtViewerApp.
647 Following commits will add support for tests thanks to this move.
648
649 2016-03-07 Fabiano Fidêncio <fidencio@redhat.com>
650
651 app, cosmetic: remove one unneeded level of identation
652 Acked-by: Pavel Grunt <pgrunt@redhat.com>
653
654 app: monitor-config - do it all or nothing
655 Don't keep trying to use a monitor config when it already failed for one
656 monitor, otherwise virt-viewer can end up in a situation where none of
657 the displays are enabled but the program is still running.
658 So, in case of any failure, let's skip the whole monitor config, forcing
659 virt-viewer to use the "fallback" one instead.
660
661 Resolves: rhbz#1315206
662
663 Acked-by: Pavel Grunt <pgrunt@redhat.com>
664
665 2016-03-04 Fabiano Fidêncio <fidencio@redhat.com>
666
667 Refresh translations from Zanata
668
669 2016-03-03 Fabiano Fidêncio <fidencio@redhat.com>
670
671 Use GResource for loading ui files
672 Let's take advantage of GResource for loading ui files in a better and
673 cleaner way than virt_viewer_util_load_ui() was doing.
674 It also brings the benefit, at least for developers, of being able to
675 test ui changes without having to "make install" virt-viewer.
676
677 Acked-by: Eduardo Lima (Etrunko) <etrunko@redhat.com>
678
679 app: Remove useless libxml includes
680 Acked-by: Eduardo Lima (Etrunko) <etrunko@redhat.com>
681
682 about: Fix the program's name in the title
683 Title currently says "About Glade". It's not a big deal because it's not
684 actually shown anywhere, but just for correctness let's change it to
685 "About Virt-Viewer".
686
687 Thanks Jonathon Jongsma for pointing this out.
688
689 Acked-by: Eduardo Lima (Etrunko) <etrunko@redhat.com>
690
691 2016-02-26 Eduardo Lima (Etrunko) <etrunko@redhat.com>
692
693 Don't open the default display while parsing command line
694 Since commit a9ce19f it has not been possible to check app version from
695 a tty without X session running. The issue is that gtk_get_option_group
696 function opens the default display if passed TRUE as argument.
697
698 Acked-by: Fabiano Fidêncio <fidencio@redhat.com>
699
700 2016-02-26 Fabiano Fidêncio <fidencio@redhat.com>
701
702 session-vnc: Avoid depracated warnings on this file
703 This is a temporary solution for using autobuild.sh, as commit df403f5
704 introduced the -Wdeprecated-declarations and gtk-vnc provides a callback
705 for getting authentication credentials which uses GValueArray, forcing
706 virt-viewer to keep using g_value_array_get_nth(), which is deprecated.
707
708 Acked-by: Pavel Grunt <pgrunt@redhat.com>
709
710 2016-02-25 Fabiano Fidêncio <fidencio@redhat.com>
711
712 configure: Simplify libvirt/libvirt-glib handling
713 Merge libvirt and libvirt-glib checking in PKG_CHECK_MODULES, then we
714 don't nee the LIBVIRT_GLIB_{CFLAGS,LIBS} in Makefile.am
715
716 Acked-by: Eduardo Lima (Etrunko) <etrunko@redhat.com>
717
718 wxi: virt-viewer depends on libvirt-glib
719 Since 51ce01d virt-viewer depends again on libvirt-glib.
720
721 Acked-by: Eduardo Lima (Etrunko) <etrunko@redhat.com>
722 Acked-by: Victor Toso <victortoso@redhat.com>
723
724 nsis: Add libvirt-glib-1.0-0.dll
725 Since 51ce01d virt-viewer depends again on libvirt-glib.
726
727 Acked-by: Eduardo Lima (Etrunko) <etrunko@redhat.com>
728 Acked-by: Victor Toso <victortoso@redhat.com>
729
730 Bring back libvirt-glib dependency
731 libvirt-glib dependency was dropped in commit 296f91c in favor to
732 maintain the full glib event loop integration into virt-viewer tree.
733 This decision was taken because libvirt-glib was not mature enough at
734 that time, which is not the case nowadays.
735
736 The libvirt-glib version chosen as dependency (0.1.8) is the first
737 release that includes the fixes for the glib event loop integration that
738 were backported to virt-viewer last year.
739
740 Acked-by: Eduardo Lima (Etrunko) <etrunko@redhat.com>
741 Acked-by: Victor Toso <victortoso@redhat.com>
742
743 2016-02-25 Pavel Grunt <pgrunt@redhat.com>
744
745 README: update information
746 Remove info about gtk versions
747 Fix a typo
748 Change link for spice-gtk widget
749
750 2016-02-24 Fabiano Fidêncio <fidencio@redhat.com>
751
752 cleanup: Don't use gtk_widget_modify_{fg,bg}()
753 These function have been deprecated since Gtk 3.0 and is recommended to
754 use _override_color() and _override_background_color() instead.
755 As these new functions take a GdkRGBA as parameter, let's use
756 gdk_rgba_parse() instead of gdk_color_parse().
757
758 Acked-by: Jonathon Jongsma <jjongsma@redhat.com>
759 Acked-by: Pavel Grunt <pgrunt@redhat.com>
760
761 cleanup: Don't use GtkStock
762 It has been deprecated since Gtk 3.10.
763
764 New strings have been added as the GTK_STOCK_* defines had their
765 translations done inside Gtk itself, but now the translations of the new
766 added labels must be done by virt-viewer translators.
767
768 Acked-by: Jonathon Jongsma <jjongsma@redhat.com>
769 Acked-by: Pavel Grunt <pgrunt@redhat.com>
770
771 cleanup: Drop old compatibilty code
772 A few more pieces of old compatibility code can be dropped, as we
773 already depend on GLib 2.38.
774
775 Acked-by: Jonathon Jongsma <jjongsma@redhat.com>
776
777 Use GDK_VERSION_MAX_ALLOWED
778 In order to avoid using a too new Gtk API.
779
780 Acked-by: Pavel Grunt <pgrunt@redhat.com>
781
782 Use GLIB_VERSION_MAX_ALLOWED
783 In order to avoid using a too new GLib API.
784
785 Acked-by: Pavel Grunt <pgrunt@redhat.com>
786
787 m4: Use -Wdeprecated-declarations
788 Let's enable deprecated-declarations warnings as we want to:
789 1) Avoid insert/maintain deprecated widgets/methods
790 2) Avoid adding widgets/methods that are too new, what could cause
791 problems like virt-viewer not being able to build in a specific distro.
792
793 Patches for making these two items possible are coming, introducing
794 _VERSION_MAX_ALLOWED for both GLIB and GDK and removing (as much as
795 possible) deprecated widgets/methods/structures.
796
797 Acked-by: Pavel Grunt <pgrunt@redhat.com>
798
799 mingw: Bump msitools version
800 Since commit 5d98df3 we depend on msitools 0.95-2.
801
802 Acked-by: Pavel Grunt <pgrunt@redhat.com>
803
804 app: Don't leave a window opened in case of connection error
805 Since commit ed9b3f3 the main window is not hidden when disconnecting.
806 But it also is not hidden when a connection error occurs, leaving a
807 black display with a not so accurate message to the users in case they
808 try to connect to a non-valid address from the remote-viewer connection
809 window and in this case the main window (display #1) shuldn't be shown.
810
811 The impetus for this chance is the following:
812 - user runs remote-viewer without any argument
813 - the remote-viewer connection window shows up
814 - user attempts to connect to a non-valid address
815 - a dialog pops up indicating a failure connecting to the graphic server
816 - the main window shows up saying "Connecting to the graphic server"
817 - user clicks 'Ok'
818 - the main window stays there with the same message
819
820 As a user, I expect the program to not show the main window in
821 connecting failure cases. This patch accomplishes that.
822
823 nsis: update nettle to 3.2.1
824 Use version 3.2.1, matching what currently is in f23.
825
826 2016-02-18 Eduardo Lima (Etrunko) <etrunko@redhat.com>
827
828 Drop old compatibility code
829 With glib requirements now being 2.38, these functions do not make sense anymore.
830
831 remote-viewer: Remove unused properties
832 The reason for using properties to access those members was to ensure
833 that they would only be set during the creation of the object. Now that
834 we removed that restriction, we set private members directly.
835
836 Port to GtkApplication API's
837 Most of this patch consists in code being shuffled around to fit the
838 expected flow while using the new APIs. I tried my best to make this
839 patch the less intrusive as possible. Main changes are:
840
841 - Updated build requirements
842 * glib version 2.38
843 * gtk+ version 3.10
844 * gio
845
846 - VirtViewerApp is now a subclass of GtkApplication.
847 Some mainloop calls were replaced:
848 * gtk_main() -> g_application_run()
849 * gtk_quit() -> g_application_quit()
850
851 - Unified command line option handling.
852 The logic has moved from the main functions and split in common
853 options, and specific ones for each application. With this, the main
854 functions were highly simplified, and now basically responsible for
855 instantiating the App object and running the main loop.
856
857 - All Window objects must be associated with the Application.
858 With this, there is no need to emit our own 'window-added'/'window-
859 removed' signals, as those will be emited by GtkApplication whenever
860 gtk_application_add_window() and gtk_application_remove_window() are
861 called. Also, 'window-removed' was not being used anywhere.
862
863 2016-02-18 Uri Lublin <uril@redhat.com>
864
865 spice: vv-file: do not ignore usb-filter
866 Fixes rhbz#1309634
867
868 Acked-by: Fabiano Fidêncio <fidencio@redhat.com>
869
870 2016-02-15 Eduardo Lima (Etrunko) <etrunko@redhat.com>
871
872 Minor code cleanups
873 - Reuse #ifdef HAVE_SPICE_GTK block for include.
874 - Move declaration of vfunc together with others of the same class.
875 - Move variable declaration to the top of the function.
876
877 2016-02-15 Fabiano Fidêncio <fidencio@redhat.com>
878
879 Drop support to gtk2
880 The 3.0 release was the last one that still supports GTK2. For the
881 Windows builds the support to GTK2 was dropped in the previous release.
882 Let's do the same for the entire project now.
883
884 2016-02-15 Pavel Grunt <pgrunt@redhat.com>
885
886 display: Use correct variable name
887 Fix gtk2 build
888
889 display: Remove zoom property
890 It is possible to get the same info from the "zoom-level" property.
891 virt_viewer_display_get_zoom() now returns TRUE if zoom level != 100
892
893 display: Use common code to get preferred size
894
895 app: Compute monitor mapping only in fullscreen
896
897 app: Do not show usbredir button without session
898 The button is visible in the fullscreen toolbar when waiting for a guest.
899 Clicking on it causes the runtime warning:
900 virt-viewer-CRITICAL **: virt_viewer_session_usb_device_selection: assertion 'VIRT_VIEWER_IS_SESSION(self)' failed
901
902 app: Add comment only when config file has VM group
903 Avoid the debug message on close:
904 virt-viewer-DEBUG: Unable to get comment from key file: Key file does not have group '39cd210d-5d45-478a-91fe-b3680307f2df'
905
906 app: Return early on empty monitor mapping
907 Resolves:
908 https://bugzilla.redhat.com/show_bug.cgi?id=1304648
909
910 2016-02-03 Pavel Grunt <pgrunt@redhat.com>
911
912 display: Set value of desktop width and height property directly
913 Avoid calling gtk_widget_queue_resize() and emiting
914 the "display-desktop-resize" signal.
915 The only user of the properties is virt_viewer_display_spice_set_desktop()
916 which will call the function and emit the signal after setting both
917 "desktop-width" and "desktop-height" properties.
918
919 Acked-by: Eduardo Lima (Etrunko) <etrunko@redhat.com>
920
921 display: Return early and remove a block
922 Acked-by: Eduardo Lima (Etrunko) <etrunko@redhat.com>
923
924 display: Remove unnecessary VIRT_VIEWER_DISPLAY cast
925 Acked-by: Eduardo Lima (Etrunko) <etrunko@redhat.com>
926
927 2016-01-18 Fabiano Fidêncio <fidencio@redhat.com>
928
929 Remove GSLice usage
930 It's being slowly deprecated in glib
931 https://bugzilla.gnome.org/show_bug.cgi?id=754687
932
933 2016-01-13 Jonathon Jongsma <jjongsma@redhat.com>
934
935 display: Set useful values for MIN_DISPLAY_{WIDTH, HEIGHT}
936 Nowadays the value for MIN_DISPLAY_{WIDTH,HEIGHT} is 50. This arbitrary
937 value doesn't bring any benefit, doesn't provide a useful size for a
938 desktop to be usable and can actually trigger some undefined behavior
939 when reaching resolutions that are lower than the ones provided by the
940 video drivers (as in rhbz#1296878).
941
942 In order to avoid these issues and provide a minimum resolution that can
943 still be useful for our users, let's use the same values for minimum
944 width and height used by the linux QXL drivers (320x200).
945
946 This also requires us to adjust the minimum requested widget size when
947 zoom is enabled so that we don't accidentally request a size smaller
948 than the driver can support.
949
950 Related: rhbz#1296878
951
952 2016-01-08 Fabiano Fidêncio <fidencio@redhat.com>
953
954 display: set min value for desktop-{width,height} props as MIN_DISPLAY_{WIDTH,HEIGHT}
955 Otherwise we can have warnings when resizing the virt-viewer window to
956 the smallest possible size, like:
957
958 (virt-viewer:11187): GLib-GObject-WARNING **: value "50" of type `gint'
959 is invalid or out of range for property `desktop-height' of type `gint'
960
961 Related: rhbz#1296878
5962
6963 2015-12-07 Daniel P. Berrange <berrange@redhat.com>
7964
+5
-5
Makefile.am less more
11
22 ACLOCAL_AMFLAGS = -I m4
33
4 SUBDIRS = icons src man po data
4 SUBDIRS = icons src man po data tests
55
66 AM_DISTCHECK_CONFIGURE_FLAGS = --disable-update-mimedb
77 EXTRA_DIST = \
4040 # Generate the ChangeLog file (with all entries since the switch to git)
4141 # and insert it into the directory we're about to use to create a tarball.
4242 if OS_WIN32
43 .PHONY: gen-ChangeLog gen-AUTHORS nsis
43 .PHONY: gen-ChangeLog gen-AUTHORS msi
4444 else
4545 .PHONY: gen-ChangeLog gen-AUTHORS
4646 endif
6262 fi
6363
6464 if OS_WIN32
65 .PHONY: nsis
66 nsis:
67 make -C $(builddir)/data virt-viewer-$(VERSION).exe
65 .PHONY: msi
66 msi:
67 make -C $(builddir)/data msi
6868 endif
6969
7070
+12
-16
Makefile.in less more
8888 host_triplet = @host@
8989 subdir = .
9090 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
91 am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
92 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
93 $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
94 $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
95 $(top_srcdir)/configure.ac
91 am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
92 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
93 $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
94 $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
9695 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
9796 $(ACLOCAL_M4)
9897 DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
247246 GLIB2_CFLAGS = @GLIB2_CFLAGS@
248247 GLIB2_LIBS = @GLIB2_LIBS@
249248 GLIB2_REQUIRED = @GLIB2_REQUIRED@
249 GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
250250 GLIB_MKENUMS = @GLIB_MKENUMS@
251251 GMOFILES = @GMOFILES@
252252 GMSGFMT = @GMSGFMT@
253253 GOVIRT_REQUIRED = @GOVIRT_REQUIRED@
254254 GREP = @GREP@
255 GTK2_REQUIRED = @GTK2_REQUIRED@
256 GTK3_REQUIRED = @GTK3_REQUIRED@
257 GTK_API_VERSION = @GTK_API_VERSION@
258255 GTK_CFLAGS = @GTK_CFLAGS@
259256 GTK_LIBS = @GTK_LIBS@
260257 GTK_REQUIRED = @GTK_REQUIRED@
261 GTK_VNC1_REQUIRED = @GTK_VNC1_REQUIRED@
262 GTK_VNC2_REQUIRED = @GTK_VNC2_REQUIRED@
263 GTK_VNC_API_VERSION = @GTK_VNC_API_VERSION@
264258 GTK_VNC_CFLAGS = @GTK_VNC_CFLAGS@
265259 GTK_VNC_LIBS = @GTK_VNC_LIBS@
260 GTK_VNC_REQUIRED = @GTK_VNC_REQUIRED@
266261 ICOTOOL = @ICOTOOL@
267262 INSTALL = @INSTALL@
268263 INSTALL_DATA = @INSTALL_DATA@
285280 LIBS = @LIBS@
286281 LIBTOOL = @LIBTOOL@
287282 LIBVIRT_CFLAGS = @LIBVIRT_CFLAGS@
283 LIBVIRT_GLIB_REQUIRED = @LIBVIRT_GLIB_REQUIRED@
288284 LIBVIRT_LIBS = @LIBVIRT_LIBS@
289285 LIBVIRT_REQUIRED = @LIBVIRT_REQUIRED@
290286 LIBXML2_CFLAGS = @LIBXML2_CFLAGS@
401397 top_srcdir = @top_srcdir@
402398 NULL =
403399 ACLOCAL_AMFLAGS = -I m4
404 SUBDIRS = icons src man po data
400 SUBDIRS = icons src man po data tests
405401 AM_DISTCHECK_CONFIGURE_FLAGS = --disable-update-mimedb
406402 EXTRA_DIST = \
407403 $(PACKAGE).spec \
929925
930926 # Generate the ChangeLog file (with all entries since the switch to git)
931927 # and insert it into the directory we're about to use to create a tarball.
932 @OS_WIN32_TRUE@.PHONY: gen-ChangeLog gen-AUTHORS nsis
928 @OS_WIN32_TRUE@.PHONY: gen-ChangeLog gen-AUTHORS msi
933929 @OS_WIN32_FALSE@.PHONY: gen-ChangeLog gen-AUTHORS
934930
935931 gen-ChangeLog:
948944 mv -f $(distdir)/AUTHORS-tmp $(distdir)/AUTHORS ; \
949945 fi
950946
951 @OS_WIN32_TRUE@.PHONY: nsis
952 @OS_WIN32_TRUE@nsis:
953 @OS_WIN32_TRUE@ make -C $(builddir)/data virt-viewer-$(VERSION).exe
947 @OS_WIN32_TRUE@.PHONY: msi
948 @OS_WIN32_TRUE@msi:
949 @OS_WIN32_TRUE@ make -C $(builddir)/data msi
954950
955951 # this make sure those files are regenerated when they change
956952 # (in maintainer-mode)
+32
-1
NEWS less more
00 Virt Viewer News
11 ================
22
3 3.1: Dec 17, 2015
3 4.0: Jun 20, 2016
44 -----------------
55
6 - Drop support for gtk2 builds
7 - Require spice-gtk >= 0.31
8 - Require glib2 >= 2.38
9 - Require gtk3 >= 3.10
10 - Require libvirt-glib >= 0.1.8
11 - Increase minimum window size fo 320x200 instead of 50x50
12 - Remove use of GSLice
13 - Don't show usbredir button if not connected yet
14 - Only compute monitor mapping in full screen
15 - Don't ignore usb-filter in spiec vv-file
16 - Port to use GtkApplication API
17 - Don't leave window open after connection failure
18 - Validate symbols from max glib/gdk versions
19 - Don't use GtkStock
20 - Don't use gtk_widget-modify_{fg,bg} APIs
21 - Drop use of built-in eventloop in favour of libvirt-glib
22 - Don't open X display while parsing command line
23 - Fix window title
24 - Use GResource for building ui files into binary
25 - Fix crash with invalid spice monitor mapping
26 - Add dialog to show file transfer progress and allow
27 cancelling
28 - Remove unused nsis installer support
29 - Include adwaita icon theme in msi builds
30 - Add more menu mnemonics
31 - Fix support for windows consoles to allow I/O redirection
32 - Add support for ovirt sso-token in vv-file
33 - Fix crash with zooming window while not connected
34 - Remove custom auto drawer widget with GtkRevealer
35 - Add appdata file for gnome software
36 - Misc other bug fixes
637 - Refresh translations
738
839 3.0: Dec 3, 2015
+5
-8
README less more
33 Virt Viewer provides a graphical viewer for the guest OS
44 display. At this time is supports guest OS using the VNC
55 or SPICE protocols. Further protocols may be supported in
6 the future as user demand dicatates. The viewer can connect
6 the future as user demand dictates. The viewer can connect
77 directly to both local and remotely hosted guest OS, optionally
88 using SSL/TLS encryption.
99
10 Virt Viewer can be built with either GTK2 or GTK3, with the
11 default option currently being GTK2. The choice can be made
12 with:
10 Virt Viewer is the GTK3 application. Virt Viewer 3.0 was
11 the last release that supported GTK2.
1312
14 ./configure --with-gtk=3.0 (or =2.0)
15
16 Virt Viewer uses the GTK-VNC (>= 0.4.3) widget to provide a
13 Virt Viewer uses the GTK-VNC (>= 0.4.0) widget to provide a
1714 display of the VNC protocol, which is available from
1815
1916 http://gtk-vnc.sourceforge.net/
2118 Virt Viewer uses the SPICE-GTK (>= 0.30) widget to provide a
2219 display of the SPICE protocol, which is available from:
2320
24 http://spice-space.org/page/Spice-Gtk
21 http://www.spice-space.org/download.html
2522
2623 Use of either SPICE-GTK or GTK-VNC can be disabled at time
2724 of configure, with --without-gtk-vnc or --without-spice-gtk
+1
-1
acinclude.m4 less more
3333 try_compiler_flags="$try_compiler_flags -Wall -Wmissing-prototypes -std=c99 -Wnested-externs -Wpointer-arith"
3434 try_compiler_flags="$try_compiler_flags -Wextra -Wshadow -Wcast-align -Wwrite-strings -Waggregate-return"
3535 # Removed -Wstrict-prototypes to avoid GTK bug
36 try_compiler_flags="$try_compiler_flags -Winline -Wredundant-decls -Wno-sign-compare -Wno-deprecated-declarations"
36 try_compiler_flags="$try_compiler_flags -Winline -Wredundant-decls -Wdeprecated-declarations -Wno-sign-compare"
3737 if test "$enable_compile_warnings" = "error" ; then
3838 try_compiler_flags="$try_compiler_flags -Werror"
3939 fi
+343
-92
aclocal.m4 less more
334334 # on various variables needed by the Makefile.in.in installed by
335335 # glib-gettextize.
336336 dnl
337 glib_DEFUN([GLIB_GNU_GETTEXT],
337 AU_DEFUN([GLIB_GNU_GETTEXT],
338338 [AC_REQUIRE([AC_PROG_CC])dnl
339339
340340 GLIB_LC_MESSAGES
404404 rm -f po/POTFILES
405405 sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \
406406 < $srcdir/po/POTFILES.in > po/POTFILES
407 ])
407 ],
408 [[$0: This macro is deprecated. You should use upstream gettext instead.]])
408409
409410 # AM_GLIB_DEFINE_LOCALEDIR(VARIABLE)
410411 # -------------------------------
455456 fi])
456457
457458
459
460 dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
461 # serial 42 IT_PROG_INTLTOOL
462 AC_DEFUN([IT_PROG_INTLTOOL], [
463 AC_PREREQ([2.50])dnl
464 AC_REQUIRE([AM_NLS])dnl
465
466 case "$am__api_version" in
467 1.[01234])
468 AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool])
469 ;;
470 *)
471 ;;
472 esac
473
474 INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
475 INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3`
476 INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
477 if test -n "$1"; then
478 AC_MSG_CHECKING([for intltool >= $1])
479 AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
480 test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
481 AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.])
482 fi
483
484 AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update])
485 AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge])
486 AC_PATH_PROG(INTLTOOL_EXTRACT, [intltool-extract])
487 if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then
488 AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.])
489 fi
490
491 if test -z "$AM_DEFAULT_VERBOSITY"; then
492 AM_DEFAULT_VERBOSITY=1
493 fi
494 AC_SUBST([AM_DEFAULT_VERBOSITY])
495
496 INTLTOOL_V_MERGE='$(INTLTOOL__v_MERGE_$(V))'
497 INTLTOOL__v_MERGE_='$(INTLTOOL__v_MERGE_$(AM_DEFAULT_VERBOSITY))'
498 INTLTOOL__v_MERGE_0='@echo " ITMRG " [$]@;'
499 AC_SUBST(INTLTOOL_V_MERGE)
500 AC_SUBST(INTLTOOL__v_MERGE_)
501 AC_SUBST(INTLTOOL__v_MERGE_0)
502
503 INTLTOOL_V_MERGE_OPTIONS='$(intltool__v_merge_options_$(V))'
504 intltool__v_merge_options_='$(intltool__v_merge_options_$(AM_DEFAULT_VERBOSITY))'
505 intltool__v_merge_options_0='-q'
506 AC_SUBST(INTLTOOL_V_MERGE_OPTIONS)
507 AC_SUBST(intltool__v_merge_options_)
508 AC_SUBST(intltool__v_merge_options_0)
509
510 INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
511 INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
512 INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
513 INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
514 INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -p $(top_srcdir)/po $< [$]@'
515 INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
516 INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
517 INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
518 INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
519 INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
520 INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
521 if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge 5000; then
522 INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u --no-translations $< [$]@'
523 else
524 INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; $(INTLTOOL_V_MERGE)_it_tmp_dir=tmp.intltool.[$][$]RANDOM && mkdir [$][$]_it_tmp_dir && LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u [$][$]_it_tmp_dir $< [$]@ && rmdir [$][$]_it_tmp_dir'
525 fi
526 INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
527 INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
528 INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
529 INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
530 INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
531 INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
532 INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(INTLTOOL_V_MERGE)LC_ALL=C $(INTLTOOL_MERGE) $(INTLTOOL_V_MERGE_OPTIONS) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
533
534 _IT_SUBST(INTLTOOL_DESKTOP_RULE)
535 _IT_SUBST(INTLTOOL_DIRECTORY_RULE)
536 _IT_SUBST(INTLTOOL_KEYS_RULE)
537 _IT_SUBST(INTLTOOL_PROP_RULE)
538 _IT_SUBST(INTLTOOL_OAF_RULE)
539 _IT_SUBST(INTLTOOL_PONG_RULE)
540 _IT_SUBST(INTLTOOL_SERVER_RULE)
541 _IT_SUBST(INTLTOOL_SHEET_RULE)
542 _IT_SUBST(INTLTOOL_SOUNDLIST_RULE)
543 _IT_SUBST(INTLTOOL_UI_RULE)
544 _IT_SUBST(INTLTOOL_XAM_RULE)
545 _IT_SUBST(INTLTOOL_KBD_RULE)
546 _IT_SUBST(INTLTOOL_XML_RULE)
547 _IT_SUBST(INTLTOOL_XML_NOMERGE_RULE)
548 _IT_SUBST(INTLTOOL_CAVES_RULE)
549 _IT_SUBST(INTLTOOL_SCHEMAS_RULE)
550 _IT_SUBST(INTLTOOL_THEME_RULE)
551 _IT_SUBST(INTLTOOL_SERVICE_RULE)
552 _IT_SUBST(INTLTOOL_POLICY_RULE)
553
554 # Check the gettext tools to make sure they are GNU
555 AC_PATH_PROG(XGETTEXT, xgettext)
556 AC_PATH_PROG(MSGMERGE, msgmerge)
557 AC_PATH_PROG(MSGFMT, msgfmt)
558 AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
559 if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
560 AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
561 fi
562 xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`"
563 mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`"
564 mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`"
565 if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then
566 AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
567 fi
568
569 AC_PATH_PROG(INTLTOOL_PERL, perl)
570 if test -z "$INTLTOOL_PERL"; then
571 AC_MSG_ERROR([perl not found])
572 fi
573 AC_MSG_CHECKING([for perl >= 5.8.1])
574 $INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
575 if test $? -ne 0; then
576 AC_MSG_ERROR([perl 5.8.1 is required for intltool])
577 else
578 IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"`
579 AC_MSG_RESULT([$IT_PERL_VERSION])
580 fi
581 if test "x$2" != "xno-xml"; then
582 AC_MSG_CHECKING([for XML::Parser])
583 if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
584 AC_MSG_RESULT([ok])
585 else
586 AC_MSG_ERROR([XML::Parser perl module is required for intltool])
587 fi
588 fi
589
590 # Substitute ALL_LINGUAS so we can use it in po/Makefile
591 AC_SUBST(ALL_LINGUAS)
592
593 IT_PO_SUBDIR([po])
594
595 ])
596
597
598 # IT_PO_SUBDIR(DIRNAME)
599 # ---------------------
600 # All po subdirs have to be declared with this macro; the subdir "po" is
601 # declared by IT_PROG_INTLTOOL.
602 #
603 AC_DEFUN([IT_PO_SUBDIR],
604 [AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS.
605 dnl
606 dnl The following CONFIG_COMMANDS should be executed at the very end
607 dnl of config.status.
608 AC_CONFIG_COMMANDS_PRE([
609 AC_CONFIG_COMMANDS([$1/stamp-it], [
610 if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then
611 AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.])
612 fi
613 rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp"
614 >"$1/stamp-it.tmp"
615 [sed '/^#/d
616 s/^[[].*] *//
617 /^[ ]*$/d
618 '"s|^| $ac_top_srcdir/|" \
619 "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES"
620 ]
621 [sed '/^POTFILES =/,/[^\\]$/ {
622 /^POTFILES =/!d
623 r $1/POTFILES
624 }
625 ' "$1/Makefile.in" >"$1/Makefile"]
626 rm -f "$1/Makefile.tmp"
627 mv "$1/stamp-it.tmp" "$1/stamp-it"
628 ])
629 ])dnl
630 ])
631
632 # _IT_SUBST(VARIABLE)
633 # -------------------
634 # Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
635 #
636 AC_DEFUN([_IT_SUBST],
637 [
638 AC_SUBST([$1])
639 m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
640 ]
641 )
642
643 # deprecated macros
644 AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
645 # A hint is needed for aclocal from Automake <= 1.9.4:
646 # AC_DEFUN([AC_PROG_INTLTOOL], ...)
647
648
458649 # nls.m4 serial 5 (gettext-0.18)
459 dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014 Free Software Foundation,
460 dnl Inc.
650 dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014, 2016 Free Software
651 dnl Foundation, Inc.
461652 dnl This file is free software; the Free Software Foundation
462653 dnl gives unlimited permission to copy and/or distribute it,
463654 dnl with or without modifications, as long as this notice is preserved.
464655 dnl
465 dnl This file can can be used in projects which are not available under
656 dnl This file can be used in projects which are not available under
466657 dnl the GNU General Public License or the GNU Library General Public
467658 dnl License but which still want to provide support for the GNU gettext
468659 dnl functionality.
469660 dnl Please note that the actual code of the GNU gettext library is covered
470661 dnl by the GNU Library General Public License, and the rest of the GNU
471 dnl gettext package package is covered by the GNU General Public License.
662 dnl gettext package is covered by the GNU General Public License.
472663 dnl They are *not* in the public domain.
473664
474665 dnl Authors:
488679 AC_SUBST([USE_NLS])
489680 ])
490681
491 # pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
492 # serial 1 (pkg-config-0.24)
493 #
494 # Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
495 #
496 # This program is free software; you can redistribute it and/or modify
497 # it under the terms of the GNU General Public License as published by
498 # the Free Software Foundation; either version 2 of the License, or
499 # (at your option) any later version.
500 #
501 # This program is distributed in the hope that it will be useful, but
502 # WITHOUT ANY WARRANTY; without even the implied warranty of
503 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
504 # General Public License for more details.
505 #
506 # You should have received a copy of the GNU General Public License
507 # along with this program; if not, write to the Free Software
508 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
509 #
510 # As a special exception to the GNU General Public License, if you
511 # distribute this file as part of a program that contains a
512 # configuration script generated by Autoconf, you may include it under
513 # the same distribution terms that you use for the rest of that program.
514
515 # PKG_PROG_PKG_CONFIG([MIN-VERSION])
516 # ----------------------------------
682 dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*-
683 dnl serial 11 (pkg-config-0.29)
684 dnl
685 dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
686 dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
687 dnl
688 dnl This program is free software; you can redistribute it and/or modify
689 dnl it under the terms of the GNU General Public License as published by
690 dnl the Free Software Foundation; either version 2 of the License, or
691 dnl (at your option) any later version.
692 dnl
693 dnl This program is distributed in the hope that it will be useful, but
694 dnl WITHOUT ANY WARRANTY; without even the implied warranty of
695 dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
696 dnl General Public License for more details.
697 dnl
698 dnl You should have received a copy of the GNU General Public License
699 dnl along with this program; if not, write to the Free Software
700 dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
701 dnl 02111-1307, USA.
702 dnl
703 dnl As a special exception to the GNU General Public License, if you
704 dnl distribute this file as part of a program that contains a
705 dnl configuration script generated by Autoconf, you may include it under
706 dnl the same distribution terms that you use for the rest of that
707 dnl program.
708
709 dnl PKG_PREREQ(MIN-VERSION)
710 dnl -----------------------
711 dnl Since: 0.29
712 dnl
713 dnl Verify that the version of the pkg-config macros are at least
714 dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's
715 dnl installed version of pkg-config, this checks the developer's version
716 dnl of pkg.m4 when generating configure.
717 dnl
718 dnl To ensure that this macro is defined, also add:
719 dnl m4_ifndef([PKG_PREREQ],
720 dnl [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])])
721 dnl
722 dnl See the "Since" comment for each macro you use to see what version
723 dnl of the macros you require.
724 m4_defun([PKG_PREREQ],
725 [m4_define([PKG_MACROS_VERSION], [0.29])
726 m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
727 [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
728 ])dnl PKG_PREREQ
729
730 dnl PKG_PROG_PKG_CONFIG([MIN-VERSION])
731 dnl ----------------------------------
732 dnl Since: 0.16
733 dnl
734 dnl Search for the pkg-config tool and set the PKG_CONFIG variable to
735 dnl first found in the path. Checks that the version of pkg-config found
736 dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is
737 dnl used since that's the first version where most current features of
738 dnl pkg-config existed.
517739 AC_DEFUN([PKG_PROG_PKG_CONFIG],
518740 [m4_pattern_forbid([^_?PKG_[A-Z_]+$])
519741 m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
535757 PKG_CONFIG=""
536758 fi
537759 fi[]dnl
538 ])# PKG_PROG_PKG_CONFIG
539
540 # PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
541 #
542 # Check to see whether a particular set of modules exists. Similar
543 # to PKG_CHECK_MODULES(), but does not set variables or print errors.
544 #
545 # Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
546 # only at the first occurence in configure.ac, so if the first place
547 # it's called might be skipped (such as if it is within an "if", you
548 # have to call PKG_CHECK_EXISTS manually
549 # --------------------------------------------------------------
760 ])dnl PKG_PROG_PKG_CONFIG
761
762 dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
763 dnl -------------------------------------------------------------------
764 dnl Since: 0.18
765 dnl
766 dnl Check to see whether a particular set of modules exists. Similar to
767 dnl PKG_CHECK_MODULES(), but does not set variables or print errors.
768 dnl
769 dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
770 dnl only at the first occurence in configure.ac, so if the first place
771 dnl it's called might be skipped (such as if it is within an "if", you
772 dnl have to call PKG_CHECK_EXISTS manually
550773 AC_DEFUN([PKG_CHECK_EXISTS],
551774 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
552775 if test -n "$PKG_CONFIG" && \
556779 $3])dnl
557780 fi])
558781
559 # _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
560 # ---------------------------------------------
782 dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
783 dnl ---------------------------------------------
784 dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting
785 dnl pkg_failed based on the result.
561786 m4_define([_PKG_CONFIG],
562787 [if test -n "$$1"; then
563788 pkg_cv_[]$1="$$1"
569794 else
570795 pkg_failed=untried
571796 fi[]dnl
572 ])# _PKG_CONFIG
573
574 # _PKG_SHORT_ERRORS_SUPPORTED
575 # -----------------------------
797 ])dnl _PKG_CONFIG
798
799 dnl _PKG_SHORT_ERRORS_SUPPORTED
800 dnl ---------------------------
801 dnl Internal check to see if pkg-config supports short errors.
576802 AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
577803 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])
578804 if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
580806 else
581807 _pkg_short_errors_supported=no
582808 fi[]dnl
583 ])# _PKG_SHORT_ERRORS_SUPPORTED
584
585
586 # PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
587 # [ACTION-IF-NOT-FOUND])
588 #
589 #
590 # Note that if there is a possibility the first call to
591 # PKG_CHECK_MODULES might not happen, you should be sure to include an
592 # explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
593 #
594 #
595 # --------------------------------------------------------------
809 ])dnl _PKG_SHORT_ERRORS_SUPPORTED
810
811
812 dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
813 dnl [ACTION-IF-NOT-FOUND])
814 dnl --------------------------------------------------------------
815 dnl Since: 0.4.0
816 dnl
817 dnl Note that if there is a possibility the first call to
818 dnl PKG_CHECK_MODULES might not happen, you should be sure to include an
819 dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
596820 AC_DEFUN([PKG_CHECK_MODULES],
597821 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
598822 AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
646870 AC_MSG_RESULT([yes])
647871 $3
648872 fi[]dnl
649 ])# PKG_CHECK_MODULES
650
651
652 # PKG_INSTALLDIR(DIRECTORY)
653 # -------------------------
654 # Substitutes the variable pkgconfigdir as the location where a module
655 # should install pkg-config .pc files. By default the directory is
656 # $libdir/pkgconfig, but the default can be changed by passing
657 # DIRECTORY. The user can override through the --with-pkgconfigdir
658 # parameter.
873 ])dnl PKG_CHECK_MODULES
874
875
876 dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
877 dnl [ACTION-IF-NOT-FOUND])
878 dnl ---------------------------------------------------------------------
879 dnl Since: 0.29
880 dnl
881 dnl Checks for existence of MODULES and gathers its build flags with
882 dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags
883 dnl and VARIABLE-PREFIX_LIBS from --libs.
884 dnl
885 dnl Note that if there is a possibility the first call to
886 dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to
887 dnl include an explicit call to PKG_PROG_PKG_CONFIG in your
888 dnl configure.ac.
889 AC_DEFUN([PKG_CHECK_MODULES_STATIC],
890 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
891 _save_PKG_CONFIG=$PKG_CONFIG
892 PKG_CONFIG="$PKG_CONFIG --static"
893 PKG_CHECK_MODULES($@)
894 PKG_CONFIG=$_save_PKG_CONFIG[]dnl
895 ])dnl PKG_CHECK_MODULES_STATIC
896
897
898 dnl PKG_INSTALLDIR([DIRECTORY])
899 dnl -------------------------
900 dnl Since: 0.27
901 dnl
902 dnl Substitutes the variable pkgconfigdir as the location where a module
903 dnl should install pkg-config .pc files. By default the directory is
904 dnl $libdir/pkgconfig, but the default can be changed by passing
905 dnl DIRECTORY. The user can override through the --with-pkgconfigdir
906 dnl parameter.
659907 AC_DEFUN([PKG_INSTALLDIR],
660908 [m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
661909 m4_pushdef([pkg_description],
666914 AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
667915 m4_popdef([pkg_default])
668916 m4_popdef([pkg_description])
669 ]) dnl PKG_INSTALLDIR
670
671
672 # PKG_NOARCH_INSTALLDIR(DIRECTORY)
673 # -------------------------
674 # Substitutes the variable noarch_pkgconfigdir as the location where a
675 # module should install arch-independent pkg-config .pc files. By
676 # default the directory is $datadir/pkgconfig, but the default can be
677 # changed by passing DIRECTORY. The user can override through the
678 # --with-noarch-pkgconfigdir parameter.
917 ])dnl PKG_INSTALLDIR
918
919
920 dnl PKG_NOARCH_INSTALLDIR([DIRECTORY])
921 dnl --------------------------------
922 dnl Since: 0.27
923 dnl
924 dnl Substitutes the variable noarch_pkgconfigdir as the location where a
925 dnl module should install arch-independent pkg-config .pc files. By
926 dnl default the directory is $datadir/pkgconfig, but the default can be
927 dnl changed by passing DIRECTORY. The user can override through the
928 dnl --with-noarch-pkgconfigdir parameter.
679929 AC_DEFUN([PKG_NOARCH_INSTALLDIR],
680930 [m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
681931 m4_pushdef([pkg_description],
686936 AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
687937 m4_popdef([pkg_default])
688938 m4_popdef([pkg_description])
689 ]) dnl PKG_NOARCH_INSTALLDIR
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.
939 ])dnl PKG_NOARCH_INSTALLDIR
940
941
942 dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
943 dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
944 dnl -------------------------------------------
945 dnl Since: 0.28
946 dnl
947 dnl Retrieves the value of the pkg-config variable for the given module.
696948 AC_DEFUN([PKG_CHECK_VAR],
697949 [AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
698950 AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
701953 AS_VAR_COPY([$1], [pkg_cv_][$1])
702954
703955 AS_VAR_IF([$1], [""], [$5], [$4])dnl
704 ])# PKG_CHECK_VAR
956 ])dnl PKG_CHECK_VAR
705957
706958 # Copyright (C) 2002-2014 Free Software Foundation, Inc.
707959 #
18332085 AC_SUBST([am__untar])
18342086 ]) # _AM_PROG_TAR
18352087
1836 m4_include([m4/intltool.m4])
18372088 m4_include([m4/libtool.m4])
18382089 m4_include([m4/ltoptions.m4])
18392090 m4_include([m4/ltsugar.m4])
+132
-151
configure less more
00 #! /bin/sh
11 # Guess values for system-dependent variables and create Makefiles.
2 # Generated by GNU Autoconf 2.69 for virt-viewer 3.1.
2 # Generated by GNU Autoconf 2.69 for virt-viewer 4.0.
33 #
44 #
55 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
586586 # Identity of this package.
587587 PACKAGE_NAME='virt-viewer'
588588 PACKAGE_TARNAME='virt-viewer'
589 PACKAGE_VERSION='3.1'
590 PACKAGE_STRING='virt-viewer 3.1'
589 PACKAGE_VERSION='4.0'
590 PACKAGE_STRING='virt-viewer 4.0'
591591 PACKAGE_BUGREPORT=''
592592 PACKAGE_URL=''
593593
656656 GTK_VNC_CFLAGS
657657 GTK_LIBS
658658 GTK_CFLAGS
659 HAVE_GTK_3_FALSE
660 HAVE_GTK_3_TRUE
661 HAVE_GTK_2_FALSE
662 HAVE_GTK_2_TRUE
663 GTK_VNC_API_VERSION
664 GTK_REQUIRED
665 GTK_API_VERSION
666659 HAVE_LIBVIRT_FALSE
667660 HAVE_LIBVIRT_TRUE
668661 LIBVIRT_LIBS
669662 LIBVIRT_CFLAGS
670663 LIBXML2_LIBS
671664 LIBXML2_CFLAGS
665 GLIB_COMPILE_RESOURCES
672666 GLIB2_LIBS
673667 GLIB2_CFLAGS
674668 GLIB_MKENUMS
772766 GOVIRT_REQUIRED
773767 SPICE_PROTOCOL_REQUIRED
774768 SPICE_GTK_REQUIRED
775 GTK_VNC2_REQUIRED
776 GTK_VNC1_REQUIRED
777 GTK3_REQUIRED
778 GTK2_REQUIRED
769 GTK_VNC_REQUIRED
770 GTK_REQUIRED
771 LIBVIRT_GLIB_REQUIRED
779772 LIBVIRT_REQUIRED
780773 LIBXML2_REQUIRED
781774 GLIB2_REQUIRED
869862 enable_iso_c
870863 enable_nls
871864 with_libvirt
872 with_gtk
873865 with_gtk_vnc
874866 with_spice_gtk
875867 with_ovirt
892884 PKG_CONFIG_LIBDIR
893885 GLIB2_CFLAGS
894886 GLIB2_LIBS
887 GLIB_COMPILE_RESOURCES
895888 LIBXML2_CFLAGS
896889 LIBXML2_LIBS
897890 LIBVIRT_CFLAGS
14481441 # Omit some internal or obsolete options to make the list less imposing.
14491442 # This message is too long to be a string in the A/UX 3.1 sh.
14501443 cat <<_ACEOF
1451 \`configure' configures virt-viewer 3.1 to adapt to many kinds of systems.
1444 \`configure' configures virt-viewer 4.0 to adapt to many kinds of systems.
14521445
14531446 Usage: $0 [OPTION]... [VAR=VALUE]...
14541447
15181511
15191512 if test -n "$ac_init_help"; then
15201513 case $ac_init_help in
1521 short | recursive ) echo "Configuration of virt-viewer 3.1:";;
1514 short | recursive ) echo "Configuration of virt-viewer 4.0:";;
15221515 esac
15231516 cat <<\_ACEOF
15241517
15561549 --with-sysroot[=DIR] Search for dependent libraries within DIR (or the
15571550 compiler's sysroot if not specified).
15581551 --without-libvirt Ignore presence of libvirt and disable it
1559 --with-gtk=2.0|3.0 which gtk+ version to compile against (default: 3.0)
15601552 --without-gtk-vnc Ignore presence of gtk-vnc and disable it
15611553 --without-spice-gtk Ignore presence of spice-gtk and disable it
15621554 --without-ovirt Ignore presence of librest and disable oVirt support
15821574 GLIB2_CFLAGS
15831575 C compiler flags for GLIB2, overriding pkg-config
15841576 GLIB2_LIBS linker flags for GLIB2, overriding pkg-config
1577 GLIB_COMPILE_RESOURCES
1578 the glib-compile-resources program
15851579 LIBXML2_CFLAGS
15861580 C compiler flags for LIBXML2, overriding pkg-config
15871581 LIBXML2_LIBS
16781672 test -n "$ac_init_help" && exit $ac_status
16791673 if $ac_init_version; then
16801674 cat <<\_ACEOF
1681 virt-viewer configure 3.1
1675 virt-viewer configure 4.0
16821676 generated by GNU Autoconf 2.69
16831677
16841678 Copyright (C) 2012 Free Software Foundation, Inc.
20432037 This file contains any messages produced by compilers while
20442038 running configure, to aid debugging if configure makes a mistake.
20452039
2046 It was created by virt-viewer $as_me 3.1, which was
2040 It was created by virt-viewer $as_me 4.0, which was
20472041 generated by GNU Autoconf 2.69. Invocation command line was
20482042
20492043 $ $0 $@
29102904
29112905 # Define the identity of the package.
29122906 PACKAGE='virt-viewer'
2913 VERSION='3.1'
2907 VERSION='4.0'
29142908
29152909
29162910 cat >>confdefs.h <<_ACEOF
31173111 AM_BACKSLASH='\'
31183112
31193113
3120 GLIB2_REQUIRED=2.22.0
3114 # Keep these two definitions in agreement.
3115 GLIB2_REQUIRED="2.38"
3116 GLIB2_ENCODED_VERSION="GLIB_VERSION_2_38"
3117
3118 # Keep these two definitions in agreement.
3119 GTK_REQUIRED="3.10"
3120 GTK_ENCODED_VERSION="GDK_VERSION_3_10"
3121
31213122 LIBXML2_REQUIRED="2.6.0"
31223123 LIBVIRT_REQUIRED="0.10.0"
3123 GTK2_REQUIRED="2.18.0"
3124 GTK3_REQUIRED="3.0"
3125 GTK_VNC1_REQUIRED="0.3.8"
3126 GTK_VNC2_REQUIRED="0.4.0"
3127 SPICE_GTK_REQUIRED="0.30"
3124 LIBVIRT_GLIB_REQUIRED="0.1.8"
3125 GTK_VNC_REQUIRED="0.4.0"
3126 SPICE_GTK_REQUIRED="0.31"
31283127 SPICE_PROTOCOL_REQUIRED="0.12.7"
31293128 GOVIRT_REQUIRED="0.3.2"
3130
31313129
31323130
31333131
1239812396 try_compiler_flags="$try_compiler_flags -Wall -Wmissing-prototypes -std=c99 -Wnested-externs -Wpointer-arith"
1239912397 try_compiler_flags="$try_compiler_flags -Wextra -Wshadow -Wcast-align -Wwrite-strings -Waggregate-return"
1240012398 # Removed -Wstrict-prototypes to avoid GTK bug
12401 try_compiler_flags="$try_compiler_flags -Winline -Wredundant-decls -Wno-sign-compare -Wno-deprecated-declarations"
12399 try_compiler_flags="$try_compiler_flags -Winline -Wredundant-decls -Wdeprecated-declarations -Wno-sign-compare"
1240212400 if test "$enable_compile_warnings" = "error" ; then
1240312401 try_compiler_flags="$try_compiler_flags -Werror"
1240412402 fi
1386513863 pkg_cv_GLIB2_CFLAGS="$GLIB2_CFLAGS"
1386613864 elif test -n "$PKG_CONFIG"; then
1386713865 if test -n "$PKG_CONFIG" && \
13868 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB2_REQUIRED gthread-2.0 gmodule-export-2.0\""; } >&5
13869 ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB2_REQUIRED gthread-2.0 gmodule-export-2.0") 2>&5
13866 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB2_REQUIRED gio-2.0 gthread-2.0 gmodule-export-2.0\""; } >&5
13867 ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB2_REQUIRED gio-2.0 gthread-2.0 gmodule-export-2.0") 2>&5
1387013868 ac_status=$?
1387113869 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1387213870 test $ac_status = 0; }; then
13873 pkg_cv_GLIB2_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= $GLIB2_REQUIRED gthread-2.0 gmodule-export-2.0" 2>/dev/null`
13871 pkg_cv_GLIB2_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= $GLIB2_REQUIRED gio-2.0 gthread-2.0 gmodule-export-2.0" 2>/dev/null`
1387413872 test "x$?" != "x0" && pkg_failed=yes
1387513873 else
1387613874 pkg_failed=yes
1388213880 pkg_cv_GLIB2_LIBS="$GLIB2_LIBS"
1388313881 elif test -n "$PKG_CONFIG"; then
1388413882 if test -n "$PKG_CONFIG" && \
13885 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB2_REQUIRED gthread-2.0 gmodule-export-2.0\""; } >&5
13886 ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB2_REQUIRED gthread-2.0 gmodule-export-2.0") 2>&5
13883 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= \$GLIB2_REQUIRED gio-2.0 gthread-2.0 gmodule-export-2.0\""; } >&5
13884 ($PKG_CONFIG --exists --print-errors "glib-2.0 >= $GLIB2_REQUIRED gio-2.0 gthread-2.0 gmodule-export-2.0") 2>&5
1388713885 ac_status=$?
1388813886 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1388913887 test $ac_status = 0; }; then
13890 pkg_cv_GLIB2_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB2_REQUIRED gthread-2.0 gmodule-export-2.0" 2>/dev/null`
13888 pkg_cv_GLIB2_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB2_REQUIRED gio-2.0 gthread-2.0 gmodule-export-2.0" 2>/dev/null`
1389113889 test "x$?" != "x0" && pkg_failed=yes
1389213890 else
1389313891 pkg_failed=yes
1390813906 _pkg_short_errors_supported=no
1390913907 fi
1391013908 if test $_pkg_short_errors_supported = yes; then
13911 GLIB2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= $GLIB2_REQUIRED gthread-2.0 gmodule-export-2.0" 2>&1`
13909 GLIB2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= $GLIB2_REQUIRED gio-2.0 gthread-2.0 gmodule-export-2.0" 2>&1`
1391213910 else
13913 GLIB2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= $GLIB2_REQUIRED gthread-2.0 gmodule-export-2.0" 2>&1`
13911 GLIB2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= $GLIB2_REQUIRED gio-2.0 gthread-2.0 gmodule-export-2.0" 2>&1`
1391413912 fi
1391513913 # Put the nasty error message in config.log where it belongs
1391613914 echo "$GLIB2_PKG_ERRORS" >&5
1391713915
13918 as_fn_error $? "Package requirements (glib-2.0 >= $GLIB2_REQUIRED gthread-2.0 gmodule-export-2.0) were not met:
13916 as_fn_error $? "Package requirements (glib-2.0 >= $GLIB2_REQUIRED gio-2.0 gthread-2.0 gmodule-export-2.0) were not met:
1391913917
1392013918 $GLIB2_PKG_ERRORS
1392113919
1394713945 $as_echo "yes" >&6; }
1394813946
1394913947 fi
13948 GLIB2_CFLAGS="$GLIB2_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=$GLIB2_ENCODED_VERSION \
13949 -DGLIB_VERSION_MAX_ALLOWED=$GLIB2_ENCODED_VERSION"
13950
13951
13952
13953 # Extract the first word of "glib-compile-resources", so it can be a program name with args.
13954 set dummy glib-compile-resources; ac_word=$2
13955 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
13956 $as_echo_n "checking for $ac_word... " >&6; }
13957 if ${ac_cv_path_GLIB_COMPILE_RESOURCES+:} false; then :
13958 $as_echo_n "(cached) " >&6
13959 else
13960 case $GLIB_COMPILE_RESOURCES in
13961 [\\/]* | ?:[\\/]*)
13962 ac_cv_path_GLIB_COMPILE_RESOURCES="$GLIB_COMPILE_RESOURCES" # Let the user override the test with a path.
13963 ;;
13964 *)
13965 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
13966 for as_dir in $PATH
13967 do
13968 IFS=$as_save_IFS
13969 test -z "$as_dir" && as_dir=.
13970 for ac_exec_ext in '' $ac_executable_extensions; do
13971 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
13972 ac_cv_path_GLIB_COMPILE_RESOURCES="$as_dir/$ac_word$ac_exec_ext"
13973 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
13974 break 2
13975 fi
13976 done
13977 done
13978 IFS=$as_save_IFS
13979
13980 ;;
13981 esac
13982 fi
13983 GLIB_COMPILE_RESOURCES=$ac_cv_path_GLIB_COMPILE_RESOURCES
13984 if test -n "$GLIB_COMPILE_RESOURCES"; then
13985 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GLIB_COMPILE_RESOURCES" >&5
13986 $as_echo "$GLIB_COMPILE_RESOURCES" >&6; }
13987 else
13988 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13989 $as_echo "no" >&6; }
13990 fi
13991
13992
13993 if test -z "$GLIB_COMPILE_RESOURCES"; then
13994 as_fn_error $? "glib-compile-resources not found" "$LINENO" 5
13995 fi
13996
1395013997
1395113998 pkg_failed=no
1395213999 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBXML2" >&5
1406914116 pkg_cv_LIBVIRT_CFLAGS="$LIBVIRT_CFLAGS"
1407014117 elif test -n "$PKG_CONFIG"; then
1407114118 if test -n "$PKG_CONFIG" && \
14072 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libvirt >= \$LIBVIRT_REQUIRED\""; } >&5
14073 ($PKG_CONFIG --exists --print-errors "libvirt >= $LIBVIRT_REQUIRED") 2>&5
14119 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libvirt >= \$LIBVIRT_REQUIRED libvirt-glib-1.0 >= \$LIBVIRT_GLIB_REQUIRED\""; } >&5
14120 ($PKG_CONFIG --exists --print-errors "libvirt >= $LIBVIRT_REQUIRED libvirt-glib-1.0 >= $LIBVIRT_GLIB_REQUIRED") 2>&5
1407414121 ac_status=$?
1407514122 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1407614123 test $ac_status = 0; }; then
14077 pkg_cv_LIBVIRT_CFLAGS=`$PKG_CONFIG --cflags "libvirt >= $LIBVIRT_REQUIRED" 2>/dev/null`
14124 pkg_cv_LIBVIRT_CFLAGS=`$PKG_CONFIG --cflags "libvirt >= $LIBVIRT_REQUIRED libvirt-glib-1.0 >= $LIBVIRT_GLIB_REQUIRED" 2>/dev/null`
1407814125 test "x$?" != "x0" && pkg_failed=yes
1407914126 else
1408014127 pkg_failed=yes
1408614133 pkg_cv_LIBVIRT_LIBS="$LIBVIRT_LIBS"
1408714134 elif test -n "$PKG_CONFIG"; then
1408814135 if test -n "$PKG_CONFIG" && \
14089 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libvirt >= \$LIBVIRT_REQUIRED\""; } >&5
14090 ($PKG_CONFIG --exists --print-errors "libvirt >= $LIBVIRT_REQUIRED") 2>&5
14136 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libvirt >= \$LIBVIRT_REQUIRED libvirt-glib-1.0 >= \$LIBVIRT_GLIB_REQUIRED\""; } >&5
14137 ($PKG_CONFIG --exists --print-errors "libvirt >= $LIBVIRT_REQUIRED libvirt-glib-1.0 >= $LIBVIRT_GLIB_REQUIRED") 2>&5
1409114138 ac_status=$?
1409214139 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1409314140 test $ac_status = 0; }; then
14094 pkg_cv_LIBVIRT_LIBS=`$PKG_CONFIG --libs "libvirt >= $LIBVIRT_REQUIRED" 2>/dev/null`
14141 pkg_cv_LIBVIRT_LIBS=`$PKG_CONFIG --libs "libvirt >= $LIBVIRT_REQUIRED libvirt-glib-1.0 >= $LIBVIRT_GLIB_REQUIRED" 2>/dev/null`
1409514142 test "x$?" != "x0" && pkg_failed=yes
1409614143 else
1409714144 pkg_failed=yes
1411214159 _pkg_short_errors_supported=no
1411314160 fi
1411414161 if test $_pkg_short_errors_supported = yes; then
14115 LIBVIRT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libvirt >= $LIBVIRT_REQUIRED" 2>&1`
14162 LIBVIRT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libvirt >= $LIBVIRT_REQUIRED libvirt-glib-1.0 >= $LIBVIRT_GLIB_REQUIRED" 2>&1`
1411614163 else
14117 LIBVIRT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libvirt >= $LIBVIRT_REQUIRED" 2>&1`
14164 LIBVIRT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libvirt >= $LIBVIRT_REQUIRED libvirt-glib-1.0 >= $LIBVIRT_GLIB_REQUIRED" 2>&1`
1411814165 fi
1411914166 # Put the nasty error message in config.log where it belongs
1412014167 echo "$LIBVIRT_PKG_ERRORS" >&5
1412114168
14122 as_fn_error $? "Package requirements (libvirt >= $LIBVIRT_REQUIRED) were not met:
14169 as_fn_error $? "Package requirements (libvirt >= $LIBVIRT_REQUIRED libvirt-glib-1.0 >= $LIBVIRT_GLIB_REQUIRED) were not met:
1412314170
1412414171 $LIBVIRT_PKG_ERRORS
1412514172
1421214259
1421314260 LIBS=$old_LIBS
1421414261
14215 { $as_echo "$as_me:${as_lineno-$LINENO}: checking which gtk+ version to compile against" >&5
14216 $as_echo_n "checking which gtk+ version to compile against... " >&6; }
14217
14218 # Check whether --with-gtk was given.
14219 if test "${with_gtk+set}" = set; then :
14220 withval=$with_gtk; case "$with_gtk" in
14221 2.0|3.0) ;;
14222 *) as_fn_error $? "invalid gtk version specified" "$LINENO" 5 ;;
14223 esac
14224 else
14225 with_gtk=3.0
14226 fi
14227
14228 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_gtk" >&5
14229 $as_echo "$with_gtk" >&6; }
14230
14231 case "$with_gtk" in
14232 2.0) GTK_API_VERSION=2.0
14233 GTK_REQUIRED=$GTK2_REQUIRED
14234 GTK_VNC_REQUIRED=$GTK_VNC1_REQUIRED
14235 GTK_VNC_API_VERSION=1.0
14236 SPICE_GTK_API_VERSION=2.0
14237 ;;
14238 3.0) GTK_API_VERSION=3.0
14239 GTK_REQUIRED=$GTK3_REQUIRED
14240 GTK_VNC_REQUIRED=$GTK_VNC2_REQUIRED
14241 GTK_VNC_API_VERSION=2.0
14242 SPICE_GTK_API_VERSION=3.0
14243 ;;
14244 esac
14245
14246
14247
14248
14249 if test "$with_gtk" = "2.0"; then
14250 HAVE_GTK_2_TRUE=
14251 HAVE_GTK_2_FALSE='#'
14252 else
14253 HAVE_GTK_2_TRUE='#'
14254 HAVE_GTK_2_FALSE=
14255 fi
14256
14257 if test "$with_gtk" = "3.0"; then
14258 HAVE_GTK_3_TRUE=
14259 HAVE_GTK_3_FALSE='#'
14260 else
14261 HAVE_GTK_3_TRUE='#'
14262 HAVE_GTK_3_FALSE=
14263 fi
14264
14265
1426614262
1426714263 pkg_failed=no
1426814264 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTK" >&5
1427214268 pkg_cv_GTK_CFLAGS="$GTK_CFLAGS"
1427314269 elif test -n "$PKG_CONFIG"; then
1427414270 if test -n "$PKG_CONFIG" && \
14275 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-\$GTK_API_VERSION >= \$GTK_REQUIRED\""; } >&5
14276 ($PKG_CONFIG --exists --print-errors "gtk+-$GTK_API_VERSION >= $GTK_REQUIRED") 2>&5
14271 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= \$GTK_REQUIRED\""; } >&5
14272 ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= $GTK_REQUIRED") 2>&5
1427714273 ac_status=$?
1427814274 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1427914275 test $ac_status = 0; }; then
14280 pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-$GTK_API_VERSION >= $GTK_REQUIRED" 2>/dev/null`
14276 pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0 >= $GTK_REQUIRED" 2>/dev/null`
1428114277 test "x$?" != "x0" && pkg_failed=yes
1428214278 else
1428314279 pkg_failed=yes
1428914285 pkg_cv_GTK_LIBS="$GTK_LIBS"
1429014286 elif test -n "$PKG_CONFIG"; then
1429114287 if test -n "$PKG_CONFIG" && \
14292 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-\$GTK_API_VERSION >= \$GTK_REQUIRED\""; } >&5
14293 ($PKG_CONFIG --exists --print-errors "gtk+-$GTK_API_VERSION >= $GTK_REQUIRED") 2>&5
14288 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= \$GTK_REQUIRED\""; } >&5
14289 ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= $GTK_REQUIRED") 2>&5
1429414290 ac_status=$?
1429514291 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1429614292 test $ac_status = 0; }; then
14297 pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-$GTK_API_VERSION >= $GTK_REQUIRED" 2>/dev/null`
14293 pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-3.0 >= $GTK_REQUIRED" 2>/dev/null`
1429814294 test "x$?" != "x0" && pkg_failed=yes
1429914295 else
1430014296 pkg_failed=yes
1431514311 _pkg_short_errors_supported=no
1431614312 fi
1431714313 if test $_pkg_short_errors_supported = yes; then
14318 GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-$GTK_API_VERSION >= $GTK_REQUIRED" 2>&1`
14314 GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-3.0 >= $GTK_REQUIRED" 2>&1`
1431914315 else
14320 GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-$GTK_API_VERSION >= $GTK_REQUIRED" 2>&1`
14316 GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-3.0 >= $GTK_REQUIRED" 2>&1`
1432114317 fi
1432214318 # Put the nasty error message in config.log where it belongs
1432314319 echo "$GTK_PKG_ERRORS" >&5
1432414320
14325 as_fn_error $? "Package requirements (gtk+-$GTK_API_VERSION >= $GTK_REQUIRED) were not met:
14321 as_fn_error $? "Package requirements (gtk+-3.0 >= $GTK_REQUIRED) were not met:
1432614322
1432714323 $GTK_PKG_ERRORS
1432814324
1435414350 $as_echo "yes" >&6; }
1435514351
1435614352 fi
14353 GTK_CFLAGS="$GTK_CFLAGS -DGDK_VERSION_MIN_REQUIRED=$GTK_ENCODED_VERSION \
14354 -DGDK_VERSION_MAX_ALLOWED=$GTK_ENCODED_VERSION"
14355
1435714356
1435814357
1435914358 # Check whether --with-gtk-vnc was given.
1436414363
1436514364 if test "x$with_gtk_vnc" != "xno" && test "x$with_gtk_vnc" != "xyes"; then :
1436614365 if test -n "$PKG_CONFIG" && \
14367 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-vnc-\$GTK_VNC_API_VERSION >= \$GTK_VNC_REQUIRED\""; } >&5
14368 ($PKG_CONFIG --exists --print-errors "gtk-vnc-$GTK_VNC_API_VERSION >= $GTK_VNC_REQUIRED") 2>&5
14366 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-vnc-2.0 >= \$GTK_VNC_REQUIRED\""; } >&5
14367 ($PKG_CONFIG --exists --print-errors "gtk-vnc-2.0 >= $GTK_VNC_REQUIRED") 2>&5
1436914368 ac_status=$?
1437014369 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1437114370 test $ac_status = 0; }; then
1438514384 pkg_cv_GTK_VNC_CFLAGS="$GTK_VNC_CFLAGS"
1438614385 elif test -n "$PKG_CONFIG"; then
1438714386 if test -n "$PKG_CONFIG" && \
14388 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-vnc-\$GTK_VNC_API_VERSION >= \$GTK_VNC_REQUIRED\""; } >&5
14389 ($PKG_CONFIG --exists --print-errors "gtk-vnc-$GTK_VNC_API_VERSION >= $GTK_VNC_REQUIRED") 2>&5
14387 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-vnc-2.0 >= \$GTK_VNC_REQUIRED\""; } >&5
14388 ($PKG_CONFIG --exists --print-errors "gtk-vnc-2.0 >= $GTK_VNC_REQUIRED") 2>&5
1439014389 ac_status=$?
1439114390 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1439214391 test $ac_status = 0; }; then
14393 pkg_cv_GTK_VNC_CFLAGS=`$PKG_CONFIG --cflags "gtk-vnc-$GTK_VNC_API_VERSION >= $GTK_VNC_REQUIRED" 2>/dev/null`
14392 pkg_cv_GTK_VNC_CFLAGS=`$PKG_CONFIG --cflags "gtk-vnc-2.0 >= $GTK_VNC_REQUIRED" 2>/dev/null`
1439414393 test "x$?" != "x0" && pkg_failed=yes
1439514394 else
1439614395 pkg_failed=yes
1440214401 pkg_cv_GTK_VNC_LIBS="$GTK_VNC_LIBS"
1440314402 elif test -n "$PKG_CONFIG"; then
1440414403 if test -n "$PKG_CONFIG" && \
14405 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-vnc-\$GTK_VNC_API_VERSION >= \$GTK_VNC_REQUIRED\""; } >&5
14406 ($PKG_CONFIG --exists --print-errors "gtk-vnc-$GTK_VNC_API_VERSION >= $GTK_VNC_REQUIRED") 2>&5
14404 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk-vnc-2.0 >= \$GTK_VNC_REQUIRED\""; } >&5
14405 ($PKG_CONFIG --exists --print-errors "gtk-vnc-2.0 >= $GTK_VNC_REQUIRED") 2>&5
1440714406 ac_status=$?
1440814407 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1440914408 test $ac_status = 0; }; then
14410 pkg_cv_GTK_VNC_LIBS=`$PKG_CONFIG --libs "gtk-vnc-$GTK_VNC_API_VERSION >= $GTK_VNC_REQUIRED" 2>/dev/null`
14409 pkg_cv_GTK_VNC_LIBS=`$PKG_CONFIG --libs "gtk-vnc-2.0 >= $GTK_VNC_REQUIRED" 2>/dev/null`
1441114410 test "x$?" != "x0" && pkg_failed=yes
1441214411 else
1441314412 pkg_failed=yes
1442814427 _pkg_short_errors_supported=no
1442914428 fi
1443014429 if test $_pkg_short_errors_supported = yes; then
14431 GTK_VNC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk-vnc-$GTK_VNC_API_VERSION >= $GTK_VNC_REQUIRED" 2>&1`
14430 GTK_VNC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk-vnc-2.0 >= $GTK_VNC_REQUIRED" 2>&1`
1443214431 else
14433 GTK_VNC_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk-vnc-$GTK_VNC_API_VERSION >= $GTK_VNC_REQUIRED" 2>&1`
14432 GTK_VNC_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk-vnc-2.0 >= $GTK_VNC_REQUIRED" 2>&1`
1443414433 fi
1443514434 # Put the nasty error message in config.log where it belongs
1443614435 echo "$GTK_VNC_PKG_ERRORS" >&5
1443714436
14438 as_fn_error $? "Package requirements (gtk-vnc-$GTK_VNC_API_VERSION >= $GTK_VNC_REQUIRED) were not met:
14437 as_fn_error $? "Package requirements (gtk-vnc-2.0 >= $GTK_VNC_REQUIRED) were not met:
1443914438
1444014439 $GTK_VNC_PKG_ERRORS
1444114440
1449014489
1449114490 if test "x$with_spice_gtk" != "xno" && test "x$with_spice_gtk" != "xyes"; then :
1449214491 if test -n "$PKG_CONFIG" && \
14493 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"spice-client-gtk-\$SPICE_GTK_API_VERSION >= \$SPICE_GTK_REQUIRED
14492 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"spice-client-gtk-3.0 >= \$SPICE_GTK_REQUIRED
1449414493 spice-controller spice-protocol >= \$SPICE_PROTOCOL_REQUIRED\""; } >&5
14495 ($PKG_CONFIG --exists --print-errors "spice-client-gtk-$SPICE_GTK_API_VERSION >= $SPICE_GTK_REQUIRED
14494 ($PKG_CONFIG --exists --print-errors "spice-client-gtk-3.0 >= $SPICE_GTK_REQUIRED
1449614495 spice-controller spice-protocol >= $SPICE_PROTOCOL_REQUIRED") 2>&5
1449714496 ac_status=$?
1449814497 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1451314512 pkg_cv_SPICE_GTK_CFLAGS="$SPICE_GTK_CFLAGS"
1451414513 elif test -n "$PKG_CONFIG"; then
1451514514 if test -n "$PKG_CONFIG" && \
14516 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"spice-client-gtk-\$SPICE_GTK_API_VERSION >= \$SPICE_GTK_REQUIRED\""; } >&5
14517 ($PKG_CONFIG --exists --print-errors "spice-client-gtk-$SPICE_GTK_API_VERSION >= $SPICE_GTK_REQUIRED") 2>&5
14515 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"spice-client-gtk-3.0 >= \$SPICE_GTK_REQUIRED\""; } >&5
14516 ($PKG_CONFIG --exists --print-errors "spice-client-gtk-3.0 >= $SPICE_GTK_REQUIRED") 2>&5
1451814517 ac_status=$?
1451914518 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1452014519 test $ac_status = 0; }; then
14521 pkg_cv_SPICE_GTK_CFLAGS=`$PKG_CONFIG --cflags "spice-client-gtk-$SPICE_GTK_API_VERSION >= $SPICE_GTK_REQUIRED" 2>/dev/null`
14520 pkg_cv_SPICE_GTK_CFLAGS=`$PKG_CONFIG --cflags "spice-client-gtk-3.0 >= $SPICE_GTK_REQUIRED" 2>/dev/null`
1452214521 test "x$?" != "x0" && pkg_failed=yes
1452314522 else
1452414523 pkg_failed=yes
1453014529 pkg_cv_SPICE_GTK_LIBS="$SPICE_GTK_LIBS"
1453114530 elif test -n "$PKG_CONFIG"; then
1453214531 if test -n "$PKG_CONFIG" && \
14533 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"spice-client-gtk-\$SPICE_GTK_API_VERSION >= \$SPICE_GTK_REQUIRED\""; } >&5
14534 ($PKG_CONFIG --exists --print-errors "spice-client-gtk-$SPICE_GTK_API_VERSION >= $SPICE_GTK_REQUIRED") 2>&5
14532 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"spice-client-gtk-3.0 >= \$SPICE_GTK_REQUIRED\""; } >&5
14533 ($PKG_CONFIG --exists --print-errors "spice-client-gtk-3.0 >= $SPICE_GTK_REQUIRED") 2>&5
1453514534 ac_status=$?
1453614535 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1453714536 test $ac_status = 0; }; then
14538 pkg_cv_SPICE_GTK_LIBS=`$PKG_CONFIG --libs "spice-client-gtk-$SPICE_GTK_API_VERSION >= $SPICE_GTK_REQUIRED" 2>/dev/null`
14537 pkg_cv_SPICE_GTK_LIBS=`$PKG_CONFIG --libs "spice-client-gtk-3.0 >= $SPICE_GTK_REQUIRED" 2>/dev/null`
1453914538 test "x$?" != "x0" && pkg_failed=yes
1454014539 else
1454114540 pkg_failed=yes
1455614555 _pkg_short_errors_supported=no
1455714556 fi
1455814557 if test $_pkg_short_errors_supported = yes; then
14559 SPICE_GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "spice-client-gtk-$SPICE_GTK_API_VERSION >= $SPICE_GTK_REQUIRED" 2>&1`
14558 SPICE_GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "spice-client-gtk-3.0 >= $SPICE_GTK_REQUIRED" 2>&1`
1456014559 else
14561 SPICE_GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "spice-client-gtk-$SPICE_GTK_API_VERSION >= $SPICE_GTK_REQUIRED" 2>&1`
14560 SPICE_GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "spice-client-gtk-3.0 >= $SPICE_GTK_REQUIRED" 2>&1`
1456214561 fi
1456314562 # Put the nasty error message in config.log where it belongs
1456414563 echo "$SPICE_GTK_PKG_ERRORS" >&5
1456514564
14566 as_fn_error $? "Package requirements (spice-client-gtk-$SPICE_GTK_API_VERSION >= $SPICE_GTK_REQUIRED) were not met:
14565 as_fn_error $? "Package requirements (spice-client-gtk-3.0 >= $SPICE_GTK_REQUIRED) were not met:
1456714566
1456814567 $SPICE_GTK_PKG_ERRORS
1456914568
1507615075
1507715076
1507815077
15079 ac_config_files="$ac_config_files Makefile data/Makefile data/adwaita-icons-needed.wxi 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"
15078 ac_config_files="$ac_config_files Makefile data/Makefile data/virt-viewer.wxs 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 tests/Makefile virt-viewer.spec"
1508015079
1508115080 cat >confcache <<\_ACEOF
1508215081 # This file is a shell script that caches the results of configure
1522315222 as_fn_error $? "conditional \"HAVE_LIBVIRT\" was never defined.
1522415223 Usually this means the macro was only invoked conditionally." "$LINENO" 5
1522515224 fi
15226 if test -z "${HAVE_GTK_2_TRUE}" && test -z "${HAVE_GTK_2_FALSE}"; then
15227 as_fn_error $? "conditional \"HAVE_GTK_2\" was never defined.
15228 Usually this means the macro was only invoked conditionally." "$LINENO" 5
15229 fi
15230 if test -z "${HAVE_GTK_3_TRUE}" && test -z "${HAVE_GTK_3_FALSE}"; then
15231 as_fn_error $? "conditional \"HAVE_GTK_3\" was never defined.
15232 Usually this means the macro was only invoked conditionally." "$LINENO" 5
15233 fi
1523415225 if test -z "${HAVE_GTK_VNC_TRUE}" && test -z "${HAVE_GTK_VNC_FALSE}"; then
1523515226 as_fn_error $? "conditional \"HAVE_GTK_VNC\" was never defined.
1523615227 Usually this means the macro was only invoked conditionally." "$LINENO" 5
1564415635 # report actual input values of CONFIG_FILES etc. instead of their
1564515636 # values after options handling.
1564615637 ac_log="
15647 This file was extended by virt-viewer $as_me 3.1, which was
15638 This file was extended by virt-viewer $as_me 4.0, which was
1564815639 generated by GNU Autoconf 2.69. Invocation command line was
1564915640
1565015641 CONFIG_FILES = $CONFIG_FILES
1571415705 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
1571515706 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
1571615707 ac_cs_version="\\
15717 virt-viewer config.status 3.1
15708 virt-viewer config.status 4.0
1571815709 configured by $0, generated by GNU Autoconf 2.69,
1571915710 with options \\"\$ac_cs_config\\"
1572015711
1613516126 "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
1613616127 "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
1613716128 "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;;
16138 "data/adwaita-icons-needed.wxi") CONFIG_FILES="$CONFIG_FILES data/adwaita-icons-needed.wxi" ;;
1613916129 "data/virt-viewer.wxs") CONFIG_FILES="$CONFIG_FILES data/virt-viewer.wxs" ;;
16140 "data/virt-viewer.nsis") CONFIG_FILES="$CONFIG_FILES data/virt-viewer.nsis" ;;
16141 "data/virt-viewer-debug.nsis") CONFIG_FILES="$CONFIG_FILES data/virt-viewer-debug.nsis" ;;
1614216130 "icons/Makefile") CONFIG_FILES="$CONFIG_FILES icons/Makefile" ;;
1614316131 "icons/16x16/Makefile") CONFIG_FILES="$CONFIG_FILES icons/16x16/Makefile" ;;
1614416132 "icons/22x22/Makefile") CONFIG_FILES="$CONFIG_FILES icons/22x22/Makefile" ;;
1615116139 "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
1615216140 "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
1615316141 "src/virt-viewer.rc") CONFIG_FILES="$CONFIG_FILES src/virt-viewer.rc" ;;
16142 "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;;
1615416143 "virt-viewer.spec") CONFIG_FILES="$CONFIG_FILES virt-viewer.spec" ;;
1615516144 "po/stamp-it") CONFIG_COMMANDS="$CONFIG_COMMANDS po/stamp-it" ;;
1615616145
1748617475 $as_echo "$as_me: =====================" >&6;}
1748717476 { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5
1748817477 $as_echo "$as_me: " >&6;}
17489 { $as_echo "$as_me:${as_lineno-$LINENO}: Features:" >&5
17490 $as_echo "$as_me: Features:" >&6;}
17491 { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5
17492 $as_echo "$as_me: " >&6;}
17493 { $as_echo "$as_me:${as_lineno-$LINENO}: Gtk: $with_gtk" >&5
17494 $as_echo "$as_me: Gtk: $with_gtk" >&6;}
17495 { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5
17496 $as_echo "$as_me: " >&6;}
1749717478 { $as_echo "$as_me:${as_lineno-$LINENO}: Libraries:" >&5
1749817479 $as_echo "$as_me: Libraries:" >&6;}
1749917480 { $as_echo "$as_me:${as_lineno-$LINENO}: " >&5
+36
-56
configure.ac less more
00
1 AC_INIT([virt-viewer],[3.1])
1 AC_INIT([virt-viewer],[4.0])
22 AC_CONFIG_SRCDIR(src/virt-viewer-main.c)
33 AC_CONFIG_MACRO_DIR([m4])
44 AC_CONFIG_AUX_DIR([build-aux])
1111 m4_ifndef([AM_SILENT_RULES], [m4_define([AM_SILENT_RULES],[])])
1212 AM_SILENT_RULES([yes])
1313
14 GLIB2_REQUIRED=2.22.0
14 # Keep these two definitions in agreement.
15 GLIB2_REQUIRED="2.38"
16 GLIB2_ENCODED_VERSION="GLIB_VERSION_2_38"
17
18 # Keep these two definitions in agreement.
19 GTK_REQUIRED="3.10"
20 GTK_ENCODED_VERSION="GDK_VERSION_3_10"
21
1522 LIBXML2_REQUIRED="2.6.0"
1623 LIBVIRT_REQUIRED="0.10.0"
17 GTK2_REQUIRED="2.18.0"
18 GTK3_REQUIRED="3.0"
19 GTK_VNC1_REQUIRED="0.3.8"
20 GTK_VNC2_REQUIRED="0.4.0"
21 SPICE_GTK_REQUIRED="0.30"
24 LIBVIRT_GLIB_REQUIRED="0.1.8"
25 GTK_VNC_REQUIRED="0.4.0"
26 SPICE_GTK_REQUIRED="0.31"
2227 SPICE_PROTOCOL_REQUIRED="0.12.7"
2328 GOVIRT_REQUIRED="0.3.2"
2429
2530 AC_SUBST([GLIB2_REQUIRED])
2631 AC_SUBST([LIBXML2_REQUIRED])
2732 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])
33 AC_SUBST([LIBVIRT_GLIB_REQUIRED])
34 AC_SUBST([GTK_REQUIRED])
35 AC_SUBST([GTK_VNC_REQUIRED])
3236 AC_SUBST([SPICE_GTK_REQUIRED])
3337 AC_SUBST([SPICE_PROTOCOL_REQUIRED])
3438 AC_SUBST([GOVIRT_REQUIRED])
96100 GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
97101 AC_SUBST(GLIB_MKENUMS)
98102
99 PKG_CHECK_MODULES(GLIB2, glib-2.0 >= $GLIB2_REQUIRED gthread-2.0 gmodule-export-2.0)
103 PKG_CHECK_MODULES(GLIB2, glib-2.0 >= $GLIB2_REQUIRED gio-2.0 gthread-2.0 gmodule-export-2.0)
104 GLIB2_CFLAGS="$GLIB2_CFLAGS -DGLIB_VERSION_MIN_REQUIRED=$GLIB2_ENCODED_VERSION \
105 -DGLIB_VERSION_MAX_ALLOWED=$GLIB2_ENCODED_VERSION"
106 AC_SUBST(GLIB2_CFLAGS)
107
108 AC_ARG_VAR([GLIB_COMPILE_RESOURCES],[the glib-compile-resources program])
109 AC_PATH_PROG([GLIB_COMPILE_RESOURCES],[glib-compile-resources],[])
110 if test -z "$GLIB_COMPILE_RESOURCES"; then
111 AC_MSG_ERROR([glib-compile-resources not found])
112 fi
113
100114 PKG_CHECK_MODULES(LIBXML2, libxml-2.0 >= $LIBXML2_REQUIRED)
101115
102116 AC_ARG_WITH([libvirt],
107121 [with_libvirt=yes], [with_libvirt=no])])
108122
109123 AS_IF([test "x$with_libvirt" = "xyes"],
110 [PKG_CHECK_MODULES(LIBVIRT, [libvirt >= $LIBVIRT_REQUIRED])]
124 [PKG_CHECK_MODULES(LIBVIRT, [libvirt >= $LIBVIRT_REQUIRED] [libvirt-glib-1.0 >= $LIBVIRT_GLIB_REQUIRED])]
111125 [AC_DEFINE([HAVE_LIBVIRT], 1, [Have libvirt?])]
112126 )
113127 AM_CONDITIONAL([HAVE_LIBVIRT], [test "x$with_libvirt" = "xyes"])
120134 [AC_DEFINE([HAVE_VIR_DOMAIN_OPEN_GRAPHICS_FD], 1, [Have virDomainOpenGraphicsFD?])])
121135 LIBS=$old_LIBS
122136
123 AC_MSG_CHECKING([which gtk+ version to compile against])
124 AC_ARG_WITH([gtk],
125 [AS_HELP_STRING([--with-gtk=2.0|3.0],[which gtk+ version to compile against (default: 3.0)])],
126 [case "$with_gtk" in
127 2.0|3.0) ;;
128 *) AC_MSG_ERROR([invalid gtk version specified]) ;;
129 esac],
130 [with_gtk=3.0])
131 AC_MSG_RESULT([$with_gtk])
132
133 case "$with_gtk" in
134 2.0) GTK_API_VERSION=2.0
135 GTK_REQUIRED=$GTK2_REQUIRED
136 GTK_VNC_REQUIRED=$GTK_VNC1_REQUIRED
137 GTK_VNC_API_VERSION=1.0
138 SPICE_GTK_API_VERSION=2.0
139 ;;
140 3.0) GTK_API_VERSION=3.0
141 GTK_REQUIRED=$GTK3_REQUIRED
142 GTK_VNC_REQUIRED=$GTK_VNC2_REQUIRED
143 GTK_VNC_API_VERSION=2.0
144 SPICE_GTK_API_VERSION=3.0
145 ;;
146 esac
147
148 AC_SUBST([GTK_API_VERSION])
149 AC_SUBST([GTK_REQUIRED])
150 AC_SUBST([GTK_VNC_API_VERSION])
151 AM_CONDITIONAL([HAVE_GTK_2],[test "$with_gtk" = "2.0"])
152 AM_CONDITIONAL([HAVE_GTK_3],[test "$with_gtk" = "3.0"])
153
154 PKG_CHECK_MODULES(GTK, gtk+-$GTK_API_VERSION >= $GTK_REQUIRED)
137 PKG_CHECK_MODULES(GTK, gtk+-3.0 >= $GTK_REQUIRED)
138 GTK_CFLAGS="$GTK_CFLAGS -DGDK_VERSION_MIN_REQUIRED=$GTK_ENCODED_VERSION \
139 -DGDK_VERSION_MAX_ALLOWED=$GTK_ENCODED_VERSION"
140 AC_SUBST(GTK_CFLAGS)
155141
156142 AC_ARG_WITH([gtk-vnc],
157143 AS_HELP_STRING([--without-gtk-vnc], [Ignore presence of gtk-vnc and disable it]))
158144
159145 AS_IF([test "x$with_gtk_vnc" != "xno" && test "x$with_gtk_vnc" != "xyes"],
160 [PKG_CHECK_EXISTS([gtk-vnc-$GTK_VNC_API_VERSION >= $GTK_VNC_REQUIRED],
146 [PKG_CHECK_EXISTS([gtk-vnc-2.0 >= $GTK_VNC_REQUIRED],
161147 [with_gtk_vnc=yes], [with_gtk_vnc=no])])
162148
163149 AS_IF([test "x$with_gtk_vnc" = "xyes"],
164 [PKG_CHECK_MODULES(GTK_VNC, [gtk-vnc-$GTK_VNC_API_VERSION >= $GTK_VNC_REQUIRED])]
150 [PKG_CHECK_MODULES(GTK_VNC, [gtk-vnc-2.0 >= $GTK_VNC_REQUIRED])]
165151 [AC_DEFINE([HAVE_GTK_VNC], 1, [Have gtk-vnc?])]
166152 )
167153 AM_CONDITIONAL([HAVE_GTK_VNC], [test "x$with_gtk_vnc" = "xyes"])
170156 AS_HELP_STRING([--without-spice-gtk], [Ignore presence of spice-gtk and disable it]))
171157
172158 AS_IF([test "x$with_spice_gtk" != "xno" && test "x$with_spice_gtk" != "xyes"],
173 [PKG_CHECK_EXISTS([spice-client-gtk-$SPICE_GTK_API_VERSION >= $SPICE_GTK_REQUIRED
159 [PKG_CHECK_EXISTS([spice-client-gtk-3.0 >= $SPICE_GTK_REQUIRED
174160 spice-controller spice-protocol >= $SPICE_PROTOCOL_REQUIRED],
175161 [with_spice_gtk=yes], [with_spice_gtk=no])])
176162
177163 AS_IF([test "x$with_spice_gtk" = "xyes"],
178 [PKG_CHECK_MODULES(SPICE_GTK, [spice-client-gtk-$SPICE_GTK_API_VERSION >= $SPICE_GTK_REQUIRED])]
164 [PKG_CHECK_MODULES(SPICE_GTK, [spice-client-gtk-3.0 >= $SPICE_GTK_REQUIRED])]
179165 [PKG_CHECK_MODULES(SPICE_CONTROLLER, [spice-controller])]
180166 [PKG_CHECK_MODULES(SPICE_PROTOCOL, [spice-protocol >= $SPICE_PROTOCOL_REQUIRED])]
181167 [AC_DEFINE([HAVE_SPICE_GTK], 1, [Have spice-gtk?])]
250236 AC_CONFIG_FILES([
251237 Makefile
252238 data/Makefile
253 data/adwaita-icons-needed.wxi
254239 data/virt-viewer.wxs
255 data/virt-viewer.nsis
256 data/virt-viewer-debug.nsis
257240 icons/Makefile
258241 icons/16x16/Makefile
259242 icons/22x22/Makefile
266249 po/Makefile.in
267250 src/Makefile
268251 src/virt-viewer.rc
252 tests/Makefile
269253 virt-viewer.spec
270254 ])
271255 AC_OUTPUT
274258 AC_MSG_NOTICE([Configuration summary])
275259 AC_MSG_NOTICE([=====================])
276260 AC_MSG_NOTICE([])
277 AC_MSG_NOTICE([ Features:])
278 AC_MSG_NOTICE([])
279 AC_MSG_NOTICE([ Gtk: $with_gtk])
280 AC_MSG_NOTICE([])
281261 AC_MSG_NOTICE([ Libraries:])
282262 AC_MSG_NOTICE([])
283263 AC_MSG_NOTICE([ GLIB2: $GLIB2_CFLAGS $GLIB2_LIBS])
+8
-25
data/Makefile.am less more
33
44 EXTRA_DIST = \
55 spice-xpi-client-remote-viewer \
6 adwaita-icons-needed.wxi.in \
76 virt-viewer.wxs.in \
8 virt-viewer.nsis.in \
9 virt-viewer-debug.nsis.in \
107 $(NULL)
118
129 # this make sure those files are regenerated when they change
1310 # (in maintainer-mode)
14 all-local: adwaita-icons-needed.wxi virt-viewer.wxs virt-viewer.nsis virt-viewer-debug.nsis
11 all-local: virt-viewer.wxs
1512
1613 if OS_WIN32
1714
4239 deps.txt:
4340 $(AM_V_GEN)rpm -qa | grep $(host_os) | sort | unix2dos > $@
4441
45 virt-viewer-$(VERSION).exe: virt-viewer.nsis deps.txt
46 $(AM_V_GEN)DESTDIR=`mktemp -d` && \
47 make -C $(top_builddir) install DESTDIR=$$DESTDIR >/dev/null && \
48 makensis -NOCD \
49 -DDESTDIR=$$DESTDIR \
50 -DHaveSpiceGtk=$(HaveSpiceGtk) \
51 -DHaveGtkVnc=$(HaveGtkVnc) \
52 -DHaveLibvirt=$(HaveLibvirt) \
53 -DHaveOVirt=$(HaveOVirt) \
54 $< >/dev/null && \
55 rm -rf $$DESTDIR
56
57 virt-viewer-debug-$(VERSION).exe: virt-viewer-debug.nsis
58 $(AM_V_GEN)DESTDIR=`mktemp -d` && \
59 make -C $(top_builddir) install DESTDIR=$$DESTDIR >/dev/null && \
60 makensis -NOCD -DDESTDIR=$$DESTDIR $< >/dev/null && \
61 rm -rf $$DESTDIR
62
6342 virt-viewer-$(WIXL_ARCH)-$(VERSION).msi: virt-viewer.wxs deps.txt
6443 $(AM_V_GEN)DESTDIR=`mktemp -d` && \
6544 make -C $(top_builddir) install DESTDIR=$$DESTDIR >/dev/null && \
8160
8261 CLEANFILES += \
8362 deps.txt \
84 virt-viewer-$(VERSION).exe \
8563 virt-viewer-$(WIXL_ARCH)-$(VERSION).msi \
8664 $(NULL)
8765
9775 mime_DATA = virt-viewer-mime.xml
9876 @INTLTOOL_XML_RULE@
9977
78 appdatadir = $(datadir)/appdata
79 APPDATAFILES = remote-viewer.appdata.xml.in
80 appdata_DATA = $(APPDATAFILES:.xml.in=.xml)
81 @INTLTOOL_XML_RULE@
82
10083 install-data-hook:
10184 if ENABLE_UPDATE_MIMEDB
10285 @if $(AM_V_P); then set -x; else echo " INSTALL update-mime-database"; fi; \
10992 $(UPDATE_MIME_DATABASE) "$(DESTDIR)$(datadir)/mime";
11093 endif
11194
112 CLEANFILES += $(mime_DATA) $(desktop_DATA)
113 EXTRA_DIST += $(MIMEFILES) $(DESKTOPFILES)
95 CLEANFILES += $(mime_DATA) $(desktop_DATA) $(appdata_DATA)
96 EXTRA_DIST += $(MIMEFILES) $(DESKTOPFILES) $(APPDATAFILES)
11497
11598 endif
11699
+55
-62
data/Makefile.in less more
8989 host_triplet = @host@
9090 @OS_WIN32_TRUE@am__append_1 = \
9191 @OS_WIN32_TRUE@ deps.txt \
92 @OS_WIN32_TRUE@ virt-viewer-$(VERSION).exe \
9392 @OS_WIN32_TRUE@ virt-viewer-$(WIXL_ARCH)-$(VERSION).msi \
9493 @OS_WIN32_TRUE@ $(NULL)
9594
96 @OS_WIN32_FALSE@am__append_2 = $(mime_DATA) $(desktop_DATA)
97 @OS_WIN32_FALSE@am__append_3 = $(MIMEFILES) $(DESKTOPFILES)
95 @OS_WIN32_FALSE@am__append_2 = $(mime_DATA) $(desktop_DATA) $(appdata_DATA)
96 @OS_WIN32_FALSE@am__append_3 = $(MIMEFILES) $(DESKTOPFILES) $(APPDATAFILES)
9897 subdir = data
9998 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
100 am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
101 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
102 $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
103 $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/acinclude.m4 \
104 $(top_srcdir)/configure.ac
99 am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
100 $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
101 $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
102 $(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
105103 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
106104 $(ACLOCAL_M4)
107105 DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
108106 mkinstalldirs = $(install_sh) -d
109107 CONFIG_HEADER = $(top_builddir)/config.h
110 CONFIG_CLEAN_FILES = adwaita-icons-needed.wxi virt-viewer.wxs \
111 virt-viewer.nsis virt-viewer-debug.nsis
108 CONFIG_CLEAN_FILES = virt-viewer.wxs
112109 CONFIG_CLEAN_VPATH_FILES =
113110 AM_V_P = $(am__v_P_@AM_V@)
114111 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
156153 || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
157154 $(am__cd) "$$dir" && rm -f $$files; }; \
158155 }
159 am__installdirs = "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(mimedir)"
160 DATA = $(desktop_DATA) $(mime_DATA)
156 am__installdirs = "$(DESTDIR)$(appdatadir)" "$(DESTDIR)$(desktopdir)" \
157 "$(DESTDIR)$(mimedir)"
158 DATA = $(appdata_DATA) $(desktop_DATA) $(mime_DATA)
161159 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
162 am__DIST_COMMON = $(srcdir)/Makefile.in \
163 $(srcdir)/adwaita-icons-needed.wxi.in \
164 $(srcdir)/virt-viewer-debug.nsis.in \
165 $(srcdir)/virt-viewer.nsis.in $(srcdir)/virt-viewer.wxs.in
160 am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/virt-viewer.wxs.in
166161 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
167162 ACLOCAL = @ACLOCAL@
168163 ALL_LINGUAS = @ALL_LINGUAS@
198193 GLIB2_CFLAGS = @GLIB2_CFLAGS@
199194 GLIB2_LIBS = @GLIB2_LIBS@
200195 GLIB2_REQUIRED = @GLIB2_REQUIRED@
196 GLIB_COMPILE_RESOURCES = @GLIB_COMPILE_RESOURCES@
201197 GLIB_MKENUMS = @GLIB_MKENUMS@
202198 GMOFILES = @GMOFILES@
203199 GMSGFMT = @GMSGFMT@
204200 GOVIRT_REQUIRED = @GOVIRT_REQUIRED@
205201 GREP = @GREP@
206 GTK2_REQUIRED = @GTK2_REQUIRED@
207 GTK3_REQUIRED = @GTK3_REQUIRED@
208 GTK_API_VERSION = @GTK_API_VERSION@
209202 GTK_CFLAGS = @GTK_CFLAGS@
210203 GTK_LIBS = @GTK_LIBS@
211204 GTK_REQUIRED = @GTK_REQUIRED@
212 GTK_VNC1_REQUIRED = @GTK_VNC1_REQUIRED@
213 GTK_VNC2_REQUIRED = @GTK_VNC2_REQUIRED@
214 GTK_VNC_API_VERSION = @GTK_VNC_API_VERSION@
215205 GTK_VNC_CFLAGS = @GTK_VNC_CFLAGS@
216206 GTK_VNC_LIBS = @GTK_VNC_LIBS@
207 GTK_VNC_REQUIRED = @GTK_VNC_REQUIRED@
217208 ICOTOOL = @ICOTOOL@
218209 INSTALL = @INSTALL@
219210 INSTALL_DATA = @INSTALL_DATA@
236227 LIBS = @LIBS@
237228 LIBTOOL = @LIBTOOL@
238229 LIBVIRT_CFLAGS = @LIBVIRT_CFLAGS@
230 LIBVIRT_GLIB_REQUIRED = @LIBVIRT_GLIB_REQUIRED@
239231 LIBVIRT_LIBS = @LIBVIRT_LIBS@
240232 LIBVIRT_REQUIRED = @LIBVIRT_REQUIRED@
241233 LIBXML2_CFLAGS = @LIBXML2_CFLAGS@
353345 NULL =
354346 CLEANFILES = $(am__append_1) $(am__append_2)
355347 MANUFACTURER = Virt Manager Project
356 EXTRA_DIST = spice-xpi-client-remote-viewer \
357 adwaita-icons-needed.wxi.in virt-viewer.wxs.in \
358 virt-viewer.nsis.in virt-viewer-debug.nsis.in $(NULL) \
348 EXTRA_DIST = spice-xpi-client-remote-viewer virt-viewer.wxs.in $(NULL) \
359349 $(am__append_3)
360350 @HAVE_LIBVIRT_FALSE@@OS_WIN32_TRUE@HaveLibvirt = False
361351 @HAVE_LIBVIRT_TRUE@@OS_WIN32_TRUE@HaveLibvirt = True
371361 @OS_WIN32_FALSE@MIMEFILES = virt-viewer-mime.xml.in
372362 @OS_WIN32_FALSE@mimedir = $(datadir)/mime/packages
373363 @OS_WIN32_FALSE@mime_DATA = virt-viewer-mime.xml
364 @OS_WIN32_FALSE@appdatadir = $(datadir)/appdata
365 @OS_WIN32_FALSE@APPDATAFILES = remote-viewer.appdata.xml.in
366 @OS_WIN32_FALSE@appdata_DATA = $(APPDATAFILES:.xml.in=.xml)
374367 all: all-am
375368
376369 .SUFFIXES:
403396 $(ACLOCAL_M4): $(am__aclocal_m4_deps)
404397 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
405398 $(am__aclocal_m4_deps):
406 adwaita-icons-needed.wxi: $(top_builddir)/config.status $(srcdir)/adwaita-icons-needed.wxi.in
407 cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
408399 virt-viewer.wxs: $(top_builddir)/config.status $(srcdir)/virt-viewer.wxs.in
409400 cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
410 virt-viewer.nsis: $(top_builddir)/config.status $(srcdir)/virt-viewer.nsis.in
411 cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
412 virt-viewer-debug.nsis: $(top_builddir)/config.status $(srcdir)/virt-viewer-debug.nsis.in
413 cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
414401
415402 mostlyclean-libtool:
416403 -rm -f *.lo
417404
418405 clean-libtool:
419406 -rm -rf .libs _libs
407 install-appdataDATA: $(appdata_DATA)
408 @$(NORMAL_INSTALL)
409 @list='$(appdata_DATA)'; test -n "$(appdatadir)" || list=; \
410 if test -n "$$list"; then \
411 echo " $(MKDIR_P) '$(DESTDIR)$(appdatadir)'"; \
412 $(MKDIR_P) "$(DESTDIR)$(appdatadir)" || exit 1; \
413 fi; \
414 for p in $$list; do \
415 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
416 echo "$$d$$p"; \
417 done | $(am__base_list) | \
418 while read files; do \
419 echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(appdatadir)'"; \
420 $(INSTALL_DATA) $$files "$(DESTDIR)$(appdatadir)" || exit $$?; \
421 done
422
423 uninstall-appdataDATA:
424 @$(NORMAL_UNINSTALL)
425 @list='$(appdata_DATA)'; test -n "$(appdatadir)" || list=; \
426 files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
427 dir='$(DESTDIR)$(appdatadir)'; $(am__uninstall_files_from_dir)
420428 install-desktopDATA: $(desktop_DATA)
421429 @$(NORMAL_INSTALL)
422430 @list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \
500508 check: check-am
501509 all-am: Makefile $(DATA) all-local
502510 installdirs:
503 for dir in "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(mimedir)"; do \
511 for dir in "$(DESTDIR)$(appdatadir)" "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(mimedir)"; do \
504512 test -z "$$dir" || $(MKDIR_P) "$$dir"; \
505513 done
506514 install: install-am
556564
557565 info-am:
558566
559 install-data-am: install-desktopDATA install-mimeDATA
567 install-data-am: install-appdataDATA install-desktopDATA \
568 install-mimeDATA
560569 @$(NORMAL_INSTALL)
561570 $(MAKE) $(AM_MAKEFLAGS) install-data-hook
562571 install-dvi: install-dvi-am
601610
602611 ps-am:
603612
604 uninstall-am: uninstall-desktopDATA uninstall-mimeDATA
613 uninstall-am: uninstall-appdataDATA uninstall-desktopDATA \
614 uninstall-mimeDATA
605615 @$(NORMAL_INSTALL)
606616 $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
607617 .MAKE: install-am install-data-am install-strip uninstall-am
609619 .PHONY: all all-am all-local check check-am clean clean-generic \
610620 clean-libtool cscopelist-am ctags-am distclean \
611621 distclean-generic distclean-libtool distdir dvi dvi-am html \
612 html-am info info-am install install-am install-data \
613 install-data-am install-data-hook install-desktopDATA \
614 install-dvi install-dvi-am install-exec install-exec-am \
615 install-html install-html-am install-info install-info-am \
616 install-man install-mimeDATA install-pdf install-pdf-am \
617 install-ps install-ps-am install-strip installcheck \
618 installcheck-am installdirs maintainer-clean \
622 html-am info info-am install install-am install-appdataDATA \
623 install-data install-data-am install-data-hook \
624 install-desktopDATA install-dvi install-dvi-am install-exec \
625 install-exec-am install-html install-html-am install-info \
626 install-info-am install-man install-mimeDATA install-pdf \
627 install-pdf-am install-ps install-ps-am install-strip \
628 installcheck installcheck-am installdirs maintainer-clean \
619629 maintainer-clean-generic mostlyclean mostlyclean-generic \
620630 mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \
621 uninstall-am uninstall-desktopDATA uninstall-hook \
622 uninstall-mimeDATA
631 uninstall-am uninstall-appdataDATA uninstall-desktopDATA \
632 uninstall-hook uninstall-mimeDATA
623633
624634 .PRECIOUS: Makefile
625635
626636
627637 # this make sure those files are regenerated when they change
628638 # (in maintainer-mode)
629 all-local: adwaita-icons-needed.wxi virt-viewer.wxs virt-viewer.nsis virt-viewer-debug.nsis
639 all-local: virt-viewer.wxs
630640
631641 @OS_WIN32_TRUE@deps.txt:
632642 @OS_WIN32_TRUE@ $(AM_V_GEN)rpm -qa | grep $(host_os) | sort | unix2dos > $@
633
634 @OS_WIN32_TRUE@virt-viewer-$(VERSION).exe: virt-viewer.nsis deps.txt
635 @OS_WIN32_TRUE@ $(AM_V_GEN)DESTDIR=`mktemp -d` && \
636 @OS_WIN32_TRUE@ make -C $(top_builddir) install DESTDIR=$$DESTDIR >/dev/null && \
637 @OS_WIN32_TRUE@ makensis -NOCD \
638 @OS_WIN32_TRUE@ -DDESTDIR=$$DESTDIR \
639 @OS_WIN32_TRUE@ -DHaveSpiceGtk=$(HaveSpiceGtk) \
640 @OS_WIN32_TRUE@ -DHaveGtkVnc=$(HaveGtkVnc) \
641 @OS_WIN32_TRUE@ -DHaveLibvirt=$(HaveLibvirt) \
642 @OS_WIN32_TRUE@ -DHaveOVirt=$(HaveOVirt) \
643 @OS_WIN32_TRUE@ $< >/dev/null && \
644 @OS_WIN32_TRUE@ rm -rf $$DESTDIR
645
646 @OS_WIN32_TRUE@virt-viewer-debug-$(VERSION).exe: virt-viewer-debug.nsis
647 @OS_WIN32_TRUE@ $(AM_V_GEN)DESTDIR=`mktemp -d` && \
648 @OS_WIN32_TRUE@ make -C $(top_builddir) install DESTDIR=$$DESTDIR >/dev/null && \
649 @OS_WIN32_TRUE@ makensis -NOCD -DDESTDIR=$$DESTDIR $< >/dev/null && \
650 @OS_WIN32_TRUE@ rm -rf $$DESTDIR
651643
652644 @OS_WIN32_TRUE@virt-viewer-$(WIXL_ARCH)-$(VERSION).msi: virt-viewer.wxs deps.txt
653645 @OS_WIN32_TRUE@ $(AM_V_GEN)DESTDIR=`mktemp -d` && \
669661 @OS_WIN32_TRUE@msi: virt-viewer-$(WIXL_ARCH)-$(VERSION).msi
670662 @OS_WIN32_FALSE@@INTLTOOL_DESKTOP_RULE@
671663 @OS_WIN32_FALSE@@INTLTOOL_XML_RULE@
664 @OS_WIN32_FALSE@@INTLTOOL_XML_RULE@
672665
673666 @OS_WIN32_FALSE@install-data-hook:
674667 @ENABLE_UPDATE_MIMEDB_TRUE@@OS_WIN32_FALSE@ @if $(AM_V_P); then set -x; else echo " INSTALL update-mime-database"; fi; \
+0
-807
data/adwaita-icons-needed.wxi.in less more
0 <?xml version="1.0" encoding="utf-8"?>
1 <Include xmlns="http://schemas.microsoft.com/wix/2006/wi">
2 <Fragment>
3 <DirectoryRef Id="INSTALLDIR">
4 <Directory Id="DirShareDefault" Name="share">
5 <Directory Id="DirIconsDefault" Name="icons">
6 <Directory Id="DirIconsAdwaita" Name="Adwaita">
7 <Directory Id="DirIconsAdwaita16x16" Name="16x16">
8 <Directory Id="DirIconsAdwaita16x16Places" Name="places">
9 <Component Id="CIconsFolderDocuments16" Guid="*">
10 <File Id="FIconsFolderDocuments16" KeyPath="yes"
11 Source="/usr/share/icons/Adwaita/16x16/places/folder-documents-symbolic.symbolic.png"/>
12 </Component>
13 <Component Id="CIconsFolderDownload16" Guid="*">
14 <File Id="FIconsFolderDownload16" KeyPath="yes"
15 Source="/usr/share/icons/Adwaita/16x16/places/folder-download-symbolic.symbolic.png"/>
16 </Component>
17 <Component Id="CIconsFolderMusic16" Guid="*">
18 <File Id="FIconsFolderMusic16" KeyPath="yes"
19 Source="/usr/share/icons/Adwaita/16x16/places/folder-music-symbolic.symbolic.png"/>
20 </Component>
21 <Component Id="CIconsFolderPictures16" Guid="*">
22 <File Id="FIconsFolderPictures16" KeyPath="yes"
23 Source="/usr/share/icons/Adwaita/16x16/places/folder-pictures-symbolic.symbolic.png"/>
24 </Component>
25 <Component Id="CIconsFolderPublicshare16" Guid="*">
26 <File Id="FIconsFolderPublicshare16" KeyPath="yes"
27 Source="/usr/share/icons/Adwaita/16x16/places/folder-publicshare-symbolic.symbolic.png"/>
28 </Component>
29 <Component Id="CIconsFolderRemote16" Guid="*">
30 <File Id="FIconsFolderRemote16" KeyPath="yes"
31 Source="/usr/share/icons/Adwaita/16x16/places/folder-remote-symbolic.symbolic.png"/>
32 </Component>
33 <Component Id="CIconsFolderSavedSearch16" Guid="*">
34 <File Id="FIconsFolderSavedSearch16" KeyPath="yes"
35 Source="/usr/share/icons/Adwaita/16x16/places/folder-saved-search-symbolic.symbolic.png"/>
36 </Component>
37 <Component Id="CIconsFolder16" Guid="*">
38 <File Id="FIconsFolder16" KeyPath="yes"
39 Source="/usr/share/icons/Adwaita/16x16/places/folder-symbolic.symbolic.png"/>
40 </Component>
41 <Component Id="CIconsFolderTemplates16" Guid="*">
42 <File Id="FIconsFolderTemplates16" KeyPath="yes"
43 Source="/usr/share/icons/Adwaita/16x16/places/folder-templates-symbolic.symbolic.png"/>
44 </Component>
45 <Component Id="CIconsFolderVideos16" Guid="*">
46 <File Id="FIconsFolderVideos16" KeyPath="yes"
47 Source="/usr/share/icons/Adwaita/16x16/places/folder-videos-symbolic.symbolic.png"/>
48 </Component>
49 <Component Id="CIconsNetworkServer16" Guid="*">
50 <File Id="FIconsNetworkServer16" KeyPath="yes"
51 Source="/usr/share/icons/Adwaita/16x16/places/network-server-symbolic.symbolic.png"/>
52 </Component>
53 <Component Id="CIconsNetworkWorkgroup16" Guid="*">
54 <File Id="FIconsNetworkWorkgroup16" KeyPath="yes"
55 Source="/usr/share/icons/Adwaita/16x16/places/network-workgroup-symbolic.symbolic.png"/>
56 </Component>
57 <Component Id="CIconsStartHere16" Guid="*">
58 <File Id="FIconsStartHere16" KeyPath="yes"
59 Source="/usr/share/icons/Adwaita/16x16/places/start-here-symbolic.symbolic.png"/>
60 </Component>
61 <Component Id="CIconsUserBookmarks16" Guid="*">
62 <File Id="FIconsUserBookmarks16" KeyPath="yes"
63 Source="/usr/share/icons/Adwaita/16x16/places/user-bookmarks-symbolic.symbolic.png"/>
64 </Component>
65 <Component Id="CIconsUserDesktop16" Guid="*">
66 <File Id="FIconsUserDesktop16" KeyPath="yes"
67 Source="/usr/share/icons/Adwaita/16x16/places/user-desktop-symbolic.symbolic.png"/>
68 </Component>
69 <Component Id="CIconsUserHome16" Guid="*">
70 <File Id="FIconsUserHome16" KeyPath="yes"
71 Source="/usr/share/icons/Adwaita/16x16/places/user-home-symbolic.symbolic.png"/>
72 </Component>
73 <Component Id="CIconsUserTrash16" Guid="*">
74 <File Id="FIconsUserTrash16" KeyPath="yes"
75 Source="/usr/share/icons/Adwaita/16x16/places/user-trash-symbolic.symbolic.png"/>
76 </Component>
77 </Directory>
78 <Directory Id="DirIconsAdwaita16x16Devices" Name="devices">
79 <Component Id="CIconsDriveHarddisk16" Guid="*">
80 <File Id="FIconsDriveHardddisk16" KeyPath="yes"
81 Source="/usr/share/icons/Adwaita/16x16/devices/drive-harddisk-symbolic.symbolic.png"/>
82 </Component>
83 <Component Id="CIconsDriveOptical16" Guid="*">
84 <File Id="FIconsDriveOptical16" KeyPath="yes"
85 Source="/usr/share/icons/Adwaita/16x16/devices/drive-optical-symbolic.symbolic.png"/>
86 </Component>
87 <Component Id="CIconsDriveRemovableMedia16" Guid="*">
88 <File Id="FIconsDriveRemovableMedia16" KeyPath="yes"
89 Source="/usr/share/icons/Adwaita/16x16/devices/drive-removable-media-symbolic.symbolic.png"/>
90 </Component>
91 </Directory>
92 <Directory Id="DirIconsAdwaita16x16Status" Name="status">
93 <Component Id="CIconsCheckbox16" Guid="*">
94 <File Id="FIconsCheckbox16" KeyPath="yes"
95 Source="/usr/share/icons/Adwaita/16x16/status/checkbox-symbolic.symbolic.png"/>
96 </Component>
97 <Component Id="CIconsCheckboxChecked16" Guid="*">
98 <File Id="FIconsCheckBoxChecked16" KeyPath="yes"
99 Source="/usr/share/icons/Adwaita/16x16/status/checkbox-checked-symbolic.symbolic.png"/>
100 </Component>
101 </Directory>
102 <Directory Id="DirIconsAdwaita16x16Actions" Name="actions">
103 <Component Id="CIconsEditClear16" Guid="*">
104 <File Id="FIconsEditClear16" KeyPath="yes"
105 Source="/usr/share/icons/Adwaita/16x16/actions/edit-clear-symbolic.symbolic.png"/>
106 </Component>
107 <Component Id="CIconsViewRestore16" Guid="*">
108 <File Id="FIconsViewRestore16" KeyPath="yes"
109 Source="/usr/share/icons/Adwaita/16x16/actions/view-restore.png"/>
110 </Component>
111 <Component Id="CIconsWindowClose16" Guid="*">
112 <File Id="FIconsWindowClose16" KeyPath="yes"
113 Source="/usr/share/icons/Adwaita/16x16/actions/window-close.png"/>
114 </Component>
115 </Directory>
116 </Directory>
117 <Directory Id="DirIconsAdwaita24x24" Name="24x24">
118 <Directory Id="DirIconsAdwaita24x24Places" Name="places">
119 <Component Id="CIconsFolderDocuments24" Guid="*">
120 <File Id="FIconsFolderDocuments24" KeyPath="yes"
121 Source="/usr/share/icons/Adwaita/24x24/places/folder-documents-symbolic.symbolic.png"/>
122 </Component>
123 <Component Id="CIconsFolderDownload24" Guid="*">
124 <File Id="FIconsFolderDownload24" KeyPath="yes"
125 Source="/usr/share/icons/Adwaita/24x24/places/folder-download-symbolic.symbolic.png"/>
126 </Component>
127 <Component Id="CIconsFolderMusic24" Guid="*">
128 <File Id="FIconsFolderMusic24" KeyPath="yes"
129 Source="/usr/share/icons/Adwaita/24x24/places/folder-music-symbolic.symbolic.png"/>
130 </Component>
131 <Component Id="CIconsFolderPictures24" Guid="*">
132 <File Id="FIconsFolderPictures24" KeyPath="yes"
133 Source="/usr/share/icons/Adwaita/24x24/places/folder-pictures-symbolic.symbolic.png"/>
134 </Component>
135 <Component Id="CIconsFolderPublicshare24" Guid="*">
136 <File Id="FIconsFolderPublicshare24" KeyPath="yes"
137 Source="/usr/share/icons/Adwaita/24x24/places/folder-publicshare-symbolic.symbolic.png"/>
138 </Component>
139 <Component Id="CIconsFolderRemote24" Guid="*">
140 <File Id="FIconsFolderRemote24" KeyPath="yes"
141 Source="/usr/share/icons/Adwaita/24x24/places/folder-remote-symbolic.symbolic.png"/>
142 </Component>
143 <Component Id="CIconsFolderSavedSearch24" Guid="*">
144 <File Id="FIconsFolderSavedSearch24" KeyPath="yes"
145 Source="/usr/share/icons/Adwaita/24x24/places/folder-saved-search-symbolic.symbolic.png"/>
146 </Component>
147 <Component Id="CIconsFolder24" Guid="*">
148 <File Id="FIconsFolder24" KeyPath="yes"
149 Source="/usr/share/icons/Adwaita/24x24/places/folder-symbolic.symbolic.png"/>
150 </Component>
151 <Component Id="CIconsFolderTemplates24" Guid="*">
152 <File Id="FIconsFolderTemplates24" KeyPath="yes"
153 Source="/usr/share/icons/Adwaita/24x24/places/folder-templates-symbolic.symbolic.png"/>
154 </Component>
155 <Component Id="CIconsFolderVideos24" Guid="*">
156 <File Id="FIconsFolderVideos24" KeyPath="yes"
157 Source="/usr/share/icons/Adwaita/24x24/places/folder-videos-symbolic.symbolic.png"/>
158 </Component>
159 <Component Id="CIconsNetworkServer24" Guid="*">
160 <File Id="FIconsNetworkServer24" KeyPath="yes"
161 Source="/usr/share/icons/Adwaita/24x24/places/network-server-symbolic.symbolic.png"/>
162 </Component>
163 <Component Id="CIconsNetworkWorkgroup24" Guid="*">
164 <File Id="FIconsNetworkWorkgroup24" KeyPath="yes"
165 Source="/usr/share/icons/Adwaita/24x24/places/network-workgroup-symbolic.symbolic.png"/>
166 </Component>
167 <Component Id="CIconsStartHere24" Guid="*">
168 <File Id="FIconsStartHere24" KeyPath="yes"
169 Source="/usr/share/icons/Adwaita/24x24/places/start-here-symbolic.symbolic.png"/>
170 </Component>
171 <Component Id="CIconsUserBookmarks24" Guid="*">
172 <File Id="FIconsUserBookmarks24" KeyPath="yes"
173 Source="/usr/share/icons/Adwaita/24x24/places/user-bookmarks-symbolic.symbolic.png"/>
174 </Component>
175 <Component Id="CIconsUserDesktop24" Guid="*">
176 <File Id="FIconsUserDesktop24" KeyPath="yes"
177 Source="/usr/share/icons/Adwaita/24x24/places/user-desktop-symbolic.symbolic.png"/>
178 </Component>
179 <Component Id="CIconsUserHome24" Guid="*">
180 <File Id="FIconsUserHome24" KeyPath="yes"
181 Source="/usr/share/icons/Adwaita/24x24/places/user-home-symbolic.symbolic.png"/>
182 </Component>
183 <Component Id="CIconsUserTrash24" Guid="*">
184 <File Id="FIconsUserTrash24" KeyPath="yes"
185 Source="/usr/share/icons/Adwaita/24x24/places/user-trash-symbolic.symbolic.png"/>
186 </Component>
187 </Directory>
188 <Directory Id="DirIconsAdwaita24x24Devices" Name="devices">
189 <Component Id="CIconsDriveHarddisk24" Guid="*">
190 <File Id="FIconsDriveHardddisk24" KeyPath="yes"
191 Source="/usr/share/icons/Adwaita/24x24/devices/drive-harddisk-symbolic.symbolic.png"/>
192 </Component>
193 <Component Id="CIconsDriveOptical24" Guid="*">
194 <File Id="FIconsDriveOptical24" KeyPath="yes"
195 Source="/usr/share/icons/Adwaita/24x24/devices/drive-optical-symbolic.symbolic.png"/>
196 </Component>
197 <Component Id="CIconsDriveRemovableMedia24" Guid="*">
198 <File Id="FIconsDriveRemovableMedia24" KeyPath="yes"
199 Source="/usr/share/icons/Adwaita/24x24/devices/drive-removable-media-symbolic.symbolic.png"/>
200 </Component>
201 </Directory>
202 <Directory Id="DirIconsAdwaita24x24Status" Name="status">
203 <Component Id="CIconsCheckbox24" Guid="*">
204 <File Id="FIconsCheckbox24" KeyPath="yes"
205 Source="/usr/share/icons/Adwaita/24x24/status/checkbox-symbolic.symbolic.png"/>
206 </Component>
207 <Component Id="CIconsCheckboxChecked24" Guid="*">
208 <File Id="FIconsCheckBoxChecked24" KeyPath="yes"
209 Source="/usr/share/icons/Adwaita/24x24/status/checkbox-checked-symbolic.symbolic.png"/>
210 </Component>
211 </Directory>
212 <Directory Id="DirIconsAdwaita24x24Actions" Name="actions">
213 <Component Id="CIconsEditClear24" Guid="*">
214 <File Id="FIconsEditClear24" KeyPath="yes"
215 Source="/usr/share/icons/Adwaita/24x24/actions/edit-clear-symbolic.symbolic.png"/>
216 </Component>
217 <Component Id="CIconsViewRestore24" Guid="*">
218 <File Id="FIconsViewRestore24" KeyPath="yes"
219 Source="/usr/share/icons/Adwaita/24x24/actions/view-restore.png"/>
220 </Component>
221 <Component Id="CIconsWindowClose24" Guid="*">
222 <File Id="FIconsWindowClose24" KeyPath="yes"
223 Source="/usr/share/icons/Adwaita/24x24/actions/window-close.png"/>
224 </Component>
225 </Directory>
226 </Directory>
227 <Directory Id="DirIconsAdwaita32x32" Name="32x32">
228 <Directory Id="DirIconsAdwaita32x32Places" Name="places">
229 <Component Id="CIconsFolderDocuments32" Guid="*">
230 <File Id="FIconsFolderDocuments32" KeyPath="yes"
231 Source="/usr/share/icons/Adwaita/32x32/places/folder-documents-symbolic.symbolic.png"/>
232 </Component>
233 <Component Id="CIconsFolderDownload32" Guid="*">
234 <File Id="FIconsFolderDownload32" KeyPath="yes"
235 Source="/usr/share/icons/Adwaita/32x32/places/folder-download-symbolic.symbolic.png"/>
236 </Component>
237 <Component Id="CIconsFolderMusic32" Guid="*">
238 <File Id="FIconsFolderMusic32" KeyPath="yes"
239 Source="/usr/share/icons/Adwaita/32x32/places/folder-music-symbolic.symbolic.png"/>
240 </Component>
241 <Component Id="CIconsFolderPictures32" Guid="*">
242 <File Id="FIconsFolderPictures32" KeyPath="yes"
243 Source="/usr/share/icons/Adwaita/32x32/places/folder-pictures-symbolic.symbolic.png"/>
244 </Component>
245 <Component Id="CIconsFolderPublicshare32" Guid="*">
246 <File Id="FIconsFolderPublicshare32" KeyPath="yes"
247 Source="/usr/share/icons/Adwaita/32x32/places/folder-publicshare-symbolic.symbolic.png"/>
248 </Component>
249 <Component Id="CIconsFolderRemote32" Guid="*">
250 <File Id="FIconsFolderRemote32" KeyPath="yes"
251 Source="/usr/share/icons/Adwaita/32x32/places/folder-remote-symbolic.symbolic.png"/>
252 </Component>
253 <Component Id="CIconsFolderSavedSearch32" Guid="*">
254 <File Id="FIconsFolderSavedSearch32" KeyPath="yes"
255 Source="/usr/share/icons/Adwaita/32x32/places/folder-saved-search-symbolic.symbolic.png"/>
256 </Component>
257 <Component Id="CIconsFolder32" Guid="*">
258 <File Id="FIconsFolder32" KeyPath="yes"
259 Source="/usr/share/icons/Adwaita/32x32/places/folder-symbolic.symbolic.png"/>
260 </Component>
261 <Component Id="CIconsFolderTemplates32" Guid="*">
262 <File Id="FIconsFolderTemplates32" KeyPath="yes"
263 Source="/usr/share/icons/Adwaita/32x32/places/folder-templates-symbolic.symbolic.png"/>
264 </Component>
265 <Component Id="CIconsFolderVideos32" Guid="*">
266 <File Id="FIconsFolderVideos32" KeyPath="yes"
267 Source="/usr/share/icons/Adwaita/32x32/places/folder-videos-symbolic.symbolic.png"/>
268 </Component>
269 <Component Id="CIconsNetworkServer32" Guid="*">
270 <File Id="FIconsNetworkServer32" KeyPath="yes"
271 Source="/usr/share/icons/Adwaita/32x32/places/network-server-symbolic.symbolic.png"/>
272 </Component>
273 <Component Id="CIconsNetworkWorkgroup32" Guid="*">
274 <File Id="FIconsNetworkWorkgroup32" KeyPath="yes"
275 Source="/usr/share/icons/Adwaita/32x32/places/network-workgroup-symbolic.symbolic.png"/>
276 </Component>
277 <Component Id="CIconsStartHere32" Guid="*">
278 <File Id="FIconsStartHere32" KeyPath="yes"
279 Source="/usr/share/icons/Adwaita/32x32/places/start-here-symbolic.symbolic.png"/>
280 </Component>
281 <Component Id="CIconsUserBookmarks32" Guid="*">
282 <File Id="FIconsUserBookmarks32" KeyPath="yes"
283 Source="/usr/share/icons/Adwaita/32x32/places/user-bookmarks-symbolic.symbolic.png"/>
284 </Component>
285 <Component Id="CIconsUserDesktop32" Guid="*">
286 <File Id="FIconsUserDesktop32" KeyPath="yes"
287 Source="/usr/share/icons/Adwaita/32x32/places/user-desktop-symbolic.symbolic.png"/>
288 </Component>
289 <Component Id="CIconsUserHome32" Guid="*">
290 <File Id="FIconsUserHome32" KeyPath="yes"
291 Source="/usr/share/icons/Adwaita/32x32/places/user-home-symbolic.symbolic.png"/>
292 </Component>
293 <Component Id="CIconsUserTrash32" Guid="*">
294 <File Id="FIconsUserTrash32" KeyPath="yes"
295 Source="/usr/share/icons/Adwaita/32x32/places/user-trash-symbolic.symbolic.png"/>
296 </Component>
297 </Directory>
298 <Directory Id="DirIconsAdwaita32x32Devices" Name="devices">
299 <Component Id="CIconsDriveHarddisk32" Guid="*">
300 <File Id="FIconsDriveHardddisk32" KeyPath="yes"
301 Source="/usr/share/icons/Adwaita/32x32/devices/drive-harddisk-symbolic.symbolic.png"/>
302 </Component>
303 <Component Id="CIconsDriveOptical32" Guid="*">
304 <File Id="FIconsDriveOptical32" KeyPath="yes"
305 Source="/usr/share/icons/Adwaita/32x32/devices/drive-optical-symbolic.symbolic.png"/>
306 </Component>
307 <Component Id="CIconsDriveRemovableMedia32" Guid="*">
308 <File Id="FIconsDriveRemovableMedia32" KeyPath="yes"
309 Source="/usr/share/icons/Adwaita/32x32/devices/drive-removable-media-symbolic.symbolic.png"/>
310 </Component>
311 </Directory>
312 <Directory Id="DirIconsAdwaita32x32Status" Name="status">
313 <Component Id="CIconsCheckbox32" Guid="*">
314 <File Id="FIconsCheckbox32" KeyPath="yes"
315 Source="/usr/share/icons/Adwaita/32x32/status/checkbox-symbolic.symbolic.png"/>
316 </Component>
317 <Component Id="CIconsCheckboxChecked32" Guid="*">
318 <File Id="FIconsCheckBoxChecked32" KeyPath="yes"
319 Source="/usr/share/icons/Adwaita/32x32/status/checkbox-checked-symbolic.symbolic.png"/>
320 </Component>
321 </Directory>
322 <Directory Id="DirIconsAdwaita32x32Actions" Name="actions">
323 <Component Id="CIconsEditClear32" Guid="*">
324 <File Id="FIconsEditClear32" KeyPath="yes"
325 Source="/usr/share/icons/Adwaita/32x32/actions/edit-clear-symbolic.symbolic.png"/>
326 </Component>
327 <Component Id="CIconsViewRestore32" Guid="*">
328 <File Id="FIconsViewRestore32" KeyPath="yes"
329 Source="/usr/share/icons/Adwaita/32x32/actions/view-restore.png"/>
330 </Component>
331 <Component Id="CIconsWindowClose32" Guid="*">
332 <File Id="FIconsWindowClose32" KeyPath="yes"
333 Source="/usr/share/icons/Adwaita/32x32/actions/window-close.png"/>
334 </Component>
335 </Directory>
336 </Directory>
337 <Directory Id="DirIconsAdwaita48x48" Name="48x48">
338 <Directory Id="DirIconsAdwaita48x48Places" Name="places">
339 <Comp