Commit 5bf850a0de025d5abe8d12d464d5a46418bac725 - virt-viewer

Imported Upstream version 0.5.5 Laurent Léonard 9 years ago

109 changed file(s) with 18469 addition(s) and 6243 deletion(s). Raw diff Collapse all Expand all

+57

-56

AUTHORS less more

6	6	Christophe Fergeau <cfergeau@redhat.com>
7	7	Marc-André Lureau <marcandre.lureau@redhat.com>
8	8	Hans de Goede <hdegoede@redhat.com>
	9	Michal Privoznik <mprivozn@redhat.com>
9	10
10		With additional patches from:
	11	With additional patches & translations from:
11	12
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>
	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>
25	68
26	69	...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...
69	70
70	71	For full translation credits see the header of the individual
71	72	files in the po/ directory.

+21

-0

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

+570

-0

ChangeLog less more

	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
0	570	2012-09-17 Daniel P. Berrange <berrange@redhat.com>
1	571
2	572	Update for 0.5.4 releae

+22

-2

Makefile.am less more

14	14	build-aux/gitlog-to-changelog \
15	15	build-aux/useless-if-before-free \
16	16	build-aux/vc-list-files \
	17	AUTHORS.in \
17	18	$(NULL)
18	19
19	20	DISTCLEAN_FILES = \

43	44	$(srcdir)/m4/lt~obsolete.m4 \
44	45	$(NULL)
45	46
46		dist-hook: gen-ChangeLog
	47	dist-hook: gen-ChangeLog gen-AUTHORS
47	48
48	49	# Generate the ChangeLog file (with all entries since the switch to git)
49	50	# and insert it into the directory we're about to use to create a tarball.
50		.PHONY: gen-ChangeLog
	51	if OS_WIN32
	52	.PHONY: gen-ChangeLog gen-AUTHORS nsis
	53	else
	54	.PHONY: gen-ChangeLog gen-AUTHORS
	55	endif
	56
51	57	gen-ChangeLog:
52	58	if test -d .git \|\| test -d ../.git; then \
53	59	$(top_srcdir)/build-aux/gitlog-to-changelog \

56	62	mv $(distdir)/cl-t $(distdir)/ChangeLog; \
57	63	fi
58	64
	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
59	79	-include $(top_srcdir)/git.mk

+17

-2

Makefile.in less more

341	341	build-aux/gitlog-to-changelog \
342	342	build-aux/useless-if-before-free \
343	343	build-aux/vc-list-files \
	344	AUTHORS.in \
344	345	$(NULL)
345	346
346	347	DISTCLEAN_FILES = \

886	887	uninstall uninstall-am
887	888
888	889
889		dist-hook: gen-ChangeLog
	890	dist-hook: gen-ChangeLog gen-AUTHORS
890	891
891	892	# Generate the ChangeLog file (with all entries since the switch to git)
892	893	# and insert it into the directory we're about to use to create a tarball.
893		.PHONY: gen-ChangeLog
	894	@OS_WIN32_TRUE@.PHONY: gen-ChangeLog gen-AUTHORS nsis
	895	@OS_WIN32_FALSE@.PHONY: gen-ChangeLog gen-AUTHORS
	896
894	897	gen-ChangeLog:
895	898	if test -d .git \|\| test -d ../.git; then \
896	899	$(top_srcdir)/build-aux/gitlog-to-changelog \

899	902	mv $(distdir)/cl-t $(distdir)/ChangeLog; \
900	903	fi
901	904
	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
902	917	-include $(top_srcdir)/git.mk
903	918
904	919	# Tell versions [3.59,3.63) of GNU make to not export all variables.

+15

-0

NEWS less more

0	0	Virt Viewer News
1	1	================
	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
2	17
3	18	0.5.4: Sep 17, 2012
4	19	-------------------

-1

README less more

18	18
19	19	http://gtk-vnc.sourceforge.net/
20	20
21		Virt Viewer uses the SPICE-GTK (>= 0.12.101) widget to provide a
	21	Virt Viewer uses the SPICE-GTK (>= 0.16.26) widget to provide a
22	22	display of the SPICE protocol, which is available from:
23	23
24	24	http://spice-space.org/page/Spice-Gtk

-2

acinclude.m4 less more

33	33	try_compiler_flags="$try_compiler_flags -Wall -Wmissing-prototypes -std=c99 -Wnested-externs -Wpointer-arith"
34	34	try_compiler_flags="$try_compiler_flags -Wextra -Wshadow -Wcast-align -Wwrite-strings -Waggregate-return"
35	35	# Removed -Wstrict-prototypes to avoid GTK bug
36		try_compiler_flags="$try_compiler_flags -Winline -Wredundant-decls -Wno-sign-compare"
	36	try_compiler_flags="$try_compiler_flags -Winline -Wredundant-decls -Wno-sign-compare -Wno-deprecated-declarations"
37	37	if test "$enable_compile_warnings" = "error" ; then
38	38	try_compiler_flags="$try_compiler_flags -Werror"
39	39	fi

45	45
46	46	AH_VERBATIM([FORTIFY_SOURCE],
47	47	[/* Enable compile-time and run-time bounds-checking, and some warnings. */
48		#if defined __OPTIMIZE__ && __OPTIMIZE__
	48	#if !defined _FORTIFY_SOURCE && defined __OPTIMIZE__ && __OPTIMIZE__
49	49	# define _FORTIFY_SOURCE 2
50	50	#endif
51	51	])

+50

-19

aclocal.m4 less more

12	12
13	13	m4_ifndef([AC_AUTOCONF_VERSION],
14	14	[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
15		m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
16		[m4_warning([this file was generated for autoconf 2.68.
	15	m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
	16	[m4_warning([this file was generated for autoconf 2.69.
17	17	You have another version of autoconf. It may work, but is not guaranteed to.
18	18	If you have problems, you may need to regenerate the build system entirely.
19	19	To do so, use the procedure documented by the package, typically 'autoreconf'.])])

516	516	# ----------------------------------
517	517	AC_DEFUN([PKG_PROG_PKG_CONFIG],
518	518	[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
519		m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
	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)$])
520	521	AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
521	522	AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
522	523	AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])

562	563	pkg_cv_[]$1="$$1"
563	564	elif test -n "$PKG_CONFIG"; then
564	565	PKG_CHECK_EXISTS([$3],
565		[pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
	566	[pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
	567	test "x$?" != "x0" && pkg_failed=yes ],
566	568	[pkg_failed=yes])
567	569	else
568	570	pkg_failed=untried

610	612	AC_MSG_RESULT([no])
611	613	_PKG_SHORT_ERRORS_SUPPORTED
612	614	if test $_pkg_short_errors_supported = yes; then
613		$1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
	615	$1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
614	616	else
615		$1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
	617	$1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
616	618	fi
617	619	# Put the nasty error message in config.log where it belongs
618	620	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD

625	627	Consider adjusting the PKG_CONFIG_PATH environment variable if you
626	628	installed software in a non-standard prefix.
627	629
628		_PKG_TEXT])
	630	_PKG_TEXT])[]dnl
629	631	])
630	632	elif test $pkg_failed = untried; then
631	633	AC_MSG_RESULT([no])

636	638
637	639	_PKG_TEXT
638	640
639		To get pkg-config, see <http://pkg-config.freedesktop.org/>.])
	641	To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
640	642	])
641	643	else
642	644	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS

645	647	$3
646	648	fi[]dnl
647	649	])# PKG_CHECK_MODULES
	650
	651
	652	# PKG_INSTALLDIR(DIRECTORY)
	653	# -------------------------
	654	# Substitutes the variable pkgconfigdir as the location where a module
	655	# should install pkg-config .pc files. By default the directory is
	656	# $libdir/pkgconfig, but the default can be changed by passing
	657	# DIRECTORY. The user can override through the --with-pkgconfigdir
	658	# parameter.
	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
648	690
649	691	# Copyright (C) 2002-2012 Free Software Foundation, Inc.
650	692	#

1040	1082	[test x"$AMDEP_TRUE" != x"" \|\| _AM_OUTPUT_DEPENDENCY_COMMANDS],
1041	1083	[AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
1042	1084	])
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($@)])
1054	1085
1055	1086	# Do all the work for Automake. -- Autoconf --
1056	1087

-17

cfg.mk less more

0	0	# Customize Makefile.maint. -- makefile --
1		# Copyright (C) 2008-2011 Red Hat, Inc.
	1	# Copyright (C) 2008-2012 Red Hat, Inc.
2	2	# Copyright (C) 2003-2008 Free Software Foundation, Inc.
3	3
4	4	# This program is free software: you can redistribute it and/or modify

17	17	# Tests not to run as part of "make distcheck".
18	18	local-checks-to-skip = \
19	19	changelog-check \
20		check-AUTHORS \
21	20	makefile-check \
22	21	makefile_path_separator_check \
23	22	patch-check \
24	23	sc_GPL_version \
25	24	sc_always_defined_macros \
	25	sc_bindtextdomain \
26	26	sc_cast_of_alloca_return_value \
27	27	sc_cross_check_PATH_usage_in_tests \
28	28	sc_dd_max_sym_length \

109	109	# We don't use this feature of maint.mk.
110	110	prev_version_file = /dev/null
111	111
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
126	112
127	113	exclude_file_name_regexp--sc_preprocessor_indentation = ^/.[ch]
128	114	exclude_file_name_regexp--sc_prohibit_strcmp = ^/.[ch]

132	118	exclude_file_name_regexp--sc_prohibit_empty_lines_at_EOF = ^icons/
133	119	exclude_file_name_regexp--sc_trailing_blank = ^icons/
134	120
135		exclude_file_name_regexp--sc_bindtextdomain = src/windows-cmdline-wrapper.c
136	121	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

-1

config.h.in less more

0	0	/* config.h.in. Generated from configure.ac by autoheader. */
	1
	2	/* Build version details */
	3	#undef BUILDID
1	4
2	5	/* always defined to indicate that i18n is enabled */
3	6	#undef ENABLE_NLS
4	7
5	8	/* Enable compile-time and run-time bounds-checking, and some warnings. */
6		#if defined __OPTIMIZE__ && __OPTIMIZE__
	9	#if !defined _FORTIFY_SOURCE && defined __OPTIMIZE__ && __OPTIMIZE__
