Package list virt-viewer / 2286ea9
Revert back to 0.5.3-1 with spice support disabled. The libvirt version in sid is too old to built virt-viewer Closes: #701684 Guido Günther 8 years ago
113 changed file(s) with 5979 addition(s) and 18144 deletion(s). Raw diff Collapse all Expand all
66 Christophe Fergeau <cfergeau@redhat.com>
77 Marc-André Lureau <marcandre.lureau@redhat.com>
88 Hans de Goede <hdegoede@redhat.com>
9 Michal Privoznik <mprivozn@redhat.com>
109
11 With additional patches & translations from:
10 With additional patches from:
1211
13 Christophe Fergeau <cfergeau@redhat.com>
14 Daniel P. Berrange <berrange@redhat.com>
15 Dave Allan <dallan@redhat.com>
16 Doug Goldstein <cardoe@cardoe.com>
17 Guannan Ren <gren@redhat.com>
18 Guido Günther <agx@sigxcpu.org>
19 Hans de Goede <hdegoede@redhat.com>
20 Jiri Denemark <Jiri.Denemark@gmail.com>
21 Marc-André Lureau <marcandre.lureau@redhat.com>
22 Martin Kletzander <mkletzan@redhat.com>
23 Michal Privoznik <mprivozn@redhat.com>
24 Pavel Raiskup <praiskup@redhat.com>
25 Richard W.M. Jones <rjones@redhat.com>
26 Ronnie Sahlberg <ronniesahlberg@gmail.com>
27 Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
28 Yonit Halperin <yhalperi@redhat.com>
29 Zeeshan Ali (Khattak) <zeeshanak@gnome.org>
30 amitakhya <amitakhya@fedoraproject.org>
31 andreyjktl <andreyjktl@fedoraproject.org>
32 anipeter <anipeter@fedoraproject.org>
33 ankit <ankit@fedoraproject.org>
34 aron <aron@fedoraproject.org>
35 bozzo <bozzo@fedoraproject.org>
36 elsupergomez <elsupergomez@fedoraproject.org>
37 enshahar <enshahar@fedoraproject.org>
38 fdaluisio <fdaluisio@fedoraproject.org>
39 gcintra <gcintra@fedoraproject.org>
40 giallu <giallu@fedoraproject.org>
41 hedda <hedda@fedoraproject.org>
42 htaira <htaira@fedoraproject.org>
43 ifelix <ifelix@fedoraproject.org>
44 jassy <jassy@fedoraproject.org>
45 khasida <khasida@fedoraproject.org>
46 kkrothap <kkrothap@fedoraproject.org>
47 leahliu <leahliu@fedoraproject.org>
48 mgiri <mgiri@fedoraproject.org>
49 mospina <mospina@fedoraproject.org>
50 mvdz <mvdz@fedoraproject.org>
51 rajesh <rajesh@fedoraproject.org>
52 raven <raven@fedoraproject.org>
53 renault <renault@fedoraproject.org>
54 runab <runab@fedoraproject.org>
55 samfreemanz <samfreemanz@fedoraproject.org>
56 sandeeps <sandeeps@fedoraproject.org>
57 shanky <shanky@fedoraproject.org>
58 snicore <snicore@fedoraproject.org>
59 swkothar <swkothar@fedoraproject.org>
60 tchuang <tchuang@fedoraproject.org>
61 tombo <tombo@fedoraproject.org>
62 tomspur <tomspur@fedoraproject.org>
63 warrink <warrink@fedoraproject.org>
64 webappz <webappz@fedoraproject.org>
65 ypoyarko <ypoyarko@fedoraproject.org>
66 yurchor <yurchor@fedoraproject.org>
67 zoltanh721 <zoltanh721@fedoraproject.org>
12 Atsushi SAKAI <sakaia@jp.fujitsu.com>
13 Chris Lalancette <clalance@redhat.com>
14 Guannan Ren <gren@redhat.com>
15 Guido G\374nther <agx@sigxcpu.org>
16 Hans de Goede <hdegoede@redhat.com>
17 Hiroyuki Kaguchi <fj7025cf@aa.jp.fujitsu.com>
18 Jiri Denemark <Jiri.Denemark@gmail.com>
19 Pavel Raiskup <praiskup@redhat.com>
20 Richard W.M. Jones <rjones@redhat.com>
21 Ronnie Sahlberg <ronniesahlberg@gmail.com>
22 Yann E. MORIN <yann.morin.1998@anciens.enib.fr>
23 Yonit Halperin <yhalperi@redhat.com>
24 Zeeshan Ali (Khattak) <zeeshanak@gnome.org>
6825
6926 ...send patches to get your name here...
27
28 Translations have been provided by
29
30 <amitakhya@fedoraproject.org>
31 <andreyjktl@fedoraproject.org>
32 <anipeter@fedoraproject.org>
33 <ankit@fedoraproject.org>
34 <aron@fedoraproject.org>
35 <bozzo@fedoraproject.org>
36 <elsupergomez@fedoraproject.org>
37 <enshahar@fedoraproject.org>
38 <fdaluisio@fedoraproject.org>
39 <gcintra@fedoraproject.org>
40 <giallu@fedoraproject.org>
41 <hedda@fedoraproject.org>
42 <htaira@fedoraproject.org>
43 <ifelix@fedoraproject.org>
44 <jassy@fedoraproject.org>
45 <khasida@fedoraproject.org>
46 <kkrothap@fedoraproject.org>
47 <leahliu@fedoraproject.org>
48 <mgiri@fedoraproject.org>
49 <mospina@fedoraproject.org>
50 <mvdz@fedoraproject.org>
51 <rajesh@fedoraproject.org>
52 <raven@fedoraproject.org>
53 <renault@fedoraproject.org>
54 <runab@fedoraproject.org>
55 <samfreemanz@fedoraproject.org>
56 <sandeeps@fedoraproject.org>
57 <shanky@fedoraproject.org>
58 <snicore@fedoraproject.org>
59 <swkothar@fedoraproject.org>
60 <tchuang@fedoraproject.org>
61 <tombo@fedoraproject.org>
62 <tomspur@fedoraproject.org>
63 <warrink@fedoraproject.org>
64 <webappz@fedoraproject.org>
65 <ypoyarko@fedoraproject.org>
66 <yurchor@fedoraproject.org>
67 <zoltanh721@fedoraproject.org>
68 ...and more...
7069
7170 For full translation credits see the header of the individual
7271 files in the po/ directory.
+0
-21
AUTHORS.in less more
0 Virt Viewer Authors
1 ===================
2
3 The Virt Viewer application is maintained by
4
5 Daniel P. Berrange <berrange@redhat.com> (Original author)
6 Christophe Fergeau <cfergeau@redhat.com>
7 Marc-André Lureau <marcandre.lureau@redhat.com>
8 Hans de Goede <hdegoede@redhat.com>
9 Michal Privoznik <mprivozn@redhat.com>
10
11 With additional patches & translations from:
12
13 #authorslist#
14
15 ...send patches to get your name here...
16
17 For full translation credits see the header of the individual
18 files in the po/ directory.
19
20 -- End
0 2013-02-13 Daniel P. Berrange <berrange@redhat.com>
1
2 Update for 0.5.5 release
3
4 Update min spice-gtk requirement docs / RPM requires
5
6 Turn off deprecation warnings
7 GLib deprecated the GValueArray type without providing an ABI
8 compatible replacement. Thus we need to disable dreprecation
9 warnings
10
11 ../../src/virt-viewer-auth.c: In function 'virt_viewer_auth_vnc_credentials':
12 ../../src/virt-viewer-auth.c:112:9: error: 'g_value_array_get_nth' is deprecated (declared at /usr/include/glib-2.0/gobject/gvaluearray.h:65): Use 'g_array_index' instead [-Werror=deprecated-declarations]
13
14 Avoid Makefile @ check for data/Makefile.am
15
16 Adapt 'po file' syntax check to look at more files
17 The 'po file' check needs to consider various files in data/
18 as well as normal sources
19
20 Don't define the same make target/variables twice
21 The NSIS patches defined the .PHONY target twice and also
22 defined CLEANFILES twice
23
24 Auto-generate AUTHORS file from GIT logs
25 Rather than trying to manually keep track of authors,
26 just auto-generate the list from GIT logs
27
28 2013-02-13 Marc-André Lureau <marcandre.lureau@gmail.com>
29
30 win: add virt-viewer.msi build rule
31 In order to build the MSI, you will need msitools:
32 http://ftp.gnome.org/pub/GNOME/sources/msitools/
33
34 The MANUFACTURER environment variable is mandatory and should be set
35 to the manufacturer/author of the MSI build.
36
37 2013-02-12 Marc-André Lureau <marcandre.lureau@gmail.com>
38
39 spec: include mime file
40
41 build-sys: add --with-buildid to details build version
42 Add a configure argument to append build version details, similar to
43 what Daniel Berrange proposed in the "use finer package version in
44 mingw-virt-viewer" thread on the ML.
45
46 2013-02-11 Marc-André Lureau <marcandre.lureau@gmail.com>
47
48 Register remote-viewer mime handling
49 Unfortunately, I don't see yet how we could avoid the browser dialog
50 asking which application to open. On Firefox, each user has a
51 mimeTypes.rdf, but we can't really modify it..
52
53 win32: process message queue in debug-helper
54 Process messages while waiting for pi.hProcess.
55
56 Avoid the spice-x from hanging in WaitForInputIdle(), although the
57 client itself might not be ready, not even started...
58
59 https://bugzilla.redhat.com/show_bug.cgi?id=903190
60
61 2013-02-11 Hans de Goede <hdegoede@redhat.com>
62
63 virtviewer-window: Make sure fullscreen window stays on the same monitor
64 Sometimes the guest may shortly disable and then re-enable a monitor while
65 in fullscreen mode, this happens for example when changing display resolution
66 through gnome-display-properties inside the guest. This causes the client
67 window-manager to remap the window, and this can cause it to end up
68 on a different monitor.
69
70 This patch fixes this by remembering the position the window is places at
71 when going fullcreen and moving it there again when its gets (re-)shown.
72
73 2013-02-07 Marc-André Lureau <marcandre.lureau@gmail.com>
74
75 Fix "Do not ask me again" checkbox settings saving
76 Based on bug report by Hans:
77
78 The code block for saving was below this check:
79
80 if (priv->session) {
81 virt_viewer_session_close(VIRT_VIEWER_SESSION(priv->session));
82 if (priv->connected) {
83 priv->quiting = TRUE;
84 return;
85 }
86 }
87
88 Which means it never executes when quiting virt-viewer while conneced, causing
89 the "Do not ask me again" checkbox settings to not be saved.
90
91 2013-02-06 Hans de Goede <hdegoede@redhat.com>
92
93 usbredir: Fix usbredir menu always being grayed out on monitor 2+
94
95 virt-viewer-display-spice: Pass proper x and y coordinates in windowed mode
96 This stops monitor order from the guest from being re-arranged in multi-
97 monitor setups when switching between fullscreen and windowed mode.
98
99 Note this relies on spice-gtk's auto monitor alignment code, which currently
100 does not properly handle setups where there is more then 1 row of monitors,
101 ie 2x1 - 5x1 will work fine, but 2x2 will not.
102
103 virt-viewer-display-spice: Use real monitor coordinates in fullscreen
104 Now that we pass the real monitor coordinates, tell spice-gtk to use them,
105 rather then to use the passed coordinates as input for its automatic monitor
106 alignment. This fixes ie monitors in a 2x2 grid, showing up as a 4x1
107 configuration in the guest.
108
109 virt-viewer-display-spice: Pass real monitor coordinates in fullscreen
110 Rather then always passing +0+0
111
112 2013-02-04 Michal Privoznik <mprivozn@redhat.com>
113
114 g_{message,warning}: Use printf style
115 The g_message() and g_warning functions expect printf style of
116 arguments. That is, whenever we want to print a string, it has
117 to be preceded with "%s" format.
118
119 configure: Update with autoupdate
120
121 Don't redefine _FORTIFY_SOURCE macro
122 If the _FORTIFY_SOURCE has been already defined, we unconditionally
123 redefine it, leaving us with warning/error thrown at compilation time.
124
125 2013-02-04 Martin Kletzander <mkletzan@redhat.com>
126
127 Make compilation work with automake 1.13
128 Just one thing needs to be changed for virt-viewer to build with
129 automake 1.13, AM_CONFIG_HEADER is deprecated and should be
130 AC_CONFIG_HEADERS.
131
132 2013-01-31 Marc-André Lureau <marcandre.lureau@gmail.com>
133
134 remote-viewer: controller sets spice session proxy
135 Trivial change since spice-gtk now has proxy session property and
136 controller message, just forward it.
137
138 Add a "Do not ask me again" checkbox when closing app
139
140 Always ask user about closing session
141 Currently, virt-viewer doesn't ask for user confirmation when closing
142 a single monitor session. Always ask before closing, as requested by
143 user.
144
145 https://bugzilla.redhat.com/show_bug.cgi?id=803912
146
147 2013-01-29 Marc-André Lureau <marcandre.lureau@gmail.com>
148
149 spice: add proxy configuration to connection file
150
151 2013-01-24 Christophe Fergeau <cfergeau@redhat.com>
152
153 Remove unused label
154 It's no longer used after aecd80ec7
155
156 Remove unused variable
157 'window' is no longer used after 412bcf6f.
158
159 Fix warning when compiling without spice-gtk support
160 When remote-viewer is compiled without spice-gtk support, spice-session.h
161 will not get included in remote-viewer.c, causing these warnings:
162
163 remote-viewer.c: In function 'remote_viewer_start':
164 remote-viewer.c:693:9: warning: implicit declaration of function
165 'virt_viewer_session_set_file' [-Wimplicit-function-declaration]
166 remote-viewer.c:693:9: warning: nested extern declaration of
167 'virt_viewer_session_set_file' [-Wnested-externs]
168
169 Add missing intltool BuildRequires
170 The configure script fails if intltool is not installed.
171
172 mingw: Add packages for virt-viewer NSIS installer
173 This makes it much easier to build an updated Windows installer binary
174 as this can now be done using mock/koji/... by using this .spec and
175 a virt-viewer tarball.
176
177 mingw: Build a gtk2 version of virt-viewer
178 The nsis file we ship is generating an installer for a GTK+2 build
179 of virt-viewer, so it's inconsistent for the mingw-virt-viewer
180 spec file to generate a GTK+3 build. Switch to building a GTK+2
181 version of virt-viewer in mingw-virt-viewer.spec
182
183 mingw: Package debug-helper.exe
184
185 mingw: Package debug files
186 When building on f18, the build fails because of unpackaged
187 debug files. Use the appropriate mingw macro to generate
188 the mingw debug packages.
189
190 The build failure is:
191
192 RPM build errors:
193 error: Installed (but unpackaged) file(s) found:
194 /usr/i686-w64-mingw32/sys-root/mingw/bin/debug-helper.exe.debug
195 /usr/i686-w64-mingw32/sys-root/mingw/bin/remote-viewer.exe.debug
196 /usr/i686-w64-mingw32/sys-root/mingw/bin/virt-viewer.exe.debug
197 /usr/i686-w64-mingw32/sys-root/mingw/bin/windows-cmdline-wrapper.exe.debug
198 /usr/x86_64-w64-mingw32/sys-root/mingw/bin/debug-helper.exe.debug
199 /usr/x86_64-w64-mingw32/sys-root/mingw/bin/remote-viewer.exe.debug
200 /usr/x86_64-w64-mingw32/sys-root/mingw/bin/virt-viewer.exe.debug
201 /usr/x86_64-w64-mingw32/sys-root/mingw/bin/windows-cmdline-wrapper.exe.debug
202 Installed (but unpackaged) file(s) found:
203 /usr/i686-w64-mingw32/sys-root/mingw/bin/debug-helper.exe.debug
204 /usr/i686-w64-mingw32/sys-root/mingw/bin/remote-viewer.exe.debug
205 /usr/i686-w64-mingw32/sys-root/mingw/bin/virt-viewer.exe.debug
206 /usr/i686-w64-mingw32/sys-root/mingw/bin/windows-cmdline-wrapper.exe.debug
207 /usr/x86_64-w64-mingw32/sys-root/mingw/bin/debug-helper.exe.debug
208 /usr/x86_64-w64-mingw32/sys-root/mingw/bin/remote-viewer.exe.debug
209 /usr/x86_64-w64-mingw32/sys-root/mingw/bin/virt-viewer.exe.debug
210 /usr/x86_64-w64-mingw32/sys-root/mingw/bin/windows-cmdline-wrapper.exe.debug
211
212 mingw: Fix typo in mingw macro name (hedder -> header)
213
214 nsis: Adjust file list
215 Adjust file names for mingw-usbredir dlls and readline dlls
216
217 2013-01-22 Hans de Goede <hdegoede@redhat.com>
218
219 virt-viewer-display-spice: Get monitor under our window
220 When getting monitor info for going fullscreen, Get the monitor under
221 *our* window rather then under the root-window.
222
223 Noticed this not working properly when testing the monitor coordinates stuff,
224 but this should also help people seeing problems when using non equally sized
225 monitors.
226
227 2013-01-18 Marc-André Lureau <marcandre.lureau@gmail.com>
228
229 vnc: add connection by file
230 Learn to connect to a VNC server with the connection details file, ex:
231
232 [virt-viewer]
233 type=vnc
234 host=localhost
235 port=2356
236 password=foobar
237
238 v2:
239 - add username/password support
240
241 https://bugzilla.redhat.com/show_bug.cgi?id=843410
242
243 file: add username support
244
245 2012-12-21 Hans de Goede <hdegoede@redhat.com>
246
247 Make hotkey configuration functionality available from the cmdline (v2)
248 Changes in v2:
249 -Add --hotkeys documentation to the man-pages
250
251 Add a virt_viewer_app_set_hotkeys() helper function
252
253 2012-12-20 Christophe Fergeau <cfergeau@redhat.com>
254
255 Improve check for overridden grab key combination
256 remote-viewer can either use the default grab/ungrab handled by
257 spice-gtk, or override it and use the standard gtk+ accelerator
258 mechanism. However, the code currently assumes that if any accelerator
259 is set in remote-viewer, then the grab key has been overridden.
260 This commit makes sure the grab key is actually overridden before assuming
261 so.
262
263 Don't leak SpiceGrabSequence in enable_accel_changed
264
265 Improve hotkeys controller behaviour
266 Disable default accelerators when setting bindings from the controller
267 in case the controller does not override them all. This ensures we don't
268 inherit from the bindings set in VirtViewerApp::constructor if the controller
269 doesn't set any bindings for a given action.
270
271 2012-12-07 Marc-André Lureau <marcandre.lureau@gmail.com>
272
273 Use monitor geometry, not screen size
274 In a recent commit, 3bb6f5ec805ecfe78eba6d4d98e3ffcab195273a, I
275 introduced a regression: going fullscreen would no longer match client
276 and guest resolution correctly.
277
278 A GdkScreen is not necessarily the physical screen monitor size.
279 Lookup the physical monitor size using
280 gdk_screen_get_monitor_geometry().
281
282 Fixes:
283 https://bugzilla.redhat.com/show_bug.cgi?id=881020
284
285 2012-12-05 Michal Privoznik <mprivozn@redhat.com>
286
287 session-spice: Cast CA string to gunit8 pointer
288 SpiceSession has 'ca' property which is type of GByteArray*.
289 However, when we read the property from file, we read it as
290 string. For conversion g_byte_array_new_take() is used which
291 takes given pointer as guint8* so we need to do the cast.
292
293 Sanitize syntax-check
294 make syntax-check is producing some errors about empty line at EOF
295 and missing #include <config.h> in src/virt-viewer-file.c
296
297 * src/virt-viewer-file.c: add #include <config.h>
298 * data/virt-viewer-debug.nsis.in: remove empty line at EOF
299
300 2012-12-05 Doug Goldstein <cardoe@cardoe.com>
301
302 Make .desktop file comply with spec
303 The .desktop file did not comply with the Desktop Entry spec as checked
304 with desktop-file-validate. Boolean keys are defined as taking only
305 'true' or 'false', the entry Terminal had False. MimeType is a string
306 list and therefore must be terminated with a ;
307
308 2012-11-27 Marc-André Lureau <marcandre.lureau@gmail.com>
309
310 remote-viewer: learn to connect from file
311 v2:
312 - move some variables to inner-block as requested by reviewer
313
314 spice: learn to connect from file
315
316 Add VirtViewerSession:file property
317 If VirtViewerSession:file is set, it should be used to define the
318 connection parameters. Also correct the mime type used in this case.
319
320 The mime type is needed to identify the kind of resources we are
321 adding to the recent list. The recent list can then be filtered and
322 various application handling that type may attempt to access that
323 resource.
324
325 Add VirtViewerFile
326 v2:
327 - use !! for boolean values setter
328 - switch from bytearray/base64 to plain string for CA (PEM)
329 - add file format comment
330
331 Move spice_hotkey_to_gtk_accelerator() to util
332 To be compatible with RHEVM, VirtViewerFile hotkey format will use the
333 Spice Controller format.
334
335 recent: get mime type from session
336 Do not use spice mime type for all kind of sessions, but depending on
337 what is actually being used.
338
339 session: add virt_viewer_session_mime_type()
340
341 debug.nsis: remove superflous path
342
343 display: only un-constrain display size once it is mapped
344 Wait until the widget is actually on screen before removing its
345 size constrain. This solves 50x50 window secondary window size
346 when connecting to a multi-monitor spice guest.
347
348 2012-11-23 Marc-André Lureau <marcandre.lureau@gmail.com>
349
350 Add virt-viewer-debug.exe NSIS installer
351 This installer will provide with the tools and configuration needed to
352 debug virt-viewer & remote-viewer. It will install itself by default in
353 virt-viewer directory.
354
355 2012-11-21 Michal Privoznik <mprivozn@redhat.com>
356
357 debug-helper: include <config.h>
358
359 AUTHORS: add Dave Allan
360 as he has supplied patch (commit 74b1b62510d9390).
361
362 cfg.mk: Don't require bindtextdomain directly
363 With current implementation, all binaries that need it call
364 bindtextdomain but not directly. They call a helper function
365 instead. This makes, however, syntax-check fail as it cannot
366 recognize it.
367
368 Original patch proposed by Eric Blake <eblake@redhat.com>
369
370 2012-11-20 Marc-André Lureau <marcandre.lureau@gmail.com>
371
372 spice: the session is connected when main channel opened
373 The previous change in 399aae55aa384bf91dff0fc770497c0d5f935fa9 rely
374 on correct session-connected signal. However, the spice backend
375 is emiting it too early, when the main channel is created, where
376 it should wait until it is connected instead.
377
378 "Unable to connect to the graphic server" error on guest shutdown
379 In virt_viewer_app_activate(), priv->connected is set to FALSE when
380 the connect/active is successfull. However, we rely on it to know
381 whether the virt_viewer_app_disconnected() is an error, so only set it
382 to FALSE when connection failed.
383
384 Fixes:
385 https://bugzilla.redhat.com/show_bug.cgi?id=875697
386
387 2012-11-16 Marc-André Lureau <marcandre.lureau@gmail.com>
388
389 build-sys: add min libvirt version requirement check
390
391 2012-11-15 Christophe Fergeau <cfergeau@redhat.com>
392
393 Make sure png screenshots have a .png extensions
394 When falling back to saving to .png, the filename might not
395 end with .png. This commit appends the .png extension to the
396 screenshot filename if it's missing.
397
398 Allow to save to other formats than png
399 Currently, the screenshots can only be saved to png. This commit
400 checks if the file extension is a known one, and will save to this
401 format if it is. Otherwise it will fallback to saving to png.
402
403 Set a default dir/name for screenshots
404 It makes sense for the screenshots to be saved in ~/Images,
405 especially as otherwise the filechooser will display
406 'recent documents' to which we cannot save. This commit also sets
407 the default screenshot name to 'Screenshot'.
408
409 Fix spice-gtk check in configure.ac
410 The check that at least one of spice-gtk and gtk-vnc is present
411 uses a wrong variable name to check for spice-gtk presence, which
412 causes the check to think it's never present. This would make
413 gtk-vnc presence mandatory. This commit fixes the name of the
414 spice-gtk variable ($have_gtk_spice -> $have_spice_gtk).
415
416 2012-11-14 Michal Privoznik <mprivozn@redhat.com>
417
418 Don't SIGSEGV if no transport is used.
419 One of previous commits (74b1b62510d939) allowed us to connect to
420 localhost directly if ssh transport was used. However, if there's
421 not transport, we SIGSEGV'ed as g_str_equal doesn't like NULL as
422 one of arguments. Change this to g_strcmp0 which does the same
423 service but is more friendly to NULL arguments.
424
425 2012-11-13 Michal Privoznik <mprivozn@redhat.com>
426
427 Reconnect to libvirtd after connection breaks
428 Currently, if user wants to reconnect to a domain he can use
429 '-r' cmd line argument. This makes virt-viewer listen to
430 domain events. However, if connection to libvirtd breaks
431 somehow, we will receive no longer any event. Hence we must
432 reconnect to the libvirt.
433
434 2012-11-08 Dave Allan <dallan@redhat.com>
435
436 Connect to localhost for display when transport is ssh
437 When connecting to a VM that does not have a 'listen' tag in its
438 graphcs element, we have to guess where to try to connect to the VM's
439 display. The current default is the host specified in the connection
440 URI which is correct for most transports, however, the SSH transport
441 makes the display connection from the remote end, so in that case,
442 attempt to connect to localhost.
443
444 2012-10-25 Guido Günther <agx@sigxcpu.org>
445
446 Fail if neither vnc nor spice is detected
447 Since the viewer makes little sense otherwise.
448
449 2012-10-23 Marc-André Lureau <marcandre.lureau@gmail.com>
450
451 Fix jenkins build failure
452 virt-viewer-util.c: In function 'virt_viewer_util_init':
453 virt-viewer-util.c:289: warning: implicit declaration of function 'setlocale'
454 virt-viewer-util.c:289: warning: nested extern declaration of 'setlocale'
455 virt-viewer-util.c:289: error: 'LC_ALL' undeclared (first use in this function)
456 virt-viewer-util.c:289: error: (Each undeclared identifier is reported only once
457 virt-viewer-util.c:289: error: for each function it appears in.)
458
459 Use a mutex to check if VirtViewer running
460 We need to warn user that installer can't proceed if there is already
461 a running instance of VirtViewer or of the installer.
462
463 https://bugzilla.redhat.com/show_bug.cgi?id=864033
464
465 Use a common early init() function
466 There is a number of things both virt-viewer and remote-viewer need to
467 do early during execution. Do it only in one place.
468
469 windows: add debug-helper
470 This is a simple program that will set some debug variable, and run
471 gdb and wait until it finished. This makes it possible to debug
472 "remote-viewer --spice-controller" easily, by setting the necessary
473 variables and keeping the parent process running (the activex whatches
474 its death)
475
476 To use it, replace the HKCU "Software\spice-space.org\spicex\client"
477 value "$INSTDIR\bin\remote-viewer.exe --spice-controller" with
478 "$INSTDIR\bin\debug-helper.exe remote-viewer.exe --spice-controller".
479
480 nsis: add deps.txt file in installer
481 This helps track package version that were used during the
482 build of Windows installer. It's not ideal, but make up the
483 lack of package management on windows
484
485 nsis: update required files and libraries
486
487 win32: there is no CONERR$, only CONOUT$
488
489 2012-10-17 Marc-André Lureau <marcandre.lureau@gmail.com>
490
491 spice: only autoresize once with screen size in fullscreen
492 It's currently not possible to configure guest with higher resolution
493 than native, as it will switch back to native, since the gtk widget
494 allocation will always end up being the size of the screen. We
495 special-case fullscreen mode, and only resize when entering
496 fullscreen. Furthermore, it avoids sending extra unnecessary resize
497 events to the guest whenever gtk+ call size allocate in various
498 stages, with different values.
499
500 https://bugzilla.redhat.com/show_bug.cgi?id=864929
501
502 spice: avoid rounding issues when scaling up display
503 Fix some unwanted guest resize due to rounding issues (at least when
504 scaling up)
505
506 We may want to save the original remote desktop size, instead of
507 always checking widget requisition. That way zooming shouldn't resize
508 guest at all, but it seems tricky to handle that special case vs user
509 window resize that should trigger guest resize.
510
511 https://bugzilla.redhat.com/show_bug.cgi?id=856678
512
513 2012-10-16 Marc-André Lureau <marcandre.lureau@gmail.com>
514
515 Do not resize window to minimum when toggling auto-resize
516 The virt_viewer_display_idle() will queue a resize event that will
517 result in display size requisition of 50x50. If we later resize the
518 window to 1x1 in virt_viewer_window_resize() we end up with a tiny
519 window.
520
521 It is legitimate not to force that 1x1 window resize when toggling the
522 option. After the rest of the logic in virt_viewer_window_resize(), if
523 the remote desktop ends up being resize, that will trigger another
524 virt_viewer_set_desktop_size() and finally change the window size
525 appropriately.
526
527 https://bugzilla.redhat.com/show_bug.cgi?id=856610
528
529 2012-10-12 Daniel P. Berrange <berrange@redhat.com>
530
531 Add RPM magic to run autoreconf
532
533 2012-10-10 Daniel P. Berrange <berrange@redhat.com>
534
535 Fix check for IPv6 any address
536 The string '::' is just one of many possible ways to express
537 the IPv6 "any" address. Others include '::0', '0:0:0:0:0:0:0:0',
538 '0::0' and more. Instead of trying to do strcmp, actually try
539 parsing the address with GInetAddress and then simply use an
540 accessor to check what type it is
541
542 2012-10-09 Daniel P. Berrange <berrange@redhat.com>
543
544 Allow user to set a window title for remote-viewer
545 Currently the remote viewer windows get the URI as their
546 title. Provide a --title STRING arg to remote-viewer to
547 let the user override the title with something more
548 meaningful to them.
549
550 2012-10-01 Christophe Fergeau <cfergeau@redhat.com>
551
552 Don't free SPICE ticket twice
553 Commit 2201a5a was supposed to free a SPICE ticket leak, but it's
554 actually introducing a double-free as the SPICE ticket is
555 unconditionally freed at the end of
556 virt_viewer_session_spice_main_channel_event
557
558 2012-09-18 Christophe Fergeau <cfergeau@redhat.com>
559
560 Append \n to message in virt_viewer_app_trace
561 Callers manually add a trailing \n when they call virt_viewer_app_trace,
562 but it's sometimes forgotten, leading to rhbz#822794. This commit
563 removes the \n from all callers (it was missing in a few of them)
564 and adds it in virt_viewer_app_trace.
565
566 2012-09-18 Daniel P. Berrange <berrange@redhat.com>
567
568 Refresh translations
569
5700 2012-09-17 Daniel P. Berrange <berrange@redhat.com>
5711
5722 Update for 0.5.4 releae
1414 build-aux/gitlog-to-changelog \
1515 build-aux/useless-if-before-free \
1616 build-aux/vc-list-files \
17 AUTHORS.in \
1817 $(NULL)
1918
2019 DISTCLEAN_FILES = \
4443 $(srcdir)/m4/lt~obsolete.m4 \
4544 $(NULL)
4645
47 dist-hook: gen-ChangeLog gen-AUTHORS
46 dist-hook: gen-ChangeLog
4847
4948 # Generate the ChangeLog file (with all entries since the switch to git)
5049 # and insert it into the directory we're about to use to create a tarball.
51 if OS_WIN32
52 .PHONY: gen-ChangeLog gen-AUTHORS nsis
53 else
54 .PHONY: gen-ChangeLog gen-AUTHORS
55 endif
56
50 .PHONY: gen-ChangeLog
5751 gen-ChangeLog:
5852 if test -d .git || test -d ../.git; then \
5953 $(top_srcdir)/build-aux/gitlog-to-changelog \
6256 mv $(distdir)/cl-t $(distdir)/ChangeLog; \
6357 fi
6458
65 gen-AUTHORS:
66 $(AM_V_GEN)if test -d $(srcdir)/.git; then \
67 out="`cd $(srcdir) && git log --pretty=format:'%aN <%aE>' | sort -u`" && \
68 perl -p -e "s/#authorslist#// and print '$$out'" \
69 < $(srcdir)/AUTHORS.in > $(distdir)/AUTHORS-tmp && \
70 mv -f $(distdir)/AUTHORS-tmp $(distdir)/AUTHORS ; \
71 fi
72
73 if OS_WIN32
74 .PHONY: nsis
75 nsis:
76 make -C $(builddir)/data virt-viewer-$(VERSION).exe
77 endif
78
7959 -include $(top_srcdir)/git.mk
341341 build-aux/gitlog-to-changelog \
342342 build-aux/useless-if-before-free \
343343 build-aux/vc-list-files \
344 AUTHORS.in \
345344 $(NULL)
346345
347346 DISTCLEAN_FILES = \
887886 uninstall uninstall-am
888887
889888
890 dist-hook: gen-ChangeLog gen-AUTHORS
889 dist-hook: gen-ChangeLog
891890
892891 # Generate the ChangeLog file (with all entries since the switch to git)
893892 # and insert it into the directory we're about to use to create a tarball.
894 @OS_WIN32_TRUE@.PHONY: gen-ChangeLog gen-AUTHORS nsis
895 @OS_WIN32_FALSE@.PHONY: gen-ChangeLog gen-AUTHORS
896
893 .PHONY: gen-ChangeLog
897894 gen-ChangeLog:
898895 if test -d .git || test -d ../.git; then \
899896 $(top_srcdir)/build-aux/gitlog-to-changelog \
902899 mv $(distdir)/cl-t $(distdir)/ChangeLog; \
903900 fi
904901
905 gen-AUTHORS:
906 $(AM_V_GEN)if test -d $(srcdir)/.git; then \
907 out="`cd $(srcdir) && git log --pretty=format:'%aN <%aE>' | sort -u`" && \
908 perl -p -e "s/#authorslist#// and print '$$out'" \
909 < $(srcdir)/AUTHORS.in > $(distdir)/AUTHORS-tmp && \
910 mv -f $(distdir)/AUTHORS-tmp $(distdir)/AUTHORS ; \
911 fi
912
913 @OS_WIN32_TRUE@.PHONY: nsis
914 @OS_WIN32_TRUE@nsis:
915 @OS_WIN32_TRUE@ make -C $(builddir)/data virt-viewer-$(VERSION).exe
916
917902 -include $(top_srcdir)/git.mk
918903
919904 # Tell versions [3.59,3.63) of GNU make to not export all variables.
00 Virt Viewer News
11 ================
2
3 0.5.5: Feb 13, 2013
4 -------------------
5
6 - Improve screenshot saving dialog
7 - remote-viewer learned to connect with a file of mime type
8 application/x-virt-viewer, described in src/virt-viewer-file.c
9 - Add a "do not ask me again" dialog checkbox when leaving
10 - Add a MSI target, using https://live.gnome.org/msitools
11 - Add windows debug helper, useful in Spice controller running context
12 - Add remote-viewer --title STRING
13 - Support for Spice proxy settings added
14 - Numerous Spice display and multi-monitor fixes
15 - win32, memory, build, and other misc fixes
16 - Requires spice-gtk >= 0.16.26
172
183 0.5.4: Sep 17, 2012
194 -------------------
1818
1919 http://gtk-vnc.sourceforge.net/
2020
21 Virt Viewer uses the SPICE-GTK (>= 0.16.26) widget to provide a
21 Virt Viewer uses the SPICE-GTK (>= 0.12.101) widget to provide a
2222 display of the SPICE protocol, which is available from:
2323
2424 http://spice-space.org/page/Spice-Gtk
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 -Wno-sign-compare"
3737 if test "$enable_compile_warnings" = "error" ; then
3838 try_compiler_flags="$try_compiler_flags -Werror"
3939 fi
4545
4646 AH_VERBATIM([FORTIFY_SOURCE],
4747 [/* Enable compile-time and run-time bounds-checking, and some warnings. */
48 #if !defined _FORTIFY_SOURCE && defined __OPTIMIZE__ && __OPTIMIZE__
48 #if defined __OPTIMIZE__ && __OPTIMIZE__
4949 # define _FORTIFY_SOURCE 2
5050 #endif
5151 ])
1212
1313 m4_ifndef([AC_AUTOCONF_VERSION],
1414 [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
15 m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
16 [m4_warning([this file was generated for autoconf 2.69.
15 m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
16 [m4_warning([this file was generated for autoconf 2.68.
1717 You have another version of autoconf. It may work, but is not guaranteed to.
1818 If you have problems, you may need to regenerate the build system entirely.
1919 To do so, use the procedure documented by the package, typically 'autoreconf'.])])
516516 # ----------------------------------
517517 AC_DEFUN([PKG_PROG_PKG_CONFIG],
518518 [m4_pattern_forbid([^_?PKG_[A-Z_]+$])
519 m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
520 m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
519 m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
521520 AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
522521 AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
523522 AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
563562 pkg_cv_[]$1="$$1"
564563 elif test -n "$PKG_CONFIG"; then
565564 PKG_CHECK_EXISTS([$3],
566 [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
567 test "x$?" != "x0" && pkg_failed=yes ],
565 [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
568566 [pkg_failed=yes])
569567 else
570568 pkg_failed=untried
612610 AC_MSG_RESULT([no])
613611 _PKG_SHORT_ERRORS_SUPPORTED
614612 if test $_pkg_short_errors_supported = yes; then
615 $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
613 $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
616614 else
617 $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
615 $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
618616 fi
619617 # Put the nasty error message in config.log where it belongs
620618 echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
627625 Consider adjusting the PKG_CONFIG_PATH environment variable if you
628626 installed software in a non-standard prefix.
629627
630 _PKG_TEXT])[]dnl
628 _PKG_TEXT])
631629 ])
632630 elif test $pkg_failed = untried; then
633631 AC_MSG_RESULT([no])
638636
639637 _PKG_TEXT
640638
641 To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
639 To get pkg-config, see <http://pkg-config.freedesktop.org/>.])
642640 ])
643641 else
644642 $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
647645 $3
648646 fi[]dnl
649647 ])# 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.
659 AC_DEFUN([PKG_INSTALLDIR],
660 [m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
661 m4_pushdef([pkg_description],
662 [pkg-config installation directory @<:@]pkg_default[@:>@])
663 AC_ARG_WITH([pkgconfigdir],
664 [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
665 [with_pkgconfigdir=]pkg_default)
666 AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
667 m4_popdef([pkg_default])
668 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.
679 AC_DEFUN([PKG_NOARCH_INSTALLDIR],
680 [m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
681 m4_pushdef([pkg_description],
682 [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])
683 AC_ARG_WITH([noarch-pkgconfigdir],
684 [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
685 [with_noarch_pkgconfigdir=]pkg_default)
686 AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
687 m4_popdef([pkg_default])
688 m4_popdef([pkg_description])
689 ]) dnl PKG_NOARCH_INSTALLDIR
690648
691649 # Copyright (C) 2002-2012 Free Software Foundation, Inc.
692650 #
10821040 [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
10831041 [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
10841042 ])
1043
1044 # Copyright (C) 1996-2012 Free Software Foundation, Inc.
1045 #
1046 # This file is free software; the Free Software Foundation
1047 # gives unlimited permission to copy and/or distribute it,
1048 # with or without modifications, as long as this notice is preserved.
1049
1050 # serial 8
1051
1052 # AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
1053 AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
10851054
10861055 # Do all the work for Automake. -*- Autoconf -*-
10871056
00 # Customize Makefile.maint. -*- makefile -*-
1 # Copyright (C) 2008-2012 Red Hat, Inc.
1 # Copyright (C) 2008-2011 Red Hat, Inc.
22 # Copyright (C) 2003-2008 Free Software Foundation, Inc.
33
44 # This program is free software: you can redistribute it and/or modify
1717 # Tests not to run as part of "make distcheck".
1818 local-checks-to-skip = \
1919 changelog-check \
20 check-AUTHORS \
2021 makefile-check \
2122 makefile_path_separator_check \
2223 patch-check \
2324 sc_GPL_version \
2425 sc_always_defined_macros \
25 sc_bindtextdomain \
2626 sc_cast_of_alloca_return_value \
2727 sc_cross_check_PATH_usage_in_tests \
2828 sc_dd_max_sym_length \
109109 # We don't use this feature of maint.mk.
110110 prev_version_file = /dev/null
111111
112 # Give credit where due:
113 # Ensure that each commit author email address (possibly mapped via
114 # git log's .mailmap) appears in our AUTHORS file.
115 sc_check_author_list:
116 @fail=0; \
117 for i in $$(git log --pretty=format:%aE%n|sort -u|grep -v '^$$'); do \
118 sanitized=$$(echo "$$i"|LC_ALL=C sed 's/\([^a-zA-Z0-9_@-]\)/\\\1/g'); \
119 grep -iq "<$$sanitized>" $(srcdir)/AUTHORS \
120 || { printf '%s\n' "$$i" >&2; fail=1; }; \
121 done; \
122 test $$fail = 1 \
123 && echo '$(ME): committer(s) not listed in AUTHORS' >&2; \
124 test $$fail = 0
125
112126
113127 exclude_file_name_regexp--sc_preprocessor_indentation = ^*/*.[ch]
114128 exclude_file_name_regexp--sc_prohibit_strcmp = ^*/*.[ch]
118132 exclude_file_name_regexp--sc_prohibit_empty_lines_at_EOF = ^icons/
119133 exclude_file_name_regexp--sc_trailing_blank = ^icons/
120134
135 exclude_file_name_regexp--sc_bindtextdomain = src/windows-cmdline-wrapper.c
121136 exclude_file_name_regexp--sc_prohibit_magic_number_exit = src/windows-cmdline-wrapper.c
122
123 exclude_file_name_regexp--sc_makefile_at_at_check = data/Makefile.am
00 /* config.h.in. Generated from configure.ac by autoheader. */
1
2 /* Build version details */
3 #undef BUILDID
41
52 /* always defined to indicate that i18n is enabled */
63 #undef ENABLE_NLS
74
85 /* Enable compile-time and run-time bounds-checking, and some warnings. */
9 #if !defined _FORTIFY_SOURCE && defined __OPTIMIZE__ && __OPTIMIZE__
6 #if defined __OPTIMIZE__ && __OPTIMIZE__
107 # define _FORTIFY_SOURCE 2
118 #endif
129
00 #! /bin/sh
11 # Guess values for system-dependent variables and create Makefiles.
2 # Generated by GNU Autoconf 2.69 for virt-viewer 0.5.5.
2 # Generated by GNU Autoconf 2.68 for virt-viewer 0.5.4.
33 #
44 #
5 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
5 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
6 # 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
7 # Foundation, Inc.
68 #
79 #
810 # This configure script is free software; the Free Software Foundation
131133 # CDPATH.
132134 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
133135
134 # Use a proper internal environment variable to ensure we don't fall
135 # into an infinite loop, continuously re-executing ourselves.
136 if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
137 _as_can_reexec=no; export _as_can_reexec;
138 # We cannot yet assume a decent shell, so we have to provide a
139 # neutralization value for shells without unset; and this also
140 # works around shells that cannot unset nonexistent variables.
141 # Preserve -v and -x to the replacement shell.
142 BASH_ENV=/dev/null
143 ENV=/dev/null
144 (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
145 case $- in # ((((
146 *v*x* | *x*v* ) as_opts=-vx ;;
147 *v* ) as_opts=-v ;;
148 *x* ) as_opts=-x ;;
149 * ) as_opts= ;;
150 esac
151 exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
152 # Admittedly, this is quite paranoid, since all the known shells bail
153 # out after a failed `exec'.
154 $as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
155 as_fn_exit 255
156 fi
157 # We don't want this to propagate to other subprocesses.
158 { _as_can_reexec=; unset _as_can_reexec;}
159136 if test "x$CONFIG_SHELL" = x; then
160137 as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
161138 emulate sh
189166 else
190167 exitcode=1; echo positional parameters were not saved.
191168 fi
192 test x\$exitcode = x0 || exit 1
193 test -x / || exit 1"
169 test x\$exitcode = x0 || exit 1"
194170 as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
195171 as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
196172 eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
243219
244220
245221 if test "x$CONFIG_SHELL" != x; then :
246 export CONFIG_SHELL
247 # We cannot yet assume a decent shell, so we have to provide a
248 # neutralization value for shells without unset; and this also
249 # works around shells that cannot unset nonexistent variables.
250 # Preserve -v and -x to the replacement shell.
251 BASH_ENV=/dev/null
252 ENV=/dev/null
253 (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
254 case $- in # ((((
255 *v*x* | *x*v* ) as_opts=-vx ;;
256 *v* ) as_opts=-v ;;
257 *x* ) as_opts=-x ;;
258 * ) as_opts= ;;
259 esac
260 exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
261 # Admittedly, this is quite paranoid, since all the known shells bail
262 # out after a failed `exec'.
263 $as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
264 exit 255
222 # We cannot yet assume a decent shell, so we have to provide a
223 # neutralization value for shells without unset; and this also
224 # works around shells that cannot unset nonexistent variables.
225 # Preserve -v and -x to the replacement shell.
226 BASH_ENV=/dev/null
227 ENV=/dev/null
228 (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
229 export CONFIG_SHELL
230 case $- in # ((((
231 *v*x* | *x*v* ) as_opts=-vx ;;
232 *v* ) as_opts=-v ;;
233 *x* ) as_opts=-x ;;
234 * ) as_opts= ;;
235 esac
236 exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
265237 fi
266238
267239 if test x$as_have_required = xno; then :
363335
364336
365337 } # as_fn_mkdir_p
366
367 # as_fn_executable_p FILE
368 # -----------------------
369 # Test if FILE is an executable regular file.
370 as_fn_executable_p ()
371 {
372 test -f "$1" && test -x "$1"
373 } # as_fn_executable_p
374338 # as_fn_append VAR VALUE
375339 # ----------------------
376340 # Append the text in VALUE to the end of the definition contained in VAR. Take
492456 chmod +x "$as_me.lineno" ||
493457 { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
494458
495 # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
496 # already done that, so ensure we don't try to do so again and fall
497 # in an infinite loop. This has already happened in practice.
498 _as_can_reexec=no; export _as_can_reexec
499459 # Don't try to exec as it changes $[0], causing all sort of problems
500460 # (the dirname of $[0] is not the place where we might find the
501461 # original and so on. Autoconf is especially sensitive to this).
530490 # ... but there are two gotchas:
531491 # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
532492 # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
533 # In both cases, we have to default to `cp -pR'.
493 # In both cases, we have to default to `cp -p'.
534494 ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
535 as_ln_s='cp -pR'
495 as_ln_s='cp -p'
536496 elif ln conf$$.file conf$$ 2>/dev/null; then
537497 as_ln_s=ln
538498 else
539 as_ln_s='cp -pR'
499 as_ln_s='cp -p'
540500 fi
541501 else
542 as_ln_s='cp -pR'
502 as_ln_s='cp -p'
543503 fi
544504 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
545505 rmdir conf$$.dir 2>/dev/null
551511 as_mkdir_p=false
552512 fi
553513
554 as_test_x='test -x'
555 as_executable_p=as_fn_executable_p
514 if test -x / >/dev/null 2>&1; then
515 as_test_x='test -x'
516 else
517 if ls -dL / >/dev/null 2>&1; then
518 as_ls_L_option=L
519 else
520 as_ls_L_option=
521 fi
522 as_test_x='
523 eval sh -c '\''
524 if test -d "$1"; then
525 test -d "$1/.";
526 else
527 case $1 in #(
528 -*)set "./$1";;
529 esac;
530 case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
531 ???[sx]*):;;*)false;;esac;fi
532 '\'' sh
533 '
534 fi
535 as_executable_p=$as_test_x
556536
557537 # Sed expression to map a string onto a valid CPP name.
558538 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
586566 # Identity of this package.
587567 PACKAGE_NAME='virt-viewer'
588568 PACKAGE_TARNAME='virt-viewer'
589 PACKAGE_VERSION='0.5.5'
590 PACKAGE_STRING='virt-viewer 0.5.5'
569 PACKAGE_VERSION='0.5.4'
570 PACKAGE_STRING='virt-viewer 0.5.4'
591571 PACKAGE_BUGREPORT=''
592572 PACKAGE_URL=''
593573
859839 with_gtk_vnc
860840 with_spice_gtk
861841 enable_plugin
862 with_buildid
863842 '
864843 ac_precious_vars='build_alias
865844 host_alias
13501329 if test "x$host_alias" != x; then
13511330 if test "x$build_alias" = x; then
13521331 cross_compiling=maybe
1332 $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
1333 If a cross compiler is detected then cross compile mode will be used" >&2
13531334 elif test "x$build_alias" != "x$host_alias"; then
13541335 cross_compiling=yes
13551336 fi
14351416 # Omit some internal or obsolete options to make the list less imposing.
14361417 # This message is too long to be a string in the A/UX 3.1 sh.
14371418 cat <<_ACEOF
1438 \`configure' configures virt-viewer 0.5.5 to adapt to many kinds of systems.
1419 \`configure' configures virt-viewer 0.5.4 to adapt to many kinds of systems.
14391420
14401421 Usage: $0 [OPTION]... [VAR=VALUE]...
14411422
15051486
15061487 if test -n "$ac_init_help"; then
15071488 case $ac_init_help in
1508 short | recursive ) echo "Configuration of virt-viewer 0.5.5:";;
1489 short | recursive ) echo "Configuration of virt-viewer 0.5.4:";;
15091490 esac
15101491 cat <<\_ACEOF
15111492
15421523 --with-gtk=2.0|3.0 which gtk+ version to compile against (default: 2.0)
15431524 --without-gtk-vnc Ignore presence of gtk-vnc and disable it
15441525 --without-spice-gtk Ignore presence of spice-gtk and disable it
1545 --with-buildid=id Set additional build version details
15461526
15471527 Some influential environment variables:
15481528 CC C compiler command
16641644 test -n "$ac_init_help" && exit $ac_status
16651645 if $ac_init_version; then
16661646 cat <<\_ACEOF
1667 virt-viewer configure 0.5.5
1668 generated by GNU Autoconf 2.69
1669
1670 Copyright (C) 2012 Free Software Foundation, Inc.
1647 virt-viewer configure 0.5.4
1648 generated by GNU Autoconf 2.68
1649
1650 Copyright (C) 2010 Free Software Foundation, Inc.
16711651 This configure script is free software; the Free Software Foundation
16721652 gives unlimited permission to copy, distribute and modify it.
16731653 _ACEOF
17431723 test ! -s conftest.err
17441724 } && test -s conftest$ac_exeext && {
17451725 test "$cross_compiling" = yes ||
1746 test -x conftest$ac_exeext
1726 $as_test_x conftest$ac_exeext
17471727 }; then :
17481728 ac_retval=0
17491729 else
20292009 This file contains any messages produced by compilers while
20302010 running configure, to aid debugging if configure makes a mistake.
20312011
2032 It was created by virt-viewer $as_me 0.5.5, which was
2033 generated by GNU Autoconf 2.69. Invocation command line was
2012 It was created by virt-viewer $as_me 0.5.4, which was
2013 generated by GNU Autoconf 2.68. Invocation command line was
20342014
20352015 $ $0 $@
20362016
24492429 # by default.
24502430 for ac_prog in ginstall scoinst install; do
24512431 for ac_exec_ext in '' $ac_executable_extensions; do
2452 if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
2432 if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
24532433 if test $ac_prog = install &&
24542434 grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
24552435 # AIX install. It has an incompatible calling convention.
26332613 IFS=$as_save_IFS
26342614 test -z "$as_dir" && as_dir=.
26352615 for ac_exec_ext in '' $ac_executable_extensions; do
2636 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
2616 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
26372617 ac_cv_prog_STRIP="${ac_tool_prefix}strip"
26382618 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
26392619 break 2
26732653 IFS=$as_save_IFS
26742654 test -z "$as_dir" && as_dir=.
26752655 for ac_exec_ext in '' $ac_executable_extensions; do
2676 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
2656 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
26772657 ac_cv_prog_ac_ct_STRIP="strip"
26782658 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
26792659 break 2
27242704 test -z "$as_dir" && as_dir=.
27252705 for ac_prog in mkdir gmkdir; do
27262706 for ac_exec_ext in '' $ac_executable_extensions; do
2727 as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
2707 { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
27282708 case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
27292709 'mkdir (GNU coreutils) '* | \
27302710 'mkdir (coreutils) '* | \
27712751 IFS=$as_save_IFS
27722752 test -z "$as_dir" && as_dir=.
27732753 for ac_exec_ext in '' $ac_executable_extensions; do
2774 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
2754 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
27752755 ac_cv_prog_AWK="$ac_prog"
27762756 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
27772757 break 2
28572837
28582838 # Define the identity of the package.
28592839 PACKAGE='virt-viewer'
2860 VERSION='0.5.5'
2840 VERSION='0.5.4'
28612841
28622842
28632843 cat >>confdefs.h <<_ACEOF
30192999
30203000 GLIB2_REQUIRED=2.22.0
30213001 LIBXML2_REQUIRED="2.6.0"
3022 LIBVIRT_REQUIRED="0.10.0"
3002 LIBVIRT_REQUIRED="0.9.7"
30233003 GTK2_REQUIRED="2.18.0"
30243004 GTK3_REQUIRED="3.0"
30253005 GTK_VNC1_REQUIRED="0.3.8"
30263006 GTK_VNC2_REQUIRED="0.4.0"
3027 SPICE_GTK_REQUIRED="0.16.26"
3007 SPICE_GTK_REQUIRED="0.12.101"
30283008 SPICE_PROTOCOL_REQUIRED="0.10.1"
30293009
30303010 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for native Win32" >&5
30703050 IFS=$as_save_IFS
30713051 test -z "$as_dir" && as_dir=.
30723052 for ac_exec_ext in '' $ac_executable_extensions; do
3073 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3053 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
30743054 ac_cv_prog_CC="${ac_tool_prefix}gcc"
30753055 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
30763056 break 2
31103090 IFS=$as_save_IFS
31113091 test -z "$as_dir" && as_dir=.
31123092 for ac_exec_ext in '' $ac_executable_extensions; do
3113 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3093 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
31143094 ac_cv_prog_ac_ct_CC="gcc"
31153095 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
31163096 break 2
31633143 IFS=$as_save_IFS
31643144 test -z "$as_dir" && as_dir=.
31653145 for ac_exec_ext in '' $ac_executable_extensions; do
3166 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3146 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
31673147 ac_cv_prog_CC="${ac_tool_prefix}cc"
31683148 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
31693149 break 2
32043184 IFS=$as_save_IFS
32053185 test -z "$as_dir" && as_dir=.
32063186 for ac_exec_ext in '' $ac_executable_extensions; do
3207 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3187 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
32083188 if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
32093189 ac_prog_rejected=yes
32103190 continue
32623242 IFS=$as_save_IFS
32633243 test -z "$as_dir" && as_dir=.
32643244 for ac_exec_ext in '' $ac_executable_extensions; do
3265 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3245 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
32663246 ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
32673247 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
32683248 break 2
33063286 IFS=$as_save_IFS
33073287 test -z "$as_dir" && as_dir=.
33083288 for ac_exec_ext in '' $ac_executable_extensions; do
3309 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3289 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
33103290 ac_cv_prog_ac_ct_CC="$ac_prog"
33113291 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
33123292 break 2
37523732 /* end confdefs.h. */
37533733 #include <stdarg.h>
37543734 #include <stdio.h>
3755 struct stat;
3735 #include <sys/types.h>
3736 #include <sys/stat.h>
37563737 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
37573738 struct buf { int x; };
37583739 FILE * (*rcsopen) (struct buf *, struct stat *, int);
42704251 for ac_prog in sed gsed; do
42714252 for ac_exec_ext in '' $ac_executable_extensions; do
42724253 ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
4273 as_fn_executable_p "$ac_path_SED" || continue
4254 { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
42744255 # Check for GNU ac_path_SED and select it if it is found.
42754256 # Check for GNU $ac_path_SED
42764257 case `"$ac_path_SED" --version 2>&1` in
43464327 for ac_prog in grep ggrep; do
43474328 for ac_exec_ext in '' $ac_executable_extensions; do
43484329 ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
4349 as_fn_executable_p "$ac_path_GREP" || continue
4330 { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
43504331 # Check for GNU ac_path_GREP and select it if it is found.
43514332 # Check for GNU $ac_path_GREP
43524333 case `"$ac_path_GREP" --version 2>&1` in
44124393 for ac_prog in egrep; do
44134394 for ac_exec_ext in '' $ac_executable_extensions; do
44144395 ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
4415 as_fn_executable_p "$ac_path_EGREP" || continue
4396 { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
44164397 # Check for GNU ac_path_EGREP and select it if it is found.
44174398 # Check for GNU $ac_path_EGREP
44184399 case `"$ac_path_EGREP" --version 2>&1` in
44794460 for ac_prog in fgrep; do
44804461 for ac_exec_ext in '' $ac_executable_extensions; do
44814462 ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
4482 as_fn_executable_p "$ac_path_FGREP" || continue
4463 { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
44834464 # Check for GNU ac_path_FGREP and select it if it is found.
44844465 # Check for GNU $ac_path_FGREP
44854466 case `"$ac_path_FGREP" --version 2>&1` in
47354716 IFS=$as_save_IFS
47364717 test -z "$as_dir" && as_dir=.
47374718 for ac_exec_ext in '' $ac_executable_extensions; do
4738 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
4719 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
47394720 ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
47404721 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
47414722 break 2
47794760 IFS=$as_save_IFS
47804761 test -z "$as_dir" && as_dir=.
47814762 for ac_exec_ext in '' $ac_executable_extensions; do
4782 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
4763 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
47834764 ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
47844765 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
47854766 break 2
52035184 IFS=$as_save_IFS
52045185 test -z "$as_dir" && as_dir=.
52055186 for ac_exec_ext in '' $ac_executable_extensions; do
5206 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
5187 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
52075188 ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
52085189 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
52095190 break 2
52435224 IFS=$as_save_IFS
52445225 test -z "$as_dir" && as_dir=.
52455226 for ac_exec_ext in '' $ac_executable_extensions; do
5246 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
5227 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
52475228 ac_cv_prog_ac_ct_OBJDUMP="objdump"
52485229 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
52495230 break 2
55495530 IFS=$as_save_IFS
55505531 test -z "$as_dir" && as_dir=.
55515532 for ac_exec_ext in '' $ac_executable_extensions; do
5552 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
5533 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
55535534 ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
55545535 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
55555536 break 2
55895570 IFS=$as_save_IFS
55905571 test -z "$as_dir" && as_dir=.
55915572 for ac_exec_ext in '' $ac_executable_extensions; do
5592 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
5573 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
55935574 ac_cv_prog_ac_ct_DLLTOOL="dlltool"
55945575 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
55955576 break 2
56935674 IFS=$as_save_IFS
56945675 test -z "$as_dir" && as_dir=.
56955676 for ac_exec_ext in '' $ac_executable_extensions; do
5696 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
5677 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
56975678 ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
56985679 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
56995680 break 2
57375718 IFS=$as_save_IFS
57385719 test -z "$as_dir" && as_dir=.
57395720 for ac_exec_ext in '' $ac_executable_extensions; do
5740 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
5721 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
57415722 ac_cv_prog_ac_ct_AR="$ac_prog"
57425723 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
57435724 break 2
58625843 IFS=$as_save_IFS
58635844 test -z "$as_dir" && as_dir=.
58645845 for ac_exec_ext in '' $ac_executable_extensions; do
5865 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
5846 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
58665847 ac_cv_prog_STRIP="${ac_tool_prefix}strip"
58675848 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
58685849 break 2
59025883 IFS=$as_save_IFS
59035884 test -z "$as_dir" && as_dir=.
59045885 for ac_exec_ext in '' $ac_executable_extensions; do
5905 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
5886 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
59065887 ac_cv_prog_ac_ct_STRIP="strip"
59075888 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
59085889 break 2
59615942 IFS=$as_save_IFS
59625943 test -z "$as_dir" && as_dir=.
59635944 for ac_exec_ext in '' $ac_executable_extensions; do
5964 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
5945 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
59655946 ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
59665947 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
59675948 break 2
60015982 IFS=$as_save_IFS
60025983 test -z "$as_dir" && as_dir=.
60035984 for ac_exec_ext in '' $ac_executable_extensions; do
6004 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
5985 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
60055986 ac_cv_prog_ac_ct_RANLIB="ranlib"
60065987 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
60075988 break 2
66506631 IFS=$as_save_IFS
66516632 test -z "$as_dir" && as_dir=.
66526633 for ac_exec_ext in '' $ac_executable_extensions; do
6653 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6634 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
66546635 ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
66556636 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
66566637 break 2
66906671 IFS=$as_save_IFS
66916672 test -z "$as_dir" && as_dir=.
66926673 for ac_exec_ext in '' $ac_executable_extensions; do
6693 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6674 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
66946675 ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
66956676 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
66966677 break 2
67706751 IFS=$as_save_IFS
67716752 test -z "$as_dir" && as_dir=.
67726753 for ac_exec_ext in '' $ac_executable_extensions; do
6773 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6754 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
67746755 ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
67756756 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
67766757 break 2
68106791 IFS=$as_save_IFS
68116792 test -z "$as_dir" && as_dir=.
68126793 for ac_exec_ext in '' $ac_executable_extensions; do
6813 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6794 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
68146795 ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
68156796 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
68166797 break 2
68626843 IFS=$as_save_IFS
68636844 test -z "$as_dir" && as_dir=.
68646845 for ac_exec_ext in '' $ac_executable_extensions; do
6865 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6846 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
68666847 ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
68676848 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
68686849 break 2
69026883 IFS=$as_save_IFS
69036884 test -z "$as_dir" && as_dir=.
69046885 for ac_exec_ext in '' $ac_executable_extensions; do
6905 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6886 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
69066887 ac_cv_prog_ac_ct_NMEDIT="nmedit"
69076888 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
69086889 break 2
69546935 IFS=$as_save_IFS
69556936 test -z "$as_dir" && as_dir=.
69566937 for ac_exec_ext in '' $ac_executable_extensions; do
6957 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6938 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
69586939 ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
69596940 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
69606941 break 2
69946975 IFS=$as_save_IFS
69956976 test -z "$as_dir" && as_dir=.
69966977 for ac_exec_ext in '' $ac_executable_extensions; do
6997 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6978 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
69986979 ac_cv_prog_ac_ct_LIPO="lipo"
69996980 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
70006981 break 2
70467027 IFS=$as_save_IFS
70477028 test -z "$as_dir" && as_dir=.
70487029 for ac_exec_ext in '' $ac_executable_extensions; do
7049 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7030 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
70507031 ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
70517032 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
70527033 break 2
70867067 IFS=$as_save_IFS
70877068 test -z "$as_dir" && as_dir=.
70887069 for ac_exec_ext in '' $ac_executable_extensions; do
7089 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7070 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
70907071 ac_cv_prog_ac_ct_OTOOL="otool"
70917072 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
70927073 break 2
71387119 IFS=$as_save_IFS
71397120 test -z "$as_dir" && as_dir=.
71407121 for ac_exec_ext in '' $ac_executable_extensions; do
7141 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7122 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
71427123 ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
71437124 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
71447125 break 2
71787159 IFS=$as_save_IFS
71797160 test -z "$as_dir" && as_dir=.
71807161 for ac_exec_ext in '' $ac_executable_extensions; do
7181 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7162 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
71827163 ac_cv_prog_ac_ct_OTOOL64="otool64"
71837164 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
71847165 break 2
1168811669 IFS=$as_save_IFS
1168911670 test -z "$as_dir" && as_dir=.
1169011671 for ac_exec_ext in '' $ac_executable_extensions; do
11691 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
11672 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1169211673 ac_cv_prog_ICOTOOL="$ac_prog"
1169311674 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1169411675 break 2
1173311714 IFS=$as_save_IFS
1173411715 test -z "$as_dir" && as_dir=.
1173511716 for ac_exec_ext in '' $ac_executable_extensions; do
11736 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
11717 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1173711718 ac_cv_prog_WINDRES="${ac_tool_prefix}windres"
1173811719 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1173911720 break 2
1177311754 IFS=$as_save_IFS
1177411755 test -z "$as_dir" && as_dir=.
1177511756 for ac_exec_ext in '' $ac_executable_extensions; do
11776 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
11757 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1177711758 ac_cv_prog_ac_ct_WINDRES="windres"
1177811759 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1177911760 break 2
1185711838 try_compiler_flags="$try_compiler_flags -Wall -Wmissing-prototypes -std=c99 -Wnested-externs -Wpointer-arith"
1185811839 try_compiler_flags="$try_compiler_flags -Wextra -Wshadow -Wcast-align -Wwrite-strings -Waggregate-return"
1185911840 # Removed -Wstrict-prototypes to avoid GTK bug
11860 try_compiler_flags="$try_compiler_flags -Winline -Wredundant-decls -Wno-sign-compare -Wno-deprecated-declarations"
11841 try_compiler_flags="$try_compiler_flags -Winline -Wredundant-decls -Wno-sign-compare"
1186111842 if test "$enable_compile_warnings" = "error" ; then
1186211843 try_compiler_flags="$try_compiler_flags -Werror"
1186311844 fi
1244012421 IFS=$as_save_IFS
1244112422 test -z "$as_dir" && as_dir=.
1244212423 for ac_exec_ext in '' $ac_executable_extensions; do
12443 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
12424 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1244412425 ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
1244512426 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1244612427 break 2
1270412685 IFS=$as_save_IFS
1270512686 test -z "$as_dir" && as_dir=.
1270612687 for ac_exec_ext in '' $ac_executable_extensions; do
12707 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
12688 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1270812689 ac_cv_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext"
1270912690 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1271012691 break 2
1274412725 IFS=$as_save_IFS
1274512726 test -z "$as_dir" && as_dir=.
1274612727 for ac_exec_ext in '' $ac_executable_extensions; do
12747 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
12728 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1274812729 ac_cv_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext"
1274912730 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1275012731 break 2
1278412765 IFS=$as_save_IFS
1278512766 test -z "$as_dir" && as_dir=.
1278612767 for ac_exec_ext in '' $ac_executable_extensions; do
12787 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
12768 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1278812769 ac_cv_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext"
1278912770 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1279012771 break 2
1296812949 IFS=$as_save_IFS
1296912950 test -z "$as_dir" && as_dir=.
1297012951 for ac_exec_ext in '' $ac_executable_extensions; do
12971 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
12952 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1297212953 ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
1297312954 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1297412955 break 2
1300812989 IFS=$as_save_IFS
1300912990 test -z "$as_dir" && as_dir=.
1301012991 for ac_exec_ext in '' $ac_executable_extensions; do
13011 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
12992 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1301212993 ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
1301312994 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1301412995 break 2
1304813029 IFS=$as_save_IFS
1304913030 test -z "$as_dir" && as_dir=.
1305013031 for ac_exec_ext in '' $ac_executable_extensions; do
13051 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
13032 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1305213033 ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
1305313034 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1305413035 break 2
1308813069 IFS=$as_save_IFS
1308913070 test -z "$as_dir" && as_dir=.
1309013071 for ac_exec_ext in '' $ac_executable_extensions; do
13091 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
13072 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1309213073 ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
1309313074 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1309413075 break 2
1313913120 IFS=$as_save_IFS
1314013121 test -z "$as_dir" && as_dir=.
1314113122 for ac_exec_ext in '' $ac_executable_extensions; do
13142 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
13123 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1314313124 ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"
1314413125 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1314513126 break 2
1323613217
1323713218
1323813219
13239
1324013220 if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
1324113221 if test -n "$ac_tool_prefix"; then
1324213222 # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
1325713237 IFS=$as_save_IFS
1325813238 test -z "$as_dir" && as_dir=.
1325913239 for ac_exec_ext in '' $ac_executable_extensions; do
13260 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
13240 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1326113241 ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
1326213242 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1326313243 break 2
1330013280 IFS=$as_save_IFS
1330113281 test -z "$as_dir" && as_dir=.
1330213282 for ac_exec_ext in '' $ac_executable_extensions; do
13303 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
13283 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
1330413284 ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
1330513285 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
1330613286 break 2
1336813348 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1336913349 test $ac_status = 0; }; then
1337013350 pkg_cv_GLIB2_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= $GLIB2_REQUIRED gthread-2.0 gmodule-export-2.0" 2>/dev/null`
13371 test "x$?" != "x0" && pkg_failed=yes
1337213351 else
1337313352 pkg_failed=yes
1337413353 fi
1338513364 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1338613365 test $ac_status = 0; }; then
1338713366 pkg_cv_GLIB2_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB2_REQUIRED gthread-2.0 gmodule-export-2.0" 2>/dev/null`
13388 test "x$?" != "x0" && pkg_failed=yes
1338913367 else
1339013368 pkg_failed=yes
1339113369 fi
1340513383 _pkg_short_errors_supported=no
1340613384 fi
1340713385 if test $_pkg_short_errors_supported = yes; then
13408 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`
13386 GLIB2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= $GLIB2_REQUIRED gthread-2.0 gmodule-export-2.0" 2>&1`
1340913387 else
13410 GLIB2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= $GLIB2_REQUIRED gthread-2.0 gmodule-export-2.0" 2>&1`
13388 GLIB2_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= $GLIB2_REQUIRED gthread-2.0 gmodule-export-2.0" 2>&1`
1341113389 fi
1341213390 # Put the nasty error message in config.log where it belongs
1341313391 echo "$GLIB2_PKG_ERRORS" >&5
1342213400 Alternatively, you may set the environment variables GLIB2_CFLAGS
1342313401 and GLIB2_LIBS to avoid the need to call pkg-config.
1342413402 See the pkg-config man page for more details." "$LINENO" 5
13403
1342513404 elif test $pkg_failed = untried; then
1342613405 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1342713406 $as_echo "no" >&6; }
1343713416
1343813417 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
1343913418 See \`config.log' for more details" "$LINENO" 5; }
13419
1344013420 else
1344113421 GLIB2_CFLAGS=$pkg_cv_GLIB2_CFLAGS
1344213422 GLIB2_LIBS=$pkg_cv_GLIB2_LIBS
1345913439 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1346013440 test $ac_status = 0; }; then
1346113441 pkg_cv_LIBXML2_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0 >= $LIBXML2_REQUIRED" 2>/dev/null`
13462 test "x$?" != "x0" && pkg_failed=yes
1346313442 else
1346413443 pkg_failed=yes
1346513444 fi
1347613455 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1347713456 test $ac_status = 0; }; then
1347813457 pkg_cv_LIBXML2_LIBS=`$PKG_CONFIG --libs "libxml-2.0 >= $LIBXML2_REQUIRED" 2>/dev/null`
13479 test "x$?" != "x0" && pkg_failed=yes
1348013458 else
1348113459 pkg_failed=yes
1348213460 fi
1349613474 _pkg_short_errors_supported=no
1349713475 fi
1349813476 if test $_pkg_short_errors_supported = yes; then
13499 LIBXML2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libxml-2.0 >= $LIBXML2_REQUIRED" 2>&1`
13477 LIBXML2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libxml-2.0 >= $LIBXML2_REQUIRED" 2>&1`
1350013478 else
13501 LIBXML2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libxml-2.0 >= $LIBXML2_REQUIRED" 2>&1`
13479 LIBXML2_PKG_ERRORS=`$PKG_CONFIG --print-errors "libxml-2.0 >= $LIBXML2_REQUIRED" 2>&1`
1350213480 fi
1350313481 # Put the nasty error message in config.log where it belongs
1350413482 echo "$LIBXML2_PKG_ERRORS" >&5
1351313491 Alternatively, you may set the environment variables LIBXML2_CFLAGS
1351413492 and LIBXML2_LIBS to avoid the need to call pkg-config.
1351513493 See the pkg-config man page for more details." "$LINENO" 5
13494
1351613495 elif test $pkg_failed = untried; then
1351713496 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1351813497 $as_echo "no" >&6; }
1352813507
1352913508 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
1353013509 See \`config.log' for more details" "$LINENO" 5; }
13510
1353113511 else
1353213512 LIBXML2_CFLAGS=$pkg_cv_LIBXML2_CFLAGS
1353313513 LIBXML2_LIBS=$pkg_cv_LIBXML2_LIBS
1355313533 pkg_cv_LIBVIRT_CFLAGS="$LIBVIRT_CFLAGS"
1355413534 elif test -n "$PKG_CONFIG"; then
1355513535 if test -n "$PKG_CONFIG" && \
13556 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libvirt >= \$LIBVIRT_REQUIRED\""; } >&5
13557 ($PKG_CONFIG --exists --print-errors "libvirt >= $LIBVIRT_REQUIRED") 2>&5
13536 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libvirt\""; } >&5
13537 ($PKG_CONFIG --exists --print-errors "libvirt") 2>&5
1355813538 ac_status=$?
1355913539 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1356013540 test $ac_status = 0; }; then
13561 pkg_cv_LIBVIRT_CFLAGS=`$PKG_CONFIG --cflags "libvirt >= $LIBVIRT_REQUIRED" 2>/dev/null`
13562 test "x$?" != "x0" && pkg_failed=yes
13541 pkg_cv_LIBVIRT_CFLAGS=`$PKG_CONFIG --cflags "libvirt" 2>/dev/null`
1356313542 else
1356413543 pkg_failed=yes
1356513544 fi
1357013549 pkg_cv_LIBVIRT_LIBS="$LIBVIRT_LIBS"
1357113550 elif test -n "$PKG_CONFIG"; then
1357213551 if test -n "$PKG_CONFIG" && \
13573 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libvirt >= \$LIBVIRT_REQUIRED\""; } >&5
13574 ($PKG_CONFIG --exists --print-errors "libvirt >= $LIBVIRT_REQUIRED") 2>&5
13552 { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libvirt\""; } >&5
13553 ($PKG_CONFIG --exists --print-errors "libvirt") 2>&5
1357513554 ac_status=$?
1357613555 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1357713556 test $ac_status = 0; }; then
13578 pkg_cv_LIBVIRT_LIBS=`$PKG_CONFIG --libs "libvirt >= $LIBVIRT_REQUIRED" 2>/dev/null`
13579 test "x$?" != "x0" && pkg_failed=yes
13557 pkg_cv_LIBVIRT_LIBS=`$PKG_CONFIG --libs "libvirt" 2>/dev/null`
1358013558 else
1358113559 pkg_failed=yes
1358213560 fi
1359613574 _pkg_short_errors_supported=no
1359713575 fi
1359813576 if test $_pkg_short_errors_supported = yes; then
13599 LIBVIRT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libvirt >= $LIBVIRT_REQUIRED" 2>&1`
13577 LIBVIRT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libvirt" 2>&1`
1360013578 else
13601 LIBVIRT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libvirt >= $LIBVIRT_REQUIRED" 2>&1`
13579 LIBVIRT_PKG_ERRORS=`$PKG_CONFIG --print-errors "libvirt" 2>&1`
1360213580 fi
1360313581 # Put the nasty error message in config.log where it belongs
1360413582 echo "$LIBVIRT_PKG_ERRORS" >&5
1370513683 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1370613684 test $ac_status = 0; }; then
1370713685 pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-$GTK_API_VERSION >= $GTK_REQUIRED" 2>/dev/null`
13708 test "x$?" != "x0" && pkg_failed=yes
1370913686 else
1371013687 pkg_failed=yes
1371113688 fi
1372213699 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1372313700 test $ac_status = 0; }; then
1372413701 pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-$GTK_API_VERSION >= $GTK_REQUIRED" 2>/dev/null`
13725 test "x$?" != "x0" && pkg_failed=yes
1372613702 else
1372713703 pkg_failed=yes
1372813704 fi
1374213718 _pkg_short_errors_supported=no
1374313719 fi
1374413720 if test $_pkg_short_errors_supported = yes; then
13745 GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-$GTK_API_VERSION >= $GTK_REQUIRED" 2>&1`
13721 GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-$GTK_API_VERSION >= $GTK_REQUIRED" 2>&1`
1374613722 else
13747 GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-$GTK_API_VERSION >= $GTK_REQUIRED" 2>&1`
13723 GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-$GTK_API_VERSION >= $GTK_REQUIRED" 2>&1`
1374813724 fi
1374913725 # Put the nasty error message in config.log where it belongs
1375013726 echo "$GTK_PKG_ERRORS" >&5
1375913735 Alternatively, you may set the environment variables GTK_CFLAGS
1376013736 and GTK_LIBS to avoid the need to call pkg-config.
1376113737 See the pkg-config man page for more details." "$LINENO" 5
13738
1376213739 elif test $pkg_failed = untried; then
1376313740 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1376413741 $as_echo "no" >&6; }
1377413751
1377513752 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
1377613753 See \`config.log' for more details" "$LINENO" 5; }
13754
1377713755 else
1377813756 GTK_CFLAGS=$pkg_cv_GTK_CFLAGS
1377913757 GTK_LIBS=$pkg_cv_GTK_LIBS
1380513783 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1380613784 test $ac_status = 0; }; then
1380713785 pkg_cv_GTK_VNC_CFLAGS=`$PKG_CONFIG --cflags "gtk-vnc-$GTK_VNC_API_VERSION >= $GTK_VNC_REQUIRED" 2>/dev/null`
13808 test "x$?" != "x0" && pkg_failed=yes
1380913786 else
1381013787 pkg_failed=yes
1381113788 fi
1382213799 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1382313800 test $ac_status = 0; }; then
1382413801 pkg_cv_GTK_VNC_LIBS=`$PKG_CONFIG --libs "gtk-vnc-$GTK_VNC_API_VERSION >= $GTK_VNC_REQUIRED" 2>/dev/null`
13825 test "x$?" != "x0" && pkg_failed=yes
1382613802 else
1382713803 pkg_failed=yes
1382813804 fi
1384213818 _pkg_short_errors_supported=no
1384313819 fi
1384413820 if test $_pkg_short_errors_supported = yes; then
13845 GTK_VNC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk-vnc-$GTK_VNC_API_VERSION >= $GTK_VNC_REQUIRED" 2>&1`
13821 GTK_VNC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk-vnc-$GTK_VNC_API_VERSION >= $GTK_VNC_REQUIRED" 2>&1`
1384613822 else
13847 GTK_VNC_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk-vnc-$GTK_VNC_API_VERSION >= $GTK_VNC_REQUIRED" 2>&1`
13823 GTK_VNC_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk-vnc-$GTK_VNC_API_VERSION >= $GTK_VNC_REQUIRED" 2>&1`
1384813824 fi
1384913825 # Put the nasty error message in config.log where it belongs
1385013826 echo "$GTK_VNC_PKG_ERRORS" >&5
1390813884 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1390913885 test $ac_status = 0; }; then
1391013886 pkg_cv_SPICE_GTK_CFLAGS=`$PKG_CONFIG --cflags "spice-client-gtk-$SPICE_GTK_API_VERSION >= $SPICE_GTK_REQUIRED" 2>/dev/null`
13911 test "x$?" != "x0" && pkg_failed=yes
1391213887 else
1391313888 pkg_failed=yes
1391413889 fi
1392513900 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1392613901 test $ac_status = 0; }; then
1392713902 pkg_cv_SPICE_GTK_LIBS=`$PKG_CONFIG --libs "spice-client-gtk-$SPICE_GTK_API_VERSION >= $SPICE_GTK_REQUIRED" 2>/dev/null`
13928 test "x$?" != "x0" && pkg_failed=yes
1392913903 else
1393013904 pkg_failed=yes
1393113905 fi
1394513919 _pkg_short_errors_supported=no
1394613920 fi
1394713921 if test $_pkg_short_errors_supported = yes; then
13948 SPICE_GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "spice-client-gtk-$SPICE_GTK_API_VERSION >= $SPICE_GTK_REQUIRED" 2>&1`
13922 SPICE_GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "spice-client-gtk-$SPICE_GTK_API_VERSION >= $SPICE_GTK_REQUIRED" 2>&1`
1394913923 else
13950 SPICE_GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "spice-client-gtk-$SPICE_GTK_API_VERSION >= $SPICE_GTK_REQUIRED" 2>&1`
13924 SPICE_GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors "spice-client-gtk-$SPICE_GTK_API_VERSION >= $SPICE_GTK_REQUIRED" 2>&1`
1395113925 fi
1395213926 # Put the nasty error message in config.log where it belongs
1395313927 echo "$SPICE_GTK_PKG_ERRORS" >&5
1398413958 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1398513959 test $ac_status = 0; }; then
1398613960 pkg_cv_SPICE_CONTROLLER_CFLAGS=`$PKG_CONFIG --cflags "spice-controller" 2>/dev/null`
13987 test "x$?" != "x0" && pkg_failed=yes
1398813961 else
1398913962 pkg_failed=yes
1399013963 fi
1400113974 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1400213975 test $ac_status = 0; }; then
1400313976 pkg_cv_SPICE_CONTROLLER_LIBS=`$PKG_CONFIG --libs "spice-controller" 2>/dev/null`
14004 test "x$?" != "x0" && pkg_failed=yes
1400513977 else
1400613978 pkg_failed=yes
1400713979 fi
1402113993 _pkg_short_errors_supported=no
1402213994 fi
1402313995 if test $_pkg_short_errors_supported = yes; then
14024 SPICE_CONTROLLER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "spice-controller" 2>&1`
13996 SPICE_CONTROLLER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "spice-controller" 2>&1`
1402513997 else
14026 SPICE_CONTROLLER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "spice-controller" 2>&1`
13998 SPICE_CONTROLLER_PKG_ERRORS=`$PKG_CONFIG --print-errors "spice-controller" 2>&1`
1402713999 fi
1402814000 # Put the nasty error message in config.log where it belongs
1402914001 echo "$SPICE_CONTROLLER_PKG_ERRORS" >&5
1403814010 Alternatively, you may set the environment variables SPICE_CONTROLLER_CFLAGS
1403914011 and SPICE_CONTROLLER_LIBS to avoid the need to call pkg-config.
1404014012 See the pkg-config man page for more details." "$LINENO" 5
14013
1404114014 elif test $pkg_failed = untried; then
1404214015 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1404314016 $as_echo "no" >&6; }
1405314026
1405414027 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
1405514028 See \`config.log' for more details" "$LINENO" 5; }
14029
1405614030 else
1405714031 SPICE_CONTROLLER_CFLAGS=$pkg_cv_SPICE_CONTROLLER_CFLAGS
1405814032 SPICE_CONTROLLER_LIBS=$pkg_cv_SPICE_CONTROLLER_LIBS
1407514049 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1407614050 test $ac_status = 0; }; then
1407714051 pkg_cv_SPICE_PROTOCOL_CFLAGS=`$PKG_CONFIG --cflags "spice-protocol >= $SPICE_PROTOCOL_REQUIRED" 2>/dev/null`
14078 test "x$?" != "x0" && pkg_failed=yes
1407914052 else
1408014053 pkg_failed=yes
1408114054 fi
1409214065 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1409314066 test $ac_status = 0; }; then
1409414067 pkg_cv_SPICE_PROTOCOL_LIBS=`$PKG_CONFIG --libs "spice-protocol >= $SPICE_PROTOCOL_REQUIRED" 2>/dev/null`
14095 test "x$?" != "x0" && pkg_failed=yes
1409614068 else
1409714069 pkg_failed=yes
1409814070 fi
1411214084 _pkg_short_errors_supported=no
1411314085 fi
1411414086 if test $_pkg_short_errors_supported = yes; then
14115 SPICE_PROTOCOL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "spice-protocol >= $SPICE_PROTOCOL_REQUIRED" 2>&1`
14087 SPICE_PROTOCOL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "spice-protocol >= $SPICE_PROTOCOL_REQUIRED" 2>&1`
1411614088 else
14117 SPICE_PROTOCOL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "spice-protocol >= $SPICE_PROTOCOL_REQUIRED" 2>&1`
14089 SPICE_PROTOCOL_PKG_ERRORS=`$PKG_CONFIG --print-errors "spice-protocol >= $SPICE_PROTOCOL_REQUIRED" 2>&1`
1411814090 fi
1411914091 # Put the nasty error message in config.log where it belongs
1412014092 echo "$SPICE_PROTOCOL_PKG_ERRORS" >&5
1412914101 Alternatively, you may set the environment variables SPICE_PROTOCOL_CFLAGS
1413014102 and SPICE_PROTOCOL_LIBS to avoid the need to call pkg-config.
1413114103 See the pkg-config man page for more details." "$LINENO" 5
14104
1413214105 elif test $pkg_failed = untried; then
1413314106 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1413414107 $as_echo "no" >&6; }
1414414117
1414514118 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
1414614119 See \`config.log' for more details" "$LINENO" 5; }
14120
1414714121 else
1414814122 SPICE_PROTOCOL_CFLAGS=$pkg_cv_SPICE_PROTOCOL_CFLAGS
1414914123 SPICE_PROTOCOL_LIBS=$pkg_cv_SPICE_PROTOCOL_LIBS
1422214196 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1422314197 test $ac_status = 0; }; then
1422414198 pkg_cv_NSPR_CFLAGS=`$PKG_CONFIG --cflags "nspr >= $NSPR_REQUIRED" 2>/dev/null`
14225 test "x$?" != "x0" && pkg_failed=yes
1422614199 else
1422714200 pkg_failed=yes
1422814201 fi
1423914212 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1424014213 test $ac_status = 0; }; then
1424114214 pkg_cv_NSPR_LIBS=`$PKG_CONFIG --libs "nspr >= $NSPR_REQUIRED" 2>/dev/null`
14242 test "x$?" != "x0" && pkg_failed=yes
1424314215 else
1424414216 pkg_failed=yes
1424514217 fi
1425914231 _pkg_short_errors_supported=no
1426014232 fi
1426114233 if test $_pkg_short_errors_supported = yes; then
14262 NSPR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "nspr >= $NSPR_REQUIRED" 2>&1`
14234 NSPR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "nspr >= $NSPR_REQUIRED" 2>&1`
1426314235 else
14264 NSPR_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "nspr >= $NSPR_REQUIRED" 2>&1`
14236 NSPR_PKG_ERRORS=`$PKG_CONFIG --print-errors "nspr >= $NSPR_REQUIRED" 2>&1`
1426514237 fi
1426614238 # Put the nasty error message in config.log where it belongs
1426714239 echo "$NSPR_PKG_ERRORS" >&5
1427614248 Alternatively, you may set the environment variables NSPR_CFLAGS
1427714249 and NSPR_LIBS to avoid the need to call pkg-config.
1427814250 See the pkg-config man page for more details." "$LINENO" 5
14251
1427914252 elif test $pkg_failed = untried; then
1428014253 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1428114254 $as_echo "no" >&6; }
1429114264
1429214265 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
1429314266 See \`config.log' for more details" "$LINENO" 5; }
14267
1429414268 else
1429514269 NSPR_CFLAGS=$pkg_cv_NSPR_CFLAGS
1429614270 NSPR_LIBS=$pkg_cv_NSPR_LIBS
1431314287 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1431414288 test $ac_status = 0; }; then
1431514289 pkg_cv_FIREFOX_PLUGIN_CFLAGS=`$PKG_CONFIG --cflags "firefox-plugin >= $FIREFOX_PLUGIN_REQUIRED" 2>/dev/null`
14316 test "x$?" != "x0" && pkg_failed=yes
1431714290 else
1431814291 pkg_failed=yes
1431914292 fi
1433014303 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1433114304 test $ac_status = 0; }; then
1433214305 pkg_cv_FIREFOX_PLUGIN_LIBS=`$PKG_CONFIG --libs "firefox-plugin >= $FIREFOX_PLUGIN_REQUIRED" 2>/dev/null`
14333 test "x$?" != "x0" && pkg_failed=yes
1433414306 else
1433514307 pkg_failed=yes
1433614308 fi
1435014322 _pkg_short_errors_supported=no
1435114323 fi
1435214324 if test $_pkg_short_errors_supported = yes; then
14353 FIREFOX_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "firefox-plugin >= $FIREFOX_PLUGIN_REQUIRED" 2>&1`
14325 FIREFOX_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "firefox-plugin >= $FIREFOX_PLUGIN_REQUIRED" 2>&1`
1435414326 else
14355 FIREFOX_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "firefox-plugin >= $FIREFOX_PLUGIN_REQUIRED" 2>&1`
14327 FIREFOX_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --print-errors "firefox-plugin >= $FIREFOX_PLUGIN_REQUIRED" 2>&1`
1435614328 fi
1435714329 # Put the nasty error message in config.log where it belongs
1435814330 echo "$FIREFOX_PLUGIN_PKG_ERRORS" >&5
1437314345 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1437414346 test $ac_status = 0; }; then
1437514347 pkg_cv_MOZILLA_PLUGIN_CFLAGS=`$PKG_CONFIG --cflags "mozilla-plugin >= $MOZILLA_PLUGIN_REQUIRED" 2>/dev/null`
14376 test "x$?" != "x0" && pkg_failed=yes
1437714348 else
1437814349 pkg_failed=yes
1437914350 fi
1439014361 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1439114362 test $ac_status = 0; }; then
1439214363 pkg_cv_MOZILLA_PLUGIN_LIBS=`$PKG_CONFIG --libs "mozilla-plugin >= $MOZILLA_PLUGIN_REQUIRED" 2>/dev/null`
14393 test "x$?" != "x0" && pkg_failed=yes
1439414364 else
1439514365 pkg_failed=yes
1439614366 fi
1441014380 _pkg_short_errors_supported=no
1441114381 fi
1441214382 if test $_pkg_short_errors_supported = yes; then
14413 MOZILLA_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "mozilla-plugin >= $MOZILLA_PLUGIN_REQUIRED" 2>&1`
14383 MOZILLA_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "mozilla-plugin >= $MOZILLA_PLUGIN_REQUIRED" 2>&1`
1441414384 else
14415 MOZILLA_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "mozilla-plugin >= $MOZILLA_PLUGIN_REQUIRED" 2>&1`
14385 MOZILLA_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --print-errors "mozilla-plugin >= $MOZILLA_PLUGIN_REQUIRED" 2>&1`
1441614386 fi
1441714387 # Put the nasty error message in config.log where it belongs
1441814388 echo "$MOZILLA_PLUGIN_PKG_ERRORS" >&5
1442714397 Alternatively, you may set the environment variables MOZILLA_PLUGIN_CFLAGS
1442814398 and MOZILLA_PLUGIN_LIBS to avoid the need to call pkg-config.
1442914399 See the pkg-config man page for more details." "$LINENO" 5
14400
1443014401 elif test $pkg_failed = untried; then
1443114402 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1443214403 $as_echo "no" >&6; }
1444214413
1444314414 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
1444414415 See \`config.log' for more details" "$LINENO" 5; }
14416
1444514417 else
1444614418 MOZILLA_PLUGIN_CFLAGS=$pkg_cv_MOZILLA_PLUGIN_CFLAGS
1444714419 MOZILLA_PLUGIN_LIBS=$pkg_cv_MOZILLA_PLUGIN_LIBS
1447114443 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1447214444 test $ac_status = 0; }; then
1447314445 pkg_cv_MOZILLA_PLUGIN_CFLAGS=`$PKG_CONFIG --cflags "mozilla-plugin >= $MOZILLA_PLUGIN_REQUIRED" 2>/dev/null`
14474 test "x$?" != "x0" && pkg_failed=yes
1447514446 else
1447614447 pkg_failed=yes
1447714448 fi
1448814459 $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
1448914460 test $ac_status = 0; }; then
1449014461 pkg_cv_MOZILLA_PLUGIN_LIBS=`$PKG_CONFIG --libs "mozilla-plugin >= $MOZILLA_PLUGIN_REQUIRED" 2>/dev/null`
14491 test "x$?" != "x0" && pkg_failed=yes
1449214462 else
1449314463 pkg_failed=yes
1449414464 fi
1450814478 _pkg_short_errors_supported=no
1450914479 fi
1451014480 if test $_pkg_short_errors_supported = yes; then
14511 MOZILLA_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "mozilla-plugin >= $MOZILLA_PLUGIN_REQUIRED" 2>&1`
14481 MOZILLA_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "mozilla-plugin >= $MOZILLA_PLUGIN_REQUIRED" 2>&1`
1451214482 else
14513 MOZILLA_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "mozilla-plugin >= $MOZILLA_PLUGIN_REQUIRED" 2>&1`
14483 MOZILLA_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --print-errors "mozilla-plugin >= $MOZILLA_PLUGIN_REQUIRED" 2>&1`
1451414484 fi
1451514485 # Put the nasty error message in config.log where it belongs
1451614486 echo "$MOZILLA_PLUGIN_PKG_ERRORS" >&5
1452514495 Alternatively, you may set the environment variables MOZILLA_PLUGIN_CFLAGS
1452614496 and MOZILLA_PLUGIN_LIBS to avoid the need to call pkg-config.
1452714497 See the pkg-config man page for more details." "$LINENO" 5
14498
1452814499 elif test $pkg_failed = untried; then
1452914500 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
1453014501 $as_echo "no" >&6; }
1454014511
1454114512 To get pkg-config, see <http://pkg-config.freedesktop.org/>.
1454214513 See \`config.log' for more details" "$LINENO" 5; }
14514
1454314515 else
1454414516 MOZILLA_PLUGIN_CFLAGS=$pkg_cv_MOZILLA_PLUGIN_CFLAGS
1454514517 MOZILLA_PLUGIN_LIBS=$pkg_cv_MOZILLA_PLUGIN_LIBS
1456914541 fi
1457014542
1457114543
14572 if test "x$have_gtk_vnc" != "xyes" && test "x$have_spice_gtk" != "xyes"; then
14573 as_fn_error $? "At least one of spice or vnc must be used" "$LINENO" 5
14574 fi
14575
14576
14577 # Check whether --with-buildid was given.
14578 if test "${with_buildid+set}" = set; then :
14579 withval=$with_buildid;
14580 fi
14581
14582
14583 cat >>confdefs.h <<_ACEOF
14584 #define BUILDID "$with_buildid"
14585 _ACEOF
14586
14587
14588 ac_config_files="$ac_config_files Makefile data/Makefile data/virt-viewer.wxs data/virt-viewer.nsis data/virt-viewer-debug.nsis icons/Makefile icons/16x16/Makefile icons/22x22/Makefile icons/24x24/Makefile icons/32x32/Makefile icons/48x48/Makefile icons/256x256/Makefile man/Makefile mingw-virt-viewer.spec plugin/Makefile po/Makefile.in src/Makefile src/virt-viewer.rc virt-viewer.spec"
14544 ac_config_files="$ac_config_files Makefile data/Makefile data/virt-viewer.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 plugin/Makefile po/Makefile.in src/Makefile src/virt-viewer.rc virt-viewer.spec"
1458914545
1459014546 cat >confcache <<\_ACEOF
1459114547 # This file is a shell script that caches the results of configure
1505015006 # ... but there are two gotchas:
1505115007 # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
1505215008 # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
15053 # In both cases, we have to default to `cp -pR'.
15009 # In both cases, we have to default to `cp -p'.
1505415010 ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
15055 as_ln_s='cp -pR'
15011 as_ln_s='cp -p'
1505615012 elif ln conf$$.file conf$$ 2>/dev/null; then
1505715013 as_ln_s=ln
1505815014 else
15059 as_ln_s='cp -pR'
15015 as_ln_s='cp -p'
1506015016 fi
1506115017 else
15062 as_ln_s='cp -pR'
15018 as_ln_s='cp -p'
1506315019 fi
1506415020 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
1506515021 rmdir conf$$.dir 2>/dev/null
1511915075 as_mkdir_p=false
1512015076 fi
1512115077
15122
15123 # as_fn_executable_p FILE
15124 # -----------------------
15125 # Test if FILE is an executable regular file.
15126 as_fn_executable_p ()
15127 {
15128 test -f "$1" && test -x "$1"
15129 } # as_fn_executable_p
15130 as_test_x='test -x'
15131 as_executable_p=as_fn_executable_p
15078 if test -x / >/dev/null 2>&1; then
15079 as_test_x='test -x'
15080 else
15081 if ls -dL / >/dev/null 2>&1; then
15082 as_ls_L_option=L
15083 else
15084 as_ls_L_option=
15085 fi
15086 as_test_x='
15087 eval sh -c '\''
15088 if test -d "$1"; then
15089 test -d "$1/.";
15090 else
15091 case $1 in #(
15092 -*)set "./$1";;
15093 esac;
15094 case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
15095 ???[sx]*):;;*)false;;esac;fi
15096 '\'' sh
15097 '
15098 fi
15099 as_executable_p=$as_test_x
1513215100
1513315101 # Sed expression to map a string onto a valid CPP name.
1513415102 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
1514915117 # report actual input values of CONFIG_FILES etc. instead of their
1515015118 # values after options handling.
1515115119 ac_log="
15152 This file was extended by virt-viewer $as_me 0.5.5, which was
15153 generated by GNU Autoconf 2.69. Invocation command line was
15120 This file was extended by virt-viewer $as_me 0.5.4, which was
15121 generated by GNU Autoconf 2.68. Invocation command line was
1515415122
1515515123 CONFIG_FILES = $CONFIG_FILES
1515615124 CONFIG_HEADERS = $CONFIG_HEADERS
1521915187 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
1522015188 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
1522115189 ac_cs_version="\\
15222 virt-viewer config.status 0.5.5
15223 configured by $0, generated by GNU Autoconf 2.69,
15190 virt-viewer config.status 0.5.4
15191 configured by $0, generated by GNU Autoconf 2.68,
1522415192 with options \\"\$ac_cs_config\\"
1522515193
15226 Copyright (C) 2012 Free Software Foundation, Inc.
15194 Copyright (C) 2010 Free Software Foundation, Inc.
1522715195 This config.status script is free software; the Free Software Foundation
1522815196 gives unlimited permission to copy, distribute and modify it."
1522915197
1531415282 _ACEOF
1531515283 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
1531615284 if \$ac_cs_recheck; then
15317 set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
15285 set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
1531815286 shift
1531915287 \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
1532015288 CONFIG_SHELL='$SHELL'
1563415602 "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
1563515603 "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
1563615604 "data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;;
15637 "data/virt-viewer.wxs") CONFIG_FILES="$CONFIG_FILES data/virt-viewer.wxs" ;;
1563815605 "data/virt-viewer.nsis") CONFIG_FILES="$CONFIG_FILES data/virt-viewer.nsis" ;;
15639 "data/virt-viewer-debug.nsis") CONFIG_FILES="$CONFIG_FILES data/virt-viewer-debug.nsis" ;;
1564015606 "icons/Makefile") CONFIG_FILES="$CONFIG_FILES icons/Makefile" ;;
1564115607 "icons/16x16/Makefile") CONFIG_FILES="$CONFIG_FILES icons/16x16/Makefile" ;;
1564215608 "icons/22x22/Makefile") CONFIG_FILES="$CONFIG_FILES icons/22x22/Makefile" ;;
00
1 AC_INIT([virt-viewer],[0.5.5])
1 AC_INIT(virt-viewer, 0.5.4)
22 AC_CONFIG_SRCDIR(src/virt-viewer-main.c)
33 AC_CONFIG_MACRO_DIR([m4])
44 AC_CONFIG_AUX_DIR([build-aux])
5 AC_CONFIG_HEADERS([config.h])
5 AM_CONFIG_HEADER(config.h)
66 dnl Make automake keep quiet about wildcards & other GNUmake-isms
77 AM_INIT_AUTOMAKE([-Wno-portability])
88 AC_CANONICAL_HOST
1313
1414 GLIB2_REQUIRED=2.22.0
1515 LIBXML2_REQUIRED="2.6.0"
16 LIBVIRT_REQUIRED="0.10.0"
16 LIBVIRT_REQUIRED="0.9.7"
1717 GTK2_REQUIRED="2.18.0"
1818 GTK3_REQUIRED="3.0"
1919 GTK_VNC1_REQUIRED="0.3.8"
2020 GTK_VNC2_REQUIRED="0.4.0"
21 SPICE_GTK_REQUIRED="0.16.26"
21 SPICE_GTK_REQUIRED="0.12.101"
2222 SPICE_PROTOCOL_REQUIRED="0.10.1"
2323
2424 AC_MSG_CHECKING([for native Win32])
3535
3636 AC_PROG_CC
3737 AM_PROG_CC_C_O
38 LT_INIT
38 AC_PROG_LIBTOOL
3939
4040 AC_CHECK_PROGS(ICOTOOL, [icotool], [icotool])
4141
8383
8484 AS_IF([test "x$with_libvirt" != "xno"],
8585 [PKG_CHECK_MODULES(LIBVIRT,
86 [libvirt >= $LIBVIRT_REQUIRED],
86 [libvirt],
8787 [have_libvirt=yes], [have_libvirt=no])],
8888 [have_libvirt=no])
8989
191191 fi
192192 AM_CONDITIONAL(ENABLE_PLUGIN, [test "x$enable_plugin" = "xyes"])
193193
194 if test "x$have_gtk_vnc" != "xyes" && test "x$have_spice_gtk" != "xyes"; then
195 AC_MSG_ERROR([At least one of spice or vnc must be used])
196 fi
197
198 AC_ARG_WITH([buildid],
199 AS_HELP_STRING([--with-buildid=id], [Set additional build version details]))
200 AC_DEFINE_UNQUOTED([BUILDID], "$with_buildid", [Build version details])
201
202 AC_CONFIG_FILES([
194 AC_OUTPUT([
203195 Makefile
204196 data/Makefile
205 data/virt-viewer.wxs
206197 data/virt-viewer.nsis
207 data/virt-viewer-debug.nsis
208198 icons/Makefile
209199 icons/16x16/Makefile
210200 icons/22x22/Makefile
220210 src/virt-viewer.rc
221211 virt-viewer.spec
222212 ])
223 AC_OUTPUT
224213
225214 AC_MSG_NOTICE([])
226215 AC_MSG_NOTICE([Configuration summary])
0 NULL =
1 CLEANFILES =
0 NULL=
21
32 EXTRA_DIST = \
43 spice-xpi-client-remote-viewer \
5 virt-viewer.wxs.in \
64 virt-viewer.nsis.in \
7 virt-viewer-debug.nsis.in \
85 $(NULL)
96
10 if OS_WIN32
11
12 deps.txt:
13 $(AM_V_GEN)rpm -qa | grep $(host_os) | sort | unix2dos > $@
14
15 virt-viewer-$(VERSION).exe: virt-viewer.nsis deps.txt
16 $(AM_V_GEN)DESTDIR=`mktemp -d` && \
17 make -C $(top_builddir) install DESTDIR=$$DESTDIR >/dev/null && \
18 makensis -NOCD -DDESTDIR=$$DESTDIR $< >/dev/null && \
19 rm -rf $$DESTDIR
20
21 virt-viewer-$(VERSION).msi: virt-viewer.wxs deps.txt
22 $(AM_V_GEN)DESTDIR=`mktemp -d` && \
23 make -C $(top_builddir) install DESTDIR=$$DESTDIR >/dev/null && \
24 find $$DESTDIR | wixl-heat -p $$DESTDIR$(prefix)/ \
25 --component-group CG.virt-viewer --var var.DESTDIR \
26 --directory-ref=INSTALLDIR > virt-viewer-files.wxs && \
27 wixl -D SourceDir=$(prefix) \
28 -D DESTDIR=$$DESTDIR$(prefix) -o $@ \
29 $< virt-viewer-files.wxs && \
30 rm -rf $$DESTDIR virt-viewer-files.wxs
31
32 CLEANFILES += \
33 deps.txt \
34 virt-viewer-$(VERSION).exe \
35 virt-viewer-$(VERSION).msi \
36 $(NULL)
37
38 else #!WIN32
39
40 desktopdir = $(datadir)/applications
41 DESKTOPFILES = remote-viewer.desktop.in
42 desktop_DATA = $(DESKTOPFILES:.desktop.in=.desktop)
43 @INTLTOOL_DESKTOP_RULE@
44
45 MIMEFILES = virt-viewer-mime.xml.in
46 mimedir = $(datadir)/mime/packages
47 mime_DATA = virt-viewer-mime.xml
48 @INTLTOOL_XML_RULE@
49
50 CLEANFILES += $(mime_DATA) $(desktop_DATA)
51 EXTRA_DIST += $(MIMEFILES) $(DESKTOPFILES)
52
53 endif
54
557 -include $(top_srcdir)/git.mk
1212 # PARTICULAR PURPOSE.
1313
1414 @SET_MAKE@
15
1615 VPATH = @srcdir@
1716 am__make_dryrun = \
1817 { \
4948 POST_UNINSTALL = :
5049 build_triplet = @build@
5150 host_triplet = @host@
52 @OS_WIN32_TRUE@am__append_1 = \
53 @OS_WIN32_TRUE@ deps.txt \
54 @OS_WIN32_TRUE@ virt-viewer-$(VERSION).exe \
55 @OS_WIN32_TRUE@ virt-viewer-$(VERSION).msi \
56 @OS_WIN32_TRUE@ $(NULL)
57
58 @OS_WIN32_FALSE@am__append_2 = $(mime_DATA) $(desktop_DATA)
59 @OS_WIN32_FALSE@am__append_3 = $(MIMEFILES) $(DESKTOPFILES)
6051 subdir = data
6152 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
62 $(srcdir)/virt-viewer-debug.nsis.in \
63 $(srcdir)/virt-viewer.nsis.in $(srcdir)/virt-viewer.wxs.in
53 $(srcdir)/virt-viewer.nsis.in
6454 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
6555 am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
6656 $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
7161 $(ACLOCAL_M4)
7262 mkinstalldirs = $(install_sh) -d
7363 CONFIG_HEADER = $(top_builddir)/config.h
74 CONFIG_CLEAN_FILES = virt-viewer.wxs virt-viewer.nsis \
75 virt-viewer-debug.nsis
64 CONFIG_CLEAN_FILES = virt-viewer.nsis
7665 CONFIG_CLEAN_VPATH_FILES =
7766 AM_V_P = $(am__v_P_@AM_V@)
7867 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
9382 n|no|NO) false;; \
9483 *) (install-info --version) >/dev/null 2>&1;; \
9584 esac
96 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
97 am__vpath_adj = case $$p in \
98 $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
99 *) f=$$p;; \
100 esac;
101 am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
102 am__install_max = 40
103 am__nobase_strip_setup = \
104 srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
105 am__nobase_strip = \
106 for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
107 am__nobase_list = $(am__nobase_strip_setup); \
108 for p in $$list; do echo "$$p $$p"; done | \
109 sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
110 $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
111 if (++n[$$2] == $(am__install_max)) \
112 { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
113 END { for (dir in files) print dir, files[dir] }'
114 am__base_list = \
115 sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
116 sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
117 am__uninstall_files_from_dir = { \
118 test -z "$$files" \
119 || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
120 || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
121 $(am__cd) "$$dir" && rm -f $$files; }; \
122 }
123 am__installdirs = "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(mimedir)"
124 DATA = $(desktop_DATA) $(mime_DATA)
12585 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
12686 ACLOCAL = @ACLOCAL@
12787 ALL_LINGUAS = @ALL_LINGUAS@
299259 top_builddir = @top_builddir@
300260 top_srcdir = @top_srcdir@
301261 NULL =
302 CLEANFILES = $(am__append_1) $(am__append_2)
303 EXTRA_DIST = spice-xpi-client-remote-viewer virt-viewer.wxs.in \
304 virt-viewer.nsis.in virt-viewer-debug.nsis.in $(NULL) \
305 $(am__append_3)
306 @OS_WIN32_FALSE@desktopdir = $(datadir)/applications
307 @OS_WIN32_FALSE@DESKTOPFILES = remote-viewer.desktop.in
308 @OS_WIN32_FALSE@desktop_DATA = $(DESKTOPFILES:.desktop.in=.desktop)
309 @OS_WIN32_FALSE@MIMEFILES = virt-viewer-mime.xml.in
310 @OS_WIN32_FALSE@mimedir = $(datadir)/mime/packages
311 @OS_WIN32_FALSE@mime_DATA = virt-viewer-mime.xml
262 EXTRA_DIST = \
263 spice-xpi-client-remote-viewer \
264 virt-viewer.nsis.in \
265 $(NULL)
266
312267 all: all-am
313268
314269 .SUFFIXES:
342297 $(ACLOCAL_M4): $(am__aclocal_m4_deps)
343298 cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
344299 $(am__aclocal_m4_deps):
345 virt-viewer.wxs: $(top_builddir)/config.status $(srcdir)/virt-viewer.wxs.in
346 cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
347300 virt-viewer.nsis: $(top_builddir)/config.status $(srcdir)/virt-viewer.nsis.in
348301 cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
349 virt-viewer-debug.nsis: $(top_builddir)/config.status $(srcdir)/virt-viewer-debug.nsis.in
350 cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
351302
352303 mostlyclean-libtool:
353304 -rm -f *.lo
354305
355306 clean-libtool:
356307 -rm -rf .libs _libs
357 install-desktopDATA: $(desktop_DATA)
358 @$(NORMAL_INSTALL)
359 @list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \
360 if test -n "$$list"; then \
361 echo " $(MKDIR_P) '$(DESTDIR)$(desktopdir)'"; \
362 $(MKDIR_P) "$(DESTDIR)$(desktopdir)" || exit 1; \
363 fi; \
364 for p in $$list; do \
365 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
366 echo "$$d$$p"; \
367 done | $(am__base_list) | \
368 while read files; do \
369 echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(desktopdir)'"; \
370 $(INSTALL_DATA) $$files "$(DESTDIR)$(desktopdir)" || exit $$?; \
371 done
372
373 uninstall-desktopDATA:
374 @$(NORMAL_UNINSTALL)
375 @list='$(desktop_DATA)'; test -n "$(desktopdir)" || list=; \
376 files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
377 dir='$(DESTDIR)$(desktopdir)'; $(am__uninstall_files_from_dir)
378 install-mimeDATA: $(mime_DATA)
379 @$(NORMAL_INSTALL)
380 @list='$(mime_DATA)'; test -n "$(mimedir)" || list=; \
381 if test -n "$$list"; then \
382 echo " $(MKDIR_P) '$(DESTDIR)$(mimedir)'"; \
383 $(MKDIR_P) "$(DESTDIR)$(mimedir)" || exit 1; \
384 fi; \
385 for p in $$list; do \
386 if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
387 echo "$$d$$p"; \
388 done | $(am__base_list) | \
389 while read files; do \
390 echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(mimedir)'"; \
391 $(INSTALL_DATA) $$files "$(DESTDIR)$(mimedir)" || exit $$?; \
392 done
393
394 uninstall-mimeDATA:
395 @$(NORMAL_UNINSTALL)
396 @list='$(mime_DATA)'; test -n "$(mimedir)" || list=; \
397 files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
398 dir='$(DESTDIR)$(mimedir)'; $(am__uninstall_files_from_dir)
399308 tags: TAGS
400309 TAGS:
401310
437346 done
438347 check-am: all-am
439348 check: check-am
440 all-am: Makefile $(DATA)
349 all-am: Makefile
441350 installdirs:
442 for dir in "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(mimedir)"; do \
443 test -z "$$dir" || $(MKDIR_P) "$$dir"; \
444 done
445351 install: install-am
446352 install-exec: install-exec-am
447353 install-data: install-data-am
464370 mostlyclean-generic:
465371
466372 clean-generic:
467 -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
468373
469374 distclean-generic:
470375 -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
493398
494399 info-am:
495400
496 install-data-am: install-desktopDATA install-mimeDATA
401 install-data-am:
497402
498403 install-dvi: install-dvi-am
499404
537442
538443 ps-am:
539444
540 uninstall-am: uninstall-desktopDATA uninstall-mimeDATA
445 uninstall-am:
541446
542447 .MAKE: install-am install-strip
543448
544449 .PHONY: all all-am check check-am clean clean-generic clean-libtool \
545450 distclean distclean-generic distclean-libtool distdir dvi \
546451 dvi-am html html-am info info-am install install-am \
547 install-data install-data-am install-desktopDATA install-dvi \
548 install-dvi-am install-exec install-exec-am install-html \
549 install-html-am install-info install-info-am install-man \
550 install-mimeDATA install-pdf install-pdf-am install-ps \
551 install-ps-am install-strip installcheck installcheck-am \
552 installdirs maintainer-clean maintainer-clean-generic \
553 mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
554 ps ps-am uninstall uninstall-am uninstall-desktopDATA \
555 uninstall-mimeDATA
556
557
558 @OS_WIN32_TRUE@deps.txt:
559 @OS_WIN32_TRUE@ $(AM_V_GEN)rpm -qa | grep $(host_os) | sort | unix2dos > $@
560
561 @OS_WIN32_TRUE@virt-viewer-$(VERSION).exe: virt-viewer.nsis deps.txt
562 @OS_WIN32_TRUE@ $(AM_V_GEN)DESTDIR=`mktemp -d` && \
563 @OS_WIN32_TRUE@ make -C $(top_builddir) install DESTDIR=$$DESTDIR >/dev/null && \
564 @OS_WIN32_TRUE@ makensis -NOCD -DDESTDIR=$$DESTDIR $< >/dev/null && \
565 @OS_WIN32_TRUE@ rm -rf $$DESTDIR
566
567 @OS_WIN32_TRUE@virt-viewer-$(VERSION).msi: virt-viewer.wxs deps.txt
568 @OS_WIN32_TRUE@ $(AM_V_GEN)DESTDIR=`mktemp -d` && \
569 @OS_WIN32_TRUE@ make -C $(top_builddir) install DESTDIR=$$DESTDIR >/dev/null && \
570 @OS_WIN32_TRUE@ find $$DESTDIR | wixl-heat -p $$DESTDIR$(prefix)/ \
571 @OS_WIN32_TRUE@ --component-group CG.virt-viewer --var var.DESTDIR \
572 @OS_WIN32_TRUE@ --directory-ref=INSTALLDIR > virt-viewer-files.wxs && \
573 @OS_WIN32_TRUE@ wixl -D SourceDir=$(prefix) \
574 @OS_WIN32_TRUE@ -D DESTDIR=$$DESTDIR$(prefix) -o $@ \
575 @OS_WIN32_TRUE@ $< virt-viewer-files.wxs && \
576 @OS_WIN32_TRUE@ rm -rf $$DESTDIR virt-viewer-files.wxs
577 @OS_WIN32_FALSE@@INTLTOOL_DESKTOP_RULE@
578 @OS_WIN32_FALSE@@INTLTOOL_XML_RULE@
452 install-data install-data-am install-dvi install-dvi-am \
453 install-exec install-exec-am install-html install-html-am \
454 install-info install-info-am install-man install-pdf \
455 install-pdf-am install-ps install-ps-am install-strip \
456 installcheck installcheck-am installdirs maintainer-clean \
457 maintainer-clean-generic mostlyclean mostlyclean-generic \
458 mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
459
579460
580461 -include $(top_srcdir)/git.mk
581462
+0
-9
data/remote-viewer.desktop.in less more
0 [Desktop Entry]
1 _Name=Remote Viewer
2 _Comment=Access remote desktops
3 Exec=remote-viewer %u
4 Type=Application
5 Terminal=false
6 MimeType=x-scheme-handler/spice;application/x-virt-viewer
7 StartupNotify=true
8 Categories=GNOME;GTK;Network;RemoteAccess;
+0
-49
data/virt-viewer-debug.nsis.in less more
0 #!Nsis Installer Command Script
1 # @configure_input@
2 # To build an installer from the script you would normally do:
3 #
4 # makensis virt-viewer-debug.nsis
5 #
6 # which will generate the output file 'virt-viewer-@VERSION@.exe' which is a Windows
7 # installer containing your program.
8
9 Name "VirtViewer Debug @VERSION@"
10 OutFile "virt-viewer-debug-@VERSION@.exe"
11 InstallDir "$LOCALAPPDATA\virt-viewer"
12 InstallDirRegKey HKCU "Software\virt-viewer" ""
13
14 RequestExecutionLevel user
15 SetCompressor bzip2
16 ShowInstDetails hide
17 ShowUninstDetails hide
18 XPStyle on
19
20 Page instfiles
21
22 Section "VirtViewer Debug"
23 SectionIn RO
24 WriteRegStr HKCU "Software\virt-viewer" "" $INSTDIR
25
26 SetOutPath "$INSTDIR"
27
28 SetOutPath "$INSTDIR\bin"
29 File "@prefix@/bin/gdb.exe"
30 File "@prefix@/bin/gdbserver.exe"
31 File "${DESTDIR}@prefix@/bin/debug-helper.exe"
32
33 # make virt-viewer debug the default spice-x client
34 WriteRegStr HKCU "Software\spice-space.org\spicex" "client" "$INSTDIR\bin\debug-helper.exe remote-viewer.exe --spice-controller"
35 SectionEnd
36
37 Section "Uninstall"
38 Delete /rebootok "$INSTDIR\bin\debug-helper.exe"
39 Delete /rebootok "$INSTDIR\bin\gdbserver.exe"
40 Delete /rebootok "$INSTDIR\bin\gdb.exe"
41 RMDir "$INSTDIR\bin"
42
43 RMDir "$INSTDIR"
44 SectionEnd
45
46 Section -post
47 WriteUninstaller "$INSTDIR\Uninstall-debug.exe"
48 SectionEnd
+0
-11
data/virt-viewer-mime.xml.in less more
0 <?xml version="1.0" encoding="UTF-8"?>
1 <mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
2 <mime-type type="application/x-virt-viewer">
3 <sub-class-of type="text/plain"/>
4 <_comment>Virt-Viewer connection file</_comment>
5 <magic priority="50">
6 <match type="string" offset="0" value="[virt-viewer]"/>
7 </magic>
8 <glob pattern="*.vv"/>
9 </mime-type>
10 </mime-info>
4444 WriteRegDWord HKCU "${REG_IEPOLICY}" "Policy" 3
4545 FunctionEnd
4646
47 Function .onInit
48 retry:
49 System::Call 'kernel32::CreateMutexA(i 0, i 0, t "VirtViewerMutex") i .r1 ?e'
50 Pop $R0
51 StrCmp $R0 0 end
52 System::Call 'kernel32::CloseHandle(i r1) i.s'
53 MessageBox MB_ICONEXCLAMATION|MB_RETRYCANCEL "VirtViewer is already running, quit any instance and retry." IDRETRY retry IDCANCEL cancel
54 cancel:
55 Abort
56 end:
57 FunctionEnd
58
5947 Section "VirtViewer"
6048 SectionIn RO
6149 WriteRegStr HKCU "Software\virt-viewer" "" $INSTDIR
62
63 SetOutPath "$INSTDIR"
64 File "deps.txt"
6550
6651 SetOutPath "$INSTDIR\bin"
6752 File "@prefix@/bin/gst-discoverer-0.10.exe"
8065 File "@prefix@/bin/libcairo-2.dll"
8166 File "@prefix@/bin/libcelt051-0.dll"
8267 File "@prefix@/bin/libcrypto-10.dll"
83 File "@prefix@/bin/libexpat-1.dll"
8468 File "@prefix@/bin/libffi-6.dll"
8569 File "@prefix@/bin/libfontconfig-1.dll"
8670 File "@prefix@/bin/libfreetype-6.dll"
11498 File "@prefix@/bin/libpangowin32-1.0-0.dll"
11599 File "@prefix@/bin/libpixman-1-0.dll"
116100 File "@prefix@/bin/libpng15-15.dll"
117 File "@prefix@/bin/libspice-client-glib-2.0-8.dll"
118 File "@prefix@/bin/libspice-client-gtk-2.0-4.dll"
101 File "@prefix@/bin/libspice-client-glib-2.0-1.dll"
102 File "@prefix@/bin/libspice-client-gtk-2.0-1.dll"
119103 File "@prefix@/bin/libspice-controller-0.dll"
120104 File "@prefix@/bin/libssl-10.dll"
121105 File "@prefix@/bin/libtasn1-3.dll"
122 File "@prefix@/bin/libusb-1.0.dll"
123 File "@prefix@/bin/libusbredirhost-1.dll"
124 File "@prefix@/bin/libusbredirparser-1.dll"
125106 File "@prefix@/bin/libxml2-2.dll"
126107 File "@prefix@/bin/libp11-kit-0.dll"
127108 File "@prefix@/bin/libssh2-1.dll"
146127 File /oname=remote-viewer.com "${DESTDIR}@prefix@/bin/windows-cmdline-wrapper.exe"
147128 File "${DESTDIR}@prefix@/bin/remote-viewer.exe"
148129 File "${DESTDIR}@prefix@/bin/virt-viewer.exe"
149 File "@prefix@/bin/libreadline6.dll"
150130 File "@prefix@/bin/zlib1.dll"
151131
152132 SetOutPath "$INSTDIR\etc"
231211 DeleteRegKey HKCU "${REG_UNINSTALL}"
232212 DeleteRegKey HKCU "${REG_IEPOLICY}"
233213
234
235 RMDir /r "$INSTDIR\share"
236
237214 RMDir /r "$INSTDIR\lib\pango"
215
238216 RMDir /r "$INSTDIR\lib\gtk-2.0"
217
218 RMDir /r "$INSTDIR\share\icons\hicolor"
219
220 Delete /rebootok "$INSTDIR\share\virt-viewer\ui\*.xml"
221 Delete /rebootok "$INSTDIR\share\themes\MS-Windows\gtk-2.0\gtkrc"
222
239223 Delete /rebootok "$INSTDIR\lib\gstreamer-0.10\libgstdirectsoundsrc.dll"
240224 Delete /rebootok "$INSTDIR\lib\gstreamer-0.10\libgstdirectsoundsink.dll"
241225 Delete /rebootok "$INSTDIR\lib\gstreamer-0.10\libgstcoreelements.dll"
246230 Delete /rebootok "$INSTDIR\lib\gstreamer-0.10\libgstaudioconvert.dll"
247231 Delete /rebootok "$INSTDIR\lib\gstreamer-0.10\libgstapp.dll"
248232 RMDir "$INSTDIR\lib\gstreamer-0.10"
233
249234 RMDir /r "$INSTDIR\lib\gdk-pixbuf-2.0"
250235
251236 RMDir /r "$INSTDIR\etc\pango"
237
252238 RMDir /r "$INSTDIR\etc\gtk-2.0"
239
253240 RMDir /r "$INSTDIR\etc\fonts"
254241
255242 Delete /rebootok "$INSTDIR\bin\remote-viewer.com"
256243 Delete /rebootok "$INSTDIR\bin\remote-viewer.exe"
257 Delete /rebootok "$INSTDIR\bin\virt-viewer.exe"
258 Delete /rebootok "$INSTDIR\bin\virsh.exe"
259244 Delete /rebootok "$INSTDIR\bin\pango-querymodules.exe"
260 Delete /rebootok "$INSTDIR\bin\virt-pki-validate"
261 Delete /rebootok "$INSTDIR\bin\virt-xml-validate"
262245 Delete /rebootok "$INSTDIR\bin\libpangoft2-1.0-0.dll"
263246 Delete /rebootok "$INSTDIR\bin\libgdk_pixbuf-2.0-0.dll"
264247 Delete /rebootok "$INSTDIR\bin\libgdk-win32-2.0-0.dll"
274257 Delete /rebootok "$INSTDIR\bin\gst-inspect-0.10.exe"
275258 Delete /rebootok "$INSTDIR\bin\gst-feedback.exe"
276259 Delete /rebootok "$INSTDIR\bin\gst-discoverer-0.10.exe"
260 RMDir "$INSTDIR\bin"
261
262 Delete /rebootok "$INSTDIR\bin\libffi-6.dll"
277263 Delete /rebootok "$INSTDIR\bin\zlib1.dll"
278 Delete /rebootok "$INSTDIR\bin\libreadline6.dll"
279 Delete /rebootok "$INSTDIR\bin\libffi-6.dll"
280264 Delete /rebootok "$INSTDIR\bin\libp11-kit-0.dll"
281265 Delete /rebootok "$INSTDIR\bin\libxml2-2.dll"
282266 Delete /rebootok "$INSTDIR\bin\libtasn1-3.dll"
283267 Delete /rebootok "$INSTDIR\bin\libssl-10.dll"
284 Delete /rebootok "$INSTDIR\bin\libspice-client-gtk-2.0-4.dll"
285 Delete /rebootok "$INSTDIR\bin\libspice-client-glib-2.0-8.dll"
268 Delete /rebootok "$INSTDIR\bin\libspice-client-gtk-2.0-1.dll"
269 Delete /rebootok "$INSTDIR\bin\libspice-client-glib-2.0-1.dll"
286270 Delete /rebootok "$INSTDIR\bin\libspice-controller-0.dll"
287271 Delete /rebootok "$INSTDIR\bin\libpng15-15.dll"
288272 Delete /rebootok "$INSTDIR\bin\libpixman-1-0.dll"
293277 Delete /rebootok "$INSTDIR\bin\liborc-0.4-0.dll"
294278 Delete /rebootok "$INSTDIR\bin\libjpeg-62.dll"
295279 Delete /rebootok "$INSTDIR\bin\libintl-8.dll"
296 Delete /rebootok "$INSTDIR\bin\libusb-1.0.dll"
297 Delete /rebootok "$INSTDIR\bin\libusbredirhost-1.dll"
298 Delete /rebootok "$INSTDIR\bin\libusbredirparser-1.dll"
299 Delete /rebootok "$INSTDIR\bin\libvirt-0.dll"
300 Delete /rebootok "$INSTDIR\bin\libcurl-4.dll"
301 Delete /rebootok "$INSTDIR\bin\libidn-11.dll"
302 Delete /rebootok "$INSTDIR\bin\libssh2-1.dll"
303 Delete /rebootok "$INSTDIR\bin\libgvnc-1.0-0.dll"
304 Delete /rebootok "$INSTDIR\bin\libgtk-vnc-1.0-0.dll"
305 Delete /rebootok "$INSTDIR\bin\libgpg-error-0.dll"
306 Delete /rebootok "$INSTDIR\bin\libportablexdr-0.dll"
307 Delete /rebootok "$INSTDIR\bin\libvirt-qemu-0.dll"
308 Delete /rebootok "$INSTDIR\bin\libssp-0.dll"
309280 Delete /rebootok "$INSTDIR\bin\iconv.dll"
310281 Delete /rebootok "$INSTDIR\bin\libgtk-win32-2.0-0.dll"
311282 Delete /rebootok "$INSTDIR\bin\libgthread-2.0-0.dll"
319290 Delete /rebootok "$INSTDIR\bin\libgstaudio-0.10-0.dll"
320291 Delete /rebootok "$INSTDIR\bin\libgstapp-0.10-0.dll"
321292 Delete /rebootok "$INSTDIR\bin\libgobject-2.0-0.dll"
322 Delete /rebootok "$INSTDIR\bin\libgnutls-26.dll"
323 Delete /rebootok "$INSTDIR\bin\libgcrypt-11.dll"
324293 Delete /rebootok "$INSTDIR\bin\libgmodule-2.0-0.dll"
325294 Delete /rebootok "$INSTDIR\bin\libglib-2.0-0.dll"
326295 Delete /rebootok "$INSTDIR\bin\libgio-2.0-0.dll"
328297 Delete /rebootok "$INSTDIR\bin\libgdk-win32-2.0-0.dll"
329298 Delete /rebootok "$INSTDIR\bin\libfreetype-6.dll"
330299 Delete /rebootok "$INSTDIR\bin\libfontconfig-1.dll"
331 Delete /rebootok "$INSTDIR\bin\libexpat-1.dll"
332300 Delete /rebootok "$INSTDIR\bin\libcrypto-10.dll"
333301 Delete /rebootok "$INSTDIR\bin\libcelt051-0.dll"
334302 Delete /rebootok "$INSTDIR\bin\libcairo-2.dll"
335303 Delete /rebootok "$INSTDIR\bin\libatk-1.0-0.dll"
336304 RMDir "$INSTDIR\bin"
337 RMDir "$INSTDIR\lib"
338
339 Delete /rebootok "$INSTDIR\deps.txt"
340305 RMDir "$INSTDIR"
341306 SectionEnd
342307
+0
-92
data/virt-viewer.wxs.in less more
0 <?xml version="1.0" encoding="utf-8"?>
1
2 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
3
4 <?require spice-gtk.wxi?>
5 <?require gtk-vnc.wxi?>
6 <?require libvirt.wxi?>
7
8 <?define Version = "@VERSION@"?>
9 <?define UpgradeCode = "5B027138-1A63-49E6-877E-055E5EEC1903"?>
10 <Product Id="*" Name="VirtViewer" Manufacturer="$(env.MANUFACTURER)"
11 Version="$(var.Version)" UpgradeCode="$(var.UpgradeCode)"
12 Language="1033">
13
14 <Package InstallerVersion="200" Compressed="yes" Comments="comments"/>
15 <Media Id="1" Cabinet="cabinet.cab" EmbedCab="yes"/>
16
17 <Property Id="ARPHELPLINK" Value="http://www.virt-tools.org"/>
18 <Property Id="ARPNOMODIFY" Value="1"/>
19 <Property Id="ARPNOREPAIR" Value="1"/>
20 <Property Id="ARPPRODUCTICON" Value="virt-viewer.ico"/>
21 <Property Id="ARPURLINFOABOUT" Value="http://www.virt-tools.org/about"/>
22 <Upgrade Id="$(var.UpgradeCode)">
23 <UpgradeVersion Minimum="$(var.Version)" OnlyDetect="yes" Property="NEWERVERSIONDETECTED"/>
24 <UpgradeVersion Minimum="0.0.0" Maximum="$(var.Version)" IncludeMinimum="yes" IncludeMaximum="no" Property="OLDERVERSIONBEINGUPGRADED"/>
25 </Upgrade>
26 <Condition Message="VirtViewer is already installed.">NOT NEWERVERSIONDETECTED</Condition>
27
28 <DirectoryRef Id="TARGETDIR">
29 <Component Id="CRegistryEntries" Guid="*">
30 <RegistryKey Root='HKLM' Key='Software\Microsoft\Internet Explorer\Low Rights\ElevationPolicy\{96190E9D-6FBB-64DB-9095-29F6FDE0B897}'>
31 <RegistryValue Type='string' Name='AppPath' Value='[INSTALLDIR]\bin'/>
32 <RegistryValue Type='string' Name='AppName' Value='remote-viewer.exe'/>
33 <RegistryValue Type='integer' Name='Policy' Value='3'/>
34 </RegistryKey>
35 <RegistryKey Root='HKLM' Key='Software\spice-space.org\spicex'>
36 <RegistryValue Type='string' Name='client' Value='[INSTALLDIR]\bin\remote-viewer.exe --spice-controller'/>
37 </RegistryKey>
38 </Component>
39 <Component Id="CProgIds" Guid="89D6F46D-9C5E-4D65-8456-58FC361E553E">
40 <ProgId Id='VirtViewer.vvfile' Description='VirtViewer connection file'>
41 <Extension Id='vv' ContentType='application/x-virt-viewer'>
42 <Verb Id='open' Command='Open' TargetFile='fil808B4A5BAB4ACD727D3823632E798743' Argument='"%1"' />
43 <MIME ContentType="application/x-virt-viewer" Default="yes"/>
44 </Extension>
45 </ProgId>
46 </Component>
47 </DirectoryRef>
48
49 <Directory Id="TARGETDIR" Name="SourceDir">
50 <Directory Id="ProgramFilesFolder">
51 <Directory Id="INSTALLDIR" Name="VirtViewer">
52 <Component Id="CDepsFile" Guid="*">
53 <File Id="filA1E799D196006E6DF67DACE15B8C6193" KeyPath="yes" Source="deps.txt"/>
54 </Component>
55 </Directory>
56 </Directory>
57 <Directory Id="ProgramMenuFolder">
58 <Directory Id="MENUDIR" Name="VirtViewer"/>
59 </Directory>
60 </Directory>
61
62 <DirectoryRef Id="MENUDIR">
63 <Component Id="CShortcut" Guid="*">
64 <Shortcut Id="ApplicationStartMenuShortcut"
65 Name="Remote viewer"
66 Description="A SPICE/VNC client"
67 Target="[INSTALLDIR]\bin\remote-viewer.exe"
68 Icon="virt-viewer.ico"/>
69 <RemoveFolder Id="MENUDIR" On="uninstall"/>
70 <RegistryValue Root="HKCU" Key="Software\VirtViewer\remote-viewer-shortcut" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
71 </Component>
72 </DirectoryRef>
73
74 <Feature Id="Complete" Level="1">
75 <ComponentGroupRef Id="CG.spice-gtk"/>
76 <ComponentGroupRef Id="CG.libvirt"/>
77 <ComponentGroupRef Id="CG.gtk-vnc"/>
78 <ComponentGroupRef Id="CG.virt-viewer"/>
79 <ComponentRef Id="CDepsFile"/>
80 <ComponentRef Id="CShortcut"/>
81 <ComponentRef Id="CRegistryEntries"/>
82 <ComponentRef Id="CProgIds"/>
83 </Feature>
84
85 <InstallExecuteSequence>
86 <RemoveExistingProducts After="InstallValidate"/>
87 </InstallExecuteSequence>
88
89 <Icon Id="virt-viewer.ico" SourceFile="virt-viewer.ico"/>
90 </Product>
91 </Wix>
0 virt-viewer (0.5.5+really0.5.4-1) unstable; urgency=low
1
2 * [21a772c] Revert back to 0.5.4-1.
3 The libvirt version in sid is too old to built virt-viewer (Closes: #701684)
4
5 -- Guido Günther <agx@sigxcpu.org> Thu, 18 Apr 2013 08:05:36 +0200
6
07 virt-viewer (0.5.5-3) unstable; urgency=low
18
29 * New upload
0 From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
1 Date: Mon, 22 Oct 2012 20:05:24 +0200
2 Subject: Fail if opening the connection fails
3
4 instead of returning True. Which then fails with the misleading error
5
6 (virt-viewer:18631): Gtk-WARNING **: Attempting to add a widget with type
7 VncDisplay to a container of type VirtViewerDisplayVnc, but the widget is
8 already inside a container of type VirtViewerDisplayVnc, please use
9 gtk_widget_reparent()
10 ---
11 src/virt-viewer.c | 2 +-
12 1 file changed, 1 insertion(+), 1 deletion(-)
13
14 diff --git a/src/virt-viewer.c b/src/virt-viewer.c
15 index 3143104..572e9e6 100644
16 --- a/src/virt-viewer.c
17 +++ b/src/virt-viewer.c
18 @@ -425,7 +425,7 @@ virt_viewer_open_connection(VirtViewerApp *self G_GNUC_UNUSED, int *fd)
19 DEBUG_LOG("Error %s", err && err->message ? err->message : "Unknown");
20 close(pair[0]);
21 close(pair[1]);
22 - return TRUE;
23 + return FALSE;
24 }
25 close(pair[0]);
26 *fd = pair[1];
0 From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
1 Date: Mon, 22 Oct 2012 21:56:07 +0200
2 Subject: Don't fail early if virDomainOpenGraphics fails
3
4 virt_viewer_app_open_connection invokes virDomainOpenGraphics which only works
5 for local connections. Returning after this failure makes us never reach the
6 ssh part so this unbreaks connections tunneled over ssh.
7 ---
8 src/virt-viewer-app.c | 3 +--
9 1 file changed, 1 insertion(+), 2 deletions(-)
10
11 diff --git a/src/virt-viewer-app.c b/src/virt-viewer-app.c
12 index def52c5..28dc8cb 100644
13 --- a/src/virt-viewer-app.c
14 +++ b/src/virt-viewer-app.c
15 @@ -820,8 +820,7 @@ virt_viewer_app_default_activate(VirtViewerApp *self)
16 VirtViewerAppPrivate *priv = self->priv;
17 int fd = -1;
18
19 - if (!virt_viewer_app_open_connection(self, &fd))
20 - return -1;
21 + virt_viewer_app_open_connection(self, &fd);
22
23 DEBUG_LOG("After open connection callback fd=%d", fd);
24
0 0001-Fail-if-opening-the-connection-fails.patch
1 0002-Don-t-fail-early-if-virDomainOpenGraphics-fails.patch
10711071 *.m4|*.mk) continue ;; \
10721072 *.?|*.??) ;; \
10731073 *.xml) ;; \
1074 *.xml.in) ;; \
1075 *.desktop.in) ;; \
10761074 *) continue;; \
10771075 esac; \
10781076 case $$file in \
10821080 esac; \
10831081 files="$$files $$file"; \
10841082 done; \
1085 grep -E -l '(\b(N?_|gettext *)\([^)"]*("|$$))|(<interface>)|^_|<_' $$files \
1083 grep -E -l '(\b(N?_|gettext *)\([^)"]*("|$$))|(<interface>)' $$files \
10861084 | sed 's|^$(_dot_escaped_srcdir)/||' | sort -u > $@-2; \
10871085 diff -u -L $(po_file) -L $(po_file) $@-1 $@-2 \
10881086 || { printf '$(ME): '$(fix_po_file_diag) 1>&2; exit 1; }; \
3737
3838 Start with the window maximised to fullscreen
3939
40 =item -t TITLE, --title TITLE
41
42 Set the window title to B<TITLE>
43
4440 =item --spice-controller
4541
4642 Use the SPICE controller to initialize the connection with the SPICE
5046 =item --debug
5147
5248 Print debugging information
53
54 =item -h HOTKEYS, --hotkeys HOTKEYS
55
56 Override the default hotkey bindings with B<HOTKEYS>. Where B<HOTKEYS> is
57 <action1>=<key1>[+<key2>][,<action2>=<key3>[+<key4>]]. Key-names are
58 case-insensitive, valid actions are: toggle-fullscreen, release-cursor,
59 smartcard-insert and smartcard-remove. Examples:
60
61 --hotkeys=toggle-fullscreen=shift+f11,release-cursor=shift+f12
62
63 --hotkeys=release-cursor=ctrl+alt
64
65 Note that hotkeys for which no binding is given are disabled, specifying an
66 empty string disables all hotkeys.
6749
6850 =back
6951
7171
7272 Print debugging information
7373
74 =item -h HOTKEYS, --hotkeys HOTKEYS
75
76 Override the default hotkey bindings with B<HOTKEYS>. Where B<HOTKEYS> is
77 <action1>=<key1>[+<key2>][,<action2>=<key3>[+<key4>]]. Key-names are
78 case-insensitive, valid actions are: toggle-fullscreen, release-cursor,
79 smartcard-insert and smartcard-remove. Examples:
80
81 --hotkeys=toggle-fullscreen=shift+f11,release-cursor=shift+f12
82
83 --hotkeys=release-cursor=ctrl+alt
84
85 Note that hotkeys for which no binding is given are disabled, specifying an
86 empty string disables all hotkeys.
87
8874 =back
8975
9076 =head1 EXAMPLES
0 %{?mingw_package_header}
0 %{?mingw_package_hedder}
11
22 Name: mingw-virt-viewer
33 Version: @VERSION@
1313 BuildRequires: mingw64-filesystem >= 23
1414 BuildRequires: mingw32-glib2 >= 2.22
1515 BuildRequires: mingw64-glib2 >= 2.22
16 BuildRequires: mingw32-gstreamer-plugins-bad-free
17 BuildRequires: mingw64-gstreamer-plugins-bad-free
18 BuildRequires: mingw32-gstreamer-plugins-good
19 BuildRequires: mingw64-gstreamer-plugins-good
20 BuildRequires: mingw32-gtk2
21 BuildRequires: mingw64-gtk2
22 BuildRequires: mingw32-libusbx
23 BuildRequires: mingw64-libusbx
16 BuildRequires: mingw32-gtk3 >= 3.0.0
17 BuildRequires: mingw64-gtk3 >= 3.0.0
2418 BuildRequires: mingw32-libvirt >= 0.9.7
2519 BuildRequires: mingw64-libvirt >= 0.9.7
2620 BuildRequires: mingw32-libxml2
2721 BuildRequires: mingw64-libxml2
28 BuildRequires: mingw32-gtk-vnc >= 0.4.3
29 BuildRequires: mingw64-gtk-vnc >= 0.4.3
30 BuildRequires: mingw32-readline
31 BuildRequires: mingw64-readline
32 BuildRequires: mingw32-spice-glib
33 BuildRequires: mingw64-spice-glib
34 BuildRequires: mingw32-spice-gtk >= 0.16.26
35 BuildRequires: mingw64-spice-gtk >= 0.16.26
36 BuildRequires: mingw32-usbredir
37 BuildRequires: mingw64-usbredir
22 BuildRequires: mingw32-gtk-vnc2 >= 0.4.3
23 BuildRequires: mingw64-gtk-vnc2 >= 0.4.3
3824 BuildRequires: pkgconfig
39 BuildRequires: intltool
40 BuildRequires: icoutils
41 BuildRequires: dos2unix
42 BuildRequires: mingw32-nsis
43 BuildRequires: hicolor-icon-theme
44 BuildRequires: gnome-icon-theme
4525
4626 BuildArch: noarch
4727
5333 Summary: MinGW Windows virt-viewer console application
5434 Group: Applications/Internet
5535
56 %package -n mingw64-virt-viewer-installer
57 Summary: MinGW Windows virt-viewer installer
58 Group: Applications/Internet
59
60 %package -n mingw32-virt-viewer-installer
61 Summary: MinGW Windows virt-viewer installer
62 Group: Applications/Internet
63
6436 %description
6537 MinGW Windows virt-viewer console application
6638
7042 %description -n mingw64-virt-viewer
7143 MinGW Windows virt-viewer console application
7244
73 %description -n mingw64-virt-viewer-installer
74 MinGW Windows virt-viewer installer
75
76 %description -n mingw32-virt-viewer-installer
77 MinGW Windows virt-viewer installer
78
79 %{mingw_debug_package}
80
8145 %prep
8246 %setup -q -n virt-viewer-%{version}
8347
8448
8549 %build
86 %mingw_configure --with-gtk=2.0 --with-buildid=-%{release}
50 %mingw_configure --with-gtk=3.0
8751 %mingw_make %{?_smp_mflags} V=1
52
8853
8954 %install
9055 %mingw_make_install DESTDIR=$RPM_BUILD_ROOT
91
92 %if 0%{?mingw_build_win32} == 1
93 rpm -qa | grep mingw32 | sort | unix2dos >deps.txt
94 makensis -NOCD -DDESTDIR=$RPM_BUILD_ROOT build_win32$MINGW_BUILDDIR_SUFFIX/data/virt-viewer.nsis
95 cp virt-viewer-%{version}.exe $RPM_BUILD_ROOT/%{mingw32_datadir}/virt-viewer
96 %endif
97
98 %if 0%{?mingw_build_win64} == 1
99 rpm -qa | grep mingw64 | sort | unix2dos >deps.txt
100 makensis -NOCD -DDESTDIR=$RPM_BUILD_ROOT build_win64$MINGW_BUILDDIR_SUFFIX/data/virt-viewer.nsis
101 cp virt-viewer-%{version}.exe $RPM_BUILD_ROOT/%{mingw64_datadir}/virt-viewer
102 %endif
10356
10457 %find_lang virt-viewer
10558
11568 %{mingw32_bindir}/virt-viewer.exe
11669 %{mingw32_bindir}/remote-viewer.exe
11770 %{mingw32_bindir}/windows-cmdline-wrapper.exe
118 %{mingw32_bindir}/debug-helper.exe
11971
12072 %dir %{mingw32_datadir}/virt-viewer/
12173 %dir %{mingw32_datadir}/virt-viewer/ui/
12779 %{mingw32_mandir}/man1/virt-viewer.1*
12880 %{mingw32_mandir}/man1/remote-viewer.1*
12981
130 %files -n mingw32-virt-viewer-installer
131 %{mingw32_datadir}/virt-viewer/virt-viewer-@VERSION@.exe
132
13382 %files -n mingw64-virt-viewer -f virt-viewer.lang
13483 %defattr(-,root,root)
13584 %{mingw64_bindir}/virt-viewer.exe
13685 %{mingw64_bindir}/remote-viewer.exe
13786 %{mingw64_bindir}/windows-cmdline-wrapper.exe
138 %{mingw64_bindir}/debug-helper.exe
13987
14088