7	10	# define _FORTIFY_SOURCE 2
8	11	#endif
9	12

+231

-197

configure less more

0	0	#! /bin/sh
1	1	# Guess values for system-dependent variables and create Makefiles.
2		# Generated by GNU Autoconf 2.68 for virt-viewer 0.5.4.
	2	# Generated by GNU Autoconf 2.69 for virt-viewer 0.5.5.
3	3	#
4	4	#
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.
	5	# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
8	6	#
9	7	#
10	8	# This configure script is free software; the Free Software Foundation

133	131	# CDPATH.
134	132	(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
135	133
	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	vx* \| xv* ) 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;}
136	159	if test "x$CONFIG_SHELL" = x; then
137	160	as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
138	161	emulate sh

166	189	else
167	190	exitcode=1; echo positional parameters were not saved.
168	191	fi
169		test x\$exitcode = x0 \|\| exit 1"
	192	test x\$exitcode = x0 \|\| exit 1
	193	test -x / \|\| exit 1"
170	194	as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
171	195	as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
172	196	eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&

219	243
220	244
221	245	if test "x$CONFIG_SHELL" != x; then :
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		vx* \| xv* ) 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+"$@"}
	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	vx* \| xv* ) 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
237	265	fi
238	266
239	267	if test x$as_have_required = xno; then :

335	363
336	364
337	365	} # 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
338	374	# as_fn_append VAR VALUE
339	375	# ----------------------
340	376	# Append the text in VALUE to the end of the definition contained in VAR. Take

456	492	chmod +x "$as_me.lineno" \|\|
457	493	{ $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
458	494
	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
459	499	# Don't try to exec as it changes $[0], causing all sort of problems
460	500	# (the dirname of $[0] is not the place where we might find the
461	501	# original and so on. Autoconf is especially sensitive to this).

490	530	# ... but there are two gotchas:
491	531	# 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
492	532	# 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
493		# In both cases, we have to default to `cp -p'.
	533	# In both cases, we have to default to `cp -pR'.
494	534	ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe \|\|
495		as_ln_s='cp -p'
	535	as_ln_s='cp -pR'
496	536	elif ln conf$$.file conf$$ 2>/dev/null; then
497	537	as_ln_s=ln
498	538	else
499		as_ln_s='cp -p'
	539	as_ln_s='cp -pR'
500	540	fi
501	541	else
502		as_ln_s='cp -p'
	542	as_ln_s='cp -pR'
503	543	fi
504	544	rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
505	545	rmdir conf$$.dir 2>/dev/null

511	551	as_mkdir_p=false
512	552	fi
513	553
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
	554	as_test_x='test -x'
	555	as_executable_p=as_fn_executable_p
536	556
537	557	# Sed expression to map a string onto a valid CPP name.
538	558	as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"

566	586	# Identity of this package.
567	587	PACKAGE_NAME='virt-viewer'
568	588	PACKAGE_TARNAME='virt-viewer'
569		PACKAGE_VERSION='0.5.4'
570		PACKAGE_STRING='virt-viewer 0.5.4'
	589	PACKAGE_VERSION='0.5.5'
	590	PACKAGE_STRING='virt-viewer 0.5.5'
571	591	PACKAGE_BUGREPORT=''
572	592	PACKAGE_URL=''
573	593

839	859	with_gtk_vnc
840	860	with_spice_gtk
841	861	enable_plugin
	862	with_buildid
842	863	'
843	864	ac_precious_vars='build_alias
844	865	host_alias

1329	1350	if test "x$host_alias" != x; then
1330	1351	if test "x$build_alias" = x; then
1331	1352	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
1334	1353	elif test "x$build_alias" != "x$host_alias"; then
1335	1354	cross_compiling=yes
1336	1355	fi

1416	1435	# Omit some internal or obsolete options to make the list less imposing.
1417	1436	# This message is too long to be a string in the A/UX 3.1 sh.
1418	1437	cat <<_ACEOF
1419		\`configure' configures virt-viewer 0.5.4 to adapt to many kinds of systems.
	1438	\`configure' configures virt-viewer 0.5.5 to adapt to many kinds of systems.
1420	1439
1421	1440	Usage: $0 [OPTION]... [VAR=VALUE]...
1422	1441

1486	1505
1487	1506	if test -n "$ac_init_help"; then
1488	1507	case $ac_init_help in
1489		short \| recursive ) echo "Configuration of virt-viewer 0.5.4:";;
	1508	short \| recursive ) echo "Configuration of virt-viewer 0.5.5:";;
1490	1509	esac
1491	1510	cat <<\_ACEOF
1492	1511

1523	1542	--with-gtk=2.0\|3.0 which gtk+ version to compile against (default: 2.0)
1524	1543	--without-gtk-vnc Ignore presence of gtk-vnc and disable it
1525	1544	--without-spice-gtk Ignore presence of spice-gtk and disable it
	1545	--with-buildid=id Set additional build version details
1526	1546
1527	1547	Some influential environment variables:
1528	1548	CC C compiler command

1644	1664	test -n "$ac_init_help" && exit $ac_status
1645	1665	if $ac_init_version; then
1646	1666	cat <<\_ACEOF
1647		virt-viewer configure 0.5.4
1648		generated by GNU Autoconf 2.68
1649
1650		Copyright (C) 2010 Free Software Foundation, Inc.
	1667	virt-viewer configure 0.5.5
	1668	generated by GNU Autoconf 2.69
	1669
	1670	Copyright (C) 2012 Free Software Foundation, Inc.
1651	1671	This configure script is free software; the Free Software Foundation
1652	1672	gives unlimited permission to copy, distribute and modify it.
1653	1673	_ACEOF

1723	1743	test ! -s conftest.err
1724	1744	} && test -s conftest$ac_exeext && {
1725	1745	test "$cross_compiling" = yes \|\|
1726		$as_test_x conftest$ac_exeext
	1746	test -x conftest$ac_exeext
1727	1747	}; then :
1728	1748	ac_retval=0
1729	1749	else

2009	2029	This file contains any messages produced by compilers while
2010	2030	running configure, to aid debugging if configure makes a mistake.
2011	2031
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
	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
2014	2034
2015	2035	$ $0 $@
2016	2036

2429	2449	# by default.
2430	2450	for ac_prog in ginstall scoinst install; do
2431	2451	for ac_exec_ext in '' $ac_executable_extensions; do
2432		if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
	2452	if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
2433	2453	if test $ac_prog = install &&
2434	2454	grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
2435	2455	# AIX install. It has an incompatible calling convention.

2613	2633	IFS=$as_save_IFS
2614	2634	test -z "$as_dir" && as_dir=.
2615	2635	for ac_exec_ext in '' $ac_executable_extensions; do
2616		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
	2636	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
2617	2637	ac_cv_prog_STRIP="${ac_tool_prefix}strip"
2618	2638	$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2619	2639	break 2

2653	2673	IFS=$as_save_IFS
2654	2674	test -z "$as_dir" && as_dir=.
2655	2675	for ac_exec_ext in '' $ac_executable_extensions; do
2656		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
	2676	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
2657	2677	ac_cv_prog_ac_ct_STRIP="strip"
2658	2678	$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2659	2679	break 2

2704	2724	test -z "$as_dir" && as_dir=.
2705	2725	for ac_prog in mkdir gmkdir; do
2706	2726	for ac_exec_ext in '' $ac_executable_extensions; do
2707		{ test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } \|\| continue
	2727	as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" \|\| continue
2708	2728	case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
2709	2729	'mkdir (GNU coreutils) '* \| \
2710	2730	'mkdir (coreutils) '* \| \

2751	2771	IFS=$as_save_IFS
2752	2772	test -z "$as_dir" && as_dir=.
2753	2773	for ac_exec_ext in '' $ac_executable_extensions; do
2754		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
	2774	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
2755	2775	ac_cv_prog_AWK="$ac_prog"
2756	2776	$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2757	2777	break 2

2837	2857
2838	2858	# Define the identity of the package.
2839	2859	PACKAGE='virt-viewer'
2840		VERSION='0.5.4'
	2860	VERSION='0.5.5'
2841	2861
2842	2862
2843	2863	cat >>confdefs.h <<_ACEOF

2999	3019
3000	3020	GLIB2_REQUIRED=2.22.0
3001	3021	LIBXML2_REQUIRED="2.6.0"
3002		LIBVIRT_REQUIRED="0.9.7"
	3022	LIBVIRT_REQUIRED="0.10.0"
3003	3023	GTK2_REQUIRED="2.18.0"
3004	3024	GTK3_REQUIRED="3.0"
3005	3025	GTK_VNC1_REQUIRED="0.3.8"
3006	3026	GTK_VNC2_REQUIRED="0.4.0"
3007		SPICE_GTK_REQUIRED="0.12.101"
	3027	SPICE_GTK_REQUIRED="0.16.26"
3008	3028	SPICE_PROTOCOL_REQUIRED="0.10.1"
3009	3029
3010	3030	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for native Win32" >&5

3050	3070	IFS=$as_save_IFS
3051	3071	test -z "$as_dir" && as_dir=.
3052	3072	for ac_exec_ext in '' $ac_executable_extensions; do
3053		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
	3073	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3054	3074	ac_cv_prog_CC="${ac_tool_prefix}gcc"
3055	3075	$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3056	3076	break 2

3090	3110	IFS=$as_save_IFS
3091	3111	test -z "$as_dir" && as_dir=.
3092	3112	for ac_exec_ext in '' $ac_executable_extensions; do
3093		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
	3113	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3094	3114	ac_cv_prog_ac_ct_CC="gcc"
3095	3115	$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3096	3116	break 2

3143	3163	IFS=$as_save_IFS
3144	3164	test -z "$as_dir" && as_dir=.
3145	3165	for ac_exec_ext in '' $ac_executable_extensions; do
3146		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
	3166	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3147	3167	ac_cv_prog_CC="${ac_tool_prefix}cc"
3148	3168	$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3149	3169	break 2

3184	3204	IFS=$as_save_IFS
3185	3205	test -z "$as_dir" && as_dir=.
3186	3206	for ac_exec_ext in '' $ac_executable_extensions; do
3187		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
	3207	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3188	3208	if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
3189	3209	ac_prog_rejected=yes
3190	3210	continue

3242	3262	IFS=$as_save_IFS
3243	3263	test -z "$as_dir" && as_dir=.
3244	3264	for ac_exec_ext in '' $ac_executable_extensions; do
3245		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
	3265	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3246	3266	ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
3247	3267	$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3248	3268	break 2

3286	3306	IFS=$as_save_IFS
3287	3307	test -z "$as_dir" && as_dir=.
3288	3308	for ac_exec_ext in '' $ac_executable_extensions; do
3289		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
	3309	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
3290	3310	ac_cv_prog_ac_ct_CC="$ac_prog"
3291	3311	$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
3292	3312	break 2

3732	3752	/* end confdefs.h. */
3733	3753	#include <stdarg.h>
3734	3754	#include <stdio.h>
3735		#include <sys/types.h>
3736		#include <sys/stat.h>
	3755	struct stat;
3737	3756	/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
3738	3757	struct buf { int x; };
3739	3758	FILE * (rcsopen) (struct buf , struct stat *, int);

4251	4270	for ac_prog in sed gsed; do
4252	4271	for ac_exec_ext in '' $ac_executable_extensions; do
4253	4272	ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
4254		{ test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } \|\| continue
	4273	as_fn_executable_p "$ac_path_SED" \|\| continue
4255	4274	# Check for GNU ac_path_SED and select it if it is found.
4256	4275	# Check for GNU $ac_path_SED
4257	4276	case `"$ac_path_SED" --version 2>&1` in

4327	4346	for ac_prog in grep ggrep; do
4328	4347	for ac_exec_ext in '' $ac_executable_extensions; do
4329	4348	ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
4330		{ test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } \|\| continue
	4349	as_fn_executable_p "$ac_path_GREP" \|\| continue
4331	4350	# Check for GNU ac_path_GREP and select it if it is found.
4332	4351	# Check for GNU $ac_path_GREP
4333	4352	case `"$ac_path_GREP" --version 2>&1` in

4393	4412	for ac_prog in egrep; do
4394	4413	for ac_exec_ext in '' $ac_executable_extensions; do
4395	4414	ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
4396		{ test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } \|\| continue
	4415	as_fn_executable_p "$ac_path_EGREP" \|\| continue
4397	4416	# Check for GNU ac_path_EGREP and select it if it is found.
4398	4417	# Check for GNU $ac_path_EGREP
4399	4418	case `"$ac_path_EGREP" --version 2>&1` in

4460	4479	for ac_prog in fgrep; do
4461	4480	for ac_exec_ext in '' $ac_executable_extensions; do
4462	4481	ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
4463		{ test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } \|\| continue
	4482	as_fn_executable_p "$ac_path_FGREP" \|\| continue
4464	4483	# Check for GNU ac_path_FGREP and select it if it is found.
4465	4484	# Check for GNU $ac_path_FGREP
4466	4485	case `"$ac_path_FGREP" --version 2>&1` in

4716	4735	IFS=$as_save_IFS
4717	4736	test -z "$as_dir" && as_dir=.
4718	4737	for ac_exec_ext in '' $ac_executable_extensions; do
4719		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
	4738	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
4720	4739	ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
4721	4740	$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4722	4741	break 2

4760	4779	IFS=$as_save_IFS
4761	4780	test -z "$as_dir" && as_dir=.
4762	4781	for ac_exec_ext in '' $ac_executable_extensions; do
4763		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
	4782	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
4764	4783	ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
4765	4784	$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4766	4785	break 2

5184	5203	IFS=$as_save_IFS
5185	5204	test -z "$as_dir" && as_dir=.
5186	5205	for ac_exec_ext in '' $ac_executable_extensions; do
5187		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
	5206	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
5188	5207	ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
5189	5208	$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
5190	5209	break 2

5224	5243	IFS=$as_save_IFS
5225	5244	test -z "$as_dir" && as_dir=.
5226	5245	for ac_exec_ext in '' $ac_executable_extensions; do
5227		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
	5246	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
5228	5247	ac_cv_prog_ac_ct_OBJDUMP="objdump"
5229	5248	$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
5230	5249	break 2

5530	5549	IFS=$as_save_IFS
5531	5550	test -z "$as_dir" && as_dir=.
5532	5551	for ac_exec_ext in '' $ac_executable_extensions; do
5533		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
	5552	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
5534	5553	ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
5535	5554	$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
5536	5555	break 2

5570	5589	IFS=$as_save_IFS
5571	5590	test -z "$as_dir" && as_dir=.
5572	5591	for ac_exec_ext in '' $ac_executable_extensions; do
5573		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
	5592	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
5574	5593	ac_cv_prog_ac_ct_DLLTOOL="dlltool"
5575	5594	$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
5576	5595	break 2

5674	5693	IFS=$as_save_IFS
5675	5694	test -z "$as_dir" && as_dir=.
5676	5695	for ac_exec_ext in '' $ac_executable_extensions; do
5677		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
	5696	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
5678	5697	ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
5679	5698	$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
5680	5699	break 2

5718	5737	IFS=$as_save_IFS
5719	5738	test -z "$as_dir" && as_dir=.
5720	5739	for ac_exec_ext in '' $ac_executable_extensions; do
5721		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
	5740	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
5722	5741	ac_cv_prog_ac_ct_AR="$ac_prog"
5723	5742	$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
5724	5743	break 2

5843	5862	IFS=$as_save_IFS
5844	5863	test -z "$as_dir" && as_dir=.
5845	5864	for ac_exec_ext in '' $ac_executable_extensions; do
5846		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
	5865	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
5847	5866	ac_cv_prog_STRIP="${ac_tool_prefix}strip"
5848	5867	$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
5849	5868	break 2

5883	5902	IFS=$as_save_IFS
5884	5903	test -z "$as_dir" && as_dir=.
5885	5904	for ac_exec_ext in '' $ac_executable_extensions; do
5886		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
	5905	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
5887	5906	ac_cv_prog_ac_ct_STRIP="strip"
5888	5907	$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
5889	5908	break 2

5942	5961	IFS=$as_save_IFS
5943	5962	test -z "$as_dir" && as_dir=.
5944	5963	for ac_exec_ext in '' $ac_executable_extensions; do
5945		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
	5964	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
5946	5965	ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
5947	5966	$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
5948	5967	break 2

5982	6001	IFS=$as_save_IFS
5983	6002	test -z "$as_dir" && as_dir=.
5984	6003	for ac_exec_ext in '' $ac_executable_extensions; do
5985		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
	6004	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
5986	6005	ac_cv_prog_ac_ct_RANLIB="ranlib"
5987	6006	$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
5988	6007	break 2

6631	6650	IFS=$as_save_IFS
6632	6651	test -z "$as_dir" && as_dir=.
6633	6652	for ac_exec_ext in '' $ac_executable_extensions; do
6634		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
	6653	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6635	6654	ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
6636	6655	$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6637	6656	break 2

6671	6690	IFS=$as_save_IFS
6672	6691	test -z "$as_dir" && as_dir=.
6673	6692	for ac_exec_ext in '' $ac_executable_extensions; do
6674		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
	6693	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6675	6694	ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
6676	6695	$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6677	6696	break 2

6751	6770	IFS=$as_save_IFS
6752	6771	test -z "$as_dir" && as_dir=.
6753	6772	for ac_exec_ext in '' $ac_executable_extensions; do
6754		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
	6773	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6755	6774	ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
6756	6775	$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6757	6776	break 2

6791	6810	IFS=$as_save_IFS
6792	6811	test -z "$as_dir" && as_dir=.
6793	6812	for ac_exec_ext in '' $ac_executable_extensions; do
6794		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
	6813	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6795	6814	ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
6796	6815	$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6797	6816	break 2

6843	6862	IFS=$as_save_IFS
6844	6863	test -z "$as_dir" && as_dir=.
6845	6864	for ac_exec_ext in '' $ac_executable_extensions; do
6846		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
	6865	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6847	6866	ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
6848	6867	$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6849	6868	break 2

6883	6902	IFS=$as_save_IFS
6884	6903	test -z "$as_dir" && as_dir=.
6885	6904	for ac_exec_ext in '' $ac_executable_extensions; do
6886		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
	6905	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6887	6906	ac_cv_prog_ac_ct_NMEDIT="nmedit"
6888	6907	$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6889	6908	break 2

6935	6954	IFS=$as_save_IFS
6936	6955	test -z "$as_dir" && as_dir=.
6937	6956	for ac_exec_ext in '' $ac_executable_extensions; do
6938		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
	6957	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6939	6958	ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
6940	6959	$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6941	6960	break 2

6975	6994	IFS=$as_save_IFS
6976	6995	test -z "$as_dir" && as_dir=.
6977	6996	for ac_exec_ext in '' $ac_executable_extensions; do
6978		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
	6997	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
6979	6998	ac_cv_prog_ac_ct_LIPO="lipo"
6980	6999	$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
6981	7000	break 2

7027	7046	IFS=$as_save_IFS
7028	7047	test -z "$as_dir" && as_dir=.
7029	7048	for ac_exec_ext in '' $ac_executable_extensions; do
7030		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
	7049	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7031	7050	ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
7032	7051	$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7033	7052	break 2

7067	7086	IFS=$as_save_IFS
7068	7087	test -z "$as_dir" && as_dir=.
7069	7088	for ac_exec_ext in '' $ac_executable_extensions; do
7070		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
	7089	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7071	7090	ac_cv_prog_ac_ct_OTOOL="otool"
7072	7091	$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7073	7092	break 2

7119	7138	IFS=$as_save_IFS
7120	7139	test -z "$as_dir" && as_dir=.
7121	7140	for ac_exec_ext in '' $ac_executable_extensions; do
7122		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
	7141	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7123	7142	ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
7124	7143	$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7125	7144	break 2

7159	7178	IFS=$as_save_IFS
7160	7179	test -z "$as_dir" && as_dir=.
7161	7180	for ac_exec_ext in '' $ac_executable_extensions; do
7162		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
	7181	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
7163	7182	ac_cv_prog_ac_ct_OTOOL64="otool64"
7164	7183	$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
7165	7184	break 2

11669	11688	IFS=$as_save_IFS
11670	11689	test -z "$as_dir" && as_dir=.
11671	11690	for ac_exec_ext in '' $ac_executable_extensions; do
11672		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
	11691	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
11673	11692	ac_cv_prog_ICOTOOL="$ac_prog"
11674	11693	$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
11675	11694	break 2

11714	11733	IFS=$as_save_IFS
11715	11734	test -z "$as_dir" && as_dir=.
11716	11735	for ac_exec_ext in '' $ac_executable_extensions; do
11717		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
	11736	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
11718	11737	ac_cv_prog_WINDRES="${ac_tool_prefix}windres"
11719	11738	$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
11720	11739	break 2

11754	11773	IFS=$as_save_IFS
11755	11774	test -z "$as_dir" && as_dir=.
11756	11775	for ac_exec_ext in '' $ac_executable_extensions; do
11757		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
	11776	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
11758	11777	ac_cv_prog_ac_ct_WINDRES="windres"
11759	11778	$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
11760	11779	break 2

11838	11857	try_compiler_flags="$try_compiler_flags -Wall -Wmissing-prototypes -std=c99 -Wnested-externs -Wpointer-arith"
11839	11858	try_compiler_flags="$try_compiler_flags -Wextra -Wshadow -Wcast-align -Wwrite-strings -Waggregate-return"
11840	11859	# Removed -Wstrict-prototypes to avoid GTK bug
11841		try_compiler_flags="$try_compiler_flags -Winline -Wredundant-decls -Wno-sign-compare"
	11860	try_compiler_flags="$try_compiler_flags -Winline -Wredundant-decls -Wno-sign-compare -Wno-deprecated-declarations"
11842	11861	if test "$enable_compile_warnings" = "error" ; then
11843	11862	try_compiler_flags="$try_compiler_flags -Werror"
11844	11863	fi

12421	12440	IFS=$as_save_IFS
12422	12441	test -z "$as_dir" && as_dir=.
12423	12442	for ac_exec_ext in '' $ac_executable_extensions; do
12424		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
	12443	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
12425	12444	ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
12426	12445	$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
12427	12446	break 2

12685	12704	IFS=$as_save_IFS
12686	12705	test -z "$as_dir" && as_dir=.
12687	12706	for ac_exec_ext in '' $ac_executable_extensions; do
12688		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
	12707	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
12689	12708	ac_cv_path_INTLTOOL_UPDATE="$as_dir/$ac_word$ac_exec_ext"
12690	12709	$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
12691	12710	break 2

12725	12744	IFS=$as_save_IFS
12726	12745	test -z "$as_dir" && as_dir=.
12727	12746	for ac_exec_ext in '' $ac_executable_extensions; do
12728		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
	12747	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
12729	12748	ac_cv_path_INTLTOOL_MERGE="$as_dir/$ac_word$ac_exec_ext"
12730	12749	$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
12731	12750	break 2

12765	12784	IFS=$as_save_IFS
12766	12785	test -z "$as_dir" && as_dir=.
12767	12786	for ac_exec_ext in '' $ac_executable_extensions; do
12768		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
	12787	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
12769	12788	ac_cv_path_INTLTOOL_EXTRACT="$as_dir/$ac_word$ac_exec_ext"
12770	12789	$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
12771	12790	break 2

12949	12968	IFS=$as_save_IFS
12950	12969	test -z "$as_dir" && as_dir=.
12951	12970	for ac_exec_ext in '' $ac_executable_extensions; do
12952		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
	12971	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
12953	12972	ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
12954	12973	$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
12955	12974	break 2

12989	13008	IFS=$as_save_IFS
12990	13009	test -z "$as_dir" && as_dir=.
12991	13010	for ac_exec_ext in '' $ac_executable_extensions; do
12992		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
	13011	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
12993	13012	ac_cv_path_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
12994	13013	$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
12995	13014	break 2

13029	13048	IFS=$as_save_IFS
13030	13049	test -z "$as_dir" && as_dir=.
13031	13050	for ac_exec_ext in '' $ac_executable_extensions; do
13032		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
	13051	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
13033	13052	ac_cv_path_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
13034	13053	$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
13035	13054	break 2

13069	13088	IFS=$as_save_IFS
13070	13089	test -z "$as_dir" && as_dir=.
13071	13090	for ac_exec_ext in '' $ac_executable_extensions; do
13072		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
	13091	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
13073	13092	ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
13074	13093	$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
13075	13094	break 2

13120	13139	IFS=$as_save_IFS
13121	13140	test -z "$as_dir" && as_dir=.
13122	13141	for ac_exec_ext in '' $ac_executable_extensions; do
13123		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
	13142	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
13124	13143	ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"
13125	13144	$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
13126	13145	break 2

13217	13236
13218	13237
13219	13238
	13239
13220	13240	if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
13221	13241	if test -n "$ac_tool_prefix"; then
13222	13242	# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.

13237	13257	IFS=$as_save_IFS
13238	13258	test -z "$as_dir" && as_dir=.
13239	13259	for ac_exec_ext in '' $ac_executable_extensions; do
13240		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
	13260	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
13241	13261	ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
13242	13262	$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
13243	13263	break 2

13280	13300	IFS=$as_save_IFS
13281	13301	test -z "$as_dir" && as_dir=.
13282	13302	for ac_exec_ext in '' $ac_executable_extensions; do
13283		if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
	13303	if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
13284	13304	ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
13285	13305	$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
13286	13306	break 2

13348	13368	$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
13349	13369	test $ac_status = 0; }; then
13350	13370	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
13351	13372	else
13352	13373	pkg_failed=yes
13353	13374	fi

13364	13385	$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
13365	13386	test $ac_status = 0; }; then
13366	13387	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
13367	13389	else
13368	13390	pkg_failed=yes
13369	13391	fi

13383	13405	_pkg_short_errors_supported=no
13384	13406	fi
13385	13407	if test $_pkg_short_errors_supported = yes; then
13386		GLIB2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "glib-2.0 >= $GLIB2_REQUIRED gthread-2.0 gmodule-export-2.0" 2>&1`
	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`
13387	13409	else
13388		GLIB2_PKG_ERRORS=`$PKG_CONFIG --print-errors "glib-2.0 >= $GLIB2_REQUIRED gthread-2.0 gmodule-export-2.0" 2>&1`
	13410	GLIB2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= $GLIB2_REQUIRED gthread-2.0 gmodule-export-2.0" 2>&1`
13389	13411	fi
13390	13412	# Put the nasty error message in config.log where it belongs
13391	13413	echo "$GLIB2_PKG_ERRORS" >&5

13400	13422	Alternatively, you may set the environment variables GLIB2_CFLAGS
13401	13423	and GLIB2_LIBS to avoid the need to call pkg-config.
13402	13424	See the pkg-config man page for more details." "$LINENO" 5
13403
13404	13425	elif test $pkg_failed = untried; then
13405	13426	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13406	13427	$as_echo "no" >&6; }

13416	13437
13417	13438	To get pkg-config, see <http://pkg-config.freedesktop.org/>.
13418	13439	See \`config.log' for more details" "$LINENO" 5; }
13419
13420	13440	else
13421	13441	GLIB2_CFLAGS=$pkg_cv_GLIB2_CFLAGS
13422	13442	GLIB2_LIBS=$pkg_cv_GLIB2_LIBS

13439	13459	$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
13440	13460	test $ac_status = 0; }; then
13441	13461	pkg_cv_LIBXML2_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0 >= $LIBXML2_REQUIRED" 2>/dev/null`
	13462	test "x$?" != "x0" && pkg_failed=yes
13442	13463	else
13443	13464	pkg_failed=yes
13444	13465	fi

13455	13476	$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
13456	13477	test $ac_status = 0; }; then
13457	13478	pkg_cv_LIBXML2_LIBS=`$PKG_CONFIG --libs "libxml-2.0 >= $LIBXML2_REQUIRED" 2>/dev/null`
	13479	test "x$?" != "x0" && pkg_failed=yes
13458	13480	else
13459	13481	pkg_failed=yes
13460	13482	fi

13474	13496	_pkg_short_errors_supported=no
13475	13497	fi
13476	13498	if test $_pkg_short_errors_supported = yes; then
13477		LIBXML2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libxml-2.0 >= $LIBXML2_REQUIRED" 2>&1`
	13499	LIBXML2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libxml-2.0 >= $LIBXML2_REQUIRED" 2>&1`
13478	13500	else
13479		LIBXML2_PKG_ERRORS=`$PKG_CONFIG --print-errors "libxml-2.0 >= $LIBXML2_REQUIRED" 2>&1`
	13501	LIBXML2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libxml-2.0 >= $LIBXML2_REQUIRED" 2>&1`
13480	13502	fi
13481	13503	# Put the nasty error message in config.log where it belongs
13482	13504	echo "$LIBXML2_PKG_ERRORS" >&5

13491	13513	Alternatively, you may set the environment variables LIBXML2_CFLAGS
13492	13514	and LIBXML2_LIBS to avoid the need to call pkg-config.
13493	13515	See the pkg-config man page for more details." "$LINENO" 5
13494
13495	13516	elif test $pkg_failed = untried; then
13496	13517	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13497	13518	$as_echo "no" >&6; }

13507	13528
13508	13529	To get pkg-config, see <http://pkg-config.freedesktop.org/>.
13509	13530	See \`config.log' for more details" "$LINENO" 5; }
13510
13511	13531	else
13512	13532	LIBXML2_CFLAGS=$pkg_cv_LIBXML2_CFLAGS
13513	13533	LIBXML2_LIBS=$pkg_cv_LIBXML2_LIBS

13533	13553	pkg_cv_LIBVIRT_CFLAGS="$LIBVIRT_CFLAGS"
13534	13554	elif test -n "$PKG_CONFIG"; then
13535	13555	if test -n "$PKG_CONFIG" && \
13536		{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libvirt\""; } >&5
13537		($PKG_CONFIG --exists --print-errors "libvirt") 2>&5
	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
13538	13558	ac_status=$?
13539	13559	$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
13540	13560	test $ac_status = 0; }; then
13541		pkg_cv_LIBVIRT_CFLAGS=`$PKG_CONFIG --cflags "libvirt" 2>/dev/null`
	13561	pkg_cv_LIBVIRT_CFLAGS=`$PKG_CONFIG --cflags "libvirt >= $LIBVIRT_REQUIRED" 2>/dev/null`
	13562	test "x$?" != "x0" && pkg_failed=yes
13542	13563	else
13543	13564	pkg_failed=yes
13544	13565	fi

13549	13570	pkg_cv_LIBVIRT_LIBS="$LIBVIRT_LIBS"
13550	13571	elif test -n "$PKG_CONFIG"; then
13551	13572	if test -n "$PKG_CONFIG" && \
13552		{ { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libvirt\""; } >&5
13553		($PKG_CONFIG --exists --print-errors "libvirt") 2>&5
	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
13554	13575	ac_status=$?
13555	13576	$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
13556	13577	test $ac_status = 0; }; then
13557		pkg_cv_LIBVIRT_LIBS=`$PKG_CONFIG --libs "libvirt" 2>/dev/null`
	13578	pkg_cv_LIBVIRT_LIBS=`$PKG_CONFIG --libs "libvirt >= $LIBVIRT_REQUIRED" 2>/dev/null`
	13579	test "x$?" != "x0" && pkg_failed=yes
13558	13580	else
13559	13581	pkg_failed=yes
13560	13582	fi

13574	13596	_pkg_short_errors_supported=no
13575	13597	fi
13576	13598	if test $_pkg_short_errors_supported = yes; then
13577		LIBVIRT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libvirt" 2>&1`
	13599	LIBVIRT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libvirt >= $LIBVIRT_REQUIRED" 2>&1`
13578	13600	else
13579		LIBVIRT_PKG_ERRORS=`$PKG_CONFIG --print-errors "libvirt" 2>&1`
	13601	LIBVIRT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libvirt >= $LIBVIRT_REQUIRED" 2>&1`
13580	13602	fi
13581	13603	# Put the nasty error message in config.log where it belongs
13582	13604	echo "$LIBVIRT_PKG_ERRORS" >&5

13683	13705	$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
13684	13706	test $ac_status = 0; }; then
13685	13707	pkg_cv_GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-$GTK_API_VERSION >= $GTK_REQUIRED" 2>/dev/null`
	13708	test "x$?" != "x0" && pkg_failed=yes
13686	13709	else
13687	13710	pkg_failed=yes
13688	13711	fi

13699	13722	$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
13700	13723	test $ac_status = 0; }; then
13701	13724	pkg_cv_GTK_LIBS=`$PKG_CONFIG --libs "gtk+-$GTK_API_VERSION >= $GTK_REQUIRED" 2>/dev/null`
	13725	test "x$?" != "x0" && pkg_failed=yes
13702	13726	else
13703	13727	pkg_failed=yes
13704	13728	fi

13718	13742	_pkg_short_errors_supported=no
13719	13743	fi
13720	13744	if test $_pkg_short_errors_supported = yes; then
13721		GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-$GTK_API_VERSION >= $GTK_REQUIRED" 2>&1`
	13745	GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-$GTK_API_VERSION >= $GTK_REQUIRED" 2>&1`
13722	13746	else
13723		GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-$GTK_API_VERSION >= $GTK_REQUIRED" 2>&1`
	13747	GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-$GTK_API_VERSION >= $GTK_REQUIRED" 2>&1`
13724	13748	fi
13725	13749	# Put the nasty error message in config.log where it belongs
13726	13750	echo "$GTK_PKG_ERRORS" >&5

13735	13759	Alternatively, you may set the environment variables GTK_CFLAGS
13736	13760	and GTK_LIBS to avoid the need to call pkg-config.
13737	13761	See the pkg-config man page for more details." "$LINENO" 5
13738
13739	13762	elif test $pkg_failed = untried; then
13740	13763	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
13741	13764	$as_echo "no" >&6; }

13751	13774
13752	13775	To get pkg-config, see <http://pkg-config.freedesktop.org/>.
13753	13776	See \`config.log' for more details" "$LINENO" 5; }
13754
13755	13777	else
13756	13778	GTK_CFLAGS=$pkg_cv_GTK_CFLAGS
13757	13779	GTK_LIBS=$pkg_cv_GTK_LIBS

13783	13805	$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
13784	13806	test $ac_status = 0; }; then
13785	13807	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
13786	13809	else
13787	13810	pkg_failed=yes
13788	13811	fi

13799	13822	$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
13800	13823	test $ac_status = 0; }; then
13801	13824	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
13802	13826	else
13803	13827	pkg_failed=yes
13804	13828	fi

13818	13842	_pkg_short_errors_supported=no
13819	13843	fi
13820	13844	if test $_pkg_short_errors_supported = yes; then
13821		GTK_VNC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk-vnc-$GTK_VNC_API_VERSION >= $GTK_VNC_REQUIRED" 2>&1`
	13845	GTK_VNC_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk-vnc-$GTK_VNC_API_VERSION >= $GTK_VNC_REQUIRED" 2>&1`
13822	13846	else
13823		GTK_VNC_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk-vnc-$GTK_VNC_API_VERSION >= $GTK_VNC_REQUIRED" 2>&1`
	13847	GTK_VNC_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk-vnc-$GTK_VNC_API_VERSION >= $GTK_VNC_REQUIRED" 2>&1`
13824	13848	fi
13825	13849	# Put the nasty error message in config.log where it belongs
13826	13850	echo "$GTK_VNC_PKG_ERRORS" >&5

13884	13908	$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
13885	13909	test $ac_status = 0; }; then
13886	13910	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
13887	13912	else
13888	13913	pkg_failed=yes
13889	13914	fi

13900	13925	$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
13901	13926	test $ac_status = 0; }; then
13902	13927	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
13903	13929	else
13904	13930	pkg_failed=yes
13905	13931	fi

13919	13945	_pkg_short_errors_supported=no
13920	13946	fi
13921	13947	if test $_pkg_short_errors_supported = yes; then
13922		SPICE_GTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "spice-client-gtk-$SPICE_GTK_API_VERSION >= $SPICE_GTK_REQUIRED" 2>&1`
	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`
13923	13949	else
13924		SPICE_GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors "spice-client-gtk-$SPICE_GTK_API_VERSION >= $SPICE_GTK_REQUIRED" 2>&1`
	13950	SPICE_GTK_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "spice-client-gtk-$SPICE_GTK_API_VERSION >= $SPICE_GTK_REQUIRED" 2>&1`
13925	13951	fi
13926	13952	# Put the nasty error message in config.log where it belongs
13927	13953	echo "$SPICE_GTK_PKG_ERRORS" >&5

13958	13984	$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
13959	13985	test $ac_status = 0; }; then
13960	13986	pkg_cv_SPICE_CONTROLLER_CFLAGS=`$PKG_CONFIG --cflags "spice-controller" 2>/dev/null`
	13987	test "x$?" != "x0" && pkg_failed=yes
13961	13988	else
13962	13989	pkg_failed=yes
13963	13990	fi

13974	14001	$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
13975	14002	test $ac_status = 0; }; then
13976	14003	pkg_cv_SPICE_CONTROLLER_LIBS=`$PKG_CONFIG --libs "spice-controller" 2>/dev/null`
	14004	test "x$?" != "x0" && pkg_failed=yes
13977	14005	else
13978	14006	pkg_failed=yes
13979	14007	fi

13993	14021	_pkg_short_errors_supported=no
13994	14022	fi
13995	14023	if test $_pkg_short_errors_supported = yes; then
13996		SPICE_CONTROLLER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "spice-controller" 2>&1`
	14024	SPICE_CONTROLLER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "spice-controller" 2>&1`
13997	14025	else
13998		SPICE_CONTROLLER_PKG_ERRORS=`$PKG_CONFIG --print-errors "spice-controller" 2>&1`
	14026	SPICE_CONTROLLER_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "spice-controller" 2>&1`
13999	14027	fi
14000	14028	# Put the nasty error message in config.log where it belongs
14001	14029	echo "$SPICE_CONTROLLER_PKG_ERRORS" >&5

14010	14038	Alternatively, you may set the environment variables SPICE_CONTROLLER_CFLAGS
14011	14039	and SPICE_CONTROLLER_LIBS to avoid the need to call pkg-config.
14012	14040	See the pkg-config man page for more details." "$LINENO" 5
14013
14014	14041	elif test $pkg_failed = untried; then
14015	14042	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14016	14043	$as_echo "no" >&6; }

14026	14053
14027	14054	To get pkg-config, see <http://pkg-config.freedesktop.org/>.
14028	14055	See \`config.log' for more details" "$LINENO" 5; }
14029
14030	14056	else
14031	14057	SPICE_CONTROLLER_CFLAGS=$pkg_cv_SPICE_CONTROLLER_CFLAGS
14032	14058	SPICE_CONTROLLER_LIBS=$pkg_cv_SPICE_CONTROLLER_LIBS

14049	14075	$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
14050	14076	test $ac_status = 0; }; then
14051	14077	pkg_cv_SPICE_PROTOCOL_CFLAGS=`$PKG_CONFIG --cflags "spice-protocol >= $SPICE_PROTOCOL_REQUIRED" 2>/dev/null`
	14078	test "x$?" != "x0" && pkg_failed=yes
14052	14079	else
14053	14080	pkg_failed=yes
14054	14081	fi

14065	14092	$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
14066	14093	test $ac_status = 0; }; then
14067	14094	pkg_cv_SPICE_PROTOCOL_LIBS=`$PKG_CONFIG --libs "spice-protocol >= $SPICE_PROTOCOL_REQUIRED" 2>/dev/null`
	14095	test "x$?" != "x0" && pkg_failed=yes
14068	14096	else
14069	14097	pkg_failed=yes
14070	14098	fi

14084	14112	_pkg_short_errors_supported=no
14085	14113	fi
14086	14114	if test $_pkg_short_errors_supported = yes; then
14087		SPICE_PROTOCOL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "spice-protocol >= $SPICE_PROTOCOL_REQUIRED" 2>&1`
	14115	SPICE_PROTOCOL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "spice-protocol >= $SPICE_PROTOCOL_REQUIRED" 2>&1`
14088	14116	else
14089		SPICE_PROTOCOL_PKG_ERRORS=`$PKG_CONFIG --print-errors "spice-protocol >= $SPICE_PROTOCOL_REQUIRED" 2>&1`
	14117	SPICE_PROTOCOL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "spice-protocol >= $SPICE_PROTOCOL_REQUIRED" 2>&1`
14090	14118	fi
14091	14119	# Put the nasty error message in config.log where it belongs
14092	14120	echo "$SPICE_PROTOCOL_PKG_ERRORS" >&5

14101	14129	Alternatively, you may set the environment variables SPICE_PROTOCOL_CFLAGS
14102	14130	and SPICE_PROTOCOL_LIBS to avoid the need to call pkg-config.
14103	14131	See the pkg-config man page for more details." "$LINENO" 5
14104
14105	14132	elif test $pkg_failed = untried; then
14106	14133	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14107	14134	$as_echo "no" >&6; }

14117	14144
14118	14145	To get pkg-config, see <http://pkg-config.freedesktop.org/>.
14119	14146	See \`config.log' for more details" "$LINENO" 5; }
14120
14121	14147	else
14122	14148	SPICE_PROTOCOL_CFLAGS=$pkg_cv_SPICE_PROTOCOL_CFLAGS
14123	14149	SPICE_PROTOCOL_LIBS=$pkg_cv_SPICE_PROTOCOL_LIBS

14196	14222	$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
14197	14223	test $ac_status = 0; }; then
14198	14224	pkg_cv_NSPR_CFLAGS=`$PKG_CONFIG --cflags "nspr >= $NSPR_REQUIRED" 2>/dev/null`
	14225	test "x$?" != "x0" && pkg_failed=yes
14199	14226	else
14200	14227	pkg_failed=yes
14201	14228	fi

14212	14239	$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
14213	14240	test $ac_status = 0; }; then
14214	14241	pkg_cv_NSPR_LIBS=`$PKG_CONFIG --libs "nspr >= $NSPR_REQUIRED" 2>/dev/null`
	14242	test "x$?" != "x0" && pkg_failed=yes
14215	14243	else
14216	14244	pkg_failed=yes
14217	14245	fi

14231	14259	_pkg_short_errors_supported=no
14232	14260	fi
14233	14261	if test $_pkg_short_errors_supported = yes; then
14234		NSPR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "nspr >= $NSPR_REQUIRED" 2>&1`
	14262	NSPR_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "nspr >= $NSPR_REQUIRED" 2>&1`
14235	14263	else
14236		NSPR_PKG_ERRORS=`$PKG_CONFIG --print-errors "nspr >= $NSPR_REQUIRED" 2>&1`
	14264	NSPR_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "nspr >= $NSPR_REQUIRED" 2>&1`
14237	14265	fi
14238	14266	# Put the nasty error message in config.log where it belongs
14239	14267	echo "$NSPR_PKG_ERRORS" >&5

14248	14276	Alternatively, you may set the environment variables NSPR_CFLAGS
14249	14277	and NSPR_LIBS to avoid the need to call pkg-config.
14250	14278	See the pkg-config man page for more details." "$LINENO" 5
14251
14252	14279	elif test $pkg_failed = untried; then
14253	14280	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14254	14281	$as_echo "no" >&6; }

14264	14291
14265	14292	To get pkg-config, see <http://pkg-config.freedesktop.org/>.
14266	14293	See \`config.log' for more details" "$LINENO" 5; }
14267
14268	14294	else
14269	14295	NSPR_CFLAGS=$pkg_cv_NSPR_CFLAGS
14270	14296	NSPR_LIBS=$pkg_cv_NSPR_LIBS

14287	14313	$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
14288	14314	test $ac_status = 0; }; then
14289	14315	pkg_cv_FIREFOX_PLUGIN_CFLAGS=`$PKG_CONFIG --cflags "firefox-plugin >= $FIREFOX_PLUGIN_REQUIRED" 2>/dev/null`
	14316	test "x$?" != "x0" && pkg_failed=yes
14290	14317	else
14291	14318	pkg_failed=yes
14292	14319	fi

14303	14330	$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
14304	14331	test $ac_status = 0; }; then
14305	14332	pkg_cv_FIREFOX_PLUGIN_LIBS=`$PKG_CONFIG --libs "firefox-plugin >= $FIREFOX_PLUGIN_REQUIRED" 2>/dev/null`
	14333	test "x$?" != "x0" && pkg_failed=yes
14306	14334	else
14307	14335	pkg_failed=yes
14308	14336	fi

14322	14350	_pkg_short_errors_supported=no
14323	14351	fi
14324	14352	if test $_pkg_short_errors_supported = yes; then
14325		FIREFOX_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "firefox-plugin >= $FIREFOX_PLUGIN_REQUIRED" 2>&1`
	14353	FIREFOX_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "firefox-plugin >= $FIREFOX_PLUGIN_REQUIRED" 2>&1`
14326	14354	else
14327		FIREFOX_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --print-errors "firefox-plugin >= $FIREFOX_PLUGIN_REQUIRED" 2>&1`
	14355	FIREFOX_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "firefox-plugin >= $FIREFOX_PLUGIN_REQUIRED" 2>&1`
14328	14356	fi
14329	14357	# Put the nasty error message in config.log where it belongs
14330	14358	echo "$FIREFOX_PLUGIN_PKG_ERRORS" >&5

14345	14373	$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
14346	14374	test $ac_status = 0; }; then
14347	14375	pkg_cv_MOZILLA_PLUGIN_CFLAGS=`$PKG_CONFIG --cflags "mozilla-plugin >= $MOZILLA_PLUGIN_REQUIRED" 2>/dev/null`
	14376	test "x$?" != "x0" && pkg_failed=yes
14348	14377	else
14349	14378	pkg_failed=yes
14350	14379	fi

14361	14390	$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
14362	14391	test $ac_status = 0; }; then
14363	14392	pkg_cv_MOZILLA_PLUGIN_LIBS=`$PKG_CONFIG --libs "mozilla-plugin >= $MOZILLA_PLUGIN_REQUIRED" 2>/dev/null`
	14393	test "x$?" != "x0" && pkg_failed=yes
14364	14394	else
14365	14395	pkg_failed=yes
14366	14396	fi

14380	14410	_pkg_short_errors_supported=no
14381	14411	fi
14382	14412	if test $_pkg_short_errors_supported = yes; then
14383		MOZILLA_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "mozilla-plugin >= $MOZILLA_PLUGIN_REQUIRED" 2>&1`
	14413	MOZILLA_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "mozilla-plugin >= $MOZILLA_PLUGIN_REQUIRED" 2>&1`
14384	14414	else
14385		MOZILLA_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --print-errors "mozilla-plugin >= $MOZILLA_PLUGIN_REQUIRED" 2>&1`
	14415	MOZILLA_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "mozilla-plugin >= $MOZILLA_PLUGIN_REQUIRED" 2>&1`
14386	14416	fi
14387	14417	# Put the nasty error message in config.log where it belongs
14388	14418	echo "$MOZILLA_PLUGIN_PKG_ERRORS" >&5

14397	14427	Alternatively, you may set the environment variables MOZILLA_PLUGIN_CFLAGS
14398	14428	and MOZILLA_PLUGIN_LIBS to avoid the need to call pkg-config.
14399	14429	See the pkg-config man page for more details." "$LINENO" 5
14400
14401	14430	elif test $pkg_failed = untried; then
14402	14431	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14403	14432	$as_echo "no" >&6; }

14413	14442
14414	14443	To get pkg-config, see <http://pkg-config.freedesktop.org/>.
14415	14444	See \`config.log' for more details" "$LINENO" 5; }
14416
14417	14445	else
14418	14446	MOZILLA_PLUGIN_CFLAGS=$pkg_cv_MOZILLA_PLUGIN_CFLAGS
14419	14447	MOZILLA_PLUGIN_LIBS=$pkg_cv_MOZILLA_PLUGIN_LIBS

14443	14471	$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
14444	14472	test $ac_status = 0; }; then
14445	14473	pkg_cv_MOZILLA_PLUGIN_CFLAGS=`$PKG_CONFIG --cflags "mozilla-plugin >= $MOZILLA_PLUGIN_REQUIRED" 2>/dev/null`
	14474	test "x$?" != "x0" && pkg_failed=yes
14446	14475	else
14447	14476	pkg_failed=yes
14448	14477	fi

14459	14488	$as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
14460	14489	test $ac_status = 0; }; then
14461	14490	pkg_cv_MOZILLA_PLUGIN_LIBS=`$PKG_CONFIG --libs "mozilla-plugin >= $MOZILLA_PLUGIN_REQUIRED" 2>/dev/null`
	14491	test "x$?" != "x0" && pkg_failed=yes
14462	14492	else
14463	14493	pkg_failed=yes
14464	14494	fi

14478	14508	_pkg_short_errors_supported=no
14479	14509	fi
14480	14510	if test $_pkg_short_errors_supported = yes; then
14481		MOZILLA_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "mozilla-plugin >= $MOZILLA_PLUGIN_REQUIRED" 2>&1`
	14511	MOZILLA_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "mozilla-plugin >= $MOZILLA_PLUGIN_REQUIRED" 2>&1`
14482	14512	else
14483		MOZILLA_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --print-errors "mozilla-plugin >= $MOZILLA_PLUGIN_REQUIRED" 2>&1`
	14513	MOZILLA_PLUGIN_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "mozilla-plugin >= $MOZILLA_PLUGIN_REQUIRED" 2>&1`
14484	14514	fi
14485	14515	# Put the nasty error message in config.log where it belongs
14486	14516	echo "$MOZILLA_PLUGIN_PKG_ERRORS" >&5

14495	14525	Alternatively, you may set the environment variables MOZILLA_PLUGIN_CFLAGS
14496	14526	and MOZILLA_PLUGIN_LIBS to avoid the need to call pkg-config.
14497	14527	See the pkg-config man page for more details." "$LINENO" 5
14498
14499	14528	elif test $pkg_failed = untried; then
14500	14529	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
14501	14530	$as_echo "no" >&6; }

14511	14540
14512	14541	To get pkg-config, see <http://pkg-config.freedesktop.org/>.
14513	14542	See \`config.log' for more details" "$LINENO" 5; }
14514
14515	14543	else
14516	14544	MOZILLA_PLUGIN_CFLAGS=$pkg_cv_MOZILLA_PLUGIN_CFLAGS
14517	14545	MOZILLA_PLUGIN_LIBS=$pkg_cv_MOZILLA_PLUGIN_LIBS

14541	14569	fi
14542	14570
14543	14571
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"
	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"
14545	14589
14546	14590	cat >confcache <<\_ACEOF
14547	14591	# This file is a shell script that caches the results of configure

15006	15050	# ... but there are two gotchas:
15007	15051	# 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
15008	15052	# 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
15009		# In both cases, we have to default to `cp -p'.
	15053	# In both cases, we have to default to `cp -pR'.
15010	15054	ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe \|\|
15011		as_ln_s='cp -p'
	15055	as_ln_s='cp -pR'
15012	15056	elif ln conf$$.file conf$$ 2>/dev/null; then
15013	15057	as_ln_s=ln
15014	15058	else
15015		as_ln_s='cp -p'
	15059	as_ln_s='cp -pR'
15016	15060	fi
15017	15061	else
15018		as_ln_s='cp -p'
	15062	as_ln_s='cp -pR'
15019	15063	fi
15020	15064	rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
15021	15065	rmdir conf$$.dir 2>/dev/null

15075	15119	as_mkdir_p=false
15076	15120	fi
15077	15121
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
	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
15100	15132
15101	15133	# Sed expression to map a string onto a valid CPP name.
15102	15134	as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"

15117	15149	# report actual input values of CONFIG_FILES etc. instead of their
15118	15150	# values after options handling.
15119	15151	ac_log="
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
	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
15122	15154
15123	15155	CONFIG_FILES = $CONFIG_FILES
15124	15156	CONFIG_HEADERS = $CONFIG_HEADERS

15187	15219	cat >>$CONFIG_STATUS <<_ACEOF \|\| ac_write_fail=1
15188	15220	ac_cs_config="`$as_echo "$ac_configure_args" \| sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
15189	15221	ac_cs_version="\\
15190		virt-viewer config.status 0.5.4
15191		configured by $0, generated by GNU Autoconf 2.68,
	15222	virt-viewer config.status 0.5.5
	15223	configured by $0, generated by GNU Autoconf 2.69,
15192	15224	with options \\"\$ac_cs_config\\"
15193	15225
15194		Copyright (C) 2010 Free Software Foundation, Inc.
	15226	Copyright (C) 2012 Free Software Foundation, Inc.
15195	15227	This config.status script is free software; the Free Software Foundation
15196	15228	gives unlimited permission to copy, distribute and modify it."
15197	15229

15282	15314	_ACEOF
15283	15315	cat >>$CONFIG_STATUS <<_ACEOF \|\| ac_write_fail=1
15284	15316	if \$ac_cs_recheck; then
15285		set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
	15317	set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
15286	15318	shift
15287	15319	\$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
15288	15320	CONFIG_SHELL='$SHELL'

15602	15634	"default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
15603	15635	"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
15604	15636	"data/Makefile") CONFIG_FILES="$CONFIG_FILES data/Makefile" ;;
	15637	"data/virt-viewer.wxs") CONFIG_FILES="$CONFIG_FILES data/virt-viewer.wxs" ;;
15605	15638	"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" ;;
15606	15640	"icons/Makefile") CONFIG_FILES="$CONFIG_FILES icons/Makefile" ;;
15607	15641	"icons/16x16/Makefile") CONFIG_FILES="$CONFIG_FILES icons/16x16/Makefile" ;;
15608	15642	"icons/22x22/Makefile") CONFIG_FILES="$CONFIG_FILES icons/22x22/Makefile" ;;

+18

-7

configure.ac less more

0	0
1		AC_INIT(virt-viewer, 0.5.4)
	1	AC_INIT([virt-viewer],[0.5.5])
2	2	AC_CONFIG_SRCDIR(src/virt-viewer-main.c)
3	3	AC_CONFIG_MACRO_DIR([m4])
4	4	AC_CONFIG_AUX_DIR([build-aux])
5		AM_CONFIG_HEADER(config.h)
	5	AC_CONFIG_HEADERS([config.h])
6	6	dnl Make automake keep quiet about wildcards & other GNUmake-isms
7	7	AM_INIT_AUTOMAKE([-Wno-portability])
8	8	AC_CANONICAL_HOST

13	13
14	14	GLIB2_REQUIRED=2.22.0
15	15	LIBXML2_REQUIRED="2.6.0"
16		LIBVIRT_REQUIRED="0.9.7"
	16	LIBVIRT_REQUIRED="0.10.0"
17	17	GTK2_REQUIRED="2.18.0"
18	18	GTK3_REQUIRED="3.0"
19	19	GTK_VNC1_REQUIRED="0.3.8"
20	20	GTK_VNC2_REQUIRED="0.4.0"
21		SPICE_GTK_REQUIRED="0.12.101"
	21	SPICE_GTK_REQUIRED="0.16.26"
22	22	SPICE_PROTOCOL_REQUIRED="0.10.1"
23	23
24	24	AC_MSG_CHECKING([for native Win32])

35	35
36	36	AC_PROG_CC
37	37	AM_PROG_CC_C_O
38		AC_PROG_LIBTOOL
	38	LT_INIT
39	39
40	40	AC_CHECK_PROGS(ICOTOOL, [icotool], [icotool])
41	41

83	83
84	84	AS_IF([test "x$with_libvirt" != "xno"],
85	85	[PKG_CHECK_MODULES(LIBVIRT,
86		[libvirt],
	86	[libvirt >= $LIBVIRT_REQUIRED],
87	87	[have_libvirt=yes], [have_libvirt=no])],
88	88	[have_libvirt=no])
89	89

191	191	fi
192	192	AM_CONDITIONAL(ENABLE_PLUGIN, [test "x$enable_plugin" = "xyes"])
193	193
194		AC_OUTPUT([
	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([
195	203	Makefile
196	204	data/Makefile
	205	data/virt-viewer.wxs
197	206	data/virt-viewer.nsis
	207	data/virt-viewer-debug.nsis
198	208	icons/Makefile
199	209	icons/16x16/Makefile
200	210	icons/22x22/Makefile

210	220	src/virt-viewer.rc
211	221	virt-viewer.spec
212	222	])
	223	AC_OUTPUT
213	224
214	225	AC_MSG_NOTICE([])
215	226	AC_MSG_NOTICE([Configuration summary])

+49

-1

data/Makefile.am less more

0		NULL=
	0	NULL =
	1	CLEANFILES =
1	2
2	3	EXTRA_DIST = \
3	4	spice-xpi-client-remote-viewer \
	5	virt-viewer.wxs.in \
4	6	virt-viewer.nsis.in \
	7	virt-viewer-debug.nsis.in \
5	8	$(NULL)
6	9
	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
7	55	-include $(top_srcdir)/git.mk

+137

-18

data/Makefile.in less more

12	12	# PARTICULAR PURPOSE.
13	13
14	14	@SET_MAKE@
	15
15	16	VPATH = @srcdir@
16	17	am__make_dryrun = \
17	18	{ \

48	49	POST_UNINSTALL = :
49	50	build_triplet = @build@
50	51	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)
51	60	subdir = data
52	61	DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
53		$(srcdir)/virt-viewer.nsis.in
	62	$(srcdir)/virt-viewer-debug.nsis.in \
	63	$(srcdir)/virt-viewer.nsis.in $(srcdir)/virt-viewer.wxs.in
54	64	ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
55	65	am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
56	66	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \

61	71	$(ACLOCAL_M4)
62	72	mkinstalldirs = $(install_sh) -d
63	73	CONFIG_HEADER = $(top_builddir)/config.h
64		CONFIG_CLEAN_FILES = virt-viewer.nsis
	74	CONFIG_CLEAN_FILES = virt-viewer.wxs virt-viewer.nsis \
	75	virt-viewer-debug.nsis
65	76	CONFIG_CLEAN_VPATH_FILES =
66	77	AM_V_P = $(am__v_P_@AM_V@)
67	78	am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)

82	93	n\|no\|NO) false;; \
83	94	*) (install-info --version) >/dev/null 2>&1;; \
84	95	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)
85	125	DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
86	126	ACLOCAL = @ACLOCAL@
87	127	ALL_LINGUAS = @ALL_LINGUAS@

259	299	top_builddir = @top_builddir@
260	300	top_srcdir = @top_srcdir@
261	301	NULL =
262		EXTRA_DIST = \
263		spice-xpi-client-remote-viewer \
264		virt-viewer.nsis.in \
265		$(NULL)
266
	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
267	312	all: all-am
268	313
269	314	.SUFFIXES:

297	342	$(ACLOCAL_M4): $(am__aclocal_m4_deps)
298	343	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
299	344	$(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)/$@
300	347	virt-viewer.nsis: $(top_builddir)/config.status $(srcdir)/virt-viewer.nsis.in
301	348	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)/$@
302	351
303	352	mostlyclean-libtool:
304	353	-rm -f *.lo
305	354
306	355	clean-libtool:
307	356	-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)
308	399	tags: TAGS
309	400	TAGS:
310	401

346	437	done
347	438	check-am: all-am
348	439	check: check-am
349		all-am: Makefile
	440	all-am: Makefile $(DATA)
350	441	installdirs:
	442	for dir in "$(DESTDIR)$(desktopdir)" "$(DESTDIR)$(mimedir)"; do \
	443	test -z "$$dir" \|\| $(MKDIR_P) "$$dir"; \
	444	done
351	445	install: install-am
352	446	install-exec: install-exec-am
353	447	install-data: install-data-am

370	464	mostlyclean-generic:
371	465
372	466	clean-generic:
	467	-test -z "$(CLEANFILES)" \|\| rm -f $(CLEANFILES)
373	468
374	469	distclean-generic:
375	470	-test -z "$(CONFIG_CLEAN_FILES)" \|\| rm -f $(CONFIG_CLEAN_FILES)

398	493
399	494	info-am:
400	495
401		install-data-am:
	496	install-data-am: install-desktopDATA install-mimeDATA
402	497
403	498	install-dvi: install-dvi-am
404	499

442	537
443	538	ps-am:
444	539
445		uninstall-am:
	540	uninstall-am: uninstall-desktopDATA uninstall-mimeDATA
446	541
447	542	.MAKE: install-am install-strip
448	543
449	544	.PHONY: all all-am check check-am clean clean-generic clean-libtool \
450	545	distclean distclean-generic distclean-libtool distdir dvi \
451	546	dvi-am html html-am info info-am install install-am \
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
	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@
460	579
461	580	-include $(top_srcdir)/git.mk
462	581

-0

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;

+49

-0

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

+11

-0

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>

+52

-17

data/virt-viewer.nsis.in less more

44	44	WriteRegDWord HKCU "${REG_IEPOLICY}" "Policy" 3
45	45	FunctionEnd
46	46
	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
47	59	Section "VirtViewer"
48	60	SectionIn RO
49	61	WriteRegStr HKCU "Software\virt-viewer" "" $INSTDIR
	62
	63	SetOutPath "$INSTDIR"
	64	File "deps.txt"
50	65
51	66	SetOutPath "$INSTDIR\bin"
52	67	File "@prefix@/bin/gst-discoverer-0.10.exe"

65	80	File "@prefix@/bin/libcairo-2.dll"
66	81	File "@prefix@/bin/libcelt051-0.dll"
67	82	File "@prefix@/bin/libcrypto-10.dll"
	83	File "@prefix@/bin/libexpat-1.dll"
68	84	File "@prefix@/bin/libffi-6.dll"
69	85	File "@prefix@/bin/libfontconfig-1.dll"
70	86	File "@prefix@/bin/libfreetype-6.dll"

98	114	File "@prefix@/bin/libpangowin32-1.0-0.dll"
99	115	File "@prefix@/bin/libpixman-1-0.dll"
100	116	File "@prefix@/bin/libpng15-15.dll"
101		File "@prefix@/bin/libspice-client-glib-2.0-1.dll"
102		File "@prefix@/bin/libspice-client-gtk-2.0-1.dll"
	117	File "@prefix@/bin/libspice-client-glib-2.0-8.dll"
	118	File "@prefix@/bin/libspice-client-gtk-2.0-4.dll"
103	119	File "@prefix@/bin/libspice-controller-0.dll"
104	120	File "@prefix@/bin/libssl-10.dll"
105	121	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"
106	125	File "@prefix@/bin/libxml2-2.dll"
107	126	File "@prefix@/bin/libp11-kit-0.dll"
108	127	File "@prefix@/bin/libssh2-1.dll"

127	146	File /oname=remote-viewer.com "${DESTDIR}@prefix@/bin/windows-cmdline-wrapper.exe"
128	147	File "${DESTDIR}@prefix@/bin/remote-viewer.exe"
129	148	File "${DESTDIR}@prefix@/bin/virt-viewer.exe"
	149	File "@prefix@/bin/libreadline6.dll"
130	150	File "@prefix@/bin/zlib1.dll"
131	151
132	152	SetOutPath "$INSTDIR\etc"

211	231	DeleteRegKey HKCU "${REG_UNINSTALL}"
212	232	DeleteRegKey HKCU "${REG_IEPOLICY}"
213	233
	234
	235	RMDir /r "$INSTDIR\share"
	236
214	237	RMDir /r "$INSTDIR\lib\pango"
215
216	238	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
223	239	Delete /rebootok "$INSTDIR\lib\gstreamer-0.10\libgstdirectsoundsrc.dll"
224	240	Delete /rebootok "$INSTDIR\lib\gstreamer-0.10\libgstdirectsoundsink.dll"
225	241	Delete /rebootok "$INSTDIR\lib\gstreamer-0.10\libgstcoreelements.dll"

230	246	Delete /rebootok "$INSTDIR\lib\gstreamer-0.10\libgstaudioconvert.dll"
231	247	Delete /rebootok "$INSTDIR\lib\gstreamer-0.10\libgstapp.dll"
232	248	RMDir "$INSTDIR\lib\gstreamer-0.10"
233
234	249	RMDir /r "$INSTDIR\lib\gdk-pixbuf-2.0"
235	250
236	251	RMDir /r "$INSTDIR\etc\pango"
237
238	252	RMDir /r "$INSTDIR\etc\gtk-2.0"
239
240	253	RMDir /r "$INSTDIR\etc\fonts"
241	254
242	255	Delete /rebootok "$INSTDIR\bin\remote-viewer.com"
243	256	Delete /rebootok "$INSTDIR\bin\remote-viewer.exe"
	257	Delete /rebootok "$INSTDIR\bin\virt-viewer.exe"
	258	Delete /rebootok "$INSTDIR\bin\virsh.exe"
244	259	Delete /rebootok "$INSTDIR\bin\pango-querymodules.exe"
	260	Delete /rebootok "$INSTDIR\bin\virt-pki-validate"
	261	Delete /rebootok "$INSTDIR\bin\virt-xml-validate"
245	262	Delete /rebootok "$INSTDIR\bin\libpangoft2-1.0-0.dll"
246	263	Delete /rebootok "$INSTDIR\bin\libgdk_pixbuf-2.0-0.dll"
247	264	Delete /rebootok "$INSTDIR\bin\libgdk-win32-2.0-0.dll"

257	274	Delete /rebootok "$INSTDIR\bin\gst-inspect-0.10.exe"
258	275	Delete /rebootok "$INSTDIR\bin\gst-feedback.exe"
259	276	Delete /rebootok "$INSTDIR\bin\gst-discoverer-0.10.exe"
260		RMDir "$INSTDIR\bin"
261
	277	Delete /rebootok "$INSTDIR\bin\zlib1.dll"
	278	Delete /rebootok "$INSTDIR\bin\libreadline6.dll"
262	279	Delete /rebootok "$INSTDIR\bin\libffi-6.dll"
263		Delete /rebootok "$INSTDIR\bin\zlib1.dll"
264	280	Delete /rebootok "$INSTDIR\bin\libp11-kit-0.dll"
265	281	Delete /rebootok "$INSTDIR\bin\libxml2-2.dll"
266	282	Delete /rebootok "$INSTDIR\bin\libtasn1-3.dll"
267	283	Delete /rebootok "$INSTDIR\bin\libssl-10.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"
	284	Delete /rebootok "$INSTDIR\bin\libspice-client-gtk-2.0-4.dll"
	285	Delete /rebootok "$INSTDIR\bin\libspice-client-glib-2.0-8.dll"
270	286	Delete /rebootok "$INSTDIR\bin\libspice-controller-0.dll"
271	287	Delete /rebootok "$INSTDIR\bin\libpng15-15.dll"
272	288	Delete /rebootok "$INSTDIR\bin\libpixman-1-0.dll"

277	293	Delete /rebootok "$INSTDIR\bin\liborc-0.4-0.dll"
278	294	Delete /rebootok "$INSTDIR\bin\libjpeg-62.dll"
279	295	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"
280	309	Delete /rebootok "$INSTDIR\bin\iconv.dll"
281	310	Delete /rebootok "$INSTDIR\bin\libgtk-win32-2.0-0.dll"
282	311	Delete /rebootok "$INSTDIR\bin\libgthread-2.0-0.dll"

290	319	Delete /rebootok "$INSTDIR\bin\libgstaudio-0.10-0.dll"
291	320	Delete /rebootok "$INSTDIR\bin\libgstapp-0.10-0.dll"
292	321	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"
293	324	Delete /rebootok "$INSTDIR\bin\libgmodule-2.0-0.dll"
294	325	Delete /rebootok "$INSTDIR\bin\libglib-2.0-0.dll"
295	326	Delete /rebootok "$INSTDIR\bin\libgio-2.0-0.dll"

297	328	Delete /rebootok "$INSTDIR\bin\libgdk-win32-2.0-0.dll"
298	329	Delete /rebootok "$INSTDIR\bin\libfreetype-6.dll"
299	330	Delete /rebootok "$INSTDIR\bin\libfontconfig-1.dll"
	331	Delete /rebootok "$INSTDIR\bin\libexpat-1.dll"
300	332	Delete /rebootok "$INSTDIR\bin\libcrypto-10.dll"
301	333	Delete /rebootok "$INSTDIR\bin\libcelt051-0.dll"
302	334	Delete /rebootok "$INSTDIR\bin\libcairo-2.dll"
303	335	Delete /rebootok "$INSTDIR\bin\libatk-1.0-0.dll"
304	336	RMDir "$INSTDIR\bin"
	337	RMDir "$INSTDIR\lib"
	338
	339	Delete /rebootok "$INSTDIR\deps.txt"
305	340	RMDir "$INSTDIR"
306	341	SectionEnd
307	342

+92

-0

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>

-1

maint.mk less more

1071	1071	.m4\|.mk) continue ;; \
1072	1072	.?\|.??) ;; \
1073	1073	*.xml) ;; \
	1074	*.xml.in) ;; \
	1075	*.desktop.in) ;; \
1074	1076	*) continue;; \
1075	1077	esac; \
1076	1078	case $$file in \

1080	1082	esac; \
1081	1083	files="$$files $$file"; \
1082	1084	done; \
1083		grep -E -l '(\b(N?_\|gettext )\([^)"]("\|$$))\|(<interface>)' $$files \
	1085	grep -E -l '(\b(N?_\|gettext )\([^)"]("\|$$))\|(<interface>)\|^_\|<_' $$files \
1084	1086	\| sed 's\|^$(_dot_escaped_srcdir)/\|\|' \| sort -u > $@-2; \
1085	1087	diff -u -L $(po_file) -L $(po_file) $@-1 $@-2 \
1086	1088	\|\| { printf '$(ME): '$(fix_po_file_diag) 1>&2; exit 1; }; \

+18

-0

man/remote-viewer.pod less more

37	37
38	38	Start with the window maximised to fullscreen
39	39
	40	=item -t TITLE, --title TITLE
	41
	42	Set the window title to B<TITLE>
	43
40	44	=item --spice-controller
41	45
42	46	Use the SPICE controller to initialize the connection with the SPICE

46	50	=item --debug
47	51
48	52	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.
49	67
50	68	=back
51	69

+14

-0

man/virt-viewer.pod less more

71	71
72	72	Print debugging information
73	73
	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
74	88	<