Commit upstream/0.5.4 - virt-viewer

+262

-0

ChangeLog less more

	0	2012-09-17 Daniel P. Berrange <berrange@redhat.com>
	1
	2	Update for 0.5.4 releae
	3
	4	2012-09-14 Daniel P. Berrange <berrange@redhat.com>
	5
	6	Use a more specific regex to fix enum include paths
	7	Simply doing a search replace on $(srcdir) doesn't work very
	8	well in non-VPATH builds. Use a more specific regex that won't
	9	generate false matches
	10
	11	Look in builddir for icons & strip build dir prefix from enum file includs
	12
	13	Don't include generated icons in tar.gz and clean them up
	14
	15	Convert to use Mingw64 toolchain for Windows biulds
	16
	17	2012-08-13 Christophe Fergeau <cfergeau@redhat.com>
	18
	19	Document -f=auto-conf in remote-viewer --help
	20	virt-viewer does not support -f=auto-conf so this does not change the
	21	option there.
	22	Fixes rhbz#718001
	23
	24	2012-08-10 Christophe Fergeau <cfergeau@redhat.com>
	25
	26	Use real binary name in help message
	27	Now that we have 2 distinct binaries, remote-viewer and virt-viewer,
	28	'PACKAGE' can no longer be used in error messages as the name of the
	29	binary. This causes a small inconsistency when running
	30	'remote-viewer --foobar' as the error message would be:
	31	'Unknown option --foobar
	32	Run 'virt-viewer --help' to see a full list of available command line options'
	33
	34	This commit makes sure we use argv[0] for this message.
	35	Fixes rhbz#814150
	36
	37	2012-07-23 Marc-André Lureau <marcandre.lureau@gmail.com>
	38
	39	Show status page by default if display not ready
	40	Switch back to status page if display is not ready.
	41
	42	Make status widget visible immediately
	43	GtkNotebook will use the currently visible widget as default page.
	44	If we don't show status widget before we append the display, the
	45	current page will be on display. Quoting Gtk+ documentation:
	46
	47	"Note that due to historical reasons, GtkNotebook refuses to switch to
	48	a page unless the child widget is visible. Therefore, it is
	49	recommended to show child widgets before adding them to a notebook."
	50
	51	vnc: when session is disconnected, make the display as non-ready
	52
	53	Simplify display flag handling
	54
	55	Add VirtViewerSession::session-display-updated
	56	Rebuild menu when agent is connected. Only when the agent is running
	57	may a display be enabled/disabled.
	58
	59	Make the display submenu insensitive if display can't be selected
	60
	61	spice: factor out main channel lookup code
	62
	63	Add VirtViewerDisplay::selectable property
	64	This property will be set when the display can be selected to be
	65	"enabled" and shown (this can involve creating/connecting an
	66	additional guest monitor, and may need guest agent cooperation for
	67	example).
	68
	69	Add virt_viewer_window_get_display()
	70	Getter used in following changes.
	71
	72	Hook up handling of Monitors
	73	Rely on spice-gtk display channel monitors property to manage
	74	displays. The same display channel may now provide several monitors,
	75	the SpiceDisplay widget must be told which monitor to display
	76
	77	Bump glib > 2.22, add compat file
	78	We use API from 2.22, and some from further version. Add
	79	virt-glib-compat.h fallback file for those.
	80
	81	Use SpiceDisplay:ready property instead of channel mark
	82	The display can now check several conditions before the display can be
	83	shown, use that instead of display mark, which was not high-level
	84	enough.
	85
	86	Number display starting from 1
	87
	88	Prevent from adding the same display several time in the session
	89	In virt_viewer_session_spice_display_monitors(), we (re)add the
	90	display unconditionnaly every time we receive a new MonitorConfig.
	91
	92	Add a DISABLED display hint
	93	This flag will help to track whether the display has been
	94	removed/closed and whether it really has a valid display.
	95
	96	Ready in contrast, is used to "hide" temporarily the display (when
	97	starting or redrawing the display, to avoid artifacts)
	98
	99	Use virt_viewer_connect_object() for display
	100	When display is released, detach signal automatically.
	101
	102	Fix various crash related to not cleaning up signal handlers properly,
	103	due to no longer 1-1 only relation between display widget and channel.
	104
	105	Rebuild display menu when a window is added or removed
	106
	107	Mark a menu string as translatable
	108
	109	Run-time check values before doing bad computation
	110
	111	Turn display:show-hint into flags type
	112
	113	Destroy dialog immediately after run
	114	If the parent is already destroyed, it looks like the dialog is
	115	destroyed too. This avoids a crash when calling app_quit().
	116
	117	build: generate enums type boilerplate
	118
	119	spice: disconnect signal handlers when either object is destroyed
	120	Use virt_viewer_signal_connect_object(), a copy of telepathy
	121	utility function tp_g_signal_connect_object(). This function
	122	will take care of removing signal handler if any of emitter or
	123	attached object are destroyed.
	124
	125	The following patches will have this condition met, since there is no
	126	longer 1-1 relation between channel and display. The channels can
	127	continue to be around when some of the display are removed.
	128
	129	spice: improve fullscreen=auto-conf
	130	Do keep client monitor position, do not align monitors automatically.
	131	The align property is only available since v0.12.101.
	132
	133	2012-07-03 Marc-André Lureau <marcandre.lureau@gmail.com>
	134
	135	build: allow building with newer glibc-headers and -O0
	136	Fix copied from libvirt, commit by Eric Blake.
	137
	138	glibc 2.15 (on Fedora 17) coupled with explicit disabling of
	139	optimization during development dies a painful death:
	140
	141	/usr/include/features.h:314:4: error: #warning _FORTIFY_SOURCE requires compiling with optimization (-O) [-Werror=cpp]
	142
	143	Work around this by only conditionally defining _FORTIFY_SOURCE,
	144	in the case where glibc can actually use it. The trick is using
	145	AH_VERBATIM instead of AC_DEFINE.
	146
	147	2012-06-15 Christophe Fergeau <cfergeau@redhat.com>
	148
	149	Revert "Fix virt_viewer_app_activate return value"
	150	This reverts commit 3ce6df7c309068f36e2602692da809a153ed5688. This
	151	commit broke virt-viewer which expects this function to return -1
	152	or 0 on error, and a positive value on success in
	153	virt_viewer_initial_connect.
	154
	155	2012-06-13 Christophe Fergeau <cfergeau@redhat.com>
	156
	157	Fix virt_viewer_app_activate return value
	158	VirtViewerApp::activate is expected to return -1 on errors.
	159	It calls the VirtViewerSession::open_* methods, which return FALSE
	160	on error. However, VirtViewerApp::activate directly returns these
	161	boolean instead of testing the returned value and properly returning
	162	-1 on errors. This caused errors in these open methodes to be ignored.
	163
	164	Fix various memory leaks
	165	==25063== 59 bytes in 1 blocks are definitely lost in loss record 5,163 of 9,502
	166	==25063== at 0x4A0884D: malloc (vg_replace_malloc.c:263)
	167	==25063== by 0x3DE384D2BE: g_malloc (gmem.c:159)
	168	==25063== by 0x3DE3862D0B: g_strdup (gstrfuncs.c:356)
	169	==25063== by 0x41F40A: connected (remote-viewer-main.c:186)
	170	==25063== by 0x3DE400F663: g_closure_invoke (gclosure.c:777)
	171	==25063== by 0x3DE40206D7: signal_emit_unlocked_R (gsignal.c:3547)
	172	==25063== by 0x3DE402866C: g_signal_emit_valist (gsignal.c:3296)
	173	==25063== by 0x3DE4028CCF: g_signal_emit_by_name (gsignal.c:3389)
	174	==25063== by 0x41AA53: reemit_signal_VOID (virt-viewer-session-ovirt.c:211)
	175	==25063== by 0x3DE400F942: _g_closure_invoke_va (gclosure.c:840)
	176	==25063== by 0x3DE4027D87: g_signal_emit_valist (gsignal.c:3207)
	177	==25063== by 0x3DE4028CCF: g_signal_emit_by_name (gsignal.c:3389)
	178
	179	==25063== 14 bytes in 1 blocks are definitely lost in loss record 623 of 9,502
	180	==25063== at 0x4A0884D: malloc (vg_replace_malloc.c:263)
	181	==25063== by 0x34561092F7: __vasprintf_chk (vasprintf_chk.c:82)
	182	==25063== by 0x3DE3882F1A: g_vasprintf (stdio2.h:199)
	183	==25063== by 0x3DE3862EDC: g_strdup_vprintf (gstrfuncs.c:509)
	184	==25063== by 0x3DE3862F7B: g_strdup_printf (gstrfuncs.c:535)
	185	==25063== by 0x40CBAE: virt_viewer_app_update_pretty_address (virt-viewer-app.c:1538)
	186	==25063== by 0x40FB55: virt_viewer_app_free_connect_info (virt-viewer-app.c:1707)
	187	==25063== by 0x40FBE9: virt_viewer_app_dispose (virt-viewer-app.c:1291)
	188	==25063== by 0x3DE40144F7: g_object_unref (gobject.c:2981)
	189	==25063== by 0x40C31A: main (remote-viewer-main.c:336)
	190
	191	==25063== 10 bytes in 1 blocks are definitely lost in loss record 491 of 9,502
	192	==25063== at 0x4A0884D: malloc (vg_replace_malloc.c:263)
	193	==25063== by 0x34561092F7: __vasprintf_chk (vasprintf_chk.c:82)
	194	==25063== by 0x3DE3882F1A: g_vasprintf (stdio2.h:199)
	195	==25063== by 0x3DE3862EDC: g_strdup_vprintf (gstrfuncs.c:509)
	196	==25063== by 0x3DE3862F7B: g_strdup_printf (gstrfuncs.c:535)
	197	==25063== by 0x40DE36: window_update_menu_displays_cb (virt-viewer-app.c:1640)
	198	==25063== by 0x3DE383833F: g_hash_table_foreach (ghash.c:1524)
	199	==25063== by 0x3DE400F663: g_closure_invoke (gclosure.c:777)
	200	==25063== by 0x3DE40206D7: signal_emit_unlocked_R (gsignal.c:3547)
	201	==25063== by 0x3DE402866C: g_signal_emit_valist (gsignal.c:3296)
	202	==25063== by 0x3DE40287C1: g_signal_emit (gsignal.c:3352)
	203	==25063== by 0x5772F95: gtk_widget_show (gtkwidget.c:3225)
	204
	205	==25063== 8,431 (72 direct, 8,359 indirect) bytes in 1 blocks are definitely lost in loss record 9,468 of 9,502
	206	==25063== at 0x4A0884D: malloc (vg_replace_malloc.c:263)
	207	==25063== by 0x3DE384D2BE: g_malloc (gmem.c:159)
	208	==25063== by 0x3DE38616B1: g_slice_alloc (gslice.c:1003)
	209	==25063== by 0x3DE3861C05: g_slice_alloc0 (gslice.c:1029)
	210	==25063== by 0x3DE402F96F: g_type_create_instance (gtype.c:1872)
	211	==25063== by 0x3DE40147A7: g_object_constructor (gobject.c:1849)
	212	==25063== by 0x3DE4016260: g_object_newv (gobject.c:1632)
	213	==25063== by 0x3DE40168AB: g_object_new (gobject.c:1542)
	214	==25063== by 0x40C4BD: virt_viewer_util_load_ui (virt-viewer-util.c:41)
	215	==25063== by 0x40C7EB: virt_viewer_auth_collect_credentials (virt-viewer-auth.c:43)
	216	==25063== by 0x41B391: authenticate_cb (virt-viewer-session-ovirt.c:430)
	217	==25063== by 0x3458C05E8F: ffi_call_unix64 (unix64.S:75)
	218
	219	==25063== 32 (16 direct, 16 indirect) bytes in 1 blocks are definitely lost in loss record 3,962 of 9,502
	220	==25063== at 0x4A0884D: malloc (vg_replace_malloc.c:263)
	221	==25063== by 0x3DE384D2BE: g_malloc (gmem.c:159)
	222	==25063== by 0x3DE38616B1: g_slice_alloc (gslice.c:1003)
	223	==25063== by 0x3DE38629F2: g_slist_append (gslist.c:222)
	224	==25063== by 0x41483C: virt_viewer_window_init (virt-viewer-window.c:323)
	225	==25063== by 0x3DE402FA05: g_type_create_instance (gtype.c:1892)
	226	==25063== by 0x3DE40147A7: g_object_constructor (gobject.c:1849)
	227	==25063== by 0x3DE4015D70: g_object_newv (gobject.c:1713)
	228	==25063== by 0x3DE401655F: g_object_new_valist (gobject.c:1830)
	229	==25063== by 0x3DE4016893: g_object_new (gobject.c:1545)
	230	==25063== by 0x40DA34: virt_viewer_app_window_new (virt-viewer-app.c:590)
	231	==25063== by 0x40E300: virt_viewer_app_constructor (virt-viewer-app.c:1336)
	232
	233	==30355== 4 bytes in 1 blocks are definitely lost in loss record 53 of 9,267
	234	==30355== at 0x4A0884D: malloc (vg_replace_malloc.c:263)
	235	==30355== by 0x3DE384D2BE: g_malloc (gmem.c:159)
	236	==30355== by 0x3DE3862D0B: g_strdup (gstrfuncs.c:356)
	237	==30355== by 0x3DE40360FC: value_copy_string (gvaluetypes.c:276)
	238	==30355== by 0x3DE40340CA: g_value_transform (gvalue.c:535)
	239	==30355== by 0x3FDAE621DD: gdk_screen_get_setting (gdkevents-x11.c:3022)
	240	==30355== by 0x3FDB3C7415: gtk_settings_get_property (gtksettings.c:1152)
	241	==30355== by 0x3DE4017A74: g_object_get_property (gobject.c:1289)
	242	==30355== by 0x414991: virt_viewer_window_disable_modifiers (virt-viewer-window.c:616)
	243	==30355== by 0x415922: virt_viewer_window_keyboard_grab (virt-viewer-window.c:931)
	244	==30355== by 0x3DE400F942: _g_closure_invoke_va (gclosure.c:840)
	245	==30355== by 0x3DE4027D87: g_signal_emit_valist (gsignal.c:3207)
	246
	247	Don't leak SPICE ticket
	248
	249	2012-05-17 Marc-André Lureau <marcandre.lureau@gmail.com>
	250
	251	spice: use weak references to display channel
	252	Fix switch-host migration with Spice.
	253
	254	spice-gtk doesn't like channels staying around when they should be
	255	destroyed/finalized, ie removed from session.
	256
	257	spice-gtk should probably learned to handle better the case of non
	258	cooperating clients, and be able to dissociate a channel from a
	259	session without waiting for it to be disposed, but for now, the
	260	relation is quite tight.
	261
0	262	2012-05-15 Daniel P. Berrange <berrange@redhat.com>
1	263
2	264	Avoid use of deprecated GTK3 pointer APIs

+5

-5

INSTALL less more

0	0	Installation Instructions
1	1	*************************
2	2
3		Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation,
	3	Copyright (C) 1994-1996, 1999-2002, 2004-2012 Free Software Foundation,
4	4	Inc.
5	5
6	6	Copying and distribution of this file, with or without modification,

308	308	overridden in the site shell script).
309	309
310	310	Unfortunately, this technique does not work for `CONFIG_SHELL' due to
311		an Autoconf bug. Until the bug is fixed you can use this workaround:
312
313		CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
	311	an Autoconf limitation. Until the limitation is lifted, you can use
	312	this workaround:
	313
	314	CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash
314	315
315	316	`configure' Invocation
316	317	======================

366	367
367	368	`configure' also accepts some other, not widely useful, options. Run
368	369	`configure --help' for more details.
369

+110

-80

Makefile.in less more

0		# Makefile.in generated by automake 1.11.3 from Makefile.am.
	0	# Makefile.in generated by automake 1.12.2 from Makefile.am.
1	1	# @configure_input@
2	2
3		# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
4		# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
5		# Foundation, Inc.
	3	# Copyright (C) 1994-2012 Free Software Foundation, Inc.
	4
6	5	# This Makefile.in is free software; the Free Software Foundation
7	6	# gives unlimited permission to copy and/or distribute it,
8	7	# with or without modifications, as long as this notice is preserved.

14	13
15	14	@SET_MAKE@
16	15	VPATH = @srcdir@
	16	am__make_dryrun = \
	17	{ \
	18	am__dry=no; \
	19	case $$MAKEFLAGS in \
	20	\\[\ \ ]) \
	21	echo 'am--echo: ; @echo "AM" OK' \| $(MAKE) -f - 2>/dev/null \
	22	\| grep '^AM OK$$' >/dev/null \|\| am__dry=yes;; \
	23	*) \
	24	for am__flg in $$MAKEFLAGS; do \
	25	case $$am__flg in \
	26	=\|--*) ;; \
	27	n) am__dry=yes; break;; \
	28	esac; \
	29	done;; \
	30	esac; \
	31	test $$am__dry = yes; \
	32	}
17	33	pkgdatadir = $(datadir)/@PACKAGE@
18	34	pkgincludedir = $(includedir)/@PACKAGE@
19	35	pkglibdir = $(libdir)/@PACKAGE@

35	51	subdir = .
36	52	DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
37	53	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
38		$(srcdir)/mingw32-virt-viewer.spec.in \
39		$(srcdir)/virt-viewer.spec.in $(top_srcdir)/configure AUTHORS \
40		COPYING ChangeLog INSTALL NEWS build-aux/compile \
41		build-aux/config.guess build-aux/config.sub build-aux/depcomp \
	54	$(srcdir)/mingw-virt-viewer.spec.in \
	55	$(srcdir)/virt-viewer.spec.in $(top_srcdir)/build-aux/compile \
	56	$(top_srcdir)/build-aux/config.guess \
	57	$(top_srcdir)/build-aux/config.sub \
	58	$(top_srcdir)/build-aux/install-sh \
	59	$(top_srcdir)/build-aux/ltmain.sh \
	60	$(top_srcdir)/build-aux/missing $(top_srcdir)/configure \
	61	AUTHORS COPYING ChangeLog INSTALL NEWS build-aux/compile \
	62	build-aux/config.guess build-aux/config.sub \
42	63	build-aux/install-sh build-aux/ltmain.sh build-aux/missing
43	64	ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
44	65	am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \

52	73	configure.lineno config.status.lineno
53	74	mkinstalldirs = $(install_sh) -d
54	75	CONFIG_HEADER = config.h
55		CONFIG_CLEAN_FILES = mingw32-virt-viewer.spec virt-viewer.spec
	76	CONFIG_CLEAN_FILES = mingw-virt-viewer.spec virt-viewer.spec
56	77	CONFIG_CLEAN_VPATH_FILES =
	78	AM_V_P = $(am__v_P_@AM_V@)
	79	am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
	80	am__v_P_0 = false
	81	am__v_P_1 = :
57	82	AM_V_GEN = $(am__v_GEN_@AM_V@)
58	83	am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
59		am__v_GEN_0 = @echo " GEN " $@;
	84	am__v_GEN_0 = @echo " GEN " $@;
	85	am__v_GEN_1 =
60	86	AM_V_at = $(am__v_at_@AM_V@)
61	87	am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
62	88	am__v_at_0 = @
	89	am__v_at_1 =
63	90	SOURCES =
64	91	DIST_SOURCES =
65	92	RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \

69	96	install-pdf-recursive install-ps-recursive install-recursive \
70	97	installcheck-recursive installdirs-recursive pdf-recursive \
71	98	ps-recursive uninstall-recursive
	99	am__can_run_installinfo = \
	100	case $$AM_UPDATE_INFO_DIR in \
	101	n\|no\|NO) false;; \
	102	*) (install-info --version) >/dev/null 2>&1;; \
	103	esac
72	104	RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
73	105	distclean-recursive maintainer-clean-recursive
74	106	AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
75	107	$(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \
76		distdir dist dist-all distcheck
	108	cscope distdir dist dist-all distcheck
77	109	ETAGS = etags
78	110	CTAGS = ctags
	111	CSCOPE = cscope
79	112	DIST_SUBDIRS = $(SUBDIRS)
80	113	DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
81	114	distdir = $(PACKAGE)-$(VERSION)

86	119	&& rm -rf "$(distdir)" \
87	120	\|\| { sleep 5 && rm -rf "$(distdir)"; }; \
88	121	else :; fi
	122	am__post_remove_distdir = $(am__remove_distdir)
89	123	am__relativize = \
90	124	dir0=`pwd`; \
91	125	sed_first='s,^$[^/]$/.$$,\1,'; \

113	147	reldir="$$dir2"
114	148	DIST_ARCHIVES = $(distdir).tar.gz
115	149	GZIP_ENV = --best
	150	DIST_TARGETS = dist-gzip
116	151	distuninstallcheck_listfiles = find . -type f -print
117	152	am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
118	153	\| sed 's\|^\./\|$(prefix)/\|' \| grep -v '$(infodir)/dir$$'

151	186	GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
152	187	GLIB2_CFLAGS = @GLIB2_CFLAGS@
153	188	GLIB2_LIBS = @GLIB2_LIBS@
	189	GLIB_MKENUMS = @GLIB_MKENUMS@
154	190	GMOFILES = @GMOFILES@
155	191	GMSGFMT = @GMSGFMT@
156	192	GREP = @GREP@

387	423
388	424	distclean-hdr:
389	425	-rm -f config.h stamp-h1
390		mingw32-virt-viewer.spec: $(top_builddir)/config.status $(srcdir)/mingw32-virt-viewer.spec.in
	426	mingw-virt-viewer.spec: $(top_builddir)/config.status $(srcdir)/mingw-virt-viewer.spec.in
391	427	cd $(top_builddir) && $(SHELL) ./config.status $@
392	428	virt-viewer.spec: $(top_builddir)/config.status $(srcdir)/virt-viewer.spec.in
393	429	cd $(top_builddir) && $(SHELL) ./config.status $@

402	438	-rm -f libtool config.lt
403	439
404	440	# This directory's subdirectories are mostly independent; you can cd
405		# into them and run `make' without going through this Makefile.
406		# To change the values of `make' variables: instead of editing Makefiles,
407		# (1) if the variable is set in `config.status', edit `config.status'
408		# (which will cause the Makefiles to be regenerated when you run `make');
409		# (2) otherwise, pass the desired values on the `make' command line.
410		$(RECURSIVE_TARGETS):
	441	# into them and run 'make' without going through this Makefile.
	442	# To change the values of 'make' variables: instead of editing Makefiles,
	443	# (1) if the variable is set in 'config.status', edit 'config.status'
	444	# (which will cause the Makefiles to be regenerated when you run 'make');
	445	# (2) otherwise, pass the desired values on the 'make' command line.
	446	$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS):
411	447	@fail= failcom='exit 1'; \
412	448	for f in x $$MAKEFLAGS; do \
413	449	case $$f in \

417	453	done; \
418	454	dot_seen=no; \
419	455	target=`echo $@ \| sed s/-recursive//`; \
420		list='$(SUBDIRS)'; for subdir in $$list; do \
	456	case "$@" in \
	457	distclean-* \| maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
	458	*) list='$(SUBDIRS)' ;; \
	459	esac; \
	460	for subdir in $$list; do \
421	461	echo "Making $$target in $$subdir"; \
422	462	if test "$$subdir" = "."; then \
423	463	dot_seen=yes; \

431	471	if test "$$dot_seen" = "no"; then \
432	472	$(MAKE) $(AM_MAKEFLAGS) "$$target-am" \|\| exit 1; \
433	473	fi; test -z "$$fail"
434
435		$(RECURSIVE_CLEAN_TARGETS):
436		@fail= failcom='exit 1'; \
437		for f in x $$MAKEFLAGS; do \
438		case $$f in \
439		= \| --[!k]*);; \
440		k) failcom='fail=yes';; \
441		esac; \
442		done; \
443		dot_seen=no; \
444		case "$@" in \
445		distclean-* \| maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
446		*) list='$(SUBDIRS)' ;; \
447		esac; \
448		rev=''; for subdir in $$list; do \
449		if test "$$subdir" = "."; then :; else \
450		rev="$$subdir $$rev"; \
451		fi; \
452		done; \
453		rev="$$rev ."; \
454		target=`echo $@ \| sed s/-recursive//`; \
455		for subdir in $$rev; do \
456		echo "Making $$target in $$subdir"; \
457		if test "$$subdir" = "."; then \
458		local_target="$$target-am"; \
459		else \
460		local_target="$$target"; \
461		fi; \
462		($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
463		\|\| eval $$failcom; \
464		done && test -z "$$fail"
465	474	tags-recursive:
466	475	list='$(SUBDIRS)'; for subdir in $$list; do \
467	476	test "$$subdir" = . \|\| ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \

469	478	ctags-recursive:
470	479	list='$(SUBDIRS)'; for subdir in $$list; do \
471	480	test "$$subdir" = . \|\| ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
	481	done
	482	cscopelist-recursive:
	483	list='$(SUBDIRS)'; for subdir in $$list; do \
	484	test "$$subdir" = . \|\| ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \
472	485	done
473	486
474	487	ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)

533	546	&& $(am__cd) $(top_srcdir) \
534	547	&& gtags -i $(GTAGS_ARGS) "$$here"
535	548
	549	cscope: cscope.files
	550	test ! -s cscope.files \
	551	\|\| $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS)
	552
	553	clean-cscope:
	554	-rm -f cscope.files
	555
	556	cscope.files: clean-cscope cscopelist-recursive cscopelist
	557
	558	cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP)
	559	list='$(SOURCES) $(HEADERS) $(LISP)'; \
	560	case "$(srcdir)" in \
	561	[\\/]* \| ?:[\\/]*) sdir="$(srcdir)" ;; \
	562	*) sdir=$(subdir)/$(srcdir) ;; \
	563	esac; \
	564	for i in $$list; do \
	565	if test -f "$$i"; then \
	566	echo "$(subdir)/$$i"; \
	567	else \
	568	echo "$$sdir/$$i"; \
	569	fi; \
	570	done >> $(top_builddir)/cscope.files
	571
536	572	distclean-tags:
537	573	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
	574	-rm -f cscope.out cscope.in.out cscope.po.out cscope.files
538	575
539	576	distdir: $(DISTFILES)
540	577	$(am__remove_distdir)

570	607	done
571	608	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
572	609	if test "$$subdir" = .; then :; else \
573		test -d "$(distdir)/$$subdir" \
574		\|\| $(MKDIR_P) "$(distdir)/$$subdir" \
575		\|\| exit 1; \
576		fi; \
577		done
578		@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
579		if test "$$subdir" = .; then :; else \
	610	$(am__make_dryrun) \
	611	\|\| test -d "$(distdir)/$$subdir" \
	612	\|\| $(MKDIR_P) "$(distdir)/$$subdir" \
	613	\|\| exit 1; \
580	614	dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
581	615	$(am__relativize); \
582	616	new_distdir=$$reldir; \

608	642	\|\| chmod -R a+r "$(distdir)"
609	643	dist-gzip: distdir
610	644	tardir=$(distdir) && $(am__tar) \| GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
611		$(am__remove_distdir)
	645	$(am__post_remove_distdir)
612	646
613	647	dist-bzip2: distdir
614	648	tardir=$(distdir) && $(am__tar) \| BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
615		$(am__remove_distdir)
	649	$(am__post_remove_distdir)
616	650
617	651	dist-lzip: distdir
618	652	tardir=$(distdir) && $(am__tar) \| lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
619		$(am__remove_distdir)
620
621		dist-lzma: distdir
622		tardir=$(distdir) && $(am__tar) \| lzma -9 -c >$(distdir).tar.lzma
623		$(am__remove_distdir)
	653	$(am__post_remove_distdir)
624	654
625	655	dist-xz: distdir
626	656	tardir=$(distdir) && $(am__tar) \| XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
627		$(am__remove_distdir)
	657	$(am__post_remove_distdir)
628	658
629	659	dist-tarZ: distdir
630	660	tardir=$(distdir) && $(am__tar) \| compress -c >$(distdir).tar.Z
631		$(am__remove_distdir)
	661	$(am__post_remove_distdir)
632	662
633	663	dist-shar: distdir
634	664	shar $(distdir) \| GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
635		$(am__remove_distdir)
	665	$(am__post_remove_distdir)
636	666
637	667	dist-zip: distdir
638	668	-rm -f $(distdir).zip
639	669	zip -rq $(distdir).zip $(distdir)
640		$(am__remove_distdir)
641
642		dist dist-all: distdir
643		tardir=$(distdir) && $(am__tar) \| GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
644		$(am__remove_distdir)
	670	$(am__post_remove_distdir)
	671
	672	dist dist-all:
	673	$(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:'
	674	$(am__post_remove_distdir)
645	675
646	676	# This target untars the dist file and tries a VPATH configuration. Then
647	677	# it guarantees that the distribution is self-contained by making another

652	682	GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz \| $(am__untar) ;;\
653	683	.tar.bz2) \
654	684	bzip2 -dc $(distdir).tar.bz2 \| $(am__untar) ;;\
655		.tar.lzma) \
656		lzma -dc $(distdir).tar.lzma \| $(am__untar) ;;\
657	685	.tar.lz) \
658	686	lzip -dc $(distdir).tar.lz \| $(am__untar) ;;\
659	687	.tar.xz) \

665	693	.zip) \
666	694	unzip $(distdir).zip ;;\
667	695	esac
668		chmod -R a-w $(distdir); chmod a+w $(distdir)
	696	chmod -R a-w $(distdir); chmod u+w $(distdir)
669	697	mkdir $(distdir)/_build
670	698	mkdir $(distdir)/_inst
671	699	chmod a-w $(distdir)

699	727	&& $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
700	728	&& cd "$$am__cwd" \
701	729	\|\| exit 1
702		$(am__remove_distdir)
	730	$(am__post_remove_distdir)
703	731	@(echo "$(distdir) archives ready for distribution: "; \
704	732	list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) \| \
705	733	sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'

836	864	uninstall-am:
837	865
838	866	.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \
839		ctags-recursive install-am install-strip tags-recursive
	867	cscopelist-recursive ctags-recursive install-am install-strip \
	868	tags-recursive
840	869
841	870	.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
842		all all-am am--refresh check check-am clean clean-generic \
843		clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \
844		dist-gzip dist-hook dist-lzip dist-lzma dist-shar dist-tarZ \
	871	all all-am am--refresh check check-am clean clean-cscope \
	872	clean-generic clean-libtool cscope cscopelist \
	873	cscopelist-recursive ctags ctags-recursive dist dist-all \
	874	dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar dist-tarZ \
845	875	dist-xz dist-zip distcheck distclean distclean-generic \
846	876	distclean-hdr distclean-libtool distclean-tags distcleancheck \
847	877	distdir distuninstallcheck dvi dvi-am html html-am info \

+15

-0

NEWS less more

0	0	Virt Viewer News
1	1	================
	2
	3	0.5.4: Sep 17, 2012
	4	-------------------
	5
	6	- Fix host migration with Spice
	7	- Fix misc memory leaks
	8	- Fix build with newer glibc and -O0
	9	- Improve automatic fullscreen Spice configuration
	10	- Avoid crash when quiting application
	11	- Rebuild display men whenever a window is added/removed
	12	- Number displays starting from 1 instead of 0
	13	- Add support for handling multiple monitors with Spice
	14	- Menu display menu insensitive if no displays can be selected
	15	- Use real binary name in remote-viewer help message
	16	- Document -f=auto-conf in remote-viewer help
2	17
3	18	0.5.3: May 14, 2012
4	19	-------------------

+1

-1

README less more

18	18
19	19	http://gtk-vnc.sourceforge.net/
20	20
21		Virt Viewer uses the SPICE-GTK (>= 0.11) widget to provide a
	21	Virt Viewer uses the SPICE-GTK (>= 0.12.101) 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

+8

-1

acinclude.m4 less more

18	18
19	19	warnCFLAGS=
20	20
21		try_compiler_flags="-Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -fasynchronous-unwind-tables"
	21	try_compiler_flags="-fexceptions -fstack-protector --param=ssp-buffer-size=4 -fasynchronous-unwind-tables"
22	22
23	23	case "$enable_compile_warnings" in
24	24	no)

42	42	AC_MSG_ERROR(Unknown argument '$enable_compile_warnings' to --enable-compile-warnings)
43	43	;;
44	44	esac
	45
	46	AH_VERBATIM([FORTIFY_SOURCE],
	47	[/* Enable compile-time and run-time bounds-checking, and some warnings. */
	48	#if defined __OPTIMIZE__ && __OPTIMIZE__
	49	# define _FORTIFY_SOURCE 2
	50	#endif
	51	])
45	52
46	53	compiler_flags=
47	54	for option in $try_compiler_flags; do

+261

-256

aclocal.m4 less more

0		# generated automatically by aclocal 1.11.3 -- Autoconf --
1
2		# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
3		# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
4		# Inc.
	0	# generated automatically by aclocal 1.12.2 -- Autoconf --
	1
	2	# Copyright (C) 1996-2012 Free Software Foundation, Inc.
	3
5	4	# This file is free software; the Free Software Foundation
6	5	# gives unlimited permission to copy and/or distribute it,
7	6	# with or without modifications, as long as this notice is preserved.

17	16	[m4_warning([this file was generated for autoconf 2.68.
18	17	You have another version of autoconf. It may work, but is not guaranteed to.
19	18	If you have problems, you may need to regenerate the build system entirely.
20		To do so, use the procedure documented by the package, typically `autoreconf'.])])
	19	To do so, use the procedure documented by the package, typically 'autoreconf'.])])
21	20
22	21	# Copyright (C) 1995-2002 Free Software Foundation, Inc.
23	22	# Copyright (C) 2001-2003,2004 Red Hat, Inc.

647	646	fi[]dnl
648	647	])# PKG_CHECK_MODULES
649	648
650		# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
651		# Foundation, Inc.
652		#
653		# This file is free software; the Free Software Foundation
654		# gives unlimited permission to copy and/or distribute it,
655		# with or without modifications, as long as this notice is preserved.
656
657		# serial 1
	649	# Copyright (C) 2002-2012 Free Software Foundation, Inc.
	650	#
	651	# This file is free software; the Free Software Foundation
	652	# gives unlimited permission to copy and/or distribute it,
	653	# with or without modifications, as long as this notice is preserved.
	654
	655	# serial 8
658	656
659	657	# AM_AUTOMAKE_VERSION(VERSION)
660	658	# ----------------------------

662	660	# generated from the m4 files accompanying Automake X.Y.
663	661	# (This private macro should not be called outside this file.)
664	662	AC_DEFUN([AM_AUTOMAKE_VERSION],
665		[am__api_version='1.11'
	663	[am__api_version='1.12'
666	664	dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
667	665	dnl require some minimum version. Point them to the right macro.
668		m4_if([$1], [1.11.3], [],
	666	m4_if([$1], [1.12.2], [],
669	667	[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
670	668	])
671	669

681	679	# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
682	680	# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
683	681	AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
684		[AM_AUTOMAKE_VERSION([1.11.3])dnl
	682	[AM_AUTOMAKE_VERSION([1.12.2])dnl
685	683	m4_ifndef([AC_AUTOCONF_VERSION],
686	684	[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
687	685	_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
688	686
689	687	# AM_AUX_DIR_EXPAND -- Autoconf --
690	688
691		# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
692		#
693		# This file is free software; the Free Software Foundation
694		# gives unlimited permission to copy and/or distribute it,
695		# with or without modifications, as long as this notice is preserved.
696
697		# serial 1
	689	# Copyright (C) 2001-2012 Free Software Foundation, Inc.
	690	#
	691	# This file is free software; the Free Software Foundation
	692	# gives unlimited permission to copy and/or distribute it,
	693	# with or without modifications, as long as this notice is preserved.
	694
	695	# serial 2
698	696
699	697	# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
700		# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
701		# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
	698	# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to
	699	# '$srcdir', '$srcdir/..', or '$srcdir/../..'.
702	700	#
703	701	# Of course, Automake must honor this variable whenever it calls a
704	702	# tool from the auxiliary directory. The problem is that $srcdir (and

717	715	#
718	716	# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
719	717	# are both prefixed by $srcdir. In an in-source build this is usually
720		# harmless because $srcdir is `.', but things will broke when you
	718	# harmless because $srcdir is '.', but things will broke when you
721	719	# start a VPATH build or use an absolute $srcdir.
722	720	#
723	721	# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,

743	741
744	742	# AM_CONDITIONAL -- Autoconf --
745	743
746		# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
747		# Free Software Foundation, Inc.
748		#
749		# This file is free software; the Free Software Foundation
750		# gives unlimited permission to copy and/or distribute it,
751		# with or without modifications, as long as this notice is preserved.
752
753		# serial 9
	744	# Copyright (C) 1997-2012 Free Software Foundation, Inc.
	745	#
	746	# This file is free software; the Free Software Foundation
	747	# gives unlimited permission to copy and/or distribute it,
	748	# with or without modifications, as long as this notice is preserved.
	749
	750	# serial 10
754	751
755	752	# AM_CONDITIONAL(NAME, SHELL-CONDITION)
756	753	# -------------------------------------
757	754	# Define a conditional.
758	755	AC_DEFUN([AM_CONDITIONAL],
759		[AC_PREREQ(2.52)dnl
760		ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
761		[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
	756	[AC_PREREQ([2.52])dnl
	757	m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
	758	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
762	759	AC_SUBST([$1_TRUE])dnl
763	760	AC_SUBST([$1_FALSE])dnl
764	761	_AM_SUBST_NOTMAKE([$1_TRUE])dnl

777	774	Usually this means the macro was only invoked conditionally.]])
778	775	fi])])
779	776
780		# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
781		# 2010, 2011 Free Software Foundation, Inc.
782		#
783		# This file is free software; the Free Software Foundation
784		# gives unlimited permission to copy and/or distribute it,
785		# with or without modifications, as long as this notice is preserved.
786
787		# serial 12
788
789		# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
	777	# Copyright (C) 1999-2012 Free Software Foundation, Inc.
	778	#
	779	# This file is free software; the Free Software Foundation
	780	# gives unlimited permission to copy and/or distribute it,
	781	# with or without modifications, as long as this notice is preserved.
	782
	783	# serial 17
	784
	785	# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be
790	786	# written in clear, in which case automake, when reading aclocal.m4,
791	787	# will think it sees a use, and therefore will trigger all it's
792	788	# C support machinery. Also note that it means that autoscan, seeing

796	792	# _AM_DEPENDENCIES(NAME)
797	793	# ----------------------
798	794	# See how the compiler implements dependency checking.
799		# NAME is "CC", "CXX", "GCJ", or "OBJC".
	795	# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC".
800	796	# We try a few techniques and use that to set a single cache variable.
801	797	#
802	798	# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was

809	805	AC_REQUIRE([AM_MAKE_INCLUDE])dnl
810	806	AC_REQUIRE([AM_DEP_TRACK])dnl
811	807
812		ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
813		[$1], CXX, [depcc="$CXX" am_compiler_list=],
814		[$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
815		[$1], UPC, [depcc="$UPC" am_compiler_list=],
816		[$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
817		[depcc="$$1" am_compiler_list=])
	808	m4_if([$1], [CC], [depcc="$CC" am_compiler_list=],
	809	[$1], [CXX], [depcc="$CXX" am_compiler_list=],
	810	[$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
	811	[$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'],
	812	[$1], [UPC], [depcc="$UPC" am_compiler_list=],
	813	[$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
	814	[depcc="$$1" am_compiler_list=])
818	815
819	816	AC_CACHE_CHECK([dependency style of $depcc],
820	817	[am_cv_$1_dependencies_compiler_type],

822	819	# We make a subdir and do the tests there. Otherwise we can end up
823	820	# making bogus files that we don't know about and never remove. For
824	821	# instance it was reported that on HP-UX the gcc test will end up
825		# making a dummy file named `D' -- because `-MD' means `put the output
826		# in D'.
	822	# making a dummy file named 'D' -- because '-MD' means "put the output
	823	# in D".
827	824	rm -rf conftest.dir
828	825	mkdir conftest.dir
829	826	# Copy depcomp to subdir because otherwise we won't find it if we're

863	860	: > sub/conftest.c
864	861	for i in 1 2 3 4 5 6; do
865	862	echo '#include "conftst'$i'.h"' >> sub/conftest.c
866		# Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
867		# Solaris 8's {/usr,}/bin/sh.
868		touch sub/conftst$i.h
	863	# Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
	864	# Solaris 10 /bin/sh.
	865	echo '/* dummy */' > sub/conftst$i.h
869	866	done
870	867	echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
871	868
872		# We check with `-c' and `-o' for the sake of the "dashmstdout"
	869	# We check with '-c' and '-o' for the sake of the "dashmstdout"
873	870	# mode. It turns out that the SunPro C++ compiler does not properly
874		# handle `-M -o', and we need to detect this. Also, some Intel
875		# versions had trouble with output in subdirs
	871	# handle '-M -o', and we need to detect this. Also, some Intel
	872	# versions had trouble with output in subdirs.
876	873	am__obj=sub/conftest.${OBJEXT-o}
877	874	am__minus_obj="-o $am__obj"
878	875	case $depmode in

881	878	test "$am__universal" = false \|\| continue
882	879	;;
883	880	nosideeffect)
884		# after this tag, mechanisms are not by side-effect, so they'll
885		# only be used when explicitly requested
	881	# After this tag, mechanisms are not by side-effect, so they'll
	882	# only be used when explicitly requested.
886	883	if test "x$enable_dependency_tracking" = xyes; then
887	884	continue
888	885	else

890	887	fi
891	888	;;
892	889	msvc7 \| msvc7msys \| msvisualcpp \| msvcmsys)
893		# This compiler won't grok `-c -o', but also, the minuso test has
	890	# This compiler won't grok '-c -o', but also, the minuso test has
894	891	# not run yet. These depmodes are late enough in the game, and
895	892	# so weak that their functioning should not be impacted.
896	893	am__obj=conftest.${OBJEXT-o}

938	935	# AM_SET_DEPDIR
939	936	# -------------
940	937	# Choose a directory name for dependency files.
941		# This macro is AC_REQUIREd in _AM_DEPENDENCIES
	938	# This macro is AC_REQUIREd in _AM_DEPENDENCIES.
942	939	AC_DEFUN([AM_SET_DEPDIR],
943	940	[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
944	941	AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl

948	945	# AM_DEP_TRACK
949	946	# ------------
950	947	AC_DEFUN([AM_DEP_TRACK],
951		[AC_ARG_ENABLE(dependency-tracking,
952		[ --disable-dependency-tracking speeds up one-time build
953		--enable-dependency-tracking do not reject slow dependency extractors])
	948	[AC_ARG_ENABLE([dependency-tracking], [dnl
	949	AS_HELP_STRING(
	950	[--enable-dependency-tracking],
	951	[do not reject slow dependency extractors])
	952	AS_HELP_STRING(
	953	[--disable-dependency-tracking],
	954	[speeds up one-time build])])
954	955	if test "x$enable_dependency_tracking" != xno; then
955	956	am_depcomp="$ac_aux_dir/depcomp"
956	957	AMDEPBACKSLASH='\'

965	966
966	967	# Generate code to set up dependency tracking. -- Autoconf --
967	968
968		# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
969		# Free Software Foundation, Inc.
970		#
971		# This file is free software; the Free Software Foundation
972		# gives unlimited permission to copy and/or distribute it,
973		# with or without modifications, as long as this notice is preserved.
974
975		#serial 5
	969	# Copyright (C) 1999-2012 Free Software Foundation, Inc.
	970	#
	971	# This file is free software; the Free Software Foundation
	972	# gives unlimited permission to copy and/or distribute it,
	973	# with or without modifications, as long as this notice is preserved.
	974
	975	# serial 6
976	976
977	977	# _AM_OUTPUT_DEPENDENCY_COMMANDS
978	978	# ------------------------------

991	991	# Strip MF so we end up with the name of the file.
992	992	mf=`echo "$mf" \| sed -e 's/:.*$//'`
993	993	# Check whether this is an Automake generated Makefile or not.
994		# We used to match only the files named `Makefile.in', but
	994	# We used to match only the files named 'Makefile.in', but
995	995	# some people rename them; so instead we look at the file content.
996	996	# Grep'ing the first line is not enough: some people post-process
997	997	# each Makefile.in and add a new line on top of each file to say so.

1003	1003	continue
1004	1004	fi
1005	1005	# Extract the definition of DEPDIR, am__include, and am__quote
1006		# from the Makefile without running `make'.
	1006	# from the Makefile without running 'make'.
1007	1007	DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
1008	1008	test -z "$DEPDIR" && continue
1009	1009	am__include=`sed -n 's/^am__include = //p' < "$mf"`
1010	1010	test -z "am__include" && continue
1011	1011	am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
1012		# When using ansi2knr, U may be empty or an underscore; expand it
1013		U=`sed -n 's/^U = //p' < "$mf"`
1014	1012	# Find all dependency output files, they are included files with
1015	1013	# $(DEPDIR) in their names. We invoke sed twice because it is the
1016	1014	# simplest approach to changing $(DEPDIR) to its actual value in the
1017	1015	# expansion.
1018	1016	for file in `sed -n "
1019	1017	s/^$am__include $am__quote$.(DEPDIR).$$am__quote"'$/\1/p' <"$mf" \| \
1020		sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
	1018	sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
1021	1019	# Make sure the directory exists.
1022	1020	test -f "$dirpart/$file" && continue
1023	1021	fdir=`AS_DIRNAME(["$file"])`

1035	1033	# This macro should only be invoked once -- use via AC_REQUIRE.
1036	1034	#
1037	1035	# This code is only required when automatic dependency tracking
1038		# is enabled. FIXME. This creates each `.P' file that we will
	1036	# is enabled. FIXME. This creates each '.P' file that we will
1039	1037	# need in order to bootstrap the dependency handling code.
1040	1038	AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
1041	1039	[AC_CONFIG_COMMANDS([depfiles],

1043	1041	[AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
1044	1042	])
1045	1043
1046		# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
1047		# Free Software Foundation, Inc.
	1044	# Copyright (C) 1996-2012 Free Software Foundation, Inc.
1048	1045	#
1049	1046	# This file is free software; the Free Software Foundation
1050	1047	# gives unlimited permission to copy and/or distribute it,

1057	1054
1058	1055	# Do all the work for Automake. -- Autoconf --
1059	1056
1060		# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
1061		# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
1062		#
1063		# This file is free software; the Free Software Foundation
1064		# gives unlimited permission to copy and/or distribute it,
1065		# with or without modifications, as long as this notice is preserved.
1066
1067		# serial 16
	1057	# Copyright (C) 1996-2012 Free Software Foundation, Inc.
	1058	#
	1059	# This file is free software; the Free Software Foundation
	1060	# gives unlimited permission to copy and/or distribute it,
	1061	# with or without modifications, as long as this notice is preserved.
	1062
	1063	# serial 19
1068	1064
1069	1065	# This macro actually does too much. Some checks are only needed if
1070	1066	# your package does certain things. But this isn't really a big deal.

1110	1106	# Define the identity of the package.
1111	1107	dnl Distinguish between old-style and new-style calls.
1112	1108	m4_ifval([$2],
1113		[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
	1109	[AC_DIAGNOSE([obsolete],
	1110	[$0: two- and three-arguments forms are deprecated. For more info, see:
	1111	http://www.gnu.org/software/automake/manual/automake.html#Modernize-AM_INIT_AUTOMAKE-invocation])
	1112	m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
1114	1113	AC_SUBST([PACKAGE], [$1])dnl
1115	1114	AC_SUBST([VERSION], [$2])],
1116	1115	[_AM_SET_OPTIONS([$1])dnl
1117	1116	dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
1118		m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
	1117	m4_if(
	1118	m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
	1119	[ok:ok],,
1119	1120	[m4_fatal([AC_INIT should be called with package and version arguments])])dnl
1120	1121	AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
1121	1122	AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
1122	1123
1123	1124	_AM_IF_OPTION([no-define],,
1124		[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
1125		AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
	1125	[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package])
	1126	AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl
1126	1127
1127	1128	# Some tools Automake needs.
1128	1129	AC_REQUIRE([AM_SANITY_CHECK])dnl
1129	1130	AC_REQUIRE([AC_ARG_PROGRAM])dnl
1130		AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
1131		AM_MISSING_PROG(AUTOCONF, autoconf)
1132		AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
1133		AM_MISSING_PROG(AUTOHEADER, autoheader)
1134		AM_MISSING_PROG(MAKEINFO, makeinfo)
	1131	AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}])
	1132	AM_MISSING_PROG([AUTOCONF], [autoconf])
	1133	AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}])
	1134	AM_MISSING_PROG([AUTOHEADER], [autoheader])
	1135	AM_MISSING_PROG([MAKEINFO], [makeinfo])
1135	1136	AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
1136	1137	AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
1137		AC_REQUIRE([AM_PROG_MKDIR_P])dnl
	1138	AC_REQUIRE([AC_PROG_MKDIR_P])dnl
	1139	# For better backward compatibility. To be removed once Automake 1.9.x
	1140	# dies out for good. For more background, see:
	1141	# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
	1142	# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
	1143	AC_SUBST([mkdir_p], ['$(MKDIR_P)'])
1138	1144	# We need awk for the "check" target. The system "awk" is bad on
1139	1145	# some platforms.
1140	1146	AC_REQUIRE([AC_PROG_AWK])dnl

1145	1151	[_AM_PROG_TAR([v7])])])
1146	1152	_AM_IF_OPTION([no-dependencies],,
1147	1153	[AC_PROVIDE_IFELSE([AC_PROG_CC],
1148		[_AM_DEPENDENCIES(CC)],
1149		[define([AC_PROG_CC],
1150		defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
	1154	[_AM_DEPENDENCIES([CC])],
	1155	[m4_define([AC_PROG_CC],
	1156	m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl
1151	1157	AC_PROVIDE_IFELSE([AC_PROG_CXX],
1152		[_AM_DEPENDENCIES(CXX)],
1153		[define([AC_PROG_CXX],
1154		defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
	1158	[_AM_DEPENDENCIES([CXX])],
	1159	[m4_define([AC_PROG_CXX],
	1160	m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl
1155	1161	AC_PROVIDE_IFELSE([AC_PROG_OBJC],
1156		[_AM_DEPENDENCIES(OBJC)],
1157		[define([AC_PROG_OBJC],
1158		defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
	1162	[_AM_DEPENDENCIES([OBJC])],
	1163	[m4_define([AC_PROG_OBJC],
	1164	m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl
	1165	dnl Support for Objective C++ was only introduced in Autoconf 2.65,
	1166	dnl but we still cater to Autoconf 2.62.
	1167	m4_ifdef([AC_PROG_OBJCXX],
	1168	[AC_PROVIDE_IFELSE([AC_PROG_OBJCXX],
	1169	[_AM_DEPENDENCIES([OBJCXX])],
	1170	[m4_define([AC_PROG_OBJCXX],
	1171	m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])])dnl
1159	1172	])
1160	1173	_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
1161		dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
1162		dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro
	1174	dnl The 'parallel-tests' driver may need to know about EXEEXT, so add the
	1175	dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro
1163	1176	dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
1164	1177	AC_CONFIG_COMMANDS_PRE(dnl
1165	1178	[m4_provide_if([_AM_COMPILER_EXEEXT],
1166	1179	[AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
1167	1180	])
1168	1181
1169		dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
	1182	dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
1170	1183	dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
1171	1184	dnl mangled by Autoconf and run in a shell conditional statement.
1172	1185	m4_define([_AC_COMPILER_EXEEXT],

1194	1207	done
1195	1208	echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
1196	1209
1197		# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation,
1198		# Inc.
1199		#
1200		# This file is free software; the Free Software Foundation
1201		# gives unlimited permission to copy and/or distribute it,
1202		# with or without modifications, as long as this notice is preserved.
1203
1204		# serial 1
	1210	# Copyright (C) 2001-2012 Free Software Foundation, Inc.
	1211	#
	1212	# This file is free software; the Free Software Foundation
	1213	# gives unlimited permission to copy and/or distribute it,
	1214	# with or without modifications, as long as this notice is preserved.
	1215
	1216	# serial 8
1205	1217
1206	1218	# AM_PROG_INSTALL_SH
1207	1219	# ------------------

1216	1228	install_sh="\${SHELL} $am_aux_dir/install-sh"
1217	1229	esac
1218	1230	fi
1219		AC_SUBST(install_sh)])
1220
1221		# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
	1231	AC_SUBST([install_sh])])
	1232
	1233	# Copyright (C) 2003-2012 Free Software Foundation, Inc.
1222	1234	#
1223	1235	# This file is free software; the Free Software Foundation
1224	1236	# gives unlimited permission to copy and/or distribute it,

1241	1253
1242	1254	# Check to see how 'make' treats includes. -- Autoconf --
1243	1255
1244		# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc.
1245		#
1246		# This file is free software; the Free Software Foundation
1247		# gives unlimited permission to copy and/or distribute it,
1248		# with or without modifications, as long as this notice is preserved.
1249
1250		# serial 4
	1256	# Copyright (C) 2001-2012 Free Software Foundation, Inc.
	1257	#
	1258	# This file is free software; the Free Software Foundation
	1259	# gives unlimited permission to copy and/or distribute it,
	1260	# with or without modifications, as long as this notice is preserved.
	1261
	1262	# serial 5
1251	1263
1252	1264	# AM_MAKE_INCLUDE()
1253	1265	# -----------------

1266	1278	_am_result=none
1267	1279	# First try GNU make style include.
1268	1280	echo "include confinc" > confmf
1269		# Ignore all kinds of additional output from `make'.
	1281	# Ignore all kinds of additional output from 'make'.
1270	1282	case `$am_make -s -f confmf 2> /dev/null` in #(
1271	1283	the\ am__doit\ target)
1272	1284	am__include=include

1291	1303	rm -f confinc confmf
1292	1304	])
1293	1305
1294		# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008
1295		# Free Software Foundation, Inc.
	1306	# Copyright (C) 1999-2012 Free Software Foundation, Inc.
1296	1307	#
1297	1308	# This file is free software; the Free Software Foundation
1298	1309	# gives unlimited permission to copy and/or distribute it,

1328	1339
1329	1340	# Fake the existence of programs that GNU maintainers use. -- Autoconf --
1330	1341
1331		# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
1332		# Free Software Foundation, Inc.
1333		#
1334		# This file is free software; the Free Software Foundation
1335		# gives unlimited permission to copy and/or distribute it,
1336		# with or without modifications, as long as this notice is preserved.
1337
1338		# serial 6
	1342	# Copyright (C) 1997-2012 Free Software Foundation, Inc.
	1343	#
	1344	# This file is free software; the Free Software Foundation
	1345	# gives unlimited permission to copy and/or distribute it,
	1346	# with or without modifications, as long as this notice is preserved.
	1347
	1348	# serial 7
1339	1349
1340	1350	# AM_MISSING_PROG(NAME, PROGRAM)
1341	1351	# ------------------------------

1365	1375	am_missing_run="$MISSING --run "
1366	1376	else
1367	1377	am_missing_run=
1368		AC_MSG_WARN([`missing' script is too old or missing])
	1378	AC_MSG_WARN(['missing' script is too old or missing])
1369	1379	fi
1370	1380	])
1371	1381
1372		# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
1373		# Inc.
1374		#
1375		# This file is free software; the Free Software Foundation
1376		# gives unlimited permission to copy and/or distribute it,
1377		# with or without modifications, as long as this notice is preserved.
1378
1379		# serial 1
1380
1381		# AM_PROG_MKDIR_P
1382		# ---------------
1383		# Check for `mkdir -p'.
1384		AC_DEFUN([AM_PROG_MKDIR_P],
1385		[AC_PREREQ([2.60])dnl
1386		AC_REQUIRE([AC_PROG_MKDIR_P])dnl
1387		dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
1388		dnl while keeping a definition of mkdir_p for backward compatibility.
1389		dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
1390		dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
1391		dnl Makefile.ins that do not define MKDIR_P, so we do our own
1392		dnl adjustment using top_builddir (which is defined more often than
1393		dnl MKDIR_P).
1394		AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
1395		case $mkdir_p in
1396		[[\\/$]]* \| ?:[[\\/]]*) ;;
1397		/) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
1398		esac
1399		])
1400
1401	1382	# Helper functions for option handling. -- Autoconf --
1402	1383
1403		# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
1404		# Foundation, Inc.
1405		#
1406		# This file is free software; the Free Software Foundation
1407		# gives unlimited permission to copy and/or distribute it,
1408		# with or without modifications, as long as this notice is preserved.
1409
1410		# serial 5
	1384	# Copyright (C) 2001-2012 Free Software Foundation, Inc.
	1385	#
	1386	# This file is free software; the Free Software Foundation
	1387	# gives unlimited permission to copy and/or distribute it,
	1388	# with or without modifications, as long as this notice is preserved.
	1389
	1390	# serial 6
1411	1391
1412	1392	# _AM_MANGLE_OPTION(NAME)
1413	1393	# -----------------------

1418	1398	# --------------------
1419	1399	# Set option NAME. Presently that only means defining a flag for this option.
1420	1400	AC_DEFUN([_AM_SET_OPTION],
1421		[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
	1401	[m4_define(_AM_MANGLE_OPTION([$1]), [1])])
1422	1402
1423	1403	# _AM_SET_OPTIONS(OPTIONS)
1424	1404	# ------------------------

1434	1414
1435	1415	# Check to make sure that the build environment is sane. -- Autoconf --
1436	1416
1437		# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
1438		# Free Software Foundation, Inc.
1439		#
1440		# This file is free software; the Free Software Foundation
1441		# gives unlimited permission to copy and/or distribute it,
1442		# with or without modifications, as long as this notice is preserved.
1443
1444		# serial 5
	1417	# Copyright (C) 1996-2012 Free Software Foundation, Inc.
	1418	#
	1419	# This file is free software; the Free Software Foundation
	1420	# gives unlimited permission to copy and/or distribute it,
	1421	# with or without modifications, as long as this notice is preserved.
	1422
	1423	# serial 9
1445	1424
1446	1425	# AM_SANITY_CHECK
1447	1426	# ---------------
1448	1427	AC_DEFUN([AM_SANITY_CHECK],
1449	1428	[AC_MSG_CHECKING([whether build environment is sane])
1450		# Just in case
1451		sleep 1
1452		echo timestamp > conftest.file
1453	1429	# Reject unsafe characters in $srcdir or the absolute working directory
1454	1430	# name. Accept space and tab only in the latter.
1455	1431	am_lf='

1460	1436	esac
1461	1437	case $srcdir in
1462	1438	[[\\\"\#\$\&\'\`$am_lf\ \ ]])
1463		AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
	1439	AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);;
1464	1440	esac
1465	1441
1466		# Do `set' in a subshell so we don't clobber the current shell's
	1442	# Do 'set' in a subshell so we don't clobber the current shell's
1467	1443	# arguments. Must try -L first in case configure is actually a
1468	1444	# symlink; some systems play weird games with the mod time of symlinks
1469	1445	# (eg FreeBSD returns the mod time of the symlink's containing
1470	1446	# directory).
1471	1447	if (
1472		set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
1473		if test "$[*]" = "X"; then
1474		# -L didn't work.
1475		set X `ls -t "$srcdir/configure" conftest.file`
1476		fi
1477		rm -f conftest.file
1478		if test "$[*]" != "X $srcdir/configure conftest.file" \
1479		&& test "$[*]" != "X conftest.file $srcdir/configure"; then
1480
1481		# If neither matched, then we have a broken ls. This can happen
1482		# if, for instance, CONFIG_SHELL is bash and it inherits a
1483		# broken ls alias from the environment. This has actually
1484		# happened. Such a system could not be considered "sane".
1485		AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
1486		alias in your environment])
1487		fi
1488
	1448	am_has_slept=no
	1449	for am_try in 1 2; do
	1450	echo "timestamp, slept: $am_has_slept" > conftest.file
	1451	set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
	1452	if test "$[*]" = "X"; then
	1453	# -L didn't work.
	1454	set X `ls -t "$srcdir/configure" conftest.file`
	1455	fi
	1456	if test "$[*]" != "X $srcdir/configure conftest.file" \
	1457	&& test "$[*]" != "X conftest.file $srcdir/configure"; then
	1458
	1459	# If neither matched, then we have a broken ls. This can happen
	1460	# if, for instance, CONFIG_SHELL is bash and it inherits a
	1461	# broken ls alias from the environment. This has actually
	1462	# happened. Such a system could not be considered "sane".
	1463	AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
	1464	alias in your environment])
	1465	fi
	1466	if test "$[2]" = conftest.file \|\| test $am_try -eq 2; then
	1467	break
	1468	fi
	1469	# Just in case.
	1470	sleep 1
	1471	am_has_slept=yes
	1472	done
1489	1473	test "$[2]" = conftest.file
1490	1474	)
1491	1475	then

1495	1479	AC_MSG_ERROR([newly created file is older than distributed files!
1496	1480	Check your system clock])
1497	1481	fi
1498		AC_MSG_RESULT(yes)])
1499
1500		# Copyright (C) 2009, 2011 Free Software Foundation, Inc.
1501		#
1502		# This file is free software; the Free Software Foundation
1503		# gives unlimited permission to copy and/or distribute it,
1504		# with or without modifications, as long as this notice is preserved.
1505
1506		# serial 2
	1482	AC_MSG_RESULT([yes])
	1483	# If we didn't sleep, we still need to ensure time stamps of config.status and
	1484	# generated files are strictly newer.
	1485	am_sleep_pid=
	1486	if grep 'slept: no' conftest.file >/dev/null 2>&1; then
	1487	( sleep 1 ) &
	1488	am_sleep_pid=$!
	1489	fi
	1490	AC_CONFIG_COMMANDS_PRE(
	1491	[AC_MSG_CHECKING([that generated files are newer than configure])
	1492	if test -n "$am_sleep_pid"; then
	1493	# Hide warnings about reused PIDs.
	1494	wait $am_sleep_pid 2>/dev/null
	1495	fi
	1496	AC_MSG_RESULT([done])])
	1497	rm -f conftest.file
	1498	])
	1499
	1500	# Copyright (C) 2009-2012 Free Software Foundation, Inc.
	1501	#
	1502	# This file is free software; the Free Software Foundation
	1503	# gives unlimited permission to copy and/or distribute it,
	1504	# with or without modifications, as long as this notice is preserved.
	1505
	1506	# serial 3
1507	1507
1508	1508	# AM_SILENT_RULES([DEFAULT])
1509	1509	# --------------------------
1510	1510	# Enable less verbose build rules; with the default set to DEFAULT
1511		# (`yes' being less verbose, `no' or empty being verbose).
	1511	# ("yes" being less verbose, "no" or empty being verbose).
1512	1512	AC_DEFUN([AM_SILENT_RULES],
1513		[AC_ARG_ENABLE([silent-rules],
1514		[ --enable-silent-rules less verbose build output (undo: `make V=1')
1515		--disable-silent-rules verbose build output (undo: `make V=0')])
1516		case $enable_silent_rules in
1517		yes) AM_DEFAULT_VERBOSITY=0;;
1518		no) AM_DEFAULT_VERBOSITY=1;;
1519		*) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
	1513	[AC_ARG_ENABLE([silent-rules], [dnl
	1514	AS_HELP_STRING(
	1515	[--enable-silent-rules],
	1516	[less verbose build output (undo: "make V=1")])
	1517	AS_HELP_STRING(
	1518	[--disable-silent-rules],
	1519	[verbose build output (undo: "make V=0")])dnl
	1520	])
	1521	case $enable_silent_rules in @%:@ (((
	1522	yes) AM_DEFAULT_VERBOSITY=0;;
	1523	no) AM_DEFAULT_VERBOSITY=1;;
	1524	*) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);;
1520	1525	esac
1521	1526	dnl
1522		dnl A few `make' implementations (e.g., NonStop OS and NextStep)
	1527	dnl A few 'make' implementations (e.g., NonStop OS and NextStep)
1523	1528	dnl do not support nested variable expansions.
1524	1529	dnl See automake bug#9928 and bug#10237.
1525	1530	am_make=${MAKE-make}

1537	1542	am_cv_make_support_nested_variables=no
1538	1543	fi])
1539	1544	if test $am_cv_make_support_nested_variables = yes; then
1540		dnl Using `$V' instead of `$(V)' breaks IRIX make.
	1545	dnl Using '$V' instead of '$(V)' breaks IRIX make.
1541	1546	AM_V='$(V)'
1542	1547	AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
1543	1548	else

1554	1559	_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
1555	1560	])
1556	1561
1557		# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
1558		#
1559		# This file is free software; the Free Software Foundation
1560		# gives unlimited permission to copy and/or distribute it,
1561		# with or without modifications, as long as this notice is preserved.
1562
1563		# serial 1
	1562	# Copyright (C) 2001-2012 Free Software Foundation, Inc.
	1563	#
	1564	# This file is free software; the Free Software Foundation
	1565	# gives unlimited permission to copy and/or distribute it,
	1566	# with or without modifications, as long as this notice is preserved.
	1567
	1568	# serial 2
1564	1569
1565	1570	# AM_PROG_INSTALL_STRIP
1566	1571	# ---------------------
1567		# One issue with vendor `install' (even GNU) is that you can't
	1572	# One issue with vendor 'install' (even GNU) is that you can't
1568	1573	# specify the program used to strip binaries. This is especially
1569	1574	# annoying in cross-compiling environments, where the build's strip
1570	1575	# is unlikely to handle the host's binaries.
1571	1576	# Fortunately install-sh will honor a STRIPPROG variable, so we
1572		# always use install-sh in `make install-strip', and initialize
	1577	# always use install-sh in "make install-strip", and initialize
1573	1578	# STRIPPROG with the value of the STRIP variable (set by the user).
1574	1579	AC_DEFUN([AM_PROG_INSTALL_STRIP],
1575	1580	[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
1576		# Installed binaries are usually stripped using `strip' when the user
1577		# run `make install-strip'. However `strip' might not be the right
	1581	# Installed binaries are usually stripped using 'strip' when the user
	1582	# run "make install-strip". However 'strip' might not be the right
1578	1583	# tool to use in cross-compilation environments, therefore Automake
1579		# will honor the `STRIP' environment variable to overrule this program.
1580		dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
	1584	# will honor the 'STRIP' environment variable to overrule this program.
	1585	dnl Don't test for $cross_compiling = yes, because it might be 'maybe'.
1581	1586	if test "$cross_compiling" != no; then
1582	1587	AC_CHECK_TOOL([STRIP], [strip], :)
1583	1588	fi
1584	1589	INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
1585	1590	AC_SUBST([INSTALL_STRIP_PROGRAM])])
1586	1591
1587		# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
	1592	# Copyright (C) 2006-2012 Free Software Foundation, Inc.
1588	1593	#
1589	1594	# This file is free software; the Free Software Foundation
1590	1595	# gives unlimited permission to copy and/or distribute it,

1605	1610
1606	1611	# Check how to create a tarball. -- Autoconf --
1607	1612
1608		# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc.
1609		#
1610		# This file is free software; the Free Software Foundation
1611		# gives unlimited permission to copy and/or distribute it,
1612		# with or without modifications, as long as this notice is preserved.
1613
1614		# serial 2
	1613	# Copyright (C) 2004-2012 Free Software Foundation, Inc.
	1614	#
	1615	# This file is free software; the Free Software Foundation
	1616	# gives unlimited permission to copy and/or distribute it,
	1617	# with or without modifications, as long as this notice is preserved.
	1618
	1619	# serial 3
1615	1620
1616	1621	# _AM_PROG_TAR(FORMAT)
1617	1622	# --------------------
1618	1623	# Check how to create a tarball in format FORMAT.
1619		# FORMAT should be one of `v7', `ustar', or `pax'.
	1624	# FORMAT should be one of 'v7', 'ustar', or 'pax'.
1620	1625	#
1621	1626	# Substitute a variable $(am__tar) that is a command
1622	1627	# writing to stdout a FORMAT-tarball containing the directory

1639	1644	_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
1640	1645	_am_tools=${am_cv_prog_tar_$1-$_am_tools}
1641	1646	# Do not fold the above two line into one, because Tru64 sh and
1642		# Solaris sh will not grok spaces in the rhs of `-'.
	1647	# Solaris sh will not grok spaces in the rhs of '-'.
1643	1648	for _am_tool in $_am_tools
1644	1649	do
1645	1650	case $_am_tool in

+65

-33

build-aux/compile less more

0	0	#! /bin/sh
1	1	# Wrapper for compilers which do not understand '-c -o'.
2	2
3		scriptversion=2012-01-04.17; # UTC
4
5		# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010, 2012 Free
6		# Software Foundation, Inc.
	3	scriptversion=2012-03-05.13; # UTC
	4
	5	# Copyright (C) 1999-2012 Free Software Foundation, Inc.
7	6	# Written by Tom Tromey <tromey@cygnus.com>.
8	7	#
9	8	# This program is free software; you can redistribute it and/or modify

76	75	esac
77	76	;;
78	77	esac
	78	}
	79
	80	# func_cl_dashL linkdir
	81	# Make cl look for libraries in LINKDIR
	82	func_cl_dashL ()
	83	{
	84	func_file_conv "$1"
	85	if test -z "$lib_path"; then
	86	lib_path=$file
	87	else
	88	lib_path="$lib_path;$file"
	89	fi
	90	linker_opts="$linker_opts -LIBPATH:$file"
	91	}
	92
	93	# func_cl_dashl library
	94	# Do a library search-path lookup for cl
	95	func_cl_dashl ()
	96	{
	97	lib=$1
	98	found=no
	99	save_IFS=$IFS
	100	IFS=';'
	101	for dir in $lib_path $LIB
	102	do
	103	IFS=$save_IFS
	104	if $shared && test -f "$dir/$lib.dll.lib"; then
	105	found=yes
	106	lib=$dir/$lib.dll.lib
	107	break
	108	fi
	109	if test -f "$dir/$lib.lib"; then
	110	found=yes
	111	lib=$dir/$lib.lib
	112	break
	113	fi
	114	done
	115	IFS=$save_IFS
	116
	117	if test "$found" != yes; then
	118	lib=$lib.lib
	119	fi
79	120	}
80	121
81	122	# func_cl_wrapper cl arg...

108	149	;;
109	150	esac
110	151	;;
	152	-I)
	153	eat=1
	154	func_file_conv "$2" mingw
	155	set x "$@" -I"$file"
	156	shift
	157	;;
111	158	-I*)
112	159	func_file_conv "${1#-I}" mingw
113	160	set x "$@" -I"$file"
114	161	shift
115	162	;;
	163	-l)
	164	eat=1
	165	func_cl_dashl "$2"
	166	set x "$@" "$lib"
	167	shift
	168	;;
116	169	-l*)
117		lib=${1#-l}
118		found=no
119		save_IFS=$IFS
120		IFS=';'
121		for dir in $lib_path $LIB
122		do
123		IFS=$save_IFS
124		if $shared && test -f "$dir/$lib.dll.lib"; then
125		found=yes
126		set x "$@" "$dir/$lib.dll.lib"
127		break
128		fi
129		if test -f "$dir/$lib.lib"; then
130		found=yes
131		set x "$@" "$dir/$lib.lib"
132		break
133		fi
134		done
135		IFS=$save_IFS
136
137		test "$found" != yes && set x "$@" "$lib.lib"
138		shift
	170	func_cl_dashl "${1#-l}"
	171	set x "$@" "$lib"
	172	shift
	173	;;
	174	-L)
	175	eat=1
	176	func_cl_dashL "$2"
139	177	;;
140	178	-L*)
141		func_file_conv "${1#-L}"
142		if test -z "$lib_path"; then
143		lib_path=$file
144		else
145		lib_path="$lib_path;$file"
146		fi
147		linker_opts="$linker_opts -LIBPATH:$file"
	179	func_cl_dashL "${1#-L}"
148	180	;;
149	181	-static)
150	182	shared=false

+13

-5

build-aux/config.guess less more

3	3	# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
4	4	# 2011, 2012 Free Software Foundation, Inc.
5	5
6		timestamp='2012-01-01'
	6	timestamp='2012-06-10'
7	7
8	8	# This file is free software; you can redistribute it and/or modify it
9	9	# under the terms of the GNU General Public License as published by

16	16	# General Public License for more details.
17	17	#
18	18	# You should have received a copy of the GNU General Public License
19		# along with this program; if not, write to the Free Software
20		# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
21		# 02110-1301, USA.
	19	# along with this program; if not, see <http://www.gnu.org/licenses/>.
22	20	#
23	21	# As a special exception to the GNU General Public License, if you
24	22	# distribute this file as part of a program that contains a

862	860	i86:Minix::*)
863	861	echo ${UNAME_MACHINE}-pc-minix
864	862	exit ;;
	863	aarch64:Linux::)
	864	echo ${UNAME_MACHINE}-unknown-linux-gnu
	865	exit ;;
	866	aarch64_be:Linux::)
	867	UNAME_MACHINE=aarch64_be
	868	echo ${UNAME_MACHINE}-unknown-linux-gnu
	869	exit ;;
865	870	alpha:Linux::)
866	871	case `sed -n '/^cpu model/s/^.: $.$/\1/p' < /proc/cpuinfo` in
867	872	EV5) UNAME_MACHINE=alphaev5 ;;

1250	1255	NEO-?:NONSTOP_KERNEL::)
1251	1256	echo neo-tandem-nsk${UNAME_RELEASE}
1252	1257	exit ;;
1253		NSE-?:NONSTOP_KERNEL::)
	1258	NSE-:NONSTOP_KERNEL::*)
1254	1259	echo nse-tandem-nsk${UNAME_RELEASE}
1255	1260	exit ;;
1256	1261	NSR-?:NONSTOP_KERNEL::)

1318	1323	exit ;;
1319	1324	i86:AROS::*)
1320	1325	echo ${UNAME_MACHINE}-pc-aros
	1326	exit ;;
	1327	x86_64:VMkernel::)
	1328	echo ${UNAME_MACHINE}-unknown-esx
1321	1329	exit ;;
1322	1330	esac
1323	1331

+22

-6

build-aux/config.sub less more

3	3	# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
4	4	# 2011, 2012 Free Software Foundation, Inc.
5	5
6		timestamp='2012-01-01'
	6	timestamp='2012-04-18'
7	7
8	8	# This file is (in principle) common to ALL GNU software.
9	9	# The presence of a machine in this file suggests that SOME GNU software

20	20	# GNU General Public License for more details.
21	21	#
22	22	# You should have received a copy of the GNU General Public License
23		# along with this program; if not, write to the Free Software
24		# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
25		# 02110-1301, USA.
	23	# along with this program; if not, see <http://www.gnu.org/licenses/>.
26	24	#
27	25	# As a special exception to the GNU General Public License, if you
28	26	# distribute this file as part of a program that contains a

131	129	os=-$maybe_os
132	130	basic_machine=`echo $1 \| sed 's/^$.$-$[^-]-[^-]*$$/\1/'`
133	131	;;
	132	android-linux)
	133	os=-linux-android
	134	basic_machine=`echo $1 \| sed 's/^$.$-$[^-]-[^-]*$$/\1/'`-unknown
	135	;;
134	136	*)
135	137	basic_machine=`echo $1 \| sed 's/-[^-]*$//'`
136	138	if [ $basic_machine != $1 ]

222	224	-isc*)
223	225	basic_machine=`echo $1 \| sed -e 's/86-.*/86-pc/'`
224	226	;;
	227	-lynx*178)
	228	os=-lynxos178
	229	;;
	230	-lynx*5)
	231	os=-lynxos5
	232	;;
225	233	-lynx*)
226	234	os=-lynxos
227	235	;;

246	254	# Some are omitted here because they have special meanings below.
247	255	1750a \| 580 \
248	256	\| a29k \
	257	\| aarch64 \| aarch64_be \
249	258	\| alpha \| alphaev[4-8] \| alphaev56 \| alphaev6[78] \| alphapca5[67] \
250	259	\| alpha64 \| alpha64ev[4-8] \| alpha64ev56 \| alpha64ev6[78] \| alpha64pca5[67] \
251	260	\| am33_2.0 \

318	327	c6x)
319	328	basic_machine=tic6x-unknown
320	329	;;
321		m6811 \| m68hc11 \| m6812 \| m68hc12 \| picochip)
	330	m6811 \| m68hc11 \| m6812 \| m68hc12 \| m68hcs12x \| picochip)
322	331	basic_machine=$basic_machine-unknown
323	332	os=-none
324	333	;;

331	340	strongarm \| thumb \| xscale)
332	341	basic_machine=arm-unknown
333	342	;;
334
	343	xgate)
	344	basic_machine=$basic_machine-unknown
	345	os=-none
	346	;;
335	347	xscaleeb)
336	348	basic_machine=armeb-unknown
337	349	;;

354	366	# Recognize the basic CPU types with company name.
355	367	580-* \
356	368	\| a29k-* \
	369	\| aarch64-* \| aarch64_be-* \
357	370	\| alpha-* \| alphaev[4-8]-* \| alphaev56-* \| alphaev6[78]-* \
358	371	\| alpha64-* \| alpha64ev[4-8]-* \| alpha64ev56-* \| alpha64ev6[78]-* \
359	372	\| alphapca5[67]-* \| alpha64pca5[67]-* \| arc-* \

1529	1542	c4x-* \| tic4x-*)
1530	1543	os=-coff
1531	1544	;;
	1545	hexagon-*)
	1546	os=-elf
	1547	;;
1532	1548	tic54x-*)
1533	1549	os=-coff
1534	1550	;;

+73

-54

build-aux/depcomp less more

0	0	#! /bin/sh
1	1	# depcomp - compile a program generating dependencies as side-effects
2	2
3		scriptversion=2011-12-04.11; # UTC
4
5		# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010,
6		# 2011 Free Software Foundation, Inc.
	3	scriptversion=2012-03-27.16; # UTC
	4
	5	# Copyright (C) 1999-2012 Free Software Foundation, Inc.
7	6
8	7	# This program is free software; you can redistribute it and/or modify
9	8	# it under the terms of the GNU General Public License as published by

27	26
28	27	case $1 in
29	28	'')
30		echo "$0: No command. Try \`$0 --help' for more information." 1>&2
	29	echo "$0: No command. Try '$0 --help' for more information." 1>&2
31	30	exit 1;
32	31	;;
33	32	-h \| --h*)

39	38
40	39	Environment variables:
41	40	depmode Dependency tracking mode.
42		source Source file read by `PROGRAMS ARGS'.
43		object Object file output by `PROGRAMS ARGS'.
	41	source Source file read by 'PROGRAMS ARGS'.
	42	object Object file output by 'PROGRAMS ARGS'.
44	43	DEPDIR directory where to store dependencies.
45	44	depfile Dependency file to output.
46	45	tmpdepfile Temporary file to use when outputting dependencies.

56	55	;;
57	56	esac
58	57
	58	# A tabulation character.
	59	tab=' '
	60	# A newline character.
	61	nl='
	62	'
	63
59	64	if test -z "$depmode" \|\| test -z "$source" \|\| test -z "$object"; then
60	65	echo "depcomp: Variables source, object and depmode must be set" 1>&2
61	66	exit 1

99	104	# slashes to satisfy depend.m4
100	105	cygpath_u='sed s,\\\\,/,g'
101	106	depmode=msvc7
	107	fi
	108
	109	if test "$depmode" = xlc; then
	110	# IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations.
	111	gccflag=-qmakedep=gcc,-MF
	112	depmode=gcc
102	113	fi
103	114
104	115	case "$depmode" in

155	166	## The second -e expression handles DOS-style file names with drive letters.
156	167	sed -e 's/^[^:]*: / /' \
157	168	-e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
158		## This next piece of magic avoids the `deleted header file' problem.
	169	## This next piece of magic avoids the "deleted header file" problem.
159	170	## The problem is that when a header file which appears in a .P file
160	171	## is deleted, the dependency causes make to die (because there is
161	172	## typically no way to rebuild the header). We avoid this by adding
162	173	## dummy dependencies for each header file. Too bad gcc doesn't do
163	174	## this for us directly.
164		tr ' ' '
165		' < "$tmpdepfile" \|
166		## Some versions of gcc put a space before the `:'. On the theory
	175	tr ' ' "$nl" < "$tmpdepfile" \|
	176	## Some versions of gcc put a space before the ':'. On the theory
167	177	## that the space means something, we add a space to the output as
168	178	## well. hp depmode also adds that space, but also prefixes the VPATH
169	179	## to the object. Take care to not repeat it in the output.

202	212	# clever and replace this with sed code, as IRIX sed won't handle
203	213	# lines with more than a fixed number of characters (4096 in
204	214	# IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines;
205		# the IRIX cc adds comments like `#:fec' to the end of the
	215	# the IRIX cc adds comments like '#:fec' to the end of the
206	216	# dependency line.
207		tr ' ' '
208		' < "$tmpdepfile" \
	217	tr ' ' "$nl" < "$tmpdepfile" \
209	218	\| sed -e 's/^.\.o://' -e 's/#.$//' -e '/^$/ d' \| \
210		tr '
211		' ' ' >> "$depfile"
	219	tr "$nl" ' ' >> "$depfile"
212	220	echo >> "$depfile"
213	221
214	222	# The second pass generates a dummy entry for each header file.
215		tr ' ' '
216		' < "$tmpdepfile" \
	223	tr ' ' "$nl" < "$tmpdepfile" \
217	224	\| sed -e 's/^.\.o://' -e 's/#.$//' -e '/^$/ d' -e 's/$/:/' \
218	225	>> "$depfile"
219	226	else

225	232	rm -f "$tmpdepfile"
226	233	;;
227	234
	235	xlc)
	236	# This case exists only to let depend.m4 do its work. It works by
	237	# looking at the text of this script. This case will never be run,
	238	# since it is checked for above.
	239	exit 1
	240	;;
	241
228	242	aix)
229	243	# The C for AIX Compiler uses -M and outputs the dependencies
230	244	# in a .u file. In older versions, this file always lives in the
231		# current directory. Also, the AIX compiler puts `$object:' at the
	245	# current directory. Also, the AIX compiler puts '$object:' at the
232	246	# start of each line; $object doesn't have directory information.
233	247	# Version 6 uses the directory in both cases.
234	248	dir=`echo "$object" \| sed -e 's\|/[^/]*$\|/\|'`

258	272	test -f "$tmpdepfile" && break
259	273	done
260	274	if test -f "$tmpdepfile"; then
261		# Each line is of the form `foo.o: dependent.h'.
	275	# Each line is of the form 'foo.o: dependent.h'.
262	276	# Do two passes, one to just change these to
263		# `$object: dependent.h' and one to simply `dependent.h:'.
	277	# '$object: dependent.h' and one to simply 'dependent.h:'.
264	278	sed -e "s,^.\.[a-z]:,$object:," < "$tmpdepfile" > "$depfile"
265		# That's a tab and a space in the [].
266		sed -e 's,^.\.[a-z]:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
	279	sed -e 's,^.\.[a-z]:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
267	280	else
268	281	# The sourcefile does not contain any dependencies, so just
269	282	# store a dummy comment line, to avoid errors with the Makefile

274	287	;;
275	288
276	289	icc)
277		# Intel's C compiler understands `-MD -MF file'. However on
278		# icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
	290	# Intel's C compiler anf tcc (Tiny C Compiler) understand '-MD -MF file'.
	291	# However on
	292	# $CC -MD -MF foo.d -c -o sub/foo.o sub/foo.c
279	293	# ICC 7.0 will fill foo.d with something like
280	294	# foo.o: sub/foo.c
281	295	# foo.o: sub/foo.h
282		# which is wrong. We want:
	296	# which is wrong. We want
283	297	# sub/foo.o: sub/foo.c
284	298	# sub/foo.o: sub/foo.h
285	299	# sub/foo.c:
286	300	# sub/foo.h:
287	301	# ICC 7.1 will output
288	302	# foo.o: sub/foo.c sub/foo.h
289		# and will wrap long lines using \ :
	303	# and will wrap long lines using '\':
290	304	# foo.o: sub/foo.c ... \
291	305	# sub/foo.h ... \
292	306	# ...
293
	307	# tcc 0.9.26 (FIXME still under development at the moment of writing)
	308	# will emit a similar output, but also prepend the continuation lines
	309	# with horizontal tabulation characters.
294	310	"$@" -MD -MF "$tmpdepfile"
295	311	stat=$?
296	312	if test $stat -eq 0; then :

299	315	exit $stat
300	316	fi
301	317	rm -f "$depfile"
302		# Each line is of the form `foo.o: dependent.h',
303		# or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
	318	# Each line is of the form 'foo.o: dependent.h',
	319	# or 'foo.o: dep1.h dep2.h \', or ' dep3.h dep4.h \'.
304	320	# Do two passes, one to just change these to
305		# `$object: dependent.h' and one to simply `dependent.h:'.
306		sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
307		# Some versions of the HPUX 10.20 sed can't process this invocation
308		# correctly. Breaking it into two sed invocations is a workaround.
309		sed 's,^[^:]: $.$$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \|
310		sed -e 's/$/ :/' >> "$depfile"
	321	# '$object: dependent.h' and one to simply 'dependent.h:'.
	322	sed -e "s/^[ $tab][ $tab]/ /" -e "s,^[^:]:,$object :," \
	323	< "$tmpdepfile" > "$depfile"
	324	sed '
	325	s/[ '"$tab"'][ '"$tab"']*/ /g
	326	s/^ *//
	327	s/ \\$//
	328	s/^[^:]: //
	329	/^$/d
	330	/:$/d
	331	s/$/ :/
	332	' < "$tmpdepfile" >> "$depfile"
311	333	rm -f "$tmpdepfile"
312	334	;;
313	335

343	365	done
344	366	if test -f "$tmpdepfile"; then
345	367	sed -e "s,^.\.[a-z]:,$object:," "$tmpdepfile" > "$depfile"
346		# Add `dependent.h:' lines.
	368	# Add 'dependent.h:' lines.
347	369	sed -ne '2,${
348	370	s/^ *//
349	371	s/ \\*$//

358	380
359	381	tru64)
360	382	# The Tru64 compiler uses -MD to generate dependencies as a side
361		# effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
	383	# effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
362	384	# At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
363		# dependencies in `foo.d' instead, so we check for that too.
	385	# dependencies in 'foo.d' instead, so we check for that too.
364	386	# Subdirectories are respected.
365	387	dir=`echo "$object" \| sed -e 's\|/[^/]*$\|/\|'`
366	388	test "x$dir" = "x$object" && dir=

406	428	done
407	429	if test -f "$tmpdepfile"; then
408	430	sed -e "s,^.\.[a-z]:,$object:," < "$tmpdepfile" > "$depfile"
409		# That's a tab and a space in the [].
410		sed -e 's,^.\.[a-z]:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
	431	sed -e 's,^.\.[a-z]:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
411	432	else
412	433	echo "#dummy" > "$depfile"
413	434	fi

442	463	p
443	464	}' \| $cygpath_u \| sort -u \| sed -n '
444	465	s/ /\\ /g
445		s/$.*$/ \1 \\/p
	466	s/$.*$/'"$tab"'\1 \\/p
446	467	s/.$.*$ \\/\1:/
447	468	H
448	469	$ {
449		s/.*/ /
	470	s/.*/'"$tab"'/
450	471	G
451	472	p
452	473	}' >> "$depfile"

477	498	shift
478	499	fi
479	500
480		# Remove `-o $object'.
	501	# Remove '-o $object'.
481	502	IFS=" "
482	503	for arg
483	504	do

497	518	done
498	519
499	520	test -z "$dashmflag" && dashmflag=-M
500		# Require at least two characters before searching for `:'
	521	# Require at least two characters before searching for ':'
501	522	# in the target name. This is to cope with DOS-style filenames:
502		# a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
	523	# a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise.
503	524	"$@" $dashmflag \|
504		sed 's:^[ ][^: ][^:][^:]\:[ ]*:'"$object"'\: :' > "$tmpdepfile"
	525	sed 's:^['"$tab"' ][^:'"$tab"' ][^:][^:]\:['"$tab"' ]*:'"$object"'\: :' > "$tmpdepfile"
505	526	rm -f "$depfile"
506	527	cat < "$tmpdepfile" > "$depfile"
507		tr ' ' '
508		' < "$tmpdepfile" \| \
	528	tr ' ' "$nl" < "$tmpdepfile" \| \
509	529	## Some versions of the HPUX 10.20 sed can't process this invocation
510	530	## correctly. Breaking it into two sed invocations is a workaround.
511	531	sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \| sed -e 's/$/ :/' >> "$depfile"

561	581	# makedepend may prepend the VPATH from the source file name to the object.
562	582	# No need to regex-escape $object, excess matching of '.' is harmless.
563	583	sed "s\|^.$$object :$\|\1\|" "$tmpdepfile" > "$depfile"
564		sed '1,2d' "$tmpdepfile" \| tr ' ' '
565		' \| \
	584	sed '1,2d' "$tmpdepfile" \| tr ' ' "$nl" \| \
566	585	## Some versions of the HPUX 10.20 sed can't process this invocation
567	586	## correctly. Breaking it into two sed invocations is a workaround.
568	587	sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \| sed -e 's/$/ :/' >> "$depfile"

582	601	shift
583	602	fi
584	603
585		# Remove `-o $object'.
	604	# Remove '-o $object'.
586	605	IFS=" "
587	606	for arg
588	607	do

651	670	sed -n '/^#line [0-9][0-9]* "$[^"]*$"/ s::\1:p' \| $cygpath_u \| sort -u > "$tmpdepfile"
652	671	rm -f "$depfile"
653	672	echo "$object : \\" > "$depfile"
654		sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^$.*$$/ s:: \1 \\:p' >> "$depfile"
655		echo " " >> "$depfile"
	673	sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^$.*$$/ s::'"$tab"'\1 \\:p' >> "$depfile"
	674	echo "$tab" >> "$depfile"
656	675	sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^$.*$$/ s::\1\::p' >> "$depfile"
657	676	rm -f "$tmpdepfile"
658	677	;;

+7

-7

build-aux/install-sh less more

0	0	#!/bin/sh
1	1	# install - install a program, script, or datafile
2	2
3		scriptversion=2011-01-19.21; # UTC
	3	scriptversion=2011-11-20.07; # UTC
4	4
5	5	# This originates from X11R5 (mit/util/scripts/install.sh), which was
6	6	# later released in X11R6 (xc/config/util/install.sh) with the

34	34	# FSF changes to this file are in the public domain.
35	35	#
36	36	# Calling this script install-sh is preferred over install.sh, to prevent
37		# `make' implicit rules from creating a file called install from it
	37	# 'make' implicit rules from creating a file called install from it
38	38	# when there is no Makefile.
39	39	#
40	40	# This script is compatible with the BSD install script, but was written

155	155	-s) stripcmd=$stripprog;;
156	156
157	157	-t) dst_arg=$2
158		# Protect names problematic for `test' and other utilities.
	158	# Protect names problematic for 'test' and other utilities.
159	159	case $dst_arg in
160	160	-* \| [=!]) dst_arg=./$dst_arg;;
161	161	esac

189	189	fi
190	190	shift # arg
191	191	dst_arg=$arg
192		# Protect names problematic for `test' and other utilities.
	192	# Protect names problematic for 'test' and other utilities.
193	193	case $dst_arg in
194	194	-* \| [=!]) dst_arg=./$dst_arg;;
195	195	esac

201	201	echo "$0: no input file specified." >&2
202	202	exit 1
203	203	fi
204		# It's OK to call `install-sh -d' without argument.
	204	# It's OK to call 'install-sh -d' without argument.
205	205	# This can happen when creating conditional directories.
206	206	exit 0
207	207	fi

239	239
240	240	for src
241	241	do
242		# Protect names problematic for `test' and other utilities.
	242	# Protect names problematic for 'test' and other utilities.
243	243	case $src in
244	244	-* \| [=!]) src=./$src;;
245	245	esac

353	353	if test -z "$dir_arg" \|\| {
354	354	# Check for POSIX incompatibilities with -m.
355	355	# HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
356		# other-writeable bit of parent directory when it shouldn't.
	356	# other-writable bit of parent directory when it shouldn't.
357	357	# FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
358	358	ls_ld_tmpdir=`ls -ld "$tmpdir"`
359	359	case $ls_ld_tmpdir in

+51

-52

build-aux/missing less more

0	0	#! /bin/sh
1	1	# Common stub for a few missing GNU programs while installing.
2	2
3		scriptversion=2012-01-06.13; # UTC
4
5		# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
6		# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
	3	scriptversion=2012-01-06.18; # UTC
	4
	5	# Copyright (C) 1996-2012 Free Software Foundation, Inc.
7	6	# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
8	7
9	8	# This program is free software; you can redistribute it and/or modify

25	24	# the same distribution terms that you use for the rest of that program.
26	25
27	26	if test $# -eq 0; then
28		echo 1>&2 "Try \`$0 --help' for more information"
	27	echo 1>&2 "Try '$0 --help' for more information"
29	28	exit 1
30	29	fi
31	30

33	32	sed_output='s/.* --output[ =]$[^ ]$./\1/p'
34	33	sed_minuso='s/.* -o $[^ ]$./\1/p'
35	34
36		# In the cases where this matters, `missing' is being run in the
	35	# In the cases where this matters, 'missing' is being run in the
37	36	# srcdir already.
38	37	if test -f configure.ac; then
39	38	configure_ac=configure.ac

64	63	echo "\
65	64	$0 [OPTION]... PROGRAM [ARGUMENT]...
66	65
67		Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
	66	Handle 'PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
68	67	error status if there is no known handling for PROGRAM.
69	68
70	69	Options:

73	72	--run try to run the given command, and emulate it if it fails
74	73
75	74	Supported PROGRAM values:
76		aclocal touch file \`aclocal.m4'
77		autoconf touch file \`configure'
78		autoheader touch file \`config.h.in'
	75	aclocal touch file 'aclocal.m4'
	76	autoconf touch file 'configure'
	77	autoheader touch file 'config.h.in'
79	78	autom4te touch the output file, or create a stub one
80		automake touch all \`Makefile.in' files
81		bison create \`y.tab.[ch]', if possible, from existing .[ch]
82		flex create \`lex.yy.c', if possible, from existing .c
	79	automake touch all 'Makefile.in' files
	80	bison create 'y.tab.[ch]', if possible, from existing .[ch]
	81	flex create 'lex.yy.c', if possible, from existing .c
83	82	help2man touch the output file
84		lex create \`lex.yy.c', if possible, from existing .c
	83	lex create 'lex.yy.c', if possible, from existing .c
85	84	makeinfo touch the output file
86		yacc create \`y.tab.[ch]', if possible, from existing .[ch]
87
88		Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
89		\`g' are ignored when checking the name.
	85	yacc create 'y.tab.[ch]', if possible, from existing .[ch]
	86
	87	Version suffixes to PROGRAM as well as the prefixes 'gnu-', 'gnu', and
	88	'g' are ignored when checking the name.
90	89
91	90	Send bug reports to <bug-automake@gnu.org>."
92	91	exit $?

98	97	;;
99	98
100	99	-*)
101		echo 1>&2 "$0: Unknown \`$1' option"
102		echo 1>&2 "Try \`$0 --help' for more information"
	100	echo 1>&2 "$0: Unknown '$1' option"
	101	echo 1>&2 "Try '$0 --help' for more information"
103	102	exit 1
104	103	;;
105	104

126	125	exit 1
127	126	elif test "x$2" = "x--version" \|\| test "x$2" = "x--help"; then
128	127	# Could not run --version or --help. This is probably someone
129		# running `$TOOL --version' or `$TOOL --help' to check whether
	128	# running '$TOOL --version' or '$TOOL --help' to check whether
130	129	# $TOOL exists and not knowing $TOOL uses missing.
131	130	exit 1
132	131	fi

138	137	case $program in
139	138	aclocal*)
140	139	echo 1>&2 "\
141		WARNING: \`$1' is $msg. You should only need it if
142		you modified \`acinclude.m4' or \`${configure_ac}'. You might want
143		to install the \`Automake' and \`Perl' packages. Grab them from
	140	WARNING: '$1' is $msg. You should only need it if
	141	you modified 'acinclude.m4' or '${configure_ac}'. You might want
	142	to install the Automake and Perl packages. Grab them from
144	143	any GNU archive site."
145	144	touch aclocal.m4
146	145	;;
147	146
148	147	autoconf*)
149	148	echo 1>&2 "\
150		WARNING: \`$1' is $msg. You should only need it if
151		you modified \`${configure_ac}'. You might want to install the
152		\`Autoconf' and \`GNU m4' packages. Grab them from any GNU
	149	WARNING: '$1' is $msg. You should only need it if
	150	you modified '${configure_ac}'. You might want to install the
	151	Autoconf and GNU m4 packages. Grab them from any GNU
153	152	archive site."
154	153	touch configure
155	154	;;
156	155
157	156	autoheader*)
158	157	echo 1>&2 "\
159		WARNING: \`$1' is $msg. You should only need it if
160		you modified \`acconfig.h' or \`${configure_ac}'. You might want
161		to install the \`Autoconf' and \`GNU m4' packages. Grab them
	158	WARNING: '$1' is $msg. You should only need it if
	159	you modified 'acconfig.h' or '${configure_ac}'. You might want
	160	to install the Autoconf and GNU m4 packages. Grab them
162	161	from any GNU archive site."
163	162	files=`sed -n 's/^[ ]A[CM]_CONFIG_HEADER($[^)]$).*/\1/p' ${configure_ac}`
164	163	test -z "$files" && files="config.h"

175	174
176	175	automake*)
177	176	echo 1>&2 "\
178		WARNING: \`$1' is $msg. You should only need it if
179		you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
180		You might want to install the \`Automake' and \`Perl' packages.
	177	WARNING: '$1' is $msg. You should only need it if
	178	you modified 'Makefile.am', 'acinclude.m4' or '${configure_ac}'.
	179	You might want to install the Automake and Perl packages.
181	180	Grab them from any GNU archive site."
182	181	find . -type f -name Makefile.am -print \|
183	182	sed 's/\.am$/.in/' \|

186	185
187	186	autom4te*)
188	187	echo 1>&2 "\
189		WARNING: \`$1' is needed, but is $msg.
	188	WARNING: '$1' is needed, but is $msg.
190	189	You might have modified some files without having the
191	190	proper tools for further handling them.
192		You can get \`$1' as part of \`Autoconf' from any GNU
	191	You can get '$1' as part of Autoconf from any GNU
193	192	archive site."
194	193
195	194	file=`echo "$*" \| sed -n "$sed_output"`

209	208
210	209	bison\|yacc)
211	210	echo 1>&2 "\
212		WARNING: \`$1' $msg. You should only need it if
213		you modified a \`.y' file. You may need the \`Bison' package
	211	WARNING: '$1' $msg. You should only need it if
	212	you modified a '.y' file. You may need the Bison package
214	213	in order for those modifications to take effect. You can get
215		\`Bison' from any GNU archive site."
	214	Bison from any GNU archive site."
216	215	rm -f y.tab.c y.tab.h
217	216	if test $# -ne 1; then
218	217	eval LASTARG=\${$#}

239	238
240	239	lex\|flex)
241	240	echo 1>&2 "\
242		WARNING: \`$1' is $msg. You should only need it if
243		you modified a \`.l' file. You may need the \`Flex' package
	241	WARNING: '$1' is $msg. You should only need it if
	242	you modified a '.l' file. You may need the Flex package
244	243	in order for those modifications to take effect. You can get
245		\`Flex' from any GNU archive site."
	244	Flex from any GNU archive site."
246	245	rm -f lex.yy.c
247	246	if test $# -ne 1; then
248	247	eval LASTARG=\${$#}

262	261
263	262	help2man*)
264	263	echo 1>&2 "\
265		WARNING: \`$1' is $msg. You should only need it if
	264	WARNING: '$1' is $msg. You should only need it if
266	265	you modified a dependency of a manual page. You may need the
267		\`Help2man' package in order for those modifications to take
268		effect. You can get \`Help2man' from any GNU archive site."
	266	Help2man package in order for those modifications to take
	267	effect. You can get Help2man from any GNU archive site."
269	268
270	269	file=`echo "$*" \| sed -n "$sed_output"`
271	270	test -z "$file" && file=`echo "$*" \| sed -n "$sed_minuso"`

280	279
281	280	makeinfo*)
282	281	echo 1>&2 "\
283		WARNING: \`$1' is $msg. You should only need it if
284		you modified a \`.texi' or \`.texinfo' file, or any other file
	282	WARNING: '$1' is $msg. You should only need it if
	283	you modified a '.texi' or '.texinfo' file, or any other file
285	284	indirectly affecting the aspect of the manual. The spurious
286		call might also be the consequence of using a buggy \`make' (AIX,
287		DU, IRIX). You might want to install the \`Texinfo' package or
288		the \`GNU make' package. Grab either from any GNU archive site."
	285	call might also be the consequence of using a buggy 'make' (AIX,
	286	DU, IRIX). You might want to install the Texinfo package or
	287	the GNU make package. Grab either from any GNU archive site."
289	288	# The file to touch is that specified with -o ...
290	289	file=`echo "$*" \| sed -n "$sed_output"`
291	290	test -z "$file" && file=`echo "$*" \| sed -n "$sed_minuso"`

309	308
310	309	*)
311	310	echo 1>&2 "\
312		WARNING: \`$1' is needed, and is $msg.
	311	WARNING: '$1' is needed, and is $msg.
313	312	You might have modified some files without having the
314		proper tools for further handling them. Check the \`README' file,
	313	proper tools for further handling them. Check the 'README' file,
315	314	it often tells you about the needed prerequisites for installing
316	315	this package. You may also peek at any GNU archive site, in case
317		some other package would contain this missing \`$1' program."
	316	some other package would contain this missing '$1' program."
318	317	exit 1
319	318	;;
320	319	esac

+6

-0

config.h.in less more

1	1
2	2	/* always defined to indicate that i18n is enabled */
3	3	#undef ENABLE_NLS
	4
	5	/* Enable compile-time and run-time bounds-checking, and some warnings. */
	6	#if defined __OPTIMIZE__ && __OPTIMIZE__
	7	# define _FORTIFY_SOURCE 2
	8	#endif
	9
4	10
5	11	/* GETTEXT package name */
6	12	#undef GETTEXT_PACKAGE

+103

-75

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.3.
	2	# Generated by GNU Autoconf 2.68 for virt-viewer 0.5.4.
3	3	#
4	4	#
5	5	# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,

566	566	# Identity of this package.
567	567	PACKAGE_NAME='virt-viewer'
568	568	PACKAGE_TARNAME='virt-viewer'
569		PACKAGE_VERSION='0.5.3'
570		PACKAGE_STRING='virt-viewer 0.5.3'
	569	PACKAGE_VERSION='0.5.4'
	570	PACKAGE_STRING='virt-viewer 0.5.4'
571	571	PACKAGE_BUGREPORT=''
572	572	PACKAGE_URL=''
573	573

650	650	LIBXML2_CFLAGS
651	651	GLIB2_LIBS
652	652	GLIB2_CFLAGS
	653	GLIB_MKENUMS
653	654	PKG_CONFIG_LIBDIR
654	655	PKG_CONFIG_PATH
655	656	PKG_CONFIG

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

1485	1486
1486	1487	if test -n "$ac_init_help"; then
1487	1488	case $ac_init_help in
1488		short \| recursive ) echo "Configuration of virt-viewer 0.5.3:";;
	1489	short \| recursive ) echo "Configuration of virt-viewer 0.5.4:";;
1489	1490	esac
1490	1491	cat <<\_ACEOF
1491	1492

1493	1494	--disable-option-checking ignore unrecognized --enable/--with options
1494	1495	--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
1495	1496	--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
1496		--enable-silent-rules less verbose build output (undo: `make V=1')
1497		--disable-silent-rules verbose build output (undo: `make V=0')
1498		--disable-dependency-tracking speeds up one-time build
1499		--enable-dependency-tracking do not reject slow dependency extractors
	1497	--enable-silent-rules less verbose build output (undo: "make V=1")
	1498	--disable-silent-rules verbose build output (undo: "make V=0")
	1499	--enable-dependency-tracking
	1500	do not reject slow dependency extractors
	1501	--disable-dependency-tracking
	1502	speeds up one-time build
1500	1503	--enable-shared[=PKGS] build shared libraries [default=yes]
1501	1504	--enable-static[=PKGS] build static libraries [default=yes]
1502	1505	--enable-fast-install[=PKGS]

1641	1644	test -n "$ac_init_help" && exit $ac_status
1642	1645	if $ac_init_version; then
1643	1646	cat <<\_ACEOF
1644		virt-viewer configure 0.5.3
	1647	virt-viewer configure 0.5.4
1645	1648	generated by GNU Autoconf 2.68
1646	1649
1647	1650	Copyright (C) 2010 Free Software Foundation, Inc.

2006	2009	This file contains any messages produced by compilers while
2007	2010	running configure, to aid debugging if configure makes a mistake.
2008	2011
2009		It was created by virt-viewer $as_me 0.5.3, which was
	2012	It was created by virt-viewer $as_me 0.5.4, which was
2010	2013	generated by GNU Autoconf 2.68. Invocation command line was
2011	2014
2012	2015	$ $0 $@

2387	2390
2388	2391	ac_config_headers="$ac_config_headers config.h"
2389	2392
2390		am__api_version='1.11'
	2393	am__api_version='1.12'
2391	2394
2392	2395	# Find a good install program. We prefer a C program (faster),
2393	2396	# so one script is as good as another. But avoid the broken or

2484	2487
2485	2488	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
2486	2489	$as_echo_n "checking whether build environment is sane... " >&6; }
2487		# Just in case
2488		sleep 1
2489		echo timestamp > conftest.file
2490	2490	# Reject unsafe characters in $srcdir or the absolute working directory
2491	2491	# name. Accept space and tab only in the latter.
2492	2492	am_lf='

2497	2497	esac
2498	2498	case $srcdir in
2499	2499	[\\\"\#\$\&\'\`$am_lf\ \ ])
2500		as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
	2500	as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
2501	2501	esac
2502	2502
2503		# Do `set' in a subshell so we don't clobber the current shell's
	2503	# Do 'set' in a subshell so we don't clobber the current shell's
2504	2504	# arguments. Must try -L first in case configure is actually a
2505	2505	# symlink; some systems play weird games with the mod time of symlinks
2506	2506	# (eg FreeBSD returns the mod time of the symlink's containing
2507	2507	# directory).
2508	2508	if (
2509		set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
2510		if test "$*" = "X"; then
2511		# -L didn't work.
2512		set X `ls -t "$srcdir/configure" conftest.file`
2513		fi
2514		rm -f conftest.file
2515		if test "$*" != "X $srcdir/configure conftest.file" \
2516		&& test "$*" != "X conftest.file $srcdir/configure"; then
2517
2518		# If neither matched, then we have a broken ls. This can happen
2519		# if, for instance, CONFIG_SHELL is bash and it inherits a
2520		# broken ls alias from the environment. This has actually
2521		# happened. Such a system could not be considered "sane".
2522		as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
2523		alias in your environment" "$LINENO" 5
2524		fi
2525
	2509	am_has_slept=no
	2510	for am_try in 1 2; do
	2511	echo "timestamp, slept: $am_has_slept" > conftest.file
	2512	set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
	2513	if test "$*" = "X"; then
	2514	# -L didn't work.
	2515	set X `ls -t "$srcdir/configure" conftest.file`
	2516	fi
	2517	if test "$*" != "X $srcdir/configure conftest.file" \
	2518	&& test "$*" != "X conftest.file $srcdir/configure"; then
	2519
	2520	# If neither matched, then we have a broken ls. This can happen
	2521	# if, for instance, CONFIG_SHELL is bash and it inherits a
	2522	# broken ls alias from the environment. This has actually
	2523	# happened. Such a system could not be considered "sane".
	2524	as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
	2525	alias in your environment" "$LINENO" 5
	2526	fi
	2527	if test "$2" = conftest.file \|\| test $am_try -eq 2; then
	2528	break
	2529	fi
	2530	# Just in case.
	2531	sleep 1
	2532	am_has_slept=yes
	2533	done
2526	2534	test "$2" = conftest.file
2527	2535	)
2528	2536	then

2534	2542	fi
2535	2543	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
2536	2544	$as_echo "yes" >&6; }
	2545	# If we didn't sleep, we still need to ensure time stamps of config.status and
	2546	# generated files are strictly newer.
	2547	am_sleep_pid=
	2548	if grep 'slept: no' conftest.file >/dev/null 2>&1; then
	2549	( sleep 1 ) &
	2550	am_sleep_pid=$!
	2551	fi
	2552
	2553	rm -f conftest.file
	2554
2537	2555	test "$program_prefix" != NONE &&
2538	2556	program_transform_name="s&^&$program_prefix&;$program_transform_name"
2539	2557	# Use a double $ so make ignores it.

2560	2578	am_missing_run="$MISSING --run "
2561	2579	else
2562	2580	am_missing_run=
2563		{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
2564		$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
	2581	{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
	2582	$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
2565	2583	fi
2566	2584
2567	2585	if test x"${install_sh}" != xset; then

2573	2591	esac
2574	2592	fi
2575	2593
2576		# Installed binaries are usually stripped using `strip' when the user
2577		# run `make install-strip'. However `strip' might not be the right
	2594	# Installed binaries are usually stripped using 'strip' when the user
	2595	# run "make install-strip". However 'strip' might not be the right
2578	2596	# tool to use in cross-compilation environments, therefore Automake
2579		# will honor the `STRIP' environment variable to overrule this program.
	2597	# will honor the 'STRIP' environment variable to overrule this program.
2580	2598	if test "$cross_compiling" != no; then
2581	2599	if test -n "$ac_tool_prefix"; then
2582	2600	# Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.

2715	2733	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
2716	2734	$as_echo "$MKDIR_P" >&6; }
2717	2735
2718		mkdir_p="$MKDIR_P"
2719		case $mkdir_p in
2720		[\\/$]* \| ?:[\\/]*) ;;
2721		/) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
2722		esac
2723
2724	2736	for ac_prog in gawk mawk nawk awk
2725	2737	do
2726	2738	# Extract the first word of "$ac_prog", so it can be a program name with args.

2825	2837
2826	2838	# Define the identity of the package.
2827	2839	PACKAGE='virt-viewer'
2828		VERSION='0.5.3'
	2840	VERSION='0.5.4'
2829	2841
2830	2842
2831	2843	cat >>confdefs.h <<_ACEOF

2852	2864
2853	2865
2854	2866	MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
	2867
	2868	# For better backward compatibility. To be removed once Automake 1.9.x
	2869	# dies out for good. For more background, see:
	2870	# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
	2871	# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
	2872	mkdir_p='$(MKDIR_P)'
2855	2873
2856	2874	# We need awk for the "check" target. The system "awk" is bad on
2857	2875	# some platforms.

2944	2962	enableval=$enable_silent_rules;
2945	2963	fi
2946	2964
2947		case $enable_silent_rules in
2948		yes) AM_DEFAULT_VERBOSITY=0;;
2949		no) AM_DEFAULT_VERBOSITY=1;;
2950		*) AM_DEFAULT_VERBOSITY=0;;
	2965	case $enable_silent_rules in # (((
	2966	yes) AM_DEFAULT_VERBOSITY=0;;
	2967	no) AM_DEFAULT_VERBOSITY=1;;
	2968	*) AM_DEFAULT_VERBOSITY=0;;
2951	2969	esac
2952	2970	am_make=${MAKE-make}
2953	2971	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5

2979	2997	AM_BACKSLASH='\'
2980	2998
2981	2999
2982		GLIB2_REQUIRED=2.12.0
	3000	GLIB2_REQUIRED=2.22.0
2983	3001	LIBXML2_REQUIRED="2.6.0"
2984	3002	LIBVIRT_REQUIRED="0.9.7"
2985	3003	GTK2_REQUIRED="2.18.0"
2986	3004	GTK3_REQUIRED="3.0"
2987	3005	GTK_VNC1_REQUIRED="0.3.8"
2988	3006	GTK_VNC2_REQUIRED="0.4.0"
2989		SPICE_GTK_REQUIRED="0.11"
	3007	SPICE_GTK_REQUIRED="0.12.101"
2990	3008	SPICE_PROTOCOL_REQUIRED="0.10.1"
2991	3009
2992	3010	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for native Win32" >&5

3818	3836	_am_result=none
3819	3837	# First try GNU make style include.
3820	3838	echo "include confinc" > confmf
3821		# Ignore all kinds of additional output from `make'.
	3839	# Ignore all kinds of additional output from 'make'.
3822	3840	case `$am_make -s -f confmf 2> /dev/null` in #(
3823	3841	the\ am__doit\ target)
3824	3842	am__include=include

3874	3892	# We make a subdir and do the tests there. Otherwise we can end up
3875	3893	# making bogus files that we don't know about and never remove. For
3876	3894	# instance it was reported that on HP-UX the gcc test will end up
3877		# making a dummy file named `D' -- because `-MD' means `put the output
3878		# in D'.
	3895	# making a dummy file named 'D' -- because '-MD' means "put the output
	3896	# in D".
3879	3897	rm -rf conftest.dir
3880	3898	mkdir conftest.dir
3881	3899	# Copy depcomp to subdir because otherwise we won't find it if we're

3910	3928	: > sub/conftest.c
3911	3929	for i in 1 2 3 4 5 6; do
3912	3930	echo '#include "conftst'$i'.h"' >> sub/conftest.c
3913		# Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
3914		# Solaris 8's {/usr,}/bin/sh.
3915		touch sub/conftst$i.h
	3931	# Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
	3932	# Solaris 10 /bin/sh.
	3933	echo '/* dummy */' > sub/conftst$i.h
3916	3934	done
3917	3935	echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
3918	3936
3919		# We check with `-c' and `-o' for the sake of the "dashmstdout"
	3937	# We check with '-c' and '-o' for the sake of the "dashmstdout"
3920	3938	# mode. It turns out that the SunPro C++ compiler does not properly
3921		# handle `-M -o', and we need to detect this. Also, some Intel
3922		# versions had trouble with output in subdirs
	3939	# handle '-M -o', and we need to detect this. Also, some Intel
	3940	# versions had trouble with output in subdirs.
3923	3941	am__obj=sub/conftest.${OBJEXT-o}
3924	3942	am__minus_obj="-o $am__obj"
3925	3943	case $depmode in

3928	3946	test "$am__universal" = false \|\| continue
3929	3947	;;
3930	3948	nosideeffect)
3931		# after this tag, mechanisms are not by side-effect, so they'll
3932		# only be used when explicitly requested
	3949	# After this tag, mechanisms are not by side-effect, so they'll
	3950	# only be used when explicitly requested.
3933	3951	if test "x$enable_dependency_tracking" = xyes; then
3934	3952	continue
3935	3953	else

3937	3955	fi
3938	3956	;;
3939	3957	msvc7 \| msvc7msys \| msvisualcpp \| msvcmsys)
3940		# This compiler won't grok `-c -o', but also, the minuso test has
	3958	# This compiler won't grok '-c -o', but also, the minuso test has
3941	3959	# not run yet. These depmodes are late enough in the game, and
3942	3960	# so weak that their functioning should not be impacted.
3943	3961	am__obj=conftest.${OBJEXT-o}

11805	11823
11806	11824	warnCFLAGS=
11807	11825
11808		try_compiler_flags="-Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -fasynchronous-unwind-tables"
	11826	try_compiler_flags="-fexceptions -fstack-protector --param=ssp-buffer-size=4 -fasynchronous-unwind-tables"
11809	11827
11810	11828	case "$enable_compile_warnings" in
11811	11829	no)

11829	11847	as_fn_error $? "Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" "$LINENO" 5
11830	11848	;;
11831	11849	esac
	11850
	11851
11832	11852
11833	11853	compiler_flags=
11834	11854	for option in $try_compiler_flags; do

13197	13217
13198	13218
13199	13219
13200
13201	13220	if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
13202	13221	if test -n "$ac_tool_prefix"; then
13203	13222	# Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.

13311	13330	PKG_CONFIG=""
13312	13331	fi
13313	13332	fi
	13333	GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
	13334
	13335
13314	13336
13315	13337	pkg_failed=no
13316	13338	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB2" >&5

14519	14541	fi
14520	14542
14521	14543
14522		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 mingw32-virt-viewer.spec plugin/Makefile po/Makefile.in src/Makefile src/virt-viewer.rc virt-viewer.spec"
	14544	ac_config_files="$ac_config_files Makefile data/Makefile data/virt-viewer.nsis icons/Makefile icons/16x16/Makefile icons/22x22/Makefile icons/24x24/Makefile icons/32x32/Makefile icons/48x48/Makefile icons/256x256/Makefile man/Makefile mingw-virt-viewer.spec plugin/Makefile po/Makefile.in src/Makefile src/virt-viewer.rc virt-viewer.spec"
14523	14545
14524	14546	cat >confcache <<\_ACEOF
14525	14547	# This file is a shell script that caches the results of configure

14630	14652	LTLIBOBJS=$ac_ltlibobjs
14631	14653
14632	14654
	14655	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
	14656	$as_echo_n "checking that generated files are newer than configure... " >&6; }
	14657	if test -n "$am_sleep_pid"; then
	14658	# Hide warnings about reused PIDs.
	14659	wait $am_sleep_pid 2>/dev/null
	14660	fi
	14661	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
	14662	$as_echo "done" >&6; }
14633	14663	if test -n "$EXEEXT"; then
14634	14664	am__EXEEXT_TRUE=
14635	14665	am__EXEEXT_FALSE='#'

15087	15117	# report actual input values of CONFIG_FILES etc. instead of their
15088	15118	# values after options handling.
15089	15119	ac_log="
15090		This file was extended by virt-viewer $as_me 0.5.3, which was
	15120	This file was extended by virt-viewer $as_me 0.5.4, which was
15091	15121	generated by GNU Autoconf 2.68. Invocation command line was
15092	15122
15093	15123	CONFIG_FILES = $CONFIG_FILES

15157	15187	cat >>$CONFIG_STATUS <<_ACEOF \|\| ac_write_fail=1
15158	15188	ac_cs_config="`$as_echo "$ac_configure_args" \| sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
15159	15189	ac_cs_version="\\
15160		virt-viewer config.status 0.5.3
	15190	virt-viewer config.status 0.5.4
15161	15191	configured by $0, generated by GNU Autoconf 2.68,
15162	15192	with options \\"\$ac_cs_config\\"
15163	15193

15581	15611	"icons/48x48/Makefile") CONFIG_FILES="$CONFIG_FILES icons/48x48/Makefile" ;;
15582	15612	"icons/256x256/Makefile") CONFIG_FILES="$CONFIG_FILES icons/256x256/Makefile" ;;
15583	15613	"man/Makefile") CONFIG_FILES="$CONFIG_FILES man/Makefile" ;;
15584		"mingw32-virt-viewer.spec") CONFIG_FILES="$CONFIG_FILES mingw32-virt-viewer.spec" ;;
	15614	"mingw-virt-viewer.spec") CONFIG_FILES="$CONFIG_FILES mingw-virt-viewer.spec" ;;
15585	15615	"plugin/Makefile") CONFIG_FILES="$CONFIG_FILES plugin/Makefile" ;;
15586	15616	"po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
15587	15617	"src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;

16229	16259	# Strip MF so we end up with the name of the file.
16230	16260	mf=`echo "$mf" \| sed -e 's/:.*$//'`
16231	16261	# Check whether this is an Automake generated Makefile or not.
16232		# We used to match only the files named `Makefile.in', but
	16262	# We used to match only the files named 'Makefile.in', but
16233	16263	# some people rename them; so instead we look at the file content.
16234	16264	# Grep'ing the first line is not enough: some people post-process
16235	16265	# each Makefile.in and add a new line on top of each file to say so.

16263	16293	continue
16264	16294	fi
16265	16295	# Extract the definition of DEPDIR, am__include, and am__quote
16266		# from the Makefile without running `make'.
	16296	# from the Makefile without running 'make'.
16267	16297	DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
16268	16298	test -z "$DEPDIR" && continue
16269	16299	am__include=`sed -n 's/^am__include = //p' < "$mf"`
16270	16300	test -z "am__include" && continue
16271	16301	am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
16272		# When using ansi2knr, U may be empty or an underscore; expand it
16273		U=`sed -n 's/^U = //p' < "$mf"`
16274	16302	# Find all dependency output files, they are included files with
16275	16303	# $(DEPDIR) in their names. We invoke sed twice because it is the
16276	16304	# simplest approach to changing $(DEPDIR) to its actual value in the
16277	16305	# expansion.
16278	16306	for file in `sed -n "
16279	16307	s/^$am__include $am__quote$.(DEPDIR).$$am__quote"'$/\1/p' <"$mf" \| \
16280		sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
	16308	sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
16281	16309	# Make sure the directory exists.
16282	16310	test -f "$dirpart/$file" && continue
16283	16311	fdir=`$as_dirname -- "$file" \|\|

+7

-4

configure.ac less more

0	0
1		AC_INIT(virt-viewer, 0.5.3)
	1	AC_INIT(virt-viewer, 0.5.4)
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])

11	11	m4_ifndef([AM_SILENT_RULES], [m4_define([AM_SILENT_RULES],[])])
12	12	AM_SILENT_RULES([yes])
13	13
14		GLIB2_REQUIRED=2.12.0
	14	GLIB2_REQUIRED=2.22.0
15	15	LIBXML2_REQUIRED="2.6.0"
16	16	LIBVIRT_REQUIRED="0.9.7"
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.11"
	21	SPICE_GTK_REQUIRED="0.12.101"
22	22	SPICE_PROTOCOL_REQUIRED="0.10.1"
23	23
24	24	AC_MSG_CHECKING([for native Win32])

71	71	AM_GLIB_GNU_GETTEXT
72	72	IT_PROG_INTLTOOL([0.35.0])
73	73
	74	PKG_PROG_PKG_CONFIG
	75	GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
	76	AC_SUBST(GLIB_MKENUMS)
74	77
75	78	PKG_CHECK_MODULES(GLIB2, glib-2.0 >= $GLIB2_REQUIRED gthread-2.0 gmodule-export-2.0)
76	79	PKG_CHECK_MODULES(LIBXML2, libxml-2.0 >= $LIBXML2_REQUIRED)

200	203	icons/48x48/Makefile
201	204	icons/256x256/Makefile
202	205	man/Makefile
203		mingw32-virt-viewer.spec
	206	mingw-virt-viewer.spec
204	207	plugin/Makefile
205	208	po/Makefile.in
206	209	src/Makefile

+35

-5

data/Makefile.in less more

0		# Makefile.in generated by automake 1.11.3 from Makefile.am.
	0	# Makefile.in generated by automake 1.12.2 from Makefile.am.
1	1	# @configure_input@
2	2
3		# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
4		# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
5		# Foundation, Inc.
	3	# Copyright (C) 1994-2012 Free Software Foundation, Inc.
	4
6	5	# This Makefile.in is free software; the Free Software Foundation
7	6	# gives unlimited permission to copy and/or distribute it,
8	7	# with or without modifications, as long as this notice is preserved.

14	13
15	14	@SET_MAKE@
16	15	VPATH = @srcdir@
	16	am__make_dryrun = \
	17	{ \
	18	am__dry=no; \
	19	case $$MAKEFLAGS in \
	20	\\[\ \ ]) \
	21	echo 'am--echo: ; @echo "AM" OK' \| $(MAKE) -f - 2>/dev/null \
	22	\| grep '^AM OK$$' >/dev/null \|\| am__dry=yes;; \
	23	*) \
	24	for am__flg in $$MAKEFLAGS; do \
	25	case $$am__flg in \
	26	=\|--*) ;; \
	27	n) am__dry=yes; break;; \
	28	esac; \
	29	done;; \
	30	esac; \
	31	test $$am__dry = yes; \
	32	}
17	33	pkgdatadir = $(datadir)/@PACKAGE@
18	34	pkgincludedir = $(includedir)/@PACKAGE@
19	35	pkglibdir = $(libdir)/@PACKAGE@

47	63	CONFIG_HEADER = $(top_builddir)/config.h
48	64	CONFIG_CLEAN_FILES = virt-viewer.nsis
49	65	CONFIG_CLEAN_VPATH_FILES =
	66	AM_V_P = $(am__v_P_@AM_V@)
	67	am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
	68	am__v_P_0 = false
	69	am__v_P_1 = :
50	70	AM_V_GEN = $(am__v_GEN_@AM_V@)
51	71	am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
52		am__v_GEN_0 = @echo " GEN " $@;
	72	am__v_GEN_0 = @echo " GEN " $@;
	73	am__v_GEN_1 =
53	74	AM_V_at = $(am__v_at_@AM_V@)
54	75	am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
55	76	am__v_at_0 = @
	77	am__v_at_1 =
56	78	SOURCES =
57	79	DIST_SOURCES =
	80	am__can_run_installinfo = \
	81	case $$AM_UPDATE_INFO_DIR in \
	82	n\|no\|NO) false;; \
	83	*) (install-info --version) >/dev/null 2>&1;; \
	84	esac
58	85	DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
59	86	ACLOCAL = @ACLOCAL@
60	87	ALL_LINGUAS = @ALL_LINGUAS@

90	117	GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
91	118	GLIB2_CFLAGS = @GLIB2_CFLAGS@
92	119	GLIB2_LIBS = @GLIB2_LIBS@
	120	GLIB_MKENUMS = @GLIB_MKENUMS@
93	121	GMOFILES = @GMOFILES@
94	122	GMSGFMT = @GMSGFMT@
95	123	GREP = @GREP@

283	311	ctags: CTAGS
284	312	CTAGS:
285	313
	314	cscope cscopelist:
	315
286	316
287	317	distdir: $(DISTFILES)
288	318	@srcdirstrip=`echo "$(srcdir)" \| sed 's/[].[^$$\\*]/\\\\&/g'`; \

+39

-6

icons/16x16/Makefile.in less more

0		# Makefile.in generated by automake 1.11.3 from Makefile.am.
	0	# Makefile.in generated by automake 1.12.2 from Makefile.am.
1	1	# @configure_input@
2	2
3		# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
4		# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
5		# Foundation, Inc.
	3	# Copyright (C) 1994-2012 Free Software Foundation, Inc.
	4
6	5	# This Makefile.in is free software; the Free Software Foundation
7	6	# gives unlimited permission to copy and/or distribute it,
8	7	# with or without modifications, as long as this notice is preserved.

15	14	@SET_MAKE@
16	15
17	16	VPATH = @srcdir@
	17	am__make_dryrun = \
	18	{ \
	19	am__dry=no; \
	20	case $$MAKEFLAGS in \
	21	\\[\ \ ]) \
	22	echo 'am--echo: ; @echo "AM" OK' \| $(MAKE) -f - 2>/dev/null \
	23	\| grep '^AM OK$$' >/dev/null \|\| am__dry=yes;; \
	24	*) \
	25	for am__flg in $$MAKEFLAGS; do \
	26	case $$am__flg in \
	27	=\|--*) ;; \
	28	n) am__dry=yes; break;; \
	29	esac; \
	30	done;; \
	31	esac; \
	32	test $$am__dry = yes; \
	33	}
18	34	pkgdatadir = $(datadir)/@PACKAGE@
19	35	pkgincludedir = $(includedir)/@PACKAGE@
20	36	pkglibdir = $(libdir)/@PACKAGE@

47	63	CONFIG_HEADER = $(top_builddir)/config.h
48	64	CONFIG_CLEAN_FILES =
49	65	CONFIG_CLEAN_VPATH_FILES =
	66	AM_V_P = $(am__v_P_@AM_V@)
	67	am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
	68	am__v_P_0 = false
	69	am__v_P_1 = :
50	70	AM_V_GEN = $(am__v_GEN_@AM_V@)
51	71	am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
52		am__v_GEN_0 = @echo " GEN " $@;
	72	am__v_GEN_0 = @echo " GEN " $@;
	73	am__v_GEN_1 =
53	74	AM_V_at = $(am__v_at_@AM_V@)
54	75	am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
55	76	am__v_at_0 = @
	77	am__v_at_1 =
56	78	SOURCES =
57	79	DIST_SOURCES =
	80	am__can_run_installinfo = \
	81	case $$AM_UPDATE_INFO_DIR in \
	82	n\|no\|NO) false;; \
	83	*) (install-info --version) >/dev/null 2>&1;; \
	84	esac
58	85	am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" \| sed 's\|.\|.\|g'`;
59	86	am__vpath_adj = case $$p in \
60	87	$(srcdir)/*) f=`echo "$$p" \| sed "s\|^$$srcdirstrip/\|\|"`;; \

119	146	GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
120	147	GLIB2_CFLAGS = @GLIB2_CFLAGS@
121	148	GLIB2_LIBS = @GLIB2_LIBS@
	149	GLIB_MKENUMS = @GLIB_MKENUMS@
122	150	GMOFILES = @GMOFILES@
123	151	GMSGFMT = @GMSGFMT@
124	152	GREP = @GREP@

304	332	-rm -rf .libs _libs
305	333	install-iconDATA: $(icon_DATA)
306	334	@$(NORMAL_INSTALL)
307		test -z "$(icondir)" \|\| $(MKDIR_P) "$(DESTDIR)$(icondir)"
308	335	@list='$(icon_DATA)'; test -n "$(icondir)" \|\| list=; \
	336	if test -n "$$list"; then \
	337	echo " $(MKDIR_P) '$(DESTDIR)$(icondir)'"; \
	338	$(MKDIR_P) "$(DESTDIR)$(icondir)" \|\| exit 1; \
	339	fi; \
309	340	for p in $$list; do \
310	341	if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
311	342	echo "$$d$$p"; \

325	356
326	357	ctags: CTAGS
327	358	CTAGS:
	359
	360	cscope cscopelist:
328	361
329	362
330	363	distdir: $(DISTFILES)

+39

-6

icons/22x22/Makefile.in less more

0		# Makefile.in generated by automake 1.11.3 from Makefile.am.
	0	# Makefile.in generated by automake 1.12.2 from Makefile.am.
1	1	# @configure_input@
2	2
3		# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
4		# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
5		# Foundation, Inc.
	3	# Copyright (C) 1994-2012 Free Software Foundation, Inc.
	4
6	5	# This Makefile.in is free software; the Free Software Foundation
7	6	# gives unlimited permission to copy and/or distribute it,
8	7	# with or without modifications, as long as this notice is preserved.

15	14	@SET_MAKE@
16	15
17	16	VPATH = @srcdir@
	17	am__make_dryrun = \
	18	{ \
	19	am__dry=no; \
	20	case $$MAKEFLAGS in \
	21	\\[\ \ ]) \
	22	echo 'am--echo: ; @echo "AM" OK' \| $(MAKE) -f - 2>/dev/null \
	23	\| grep '^AM OK$$' >/dev/null \|\| am__dry=yes;; \
	24	*) \
	25	for am__flg in $$MAKEFLAGS; do \
	26	case $$am__flg in \
	27	=\|--*) ;; \
	28	n) am__dry=yes; break;; \
	29	esac; \
	30	done;; \
	31	esac; \
	32	test $$am__dry = yes; \
	33	}
18	34	pkgdatadir = $(datadir)/@PACKAGE@
19	35	pkgincludedir = $(includedir)/@PACKAGE@
20	36	pkglibdir = $(libdir)/@PACKAGE@

47	63	CONFIG_HEADER = $(top_builddir)/config.h
48	64	CONFIG_CLEAN_FILES =
49	65	CONFIG_CLEAN_VPATH_FILES =
	66	AM_V_P = $(am__v_P_@AM_V@)
	67	am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
	68	am__v_P_0 = false
	69	am__v_P_1 = :
50	70	AM_V_GEN = $(am__v_GEN_@AM_V@)
51	71	am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
52		am__v_GEN_0 = @echo " GEN " $@;
	72	am__v_GEN_0 = @echo " GEN " $@;
	73	am__v_GEN_1 =
53	74	AM_V_at = $(am__v_at_@AM_V@)
54	75	am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
55	76	am__v_at_0 = @
	77	am__v_at_1 =
56	78	SOURCES =
57	79	DIST_SOURCES =
	80	am__can_run_installinfo = \
	81	case $$AM_UPDATE_INFO_DIR in \
	82	n\|no\|NO) false;; \
	83	*) (install-info --version) >/dev/null 2>&1;; \
	84	esac
58	85	am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" \| sed 's\|.\|.\|g'`;
59	86	am__vpath_adj = case $$p in \
60	87	$(srcdir)/*) f=`echo "$$p" \| sed "s\|^$$srcdirstrip/\|\|"`;; \

119	146	GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
120	147	GLIB2_CFLAGS = @GLIB2_CFLAGS@
121	148	GLIB2_LIBS = @GLIB2_LIBS@
	149	GLIB_MKENUMS = @GLIB_MKENUMS@
122	150	GMOFILES = @GMOFILES@
123	151	GMSGFMT = @GMSGFMT@
124	152	GREP = @GREP@

304	332	-rm -rf .libs _libs
305	333	install-iconDATA: $(icon_DATA)
306	334	@$(NORMAL_INSTALL)
307		test -z "$(icondir)" \|\| $(MKDIR_P) "$(DESTDIR)$(icondir)"
308	335	@list='$(icon_DATA)'; test -n "$(icondir)" \|\| list=; \
	336	if test -n "$$list"; then \
	337	echo " $(MKDIR_P) '$(DESTDIR)$(icondir)'"; \
	338	$(MKDIR_P) "$(DESTDIR)$(icondir)" \|\| exit 1; \
	339	fi; \
309	340	for p in $$list; do \
310	341	if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
311	342	echo "$$d$$p"; \

325	356
326	357	ctags: CTAGS
327	358	CTAGS:
	359
	360	cscope cscopelist:
328	361
329	362
330	363	distdir: $(DISTFILES)

+39

-6

icons/24x24/Makefile.in less more

0		# Makefile.in generated by automake 1.11.3 from Makefile.am.
	0	# Makefile.in generated by automake 1.12.2 from Makefile.am.
1	1	# @configure_input@
2	2
3		# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
4		# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
5		# Foundation, Inc.
	3	# Copyright (C) 1994-2012 Free Software Foundation, Inc.
	4
6	5	# This Makefile.in is free software; the Free Software Foundation
7	6	# gives unlimited permission to copy and/or distribute it,
8	7	# with or without modifications, as long as this notice is preserved.

15	14	@SET_MAKE@
16	15
17	16	VPATH = @srcdir@
	17	am__make_dryrun = \
	18	{ \
	19	am__dry=no; \
	20	case $$MAKEFLAGS in \
	21	\\[\ \ ]) \
	22	echo 'am--echo: ; @echo "AM" OK' \| $(MAKE) -f - 2>/dev/null \
	23	\| grep '^AM OK$$' >/dev/null \|\| am__dry=yes;; \
	24	*) \
	25	for am__flg in $$MAKEFLAGS; do \
	26	case $$am__flg in \
	27	=\|--*) ;; \
	28	n) am__dry=yes; break;; \
	29	esac; \
	30	done;; \
	31	esac; \
	32	test $$am__dry = yes; \
	33	}
18	34	pkgdatadir = $(datadir)/@PACKAGE@
19	35	pkgincludedir = $(includedir)/@PACKAGE@
20	36	pkglibdir = $(libdir)/@PACKAGE@

47	63	CONFIG_HEADER = $(top_builddir)/config.h
48	64	CONFIG_CLEAN_FILES =
49	65	CONFIG_CLEAN_VPATH_FILES =
	66	AM_V_P = $(am__v_P_@AM_V@)
	67	am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
	68	am__v_P_0 = false
	69	am__v_P_1 = :
50	70	AM_V_GEN = $(am__v_GEN_@AM_V@)
51	71	am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
52		am__v_GEN_0 = @echo " GEN " $@;
	72	am__v_GEN_0 = @echo " GEN " $@;
	73	am__v_GEN_1 =
53	74	AM_V_at = $(am__v_at_@AM_V@)
54	75	am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
55	76	am__v_at_0 = @
	77	am__v_at_1 =
56	78	SOURCES =
57	79	DIST_SOURCES =
	80	am__can_run_installinfo = \
	81	case $$AM_UPDATE_INFO_DIR in \
	82	n\|no\|NO) false;; \
	83	*) (install-info --version) >/dev/null 2>&1;; \
	84	esac
58	85	am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" \| sed 's\|.\|.\|g'`;
59	86	am__vpath_adj = case $$p in \
60	87	$(srcdir)/*) f=`echo "$$p" \| sed "s\|^$$srcdirstrip/\|\|"`;; \

119	146	GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
120	147	GLIB2_CFLAGS = @GLIB2_CFLAGS@
121	148	GLIB2_LIBS = @GLIB2_LIBS@
	149	GLIB_MKENUMS = @GLIB_MKENUMS@
122	150	GMOFILES = @GMOFILES@
123	151	GMSGFMT = @GMSGFMT@
124	152	GREP = @GREP@

304	332	-rm -rf .libs _libs
305	333	install-iconDATA: $(icon_DATA)
306	334	@$(NORMAL_INSTALL)
307		test -z "$(icondir)" \|\| $(MKDIR_P) "$(DESTDIR)$(icondir)"
308	335	@list='$(icon_DATA)'; test -n "$(icondir)" \|\| list=; \
	336	if test -n "$$list"; then \
	337	echo " $(MKDIR_P) '$(DESTDIR)$(icondir)'"; \
	338	$(MKDIR_P) "$(DESTDIR)$(icondir)" \|\| exit 1; \
	339	fi; \
309	340	for p in $$list; do \
310	341	if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
311	342	echo "$$d$$p"; \

325	356
326	357	ctags: CTAGS
327	358	CTAGS:
	359
	360	cscope cscopelist:
328	361
329	362
330	363	distdir: $(DISTFILES)

+39

-6

icons/256x256/Makefile.in less more

0		# Makefile.in generated by automake 1.11.3 from Makefile.am.
	0	# Makefile.in generated by automake 1.12.2 from Makefile.am.
1	1	# @configure_input@
2	2
3		# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
4		# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
5		# Foundation, Inc.
	3	# Copyright (C) 1994-2012 Free Software Foundation, Inc.
	4
6	5	# This Makefile.in is free software; the Free Software Foundation
7	6	# gives unlimited permission to copy and/or distribute it,
8	7	# with or without modifications, as long as this notice is preserved.

15	14	@SET_MAKE@
16	15
17	16	VPATH = @srcdir@
	17	am__make_dryrun = \
	18	{ \
	19	am__dry=no; \
	20	case $$MAKEFLAGS in \
	21	\\[\ \ ]) \
	22	echo 'am--echo: ; @echo "AM" OK' \| $(MAKE) -f - 2>/dev/null \
	23	\| grep '^AM OK$$' >/dev/null \|\| am__dry=yes;; \
	24	*) \
	25	for am__flg in $$MAKEFLAGS; do \
	26	case $$am__flg in \
	27	=\|--*) ;; \
	28	n) am__dry=yes; break;; \
	29	esac; \
	30	done;; \
	31	esac; \
	32	test $$am__dry = yes; \
	33	}
18	34	pkgdatadir = $(datadir)/@PACKAGE@
19	35	pkgincludedir = $(includedir)/@PACKAGE@
20	36	pkglibdir = $(libdir)/@PACKAGE@

47	63	CONFIG_HEADER = $(top_builddir)/config.h
48	64	CONFIG_CLEAN_FILES =
49	65	CONFIG_CLEAN_VPATH_FILES =
	66	AM_V_P = $(am__v_P_@AM_V@)
	67	am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
	68	am__v_P_0 = false
	69	am__v_P_1 = :
50	70	AM_V_GEN = $(am__v_GEN_@AM_V@)
51	71	am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
52		am__v_GEN_0 = @echo " GEN " $@;
	72	am__v_GEN_0 = @echo " GEN " $@;
	73	am__v_GEN_1 =
53	74	AM_V_at = $(am__v_at_@AM_V@)
54	75	am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
55	76	am__v_at_0 = @
	77	am__v_at_1 =
56	78	SOURCES =
57	79	DIST_SOURCES =
	80	am__can_run_installinfo = \
	81	case $$AM_UPDATE_INFO_DIR in \
	82	n\|no\|NO) false;; \
	83	*) (install-info --version) >/dev/null 2>&1;; \
	84	esac
58	85	am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" \| sed 's\|.\|.\|g'`;
59	86	am__vpath_adj = case $$p in \
60	87	$(srcdir)/*) f=`echo "$$p" \| sed "s\|^$$srcdirstrip/\|\|"`;; \

119	146	GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
120	147	GLIB2_CFLAGS = @GLIB2_CFLAGS@
121	148	GLIB2_LIBS = @GLIB2_LIBS@
	149	GLIB_MKENUMS = @GLIB_MKENUMS@
122	150	GMOFILES = @GMOFILES@
123	151	GMSGFMT = @GMSGFMT@
124	152	GREP = @GREP@

304	332	-rm -rf .libs _libs
305	333	install-iconDATA: $(icon_DATA)
306	334	@$(NORMAL_INSTALL)
307		test -z "$(icondir)" \|\| $(MKDIR_P) "$(DESTDIR)$(icondir)"
308	335	@list='$(icon_DATA)'; test -n "$(icondir)" \|\| list=; \
	336	if test -n "$$list"; then \
	337	echo " $(MKDIR_P) '$(DESTDIR)$(icondir)'"; \
	338	$(MKDIR_P) "$(DESTDIR)$(icondir)" \|\| exit 1; \
	339	fi; \
309	340	for p in $$list; do \
310	341	if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
311	342	echo "$$d$$p"; \

325	356
326	357	ctags: CTAGS
327	358	CTAGS:
	359
	360	cscope cscopelist:
328	361
329	362
330	363	distdir: $(DISTFILES)

+39

-6

icons/32x32/Makefile.in less more

0		# Makefile.in generated by automake 1.11.3 from Makefile.am.
	0	# Makefile.in generated by automake 1.12.2 from Makefile.am.
1	1	# @configure_input@
2	2
3		# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
4		# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
5		# Foundation, Inc.
	3	# Copyright (C) 1994-2012 Free Software Foundation, Inc.
	4
6	5	# This Makefile.in is free software; the Free Software Foundation
7	6	# gives unlimited permission to copy and/or distribute it,
8	7	# with or without modifications, as long as this notice is preserved.

15	14	@SET_MAKE@
16	15
17	16	VPATH = @srcdir@
	17	am__make_dryrun = \
	18	{ \
	19	am__dry=no; \
	20	case $$MAKEFLAGS in \
	21	\\[\ \ ]) \
	22	echo 'am--echo: ; @echo "AM" OK' \| $(MAKE) -f - 2>/dev/null \
	23	\| grep '^AM OK$$' >/dev/null \|\| am__dry=yes;; \
	24	*) \
	25	for am__flg in $$MAKEFLAGS; do \
	26	case $$am__flg in \
	27	=\|--*) ;; \
	28	n) am__dry=yes; break;; \
	29	esac; \
	30	done;; \
	31	esac; \
	32	test $$am__dry = yes; \
	33	}
18	34	pkgdatadir = $(datadir)/@PACKAGE@
19	35	pkgincludedir = $(includedir)/@PACKAGE@
20	36	pkglibdir = $(libdir)/@PACKAGE@

47	63	CONFIG_HEADER = $(top_builddir)/config.h
48	64	CONFIG_CLEAN_FILES =
49	65	CONFIG_CLEAN_VPATH_FILES =
	66	AM_V_P = $(am__v_P_@AM_V@)
	67	am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
	68	am__v_P_0 = false
	69	am__v_P_1 = :
50	70	AM_V_GEN = $(am__v_GEN_@AM_V@)
51	71	am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
52		am__v_GEN_0 = @echo " GEN " $@;
	72	am__v_GEN_0 = @echo " GEN " $@;
	73	am__v_GEN_1 =
53	74	AM_V_at = $(am__v_at_@AM_V@)
54	75	am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
55	76	am__v_at_0 = @
	77	am__v_at_1 =
56	78	SOURCES =
57	79	DIST_SOURCES =
	80	am__can_run_installinfo = \
	81	case $$AM_UPDATE_INFO_DIR in \
	82	n\|no\|NO) false;; \
	83	*) (install-info --version) >/dev/null 2>&1;; \
	84	esac
58	85	am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" \| sed 's\|.\|.\|g'`;
59	86	am__vpath_adj = case $$p in \
60	87	$(srcdir)/*) f=`echo "$$p" \| sed "s\|^$$srcdirstrip/\|\|"`;; \

119	146	GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
120	147	GLIB2_CFLAGS = @GLIB2_CFLAGS@
121	148	GLIB2_LIBS = @GLIB2_LIBS@
	149	GLIB_MKENUMS = @GLIB_MKENUMS@
122	150	GMOFILES = @GMOFILES@
123	151	GMSGFMT = @GMSGFMT@
124	152	GREP = @GREP@

304	332	-rm -rf .libs _libs
305	333	install-iconDATA: $(icon_DATA)
306	334	@$(NORMAL_INSTALL)
307		test -z "$(icondir)" \|\| $(MKDIR_P) "$(DESTDIR)$(icondir)"
308	335	@list='$(icon_DATA)'; test -n "$(icondir)" \|\| list=; \
	336	if test -n "$$list"; then \
	337	echo " $(MKDIR_P) '$(DESTDIR)$(icondir)'"; \
	338	$(MKDIR_P) "$(DESTDIR)$(icondir)" \|\| exit 1; \
	339	fi; \
309	340	for p in $$list; do \
310	341	if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
311	342	echo "$$d$$p"; \

325	356
326	357	ctags: CTAGS
327	358	CTAGS:
	359
	360	cscope cscopelist:
328	361
329	362
330	363	distdir: $(DISTFILES)

+39

-6

icons/48x48/Makefile.in less more

0		# Makefile.in generated by automake 1.11.3 from Makefile.am.
	0	# Makefile.in generated by automake 1.12.2 from Makefile.am.
1	1	# @configure_input@
2	2
3		# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
4		# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
5		# Foundation, Inc.
	3	# Copyright (C) 1994-2012 Free Software Foundation, Inc.
	4
6	5	# This Makefile.in is free software; the Free Software Foundation
7	6	# gives unlimited permission to copy and/or distribute it,
8	7	# with or without modifications, as long as this notice is preserved.

15	14	@SET_MAKE@
16	15
17	16	VPATH = @srcdir@
	17	am__make_dryrun = \
	18	{ \
	19	am__dry=no; \
	20	case $$MAKEFLAGS in \
	21	\\[\ \ ]) \
	22	echo 'am--echo: ; @echo "AM" OK' \| $(MAKE) -f - 2>/dev/null \
	23	\| grep '^AM OK$$' >/dev/null \|\| am__dry=yes;; \
	24	*) \
	25	for am__flg in $$MAKEFLAGS; do \
	26	case $$am__flg in \
	27	=\|--*) ;; \
	28	n) am__dry=yes; break;; \
	29	esac; \
	30	done;; \
	31	esac; \
	32	test $$am__dry = yes; \
	33	}
18	34	pkgdatadir = $(datadir)/@PACKAGE@
19	35	pkgincludedir = $(includedir)/@PACKAGE@
20	36	pkglibdir = $(libdir)/@PACKAGE@

47	63	CONFIG_HEADER = $(top_builddir)/config.h
48	64	CONFIG_CLEAN_FILES =
49	65	CONFIG_CLEAN_VPATH_FILES =
	66	AM_V_P = $(am__v_P_@AM_V@)
	67	am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
	68	am__v_P_0 = false
	69	am__v_P_1 = :
50	70	AM_V_GEN = $(am__v_GEN_@AM_V@)
51	71	am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
52		am__v_GEN_0 = @echo " GEN " $@;
	72	am__v_GEN_0 = @echo " GEN " $@;
	73	am__v_GEN_1 =
53	74	AM_V_at = $(am__v_at_@AM_V@)
54	75	am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
55	76	am__v_at_0 = @
	77	am__v_at_1 =
56	78	SOURCES =
57	79	DIST_SOURCES =
	80	am__can_run_installinfo = \
	81	case $$AM_UPDATE_INFO_DIR in \
	82	n\|no\|NO) false;; \
	83	*) (install-info --version) >/dev/null 2>&1;; \
	84	esac
58	85	am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" \| sed 's\|.\|.\|g'`;
59	86	am__vpath_adj = case $$p in \
60	87	$(srcdir)/*) f=`echo "$$p" \| sed "s\|^$$srcdirstrip/\|\|"`;; \

119	146	GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
120	147	GLIB2_CFLAGS = @GLIB2_CFLAGS@
121	148	GLIB2_LIBS = @GLIB2_LIBS@
	149	GLIB_MKENUMS = @GLIB_MKENUMS@
122	150	GMOFILES = @GMOFILES@
123	151	GMSGFMT = @GMSGFMT@
124	152	GREP = @GREP@

304	332	-rm -rf .libs _libs
305	333	install-iconDATA: $(icon_DATA)
306	334	@$(NORMAL_INSTALL)
307		test -z "$(icondir)" \|\| $(MKDIR_P) "$(DESTDIR)$(icondir)"
308	335	@list='$(icon_DATA)'; test -n "$(icondir)" \|\| list=; \
	336	if test -n "$$list"; then \
	337	echo " $(MKDIR_P) '$(DESTDIR)$(icondir)'"; \
	338	$(MKDIR_P) "$(DESTDIR)$(icondir)" \|\| exit 1; \
	339	fi; \
309	340	for p in $$list; do \
310	341	if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
311	342	echo "$$d$$p"; \

325	356
326	357	ctags: CTAGS
327	358	CTAGS:
	359
	360	cscope cscopelist:
328	361
329	362
330	363	distdir: $(DISTFILES)

+1

-2

icons/Makefile.am less more

1	1
2	2	if OS_WIN32
3	3	noinst_DATA = virt-viewer.ico
	4	CLEANFILES = $(noinst_DATA)
4	5	endif
5	6
6	7	# http://stackoverflow.com/questions/3236115/which-icon-sizes-should-my-windows-applications-icon-include

8	9	%.ico: $(foreach s,$(ico_sizes),$(s)x$(s)/%.png)
9	10	$(AM_V_GEN)$(ICOTOOL) -c -o $@ $^
10	11
11		EXTRA_DIST = virt-viewer.ico
12
13	12	-include $(top_srcdir)/git.mk

+82

-64

icons/Makefile.in less more

0		# Makefile.in generated by automake 1.11.3 from Makefile.am.
	0	# Makefile.in generated by automake 1.12.2 from Makefile.am.
1	1	# @configure_input@
2	2
3		# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
4		# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
5		# Foundation, Inc.
	3	# Copyright (C) 1994-2012 Free Software Foundation, Inc.
	4
6	5	# This Makefile.in is free software; the Free Software Foundation
7	6	# gives unlimited permission to copy and/or distribute it,
8	7	# with or without modifications, as long as this notice is preserved.

15	14	@SET_MAKE@
16	15
17	16	VPATH = @srcdir@
	17	am__make_dryrun = \
	18	{ \
	19	am__dry=no; \
	20	case $$MAKEFLAGS in \
	21	\\[\ \ ]) \
	22	echo 'am--echo: ; @echo "AM" OK' \| $(MAKE) -f - 2>/dev/null \
	23	\| grep '^AM OK$$' >/dev/null \|\| am__dry=yes;; \
	24	*) \
	25	for am__flg in $$MAKEFLAGS; do \
	26	case $$am__flg in \
	27	=\|--*) ;; \
	28	n) am__dry=yes; break;; \
	29	esac; \
	30	done;; \
	31	esac; \
	32	test $$am__dry = yes; \
	33	}
18	34	pkgdatadir = $(datadir)/@PACKAGE@
19	35	pkgincludedir = $(includedir)/@PACKAGE@
20	36	pkglibdir = $(libdir)/@PACKAGE@

47	63	CONFIG_HEADER = $(top_builddir)/config.h
48	64	CONFIG_CLEAN_FILES =
49	65	CONFIG_CLEAN_VPATH_FILES =
	66	AM_V_P = $(am__v_P_@AM_V@)
	67	am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
	68	am__v_P_0 = false
	69	am__v_P_1 = :
50	70	AM_V_GEN = $(am__v_GEN_@AM_V@)
51	71	am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
52		am__v_GEN_0 = @echo " GEN " $@;
	72	am__v_GEN_0 = @echo " GEN " $@;
	73	am__v_GEN_1 =
53	74	AM_V_at = $(am__v_at_@AM_V@)
54	75	am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
55	76	am__v_at_0 = @
	77	am__v_at_1 =
56	78	SOURCES =
57	79	DIST_SOURCES =
58	80	RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \

62	84	install-pdf-recursive install-ps-recursive install-recursive \
63	85	installcheck-recursive installdirs-recursive pdf-recursive \
64	86	ps-recursive uninstall-recursive
	87	am__can_run_installinfo = \
	88	case $$AM_UPDATE_INFO_DIR in \
	89	n\|no\|NO) false;; \
	90	*) (install-info --version) >/dev/null 2>&1;; \
	91	esac
65	92	DATA = $(noinst_DATA)
66	93	RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
67	94	distclean-recursive maintainer-clean-recursive

131	158	GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
132	159	GLIB2_CFLAGS = @GLIB2_CFLAGS@
133	160	GLIB2_LIBS = @GLIB2_LIBS@
	161	GLIB_MKENUMS = @GLIB_MKENUMS@
134	162	GMOFILES = @GMOFILES@
135	163	GMSGFMT = @GMSGFMT@
136	164	GREP = @GREP@

273	301	top_srcdir = @top_srcdir@
274	302	SUBDIRS = 16x16 22x22 24x24 32x32 48x48 256x256
275	303	@OS_WIN32_TRUE@noinst_DATA = virt-viewer.ico
	304	@OS_WIN32_TRUE@CLEANFILES = $(noinst_DATA)
276	305
277	306	# http://stackoverflow.com/questions/3236115/which-icon-sizes-should-my-windows-applications-icon-include
278	307	ico_sizes = 16 32 48 256
279		EXTRA_DIST = virt-viewer.ico
280	308	all: all-recursive
281	309
282	310	.SUFFIXES:

318	346	-rm -rf .libs _libs
319	347
320	348	# This directory's subdirectories are mostly independent; you can cd
321		# into them and run `make' without going through this Makefile.
322		# To change the values of `make' variables: instead of editing Makefiles,
323		# (1) if the variable is set in `config.status', edit `config.status'
324		# (which will cause the Makefiles to be regenerated when you run `make');
325		# (2) otherwise, pass the desired values on the `make' command line.
326		$(RECURSIVE_TARGETS):
	349	# into them and run 'make' without going through this Makefile.
	350	# To change the values of 'make' variables: instead of editing Makefiles,
	351	# (1) if the variable is set in 'config.status', edit 'config.status'
	352	# (which will cause the Makefiles to be regenerated when you run 'make');
	353	# (2) otherwise, pass the desired values on the 'make' command line.
	354	$(RECURSIVE_TARGETS) $(RECURSIVE_CLEAN_TARGETS):
327	355	@fail= failcom='exit 1'; \
328	356	for f in x $$MAKEFLAGS; do \
329	357	case $$f in \

333	361	done; \
334	362	dot_seen=no; \
335	363	target=`echo $@ \| sed s/-recursive//`; \
336		list='$(SUBDIRS)'; for subdir in $$list; do \
	364	case "$@" in \
	365	distclean-* \| maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
	366	*) list='$(SUBDIRS)' ;; \
	367	esac; \
	368	for subdir in $$list; do \
337	369	echo "Making $$target in $$subdir"; \
338	370	if test "$$subdir" = "."; then \
339	371	dot_seen=yes; \

347	379	if test "$$dot_seen" = "no"; then \
348	380	$(MAKE) $(AM_MAKEFLAGS) "$$target-am" \|\| exit 1; \
349	381	fi; test -z "$$fail"
350
351		$(RECURSIVE_CLEAN_TARGETS):
352		@fail= failcom='exit 1'; \
353		for f in x $$MAKEFLAGS; do \
354		case $$f in \
355		= \| --[!k]*);; \
356		k) failcom='fail=yes';; \
357		esac; \
358		done; \
359		dot_seen=no; \
360		case "$@" in \
361		distclean-* \| maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
362		*) list='$(SUBDIRS)' ;; \
363		esac; \
364		rev=''; for subdir in $$list; do \
365		if test "$$subdir" = "."; then :; else \
366		rev="$$subdir $$rev"; \
367		fi; \
368		done; \
369		rev="$$rev ."; \
370		target=`echo $@ \| sed s/-recursive//`; \
371		for subdir in $$rev; do \
372		echo "Making $$target in $$subdir"; \
373		if test "$$subdir" = "."; then \
374		local_target="$$target-am"; \
375		else \
376		local_target="$$target"; \
377		fi; \
378		($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
379		\|\| eval $$failcom; \
380		done && test -z "$$fail"
381	382	tags-recursive:
382	383	list='$(SUBDIRS)'; for subdir in $$list; do \
383	384	test "$$subdir" = . \|\| ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \

385	386	ctags-recursive:
386	387	list='$(SUBDIRS)'; for subdir in $$list; do \
387	388	test "$$subdir" = . \|\| ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
	389	done
	390	cscopelist-recursive:
	391	list='$(SUBDIRS)'; for subdir in $$list; do \
	392	test "$$subdir" = . \|\| ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) cscopelist); \
388	393	done
389	394
390	395	ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)

449	454	&& $(am__cd) $(top_srcdir) \
450	455	&& gtags -i $(GTAGS_ARGS) "$$here"
451	456
	457	cscopelist: cscopelist-recursive $(HEADERS) $(SOURCES) $(LISP)
	458	list='$(SOURCES) $(HEADERS) $(LISP)'; \
	459	case "$(srcdir)" in \
	460	[\\/]* \| ?:[\\/]*) sdir="$(srcdir)" ;; \
	461	*) sdir=$(subdir)/$(srcdir) ;; \
	462	esac; \
	463	for i in $$list; do \
	464	if test -f "$$i"; then \
	465	echo "$(subdir)/$$i"; \
	466	else \
	467	echo "$$sdir/$$i"; \
	468	fi; \
	469	done >> $(top_builddir)/cscope.files
	470
452	471	distclean-tags:
453	472	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
454	473

484	503	done
485	504	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
486	505	if test "$$subdir" = .; then :; else \
487		test -d "$(distdir)/$$subdir" \
488		\|\| $(MKDIR_P) "$(distdir)/$$subdir" \
489		\|\| exit 1; \
490		fi; \
491		done
492		@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
493		if test "$$subdir" = .; then :; else \
	506	$(am__make_dryrun) \
	507	\|\| test -d "$(distdir)/$$subdir" \
	508	\|\| $(MKDIR_P) "$(distdir)/$$subdir" \
	509	\|\| exit 1; \
494	510	dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
495	511	$(am__relativize); \
496	512	new_distdir=$$reldir; \

537	553	mostlyclean-generic:
538	554
539	555	clean-generic:
	556	-test -z "$(CLEANFILES)" \|\| rm -f $(CLEANFILES)
540	557
541	558	distclean-generic:
542	559	-test -z "$(CONFIG_CLEAN_FILES)" \|\| rm -f $(CONFIG_CLEAN_FILES)

611	628
612	629	uninstall-am:
613	630
614		.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
615		install-am install-strip tags-recursive
	631	.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \
	632	cscopelist-recursive ctags-recursive install-am install-strip \
	633	tags-recursive
616	634
617	635	.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
618	636	all all-am check check-am clean clean-generic clean-libtool \
619		ctags ctags-recursive distclean distclean-generic \
620		distclean-libtool distclean-tags distdir dvi dvi-am html \
621		html-am info info-am install install-am install-data \
622		install-data-am install-dvi install-dvi-am install-exec \
623		install-exec-am install-html install-html-am install-info \
624		install-info-am install-man install-pdf install-pdf-am \
625		install-ps install-ps-am install-strip installcheck \
626		installcheck-am installdirs installdirs-am maintainer-clean \
627		maintainer-clean-generic mostlyclean mostlyclean-generic \
628		mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
629		uninstall uninstall-am
	637	cscopelist cscopelist-recursive ctags ctags-recursive \
	638	distclean distclean-generic distclean-libtool distclean-tags \
	639	distdir dvi dvi-am html html-am info info-am install \
	640	install-am install-data install-data-am install-dvi \
	641	install-dvi-am install-exec install-exec-am install-html \
	642	install-html-am install-info install-info-am install-man \
	643	install-pdf install-pdf-am install-ps install-ps-am \
	644	install-strip installcheck installcheck-am installdirs \
	645	installdirs-am maintainer-clean maintainer-clean-generic \
	646	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
	647	ps ps-am tags tags-recursive uninstall uninstall-am
630	648
631	649	%.ico: $(foreach s,$(ico_sizes),$(s)x$(s)/%.png)
632	650	$(AM_V_GEN)$(ICOTOOL) -c -o $@ $^

~~icons/virt-viewer.ico~~ less more

Binary diff not shown

+49

-12

man/Makefile.in less more

0		# Makefile.in generated by automake 1.11.3 from Makefile.am.
	0	# Makefile.in generated by automake 1.12.2 from Makefile.am.
1	1	# @configure_input@
2	2
3		# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
4		# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
5		# Foundation, Inc.
	3	# Copyright (C) 1994-2012 Free Software Foundation, Inc.
	4
6	5	# This Makefile.in is free software; the Free Software Foundation
7	6	# gives unlimited permission to copy and/or distribute it,
8	7	# with or without modifications, as long as this notice is preserved.

14	13
15	14	@SET_MAKE@
16	15	VPATH = @srcdir@
	16	am__make_dryrun = \
	17	{ \
	18	am__dry=no; \
	19	case $$MAKEFLAGS in \
	20	\\[\ \ ]) \
	21	echo 'am--echo: ; @echo "AM" OK' \| $(MAKE) -f - 2>/dev/null \
	22	\| grep '^AM OK$$' >/dev/null \|\| am__dry=yes;; \
	23	*) \
	24	for am__flg in $$MAKEFLAGS; do \
	25	case $$am__flg in \
	26	=\|--*) ;; \
	27	n) am__dry=yes; break;; \
	28	esac; \
	29	done;; \
	30	esac; \
	31	test $$am__dry = yes; \
	32	}
17	33	pkgdatadir = $(datadir)/@PACKAGE@
18	34	pkgincludedir = $(includedir)/@PACKAGE@
19	35	pkglibdir = $(libdir)/@PACKAGE@

46	62	CONFIG_HEADER = $(top_builddir)/config.h
47	63	CONFIG_CLEAN_FILES =
48	64	CONFIG_CLEAN_VPATH_FILES =
	65	AM_V_P = $(am__v_P_@AM_V@)
	66	am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
	67	am__v_P_0 = false
	68	am__v_P_1 = :
49	69	AM_V_GEN = $(am__v_GEN_@AM_V@)
50	70	am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
51		am__v_GEN_0 = @echo " GEN " $@;
	71	am__v_GEN_0 = @echo " GEN " $@;
	72	am__v_GEN_1 =
52	73	AM_V_at = $(am__v_at_@AM_V@)
53	74	am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
54	75	am__v_at_0 = @
	76	am__v_at_1 =
55	77	SOURCES =
56	78	DIST_SOURCES =
	79	am__can_run_installinfo = \
	80	case $$AM_UPDATE_INFO_DIR in \
	81	n\|no\|NO) false;; \
	82	*) (install-info --version) >/dev/null 2>&1;; \
	83	esac
57	84	am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" \| sed 's\|.\|.\|g'`;
58	85	am__vpath_adj = case $$p in \
59	86	$(srcdir)/*) f=`echo "$$p" \| sed "s\|^$$srcdirstrip/\|\|"`;; \

120	147	GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
121	148	GLIB2_CFLAGS = @GLIB2_CFLAGS@
122	149	GLIB2_LIBS = @GLIB2_LIBS@
	150	GLIB_MKENUMS = @GLIB_MKENUMS@
123	151	GMOFILES = @GMOFILES@
124	152	GMSGFMT = @GMSGFMT@
125	153	GREP = @GREP@

313	341	-rm -rf .libs _libs
314	342	install-man1: $(man_MANS)
315	343	@$(NORMAL_INSTALL)
316		test -z "$(man1dir)" \|\| $(MKDIR_P) "$(DESTDIR)$(man1dir)"
317		@list=''; test -n "$(man1dir)" \|\| exit 0; \
318		{ for i in $$list; do echo "$$i"; done; \
319		l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done \| \
320		sed -n '/\.1[a-z]*$$/p'; \
	344	@list1=''; \
	345	list2='$(man_MANS)'; \
	346	test -n "$(man1dir)" \
	347	&& test -n "`echo $$list1$$list2`" \
	348	\|\| exit 0; \
	349	echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
	350	$(MKDIR_P) "$(DESTDIR)$(man1dir)" \|\| exit 1; \
	351	{ for i in $$list1; do echo "$$i"; done; \
	352	if test -n "$$list2"; then \
	353	for i in $$list2; do echo "$$i"; done \
	354	\| sed -n '/\.1[a-z]*$$/p'; \
	355	fi; \
321	356	} \| while read p; do \
322	357	if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
323	358	echo "$$d$$p"; echo "$$p"; \

353	388	ctags: CTAGS
354	389	CTAGS:
355	390
	391	cscope cscopelist:
	392
356	393
357	394	distdir: $(DISTFILES)
358	395	@list='$(MANS)'; if test -n "$$list"; then \

361	398	if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
362	399	if test -n "$$list" && \
363	400	grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
364		echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
	401	echo "error: found man pages containing the 'missing help2man' replacement text:" >&2; \
365	402	grep -l 'ab help2man is required to generate this page' $$list \| sed 's/^/ /' >&2; \
366	403	echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \
367		echo " typically \`make maintainer-clean' will remove them" >&2; \
	404	echo " typically 'make maintainer-clean' will remove them" >&2; \
368	405	exit 1; \
369	406	else :; fi; \
370	407	else :; fi

+99

-0

mingw-virt-viewer.spec.in less more

	0	%{?mingw_package_hedder}
	1
	2	Name: mingw-virt-viewer
	3	Version: @VERSION@
	4	Release: 1%{?dist}%{?extra_release}
	5	Summary: MinGW Windows virt-viewer console application
	6
	7	License: GPLv2+
	8	Group: Applications/Internet
	9	URL: http://virt-manager.org/
	10	Source0: ftp://virt-manager.org/downloads/virt-viewer/virt-viewer-%{version}.tar.gz
	11
	12	BuildRequires: mingw32-filesystem >= 23
	13	BuildRequires: mingw64-filesystem >= 23
	14	BuildRequires: mingw32-glib2 >= 2.22
	15	BuildRequires: mingw64-glib2 >= 2.22
	16	BuildRequires: mingw32-gtk3 >= 3.0.0
	17	BuildRequires: mingw64-gtk3 >= 3.0.0
	18	BuildRequires: mingw32-libvirt >= 0.9.7
	19	BuildRequires: mingw64-libvirt >= 0.9.7
	20	BuildRequires: mingw32-libxml2
	21	BuildRequires: mingw64-libxml2
	22	BuildRequires: mingw32-gtk-vnc2 >= 0.4.3
	23	BuildRequires: mingw64-gtk-vnc2 >= 0.4.3
	24	BuildRequires: pkgconfig
	25
	26	BuildArch: noarch
	27
	28	%package -n mingw32-virt-viewer
	29	Summary: MinGW Windows virt-viewer console application
	30	Group: Applications/Internet
	31
	32	%package -n mingw64-virt-viewer
	33	Summary: MinGW Windows virt-viewer console application
	34	Group: Applications/Internet
	35
	36	%description
	37	MinGW Windows virt-viewer console application
	38
	39	%description -n mingw32-virt-viewer
	40	MinGW Windows virt-viewer console application
	41
	42	%description -n mingw64-virt-viewer
	43	MinGW Windows virt-viewer console application
	44
	45	%prep
	46	%setup -q -n virt-viewer-%{version}
	47
	48
	49	%build
	50	%mingw_configure --with-gtk=3.0
	51	%mingw_make %{?_smp_mflags} V=1
	52
	53
	54	%install
	55	%mingw_make_install DESTDIR=$RPM_BUILD_ROOT
	56
	57	%find_lang virt-viewer
	58
	59	# Don't need the XDG desktop files on Windows
	60	find $RPM_BUILD_ROOT -name "*.desktop" -delete
	61
	62	%clean
	63	rm -rf $RPM_BUILD_ROOT
	64
	65
	66	%files -n mingw32-virt-viewer -f virt-viewer.lang
	67	%defattr(-,root,root)
	68	%{mingw32_bindir}/virt-viewer.exe
	69	%{mingw32_bindir}/remote-viewer.exe
	70	%{mingw32_bindir}/windows-cmdline-wrapper.exe
	71
	72	%dir %{mingw32_datadir}/virt-viewer/
	73	%dir %{mingw32_datadir}/virt-viewer/ui/
	74	%{mingw32_datadir}/virt-viewer/ui/virt-viewer.xml
	75	%{mingw32_datadir}/virt-viewer/ui/virt-viewer-about.xml
	76	%{mingw32_datadir}/virt-viewer/ui/virt-viewer-auth.xml
	77	%{mingw32_datadir}/icons/hicolor//apps/
	78
	79	%{mingw32_mandir}/man1/virt-viewer.1*
	80	%{mingw32_mandir}/man1/remote-viewer.1*
	81
	82	%files -n mingw64-virt-viewer -f virt-viewer.lang
	83	%defattr(-,root,root)
	84	%{mingw64_bindir}/virt-viewer.exe
	85	%{mingw64_bindir}/remote-viewer.exe
	86	%{mingw64_bindir}/windows-cmdline-wrapper.exe
	87
	88	%dir %{mingw64_datadir}/virt-viewer/
	89	%dir %{mingw64_datadir}/virt-viewer/ui/
	90	%{mingw64_datadir}/virt-viewer/ui/virt-viewer.xml
	91	%{mingw64_datadir}/virt-viewer/ui/virt-viewer-about.xml
	92	%{mingw64_datadir}/virt-viewer/ui/virt-viewer-auth.xml
	93	%{mingw64_datadir}/icons/hicolor//apps/
	94
	95	%{mingw64_mandir}/man1/virt-viewer.1*
	96	%{mingw64_mandir}/man1/remote-viewer.1*
	97
	98	%changelog

+0

-84

~~mingw32-virt-viewer.spec.in~~ less more

0		%define __strip %{_mingw32_strip}
1		%define __objdump %{_mingw32_objdump}
2		%define _use_internal_dependency_generator 0
3		%define __find_requires %{_mingw32_findrequires}
4		%define __find_provides %{_mingw32_findprovides}
5
6		%define with_gtk3 0
7		%if 0%{?fedora} >= 15
8		%define with_gtk3 1
9		%endif
10
11		Name: mingw32-virt-viewer
12		Version: @VERSION@
13		Release: 1%{?dist}%{?extra_release}
14		Summary: MinGW Windows virt-viewer console application
15
16		License: LGPLv2+
17		Group: Development/Libraries
18		URL: http://virt-manager.org/
19		Source0: ftp://virt-manager.org/downloads/virt-viewer/virt-viewer-%{version}.tar.gz
20		BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
21
22		BuildRequires: mingw32-filesystem >= 23
23		%if %{with_gtk3}
24		BuildRequires: mingw32-gtk3 >= 3.0.0
25		%else
26		BuildRequires: mingw32-gtk2 >= 2.12.0
27		%endif
28		BuildRequires: mingw32-libvirt >= 0.9.7
29		BuildRequires: mingw32-libxml2
30		%if %{with_gtk3}
31		BuildRequires: mingw32-gtk-vnc >= 0.4.3
32		%else
33		BuildRequires: mingw32-gtk-vnc2 >= 0.4.3
34		%endif
35		BuildRequires: pkgconfig
36
37		BuildArch: noarch
38
39
40		%description
41		MinGW Windows virt-viewer console application
42
43
44		%prep
45		%setup -q -n virt-viewer-%{version}
46
47
48		%build
49		%if %{with_gtk3}
50		%{_mingw32_configure} --with-gtk=3.0
51		%else
52		%{_mingw32_configure} --with-gtk=2.0
53		%endif
54		make
55
56
57		%install
58		rm -rf $RPM_BUILD_ROOT
59
60		make DESTDIR=$RPM_BUILD_ROOT install
61
62		%find_lang virt-viewer
63
64		%clean
65		rm -rf $RPM_BUILD_ROOT
66
67
68		%files -f virt-viewer.lang
69		%defattr(-,root,root)
70		%{_mingw32_bindir}/virt-viewer.exe
71		%{_mingw32_bindir}/remote-viewer.exe
72
73		%dir %{_mingw32_datadir}/virt-viewer/
74		%dir %{_mingw32_datadir}/virt-viewer/ui/
75		%{_mingw32_datadir}/virt-viewer/ui/virt-viewer.xml
76		%{_mingw32_datadir}/virt-viewer/ui/virt-viewer-about.xml
77		%{_mingw32_datadir}/virt-viewer/ui/virt-viewer-auth.xml
78		%{_mingw32_datadir}/icons/hicolor//apps/
79
80		%{_mingw32_mandir}/man1/virt-viewer.1*
81		%{_mingw32_mandir}/man1/remote-viewer.1*
82
83		%changelog

+71

-22

plugin/Makefile.in less more

0		# Makefile.in generated by automake 1.11.3 from Makefile.am.
	0	# Makefile.in generated by automake 1.12.2 from Makefile.am.
1	1	# @configure_input@
2	2
3		# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
4		# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
5		# Foundation, Inc.
	3	# Copyright (C) 1994-2012 Free Software Foundation, Inc.
	4
6	5	# This Makefile.in is free software; the Free Software Foundation
7	6	# gives unlimited permission to copy and/or distribute it,
8	7	# with or without modifications, as long as this notice is preserved.

15	14	@SET_MAKE@
16	15
17	16	VPATH = @srcdir@
	17	am__make_dryrun = \
	18	{ \
	19	am__dry=no; \
	20	case $$MAKEFLAGS in \
	21	\\[\ \ ]) \
	22	echo 'am--echo: ; @echo "AM" OK' \| $(MAKE) -f - 2>/dev/null \
	23	\| grep '^AM OK$$' >/dev/null \|\| am__dry=yes;; \
	24	*) \
	25	for am__flg in $$MAKEFLAGS; do \
	26	case $$am__flg in \
	27	=\|--*) ;; \
	28	n) am__dry=yes; break;; \
	29	esac; \
	30	done;; \
	31	esac; \
	32	test $$am__dry = yes; \
	33	}
18	34	pkgdatadir = $(datadir)/@PACKAGE@
19	35	pkgincludedir = $(includedir)/@PACKAGE@
20	36	pkglibdir = $(libdir)/@PACKAGE@

34	50	build_triplet = @build@
35	51	host_triplet = @host@
36	52	subdir = plugin
37		DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
	53	DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
	54	$(top_srcdir)/build-aux/depcomp
38	55	ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
39	56	am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
40	57	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \

101	118	AM_V_lt = $(am__v_lt_@AM_V@)
102	119	am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
103	120	am__v_lt_0 = --silent
	121	am__v_lt_1 =
104	122	virt_viewer_plugin_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
105	123	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
106	124	$(virt_viewer_plugin_la_CFLAGS) $(CFLAGS) \
107	125	$(virt_viewer_plugin_la_LDFLAGS) $(LDFLAGS) -o $@
108	126	@ENABLE_PLUGIN_TRUE@am_virt_viewer_plugin_la_rpath = -rpath \
109	127	@ENABLE_PLUGIN_TRUE@ $(plugindir)
	128	AM_V_P = $(am__v_P_@AM_V@)
	129	am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
	130	am__v_P_0 = false
	131	am__v_P_1 = :
	132	AM_V_GEN = $(am__v_GEN_@AM_V@)
	133	am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
	134	am__v_GEN_0 = @echo " GEN " $@;
	135	am__v_GEN_1 =
	136	AM_V_at = $(am__v_at_@AM_V@)
	137	am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
	138	am__v_at_0 = @
	139	am__v_at_1 =
110	140	DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
111	141	depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
112	142	am__depfiles_maybe = depfiles

119	149	$(AM_CFLAGS) $(CFLAGS)
120	150	AM_V_CC = $(am__v_CC_@AM_V@)
121	151	am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
122		am__v_CC_0 = @echo " CC " $@;
123		AM_V_at = $(am__v_at_@AM_V@)
124		am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
125		am__v_at_0 = @
	152	am__v_CC_0 = @echo " CC " $@;
	153	am__v_CC_1 =
126	154	CCLD = $(CC)
127	155	LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
128	156	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
129	157	$(AM_LDFLAGS) $(LDFLAGS) -o $@
130	158	AM_V_CCLD = $(am__v_CCLD_@AM_V@)
131	159	am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
132		am__v_CCLD_0 = @echo " CCLD " $@;
133		AM_V_GEN = $(am__v_GEN_@AM_V@)
134		am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
135		am__v_GEN_0 = @echo " GEN " $@;
	160	am__v_CCLD_0 = @echo " CCLD " $@;
	161	am__v_CCLD_1 =
136	162	SOURCES = $(virt_viewer_plugin_la_SOURCES)
137	163	DIST_SOURCES = $(am__virt_viewer_plugin_la_SOURCES_DIST)
	164	am__can_run_installinfo = \
	165	case $$AM_UPDATE_INFO_DIR in \
	166	n\|no\|NO) false;; \
	167	*) (install-info --version) >/dev/null 2>&1;; \
	168	esac
138	169	ETAGS = etags
139	170	CTAGS = ctags
140	171	DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)

172	203	GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
173	204	GLIB2_CFLAGS = @GLIB2_CFLAGS@
174	205	GLIB2_LIBS = @GLIB2_LIBS@
	206	GLIB_MKENUMS = @GLIB_MKENUMS@
175	207	GMOFILES = @GMOFILES@
176	208	GMSGFMT = @GMSGFMT@
177	209	GREP = @GREP@

379	411	$(am__aclocal_m4_deps):
380	412	install-pluginLTLIBRARIES: $(plugin_LTLIBRARIES)
381	413	@$(NORMAL_INSTALL)
382		test -z "$(plugindir)" \|\| $(MKDIR_P) "$(DESTDIR)$(plugindir)"
383	414	@list='$(plugin_LTLIBRARIES)'; test -n "$(plugindir)" \|\| list=; \
384	415	list2=; for p in $$list; do \
385	416	if test -f $$p; then \

387	418	else :; fi; \
388	419	done; \
389	420	test -z "$$list2" \|\| { \
	421	echo " $(MKDIR_P) '$(DESTDIR)$(plugindir)'"; \
	422	$(MKDIR_P) "$(DESTDIR)$(plugindir)" \|\| exit 1; \
390	423	echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(plugindir)'"; \
391	424	$(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(plugindir)"; \
392	425	}

402	435
403	436	clean-pluginLTLIBRARIES:
404	437	-test -z "$(plugin_LTLIBRARIES)" \|\| rm -f $(plugin_LTLIBRARIES)
405		@list='$(plugin_LTLIBRARIES)'; for p in $$list; do \
406		dir="`echo $$p \| sed -e 's\|/[^/]*$$\|\|'`"; \
407		test "$$dir" != "$$p" \|\| dir=.; \
408		echo "rm -f \"$${dir}/so_locations\""; \
409		rm -f "$${dir}/so_locations"; \
410		done
	438	@list='$(plugin_LTLIBRARIES)'; \
	439	locs=`for p in $$list; do echo $$p; done \| \
	440	sed 's\|^[^/]$$\|.\|; s\|/[^/]$$\|\|; s\|$$\|/so_locations\|' \| \
	441	sort -u`; \
	442	test -z "$$locs" \|\| { \
	443	echo rm -f $${locs}; \
	444	rm -f $${locs}; \
	445	}
411	446	virt-viewer-plugin.la: $(virt_viewer_plugin_la_OBJECTS) $(virt_viewer_plugin_la_DEPENDENCIES) $(EXTRA_virt_viewer_plugin_la_DEPENDENCIES)
412	447	$(AM_V_CCLD)$(virt_viewer_plugin_la_LINK) $(am_virt_viewer_plugin_la_rpath) $(virt_viewer_plugin_la_OBJECTS) $(virt_viewer_plugin_la_LIBADD) $(LIBS)
413	448

549	584	here=`$(am__cd) $(top_builddir) && pwd` \
550	585	&& $(am__cd) $(top_srcdir) \
551	586	&& gtags -i $(GTAGS_ARGS) "$$here"
	587
	588	cscopelist: $(HEADERS) $(SOURCES) $(LISP)
	589	list='$(SOURCES) $(HEADERS) $(LISP)'; \
	590	case "$(srcdir)" in \
	591	[\\/]* \| ?:[\\/]*) sdir="$(srcdir)" ;; \
	592	*) sdir=$(subdir)/$(srcdir) ;; \
	593	esac; \
	594	for i in $$list; do \
	595	if test -f "$$i"; then \
	596	echo "$(subdir)/$$i"; \
	597	else \
	598	echo "$$sdir/$$i"; \
	599	fi; \
	600	done >> $(top_builddir)/cscope.files
552	601
553	602	distclean-tags:
554	603	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags

698	747	.MAKE: install-am install-data-am install-strip
699	748
700	749	.PHONY: CTAGS GTAGS all all-am all-local check check-am clean \
701		clean-generic clean-libtool clean-pluginLTLIBRARIES ctags \
702		distclean distclean-compile distclean-generic \
	750	clean-generic clean-libtool clean-pluginLTLIBRARIES cscopelist \
	751	ctags distclean distclean-compile distclean-generic \
703	752	distclean-libtool distclean-tags distdir dvi dvi-am html \
704	753	html-am info info-am install install-am install-data \
705	754	install-data-am install-data-hook install-dvi install-dvi-am \

+24

-4

src/Makefile.am less more

9	9	virt-viewer-auth.xml \
10	10	$(NULL)
11	11
12		EXTRA_DIST = $(builderxml_DATA) \
13		gbinding.c \
14		gbinding.h
	12	EXTRA_DIST = \
	13	$(builderxml_DATA) \
	14	virt-viewer-enums.c.etemplate \
	15	virt-viewer-enums.h.etemplate \
	16	gbinding.c \
	17	gbinding.h \
	18	$(NULL)
	19
	20	ENUMS_FILES = \
	21	virt-viewer-display.h \
	22	$(NULL)
	23
	24	BUILT_SOURCES = \
	25	virt-viewer-enums.h \
	26	virt-viewer-enums.c \
	27	$(NULL)
	28
	29	$(BUILT_SOURCES): %: %.etemplate $(ENUMS_FILES)
	30	$(AM_V_GEN)$(GLIB_MKENUMS) --template $^ \| \
	31	sed -e 's/VIRT_TYPE_VIEWER/VIRT_VIEWER_TYPE/' \
	32	-e 's,#include "$(srcdir)/,#include ",' > $@
15	33
16	34	COMMON_SOURCES = \
	35	$(BUILT_SOURCES) \
	36	virt-glib-compat.h \
17	37	virt-gtk-compat.h \
18	38	virt-viewer-util.h virt-viewer-util.c \
19	39	virt-viewer-auth.h virt-viewer-auth.c \

120	140	EXTRA_DIST += $(desktop_DATA)
121	141
122	142	VIRT_VIEWER_RES = virt-viewer.rc virt-viewer.manifest
123		ICONDIR = $(top_srcdir)/icons
	143	ICONDIR = $(top_builddir)/icons
124	144	MANIFESTDIR = $(srcdir)
125	145	EXTRA_DIST += $(VIRT_VIEWER_RES)
126	146

+184

-71

src/Makefile.in less more

0		# Makefile.in generated by automake 1.11.3 from Makefile.am.
	0	# Makefile.in generated by automake 1.12.2 from Makefile.am.
1	1	# @configure_input@
2	2
3		# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
4		# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
5		# Foundation, Inc.
	3	# Copyright (C) 1994-2012 Free Software Foundation, Inc.
	4
6	5	# This Makefile.in is free software; the Free Software Foundation
7	6	# gives unlimited permission to copy and/or distribute it,
8	7	# with or without modifications, as long as this notice is preserved.

16	15
17	16
18	17	VPATH = @srcdir@
	18	am__make_dryrun = \
	19	{ \
	20	am__dry=no; \
	21	case $$MAKEFLAGS in \
	22	\\[\ \ ]) \
	23	echo 'am--echo: ; @echo "AM" OK' \| $(MAKE) -f - 2>/dev/null \
	24	\| grep '^AM OK$$' >/dev/null \|\| am__dry=yes;; \
	25	*) \
	26	for am__flg in $$MAKEFLAGS; do \
	27	case $$am__flg in \
	28	=\|--*) ;; \
	29	n) am__dry=yes; break;; \
	30	esac; \
	31	done;; \
	32	esac; \
	33	test $$am__dry = yes; \
	34	}
19	35	pkgdatadir = $(datadir)/@PACKAGE@
20	36	pkgincludedir = $(includedir)/@PACKAGE@
21	37	pkglibdir = $(libdir)/@PACKAGE@

60	76	@OS_WIN32_TRUE@am__append_15 = virt-viewer_rc.$(OBJEXT)
61	77	subdir = src
62	78	DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
63		$(srcdir)/virt-viewer.rc.in
	79	$(srcdir)/virt-viewer.rc.in $(top_srcdir)/build-aux/depcomp
64	80	ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
65	81	am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
66	82	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \

78	94	am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(builderxmldir)" \
79	95	"$(DESTDIR)$(desktopdir)"
80	96	PROGRAMS = $(bin_PROGRAMS)
81		am__remote_viewer_SOURCES_DIST = virt-gtk-compat.h virt-viewer-util.h \
82		virt-viewer-util.c virt-viewer-auth.h virt-viewer-auth.c \
83		virt-viewer-app.h virt-viewer-app.c virt-viewer-session.h \
84		virt-viewer-session.c virt-viewer-display.h \
85		virt-viewer-display.c virt-viewer-notebook.h \
86		virt-viewer-notebook.c virt-viewer-window.h \
87		virt-viewer-window.c view/autoDrawer.c view/autoDrawer.h \
88		view/drawer.c view/drawer.h view/ovBox.c view/ovBox.h \
89		virt-viewer-session-vnc.h virt-viewer-session-vnc.c \
90		virt-viewer-display-vnc.h virt-viewer-display-vnc.c \
91		virt-viewer-session-spice.h virt-viewer-session-spice.c \
92		virt-viewer-display-spice.h virt-viewer-display-spice.c \
93		remote-viewer.h remote-viewer.c remote-viewer-main.c
	97	am__remote_viewer_SOURCES_DIST = virt-viewer-enums.h \
	98	virt-viewer-enums.c virt-glib-compat.h virt-gtk-compat.h \
	99	virt-viewer-util.h virt-viewer-util.c virt-viewer-auth.h \
	100	virt-viewer-auth.c virt-viewer-app.h virt-viewer-app.c \
	101	virt-viewer-session.h virt-viewer-session.c \
	102	virt-viewer-display.h virt-viewer-display.c \
	103	virt-viewer-notebook.h virt-viewer-notebook.c \
	104	virt-viewer-window.h virt-viewer-window.c view/autoDrawer.c \
	105	view/autoDrawer.h view/drawer.c view/drawer.h view/ovBox.c \
	106	view/ovBox.h virt-viewer-session-vnc.h \
	107	virt-viewer-session-vnc.c virt-viewer-display-vnc.h \
	108	virt-viewer-display-vnc.c virt-viewer-session-spice.h \
	109	virt-viewer-session-spice.c virt-viewer-display-spice.h \
	110	virt-viewer-display-spice.c remote-viewer.h remote-viewer.c \
	111	remote-viewer-main.c
94	112	am__objects_1 =
95		@HAVE_GTK_VNC_TRUE@am__objects_2 = remote_viewer-virt-viewer-session-vnc.$(OBJEXT) \
	113	am__objects_2 = remote_viewer-virt-viewer-enums.$(OBJEXT) \
	114	$(am__objects_1)
	115	@HAVE_GTK_VNC_TRUE@am__objects_3 = remote_viewer-virt-viewer-session-vnc.$(OBJEXT) \
96	116	@HAVE_GTK_VNC_TRUE@ remote_viewer-virt-viewer-display-vnc.$(OBJEXT) \
97	117	@HAVE_GTK_VNC_TRUE@ $(am__objects_1)
98		@HAVE_SPICE_GTK_TRUE@am__objects_3 = remote_viewer-virt-viewer-session-spice.$(OBJEXT) \
	118	@HAVE_SPICE_GTK_TRUE@am__objects_4 = remote_viewer-virt-viewer-session-spice.$(OBJEXT) \
99	119	@HAVE_SPICE_GTK_TRUE@ remote_viewer-virt-viewer-display-spice.$(OBJEXT) \
100	120	@HAVE_SPICE_GTK_TRUE@ $(am__objects_1)
101		am__objects_4 = remote_viewer-virt-viewer-util.$(OBJEXT) \
	121	am__objects_5 = $(am__objects_2) \
	122	remote_viewer-virt-viewer-util.$(OBJEXT) \
102	123	remote_viewer-virt-viewer-auth.$(OBJEXT) \
103	124	remote_viewer-virt-viewer-app.$(OBJEXT) \
104	125	remote_viewer-virt-viewer-session.$(OBJEXT) \

107	128	remote_viewer-virt-viewer-window.$(OBJEXT) \
108	129	remote_viewer-autoDrawer.$(OBJEXT) \
109	130	remote_viewer-drawer.$(OBJEXT) remote_viewer-ovBox.$(OBJEXT) \
110		$(am__objects_1) $(am__objects_2) $(am__objects_3)
111		am_remote_viewer_OBJECTS = $(am__objects_4) \
	131	$(am__objects_1) $(am__objects_3) $(am__objects_4)
	132	am_remote_viewer_OBJECTS = $(am__objects_5) \
112	133	remote_viewer-remote-viewer.$(OBJEXT) \
113	134	remote_viewer-remote-viewer-main.$(OBJEXT) $(am__objects_1)
114	135	remote_viewer_OBJECTS = $(am_remote_viewer_OBJECTS)

117	138	AM_V_lt = $(am__v_lt_@AM_V@)
118	139	am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
119	140	am__v_lt_0 = --silent
	141	am__v_lt_1 =
120	142	remote_viewer_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
121	143	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(remote_viewer_CFLAGS) \
122	144	$(CFLAGS) $(remote_viewer_LDFLAGS) $(LDFLAGS) -o $@
123		am__virt_viewer_SOURCES_DIST = virt-gtk-compat.h virt-viewer-util.h \
	145	am__virt_viewer_SOURCES_DIST = virt-viewer-enums.h virt-viewer-enums.c \
	146	virt-glib-compat.h virt-gtk-compat.h virt-viewer-util.h \
124	147	virt-viewer-util.c virt-viewer-auth.h virt-viewer-auth.c \
125	148	virt-viewer-app.h virt-viewer-app.c virt-viewer-session.h \
126	149	virt-viewer-session.c virt-viewer-display.h \

134	157	virt-viewer-display-spice.h virt-viewer-display-spice.c \
135	158	virt-viewer-events.h virt-viewer-events.c virt-viewer.h \
136	159	virt-viewer.c virt-viewer-main.c
137		@HAVE_GTK_VNC_TRUE@am__objects_5 = virt_viewer-virt-viewer-session-vnc.$(OBJEXT) \
	160	am__objects_6 = virt_viewer-virt-viewer-enums.$(OBJEXT) \
	161	$(am__objects_1)
	162	@HAVE_GTK_VNC_TRUE@am__objects_7 = virt_viewer-virt-viewer-session-vnc.$(OBJEXT) \
138	163	@HAVE_GTK_VNC_TRUE@ virt_viewer-virt-viewer-display-vnc.$(OBJEXT) \
139	164	@HAVE_GTK_VNC_TRUE@ $(am__objects_1)
140		@HAVE_SPICE_GTK_TRUE@am__objects_6 = virt_viewer-virt-viewer-session-spice.$(OBJEXT) \
	165	@HAVE_SPICE_GTK_TRUE@am__objects_8 = virt_viewer-virt-viewer-session-spice.$(OBJEXT) \
141	166	@HAVE_SPICE_GTK_TRUE@ virt_viewer-virt-viewer-display-spice.$(OBJEXT) \
142	167	@HAVE_SPICE_GTK_TRUE@ $(am__objects_1)
143		am__objects_7 = virt_viewer-virt-viewer-util.$(OBJEXT) \
	168	am__objects_9 = $(am__objects_6) \
	169	virt_viewer-virt-viewer-util.$(OBJEXT) \
144	170	virt_viewer-virt-viewer-auth.$(OBJEXT) \
145	171	virt_viewer-virt-viewer-app.$(OBJEXT) \
146	172	virt_viewer-virt-viewer-session.$(OBJEXT) \

148	174	virt_viewer-virt-viewer-notebook.$(OBJEXT) \
149	175	virt_viewer-virt-viewer-window.$(OBJEXT) \
150	176	virt_viewer-autoDrawer.$(OBJEXT) virt_viewer-drawer.$(OBJEXT) \
151		virt_viewer-ovBox.$(OBJEXT) $(am__objects_1) $(am__objects_5) \
152		$(am__objects_6)
153		@HAVE_LIBVIRT_TRUE@am_virt_viewer_OBJECTS = $(am__objects_7) \
	177	virt_viewer-ovBox.$(OBJEXT) $(am__objects_1) $(am__objects_7) \
	178	$(am__objects_8)
	179	@HAVE_LIBVIRT_TRUE@am_virt_viewer_OBJECTS = $(am__objects_9) \
154	180	@HAVE_LIBVIRT_TRUE@ virt_viewer-virt-viewer-events.$(OBJEXT) \
155	181	@HAVE_LIBVIRT_TRUE@ virt_viewer-virt-viewer.$(OBJEXT) \
156	182	@HAVE_LIBVIRT_TRUE@ virt_viewer-virt-viewer-main.$(OBJEXT) \

172	198	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
173	199	$(AM_CFLAGS) $(CFLAGS) $(windows_cmdline_wrapper_LDFLAGS) \
174	200	$(LDFLAGS) -o $@
	201	AM_V_P = $(am__v_P_@AM_V@)
	202	am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
	203	am__v_P_0 = false
	204	am__v_P_1 = :
	205	AM_V_GEN = $(am__v_GEN_@AM_V@)
	206	am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
	207	am__v_GEN_0 = @echo " GEN " $@;
	208	am__v_GEN_1 =
	209	AM_V_at = $(am__v_at_@AM_V@)
	210	am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
	211	am__v_at_0 = @
	212	am__v_at_1 =
175	213	DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
176	214	depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp
177	215	am__depfiles_maybe = depfiles

184	222	$(AM_CFLAGS) $(CFLAGS)
185	223	AM_V_CC = $(am__v_CC_@AM_V@)
186	224	am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
187		am__v_CC_0 = @echo " CC " $@;
188		AM_V_at = $(am__v_at_@AM_V@)
189		am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
190		am__v_at_0 = @
	225	am__v_CC_0 = @echo " CC " $@;
	226	am__v_CC_1 =
191	227	CCLD = $(CC)
192	228	LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
193	229	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
194	230	$(AM_LDFLAGS) $(LDFLAGS) -o $@
195	231	AM_V_CCLD = $(am__v_CCLD_@AM_V@)
196	232	am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
197		am__v_CCLD_0 = @echo " CCLD " $@;
198		AM_V_GEN = $(am__v_GEN_@AM_V@)
199		am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
200		am__v_GEN_0 = @echo " GEN " $@;
	233	am__v_CCLD_0 = @echo " CCLD " $@;
	234	am__v_CCLD_1 =
201	235	SOURCES = $(remote_viewer_SOURCES) $(virt_viewer_SOURCES) \
202	236	$(windows_cmdline_wrapper_SOURCES)
203	237	DIST_SOURCES = $(am__remote_viewer_SOURCES_DIST) \
204	238	$(am__virt_viewer_SOURCES_DIST) \
205	239	$(am__windows_cmdline_wrapper_SOURCES_DIST)
	240	am__can_run_installinfo = \
	241	case $$AM_UPDATE_INFO_DIR in \
	242	n\|no\|NO) false;; \
	243	*) (install-info --version) >/dev/null 2>&1;; \
	244	esac
206	245	am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" \| sed 's\|.\|.\|g'`;
207	246	am__vpath_adj = case $$p in \
208	247	$(srcdir)/*) f=`echo "$$p" \| sed "s\|^$$srcdirstrip/\|\|"`;; \

268	307	GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
269	308	GLIB2_CFLAGS = @GLIB2_CFLAGS@
270	309	GLIB2_LIBS = @GLIB2_LIBS@
	310	GLIB_MKENUMS = @GLIB_MKENUMS@
271	311	GMOFILES = @GMOFILES@
272	312	GMSGFMT = @GMSGFMT@
273	313	GREP = @GREP@

418	458	virt-viewer-auth.xml \
419	459	$(NULL)
420	460
421		EXTRA_DIST = $(builderxml_DATA) gbinding.c gbinding.h $(desktop_DATA) \
422		$(VIRT_VIEWER_RES)
423		COMMON_SOURCES = virt-gtk-compat.h virt-viewer-util.h \
424		virt-viewer-util.c virt-viewer-auth.h virt-viewer-auth.c \
425		virt-viewer-app.h virt-viewer-app.c virt-viewer-session.h \
426		virt-viewer-session.c virt-viewer-display.h \
427		virt-viewer-display.c virt-viewer-notebook.h \
428		virt-viewer-notebook.c virt-viewer-window.h \
429		virt-viewer-window.c view/autoDrawer.c view/autoDrawer.h \
430		view/drawer.c view/drawer.h view/ovBox.c view/ovBox.h $(NULL) \
431		$(am__append_1) $(am__append_2)
	461	EXTRA_DIST = $(builderxml_DATA) virt-viewer-enums.c.etemplate \
	462	virt-viewer-enums.h.etemplate gbinding.c gbinding.h $(NULL) \
	463	$(desktop_DATA) $(VIRT_VIEWER_RES)
	464	ENUMS_FILES = \
	465	virt-viewer-display.h \
	466	$(NULL)
	467
	468	BUILT_SOURCES = \
	469	virt-viewer-enums.h \
	470	virt-viewer-enums.c \
	471	$(NULL)
	472
	473	COMMON_SOURCES = $(BUILT_SOURCES) virt-glib-compat.h virt-gtk-compat.h \
	474	virt-viewer-util.h virt-viewer-util.c virt-viewer-auth.h \
	475	virt-viewer-auth.c virt-viewer-app.h virt-viewer-app.c \
	476	virt-viewer-session.h virt-viewer-session.c \
	477	virt-viewer-display.h virt-viewer-display.c \
	478	virt-viewer-notebook.h virt-viewer-notebook.c \
	479	virt-viewer-window.h virt-viewer-window.c view/autoDrawer.c \
	480	view/autoDrawer.h view/drawer.c view/drawer.h view/ovBox.c \
	481	view/ovBox.h $(NULL) $(am__append_1) $(am__append_2)
432	482	@HAVE_LIBVIRT_TRUE@virt_viewer_SOURCES = \
433	483	@HAVE_LIBVIRT_TRUE@ $(COMMON_SOURCES) \
434	484	@HAVE_LIBVIRT_TRUE@ virt-viewer-events.h virt-viewer-events.c \

461	511	desktopdir = $(datadir)/applications
462	512	desktop_DATA = remote-viewer.desktop
463	513	VIRT_VIEWER_RES = virt-viewer.rc virt-viewer.manifest
464		ICONDIR = $(top_srcdir)/icons
	514	ICONDIR = $(top_builddir)/icons
465	515	MANIFESTDIR = $(srcdir)
466	516	@OS_WIN32_TRUE@windows_cmdline_wrapper_SOURCES = windows-cmdline-wrapper.c
467	517	@OS_WIN32_TRUE@windows_cmdline_wrapper_LDFLAGS = -lpsapi
468		all: all-am
	518	all: $(BUILT_SOURCES)
	519	$(MAKE) $(AM_MAKEFLAGS) all-am
469	520
470	521	.SUFFIXES:
471	522	.SUFFIXES: .c .lo .o .obj

503	554	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
504	555	install-binPROGRAMS: $(bin_PROGRAMS)
505	556	@$(NORMAL_INSTALL)
506		test -z "$(bindir)" \|\| $(MKDIR_P) "$(DESTDIR)$(bindir)"
507	557	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" \|\| list=; \
	558	if test -n "$$list"; then \
	559	echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
	560	$(MKDIR_P) "$(DESTDIR)$(bindir)" \|\| exit 1; \
	561	fi; \
508	562	for p in $$list; do echo "$$p $$p"; done \| \
509	563	sed 's/$(EXEEXT)$$//' \| \
510	564	while read p p1; do if test -f $$p \|\| test -f $$p1; \

570	624	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/remote_viewer-virt-viewer-display-spice.Po@am__quote@
571	625	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/remote_viewer-virt-viewer-display-vnc.Po@am__quote@
572	626	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/remote_viewer-virt-viewer-display.Po@am__quote@
	627	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/remote_viewer-virt-viewer-enums.Po@am__quote@
573	628	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/remote_viewer-virt-viewer-notebook.Po@am__quote@
574	629	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/remote_viewer-virt-viewer-session-spice.Po@am__quote@
575	630	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/remote_viewer-virt-viewer-session-vnc.Po@am__quote@

584	639	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/virt_viewer-virt-viewer-display-spice.Po@am__quote@
585	640	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/virt_viewer-virt-viewer-display-vnc.Po@am__quote@
586	641	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/virt_viewer-virt-viewer-display.Po@am__quote@
	642	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/virt_viewer-virt-viewer-enums.Po@am__quote@
587	643	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/virt_viewer-virt-viewer-events.Po@am__quote@
588	644	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/virt_viewer-virt-viewer-main.Po@am__quote@
589	645	@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/virt_viewer-virt-viewer-notebook.Po@am__quote@

616	672	@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
617	673	@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
618	674
	675	remote_viewer-virt-viewer-enums.o: virt-viewer-enums.c
	676	@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_viewer_CFLAGS) $(CFLAGS) -MT remote_viewer-virt-viewer-enums.o -MD -MP -MF $(DEPDIR)/remote_viewer-virt-viewer-enums.Tpo -c -o remote_viewer-virt-viewer-enums.o `test -f 'virt-viewer-enums.c' \|\| echo '$(srcdir)/'`virt-viewer-enums.c
	677	@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/remote_viewer-virt-viewer-enums.Tpo $(DEPDIR)/remote_viewer-virt-viewer-enums.Po
	678	@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='virt-viewer-enums.c' object='remote_viewer-virt-viewer-enums.o' libtool=no @AMDEPBACKSLASH@
	679	@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
	680	@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_viewer_CFLAGS) $(CFLAGS) -c -o remote_viewer-virt-viewer-enums.o `test -f 'virt-viewer-enums.c' \|\| echo '$(srcdir)/'`virt-viewer-enums.c
	681
	682	remote_viewer-virt-viewer-enums.obj: virt-viewer-enums.c
	683	@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_viewer_CFLAGS) $(CFLAGS) -MT remote_viewer-virt-viewer-enums.obj -MD -MP -MF $(DEPDIR)/remote_viewer-virt-viewer-enums.Tpo -c -o remote_viewer-virt-viewer-enums.obj `if test -f 'virt-viewer-enums.c'; then $(CYGPATH_W) 'virt-viewer-enums.c'; else $(CYGPATH_W) '$(srcdir)/virt-viewer-enums.c'; fi`
	684	@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/remote_viewer-virt-viewer-enums.Tpo $(DEPDIR)/remote_viewer-virt-viewer-enums.Po
	685	@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='virt-viewer-enums.c' object='remote_viewer-virt-viewer-enums.obj' libtool=no @AMDEPBACKSLASH@
	686	@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
	687	@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_viewer_CFLAGS) $(CFLAGS) -c -o remote_viewer-virt-viewer-enums.obj `if test -f 'virt-viewer-enums.c'; then $(CYGPATH_W) 'virt-viewer-enums.c'; else $(CYGPATH_W) '$(srcdir)/virt-viewer-enums.c'; fi`
	688
619	689	remote_viewer-virt-viewer-util.o: virt-viewer-util.c
620	690	@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_viewer_CFLAGS) $(CFLAGS) -MT remote_viewer-virt-viewer-util.o -MD -MP -MF $(DEPDIR)/remote_viewer-virt-viewer-util.Tpo -c -o remote_viewer-virt-viewer-util.o `test -f 'virt-viewer-util.c' \|\| echo '$(srcdir)/'`virt-viewer-util.c
621	691	@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/remote_viewer-virt-viewer-util.Tpo $(DEPDIR)/remote_viewer-virt-viewer-util.Po

840	910	@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
841	911	@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remote_viewer_CFLAGS) $(CFLAGS) -c -o remote_viewer-remote-viewer-main.obj `if test -f 'remote-viewer-main.c'; then $(CYGPATH_W) 'remote-viewer-main.c'; else $(CYGPATH_W) '$(srcdir)/remote-viewer-main.c'; fi`
842	912
	913	virt_viewer-virt-viewer-enums.o: virt-viewer-enums.c
	914	@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virt_viewer_CFLAGS) $(CFLAGS) -MT virt_viewer-virt-viewer-enums.o -MD -MP -MF $(DEPDIR)/virt_viewer-virt-viewer-enums.Tpo -c -o virt_viewer-virt-viewer-enums.o `test -f 'virt-viewer-enums.c' \|\| echo '$(srcdir)/'`virt-viewer-enums.c
	915	@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/virt_viewer-virt-viewer-enums.Tpo $(DEPDIR)/virt_viewer-virt-viewer-enums.Po
	916	@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='virt-viewer-enums.c' object='virt_viewer-virt-viewer-enums.o' libtool=no @AMDEPBACKSLASH@
	917	@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
	918	@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virt_viewer_CFLAGS) $(CFLAGS) -c -o virt_viewer-virt-viewer-enums.o `test -f 'virt-viewer-enums.c' \|\| echo '$(srcdir)/'`virt-viewer-enums.c
	919
	920	virt_viewer-virt-viewer-enums.obj: virt-viewer-enums.c
	921	@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virt_viewer_CFLAGS) $(CFLAGS) -MT virt_viewer-virt-viewer-enums.obj -MD -MP -MF $(DEPDIR)/virt_viewer-virt-viewer-enums.Tpo -c -o virt_viewer-virt-viewer-enums.obj `if test -f 'virt-viewer-enums.c'; then $(CYGPATH_W) 'virt-viewer-enums.c'; else $(CYGPATH_W) '$(srcdir)/virt-viewer-enums.c'; fi`
	922	@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/virt_viewer-virt-viewer-enums.Tpo $(DEPDIR)/virt_viewer-virt-viewer-enums.Po
	923	@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='virt-viewer-enums.c' object='virt_viewer-virt-viewer-enums.obj' libtool=no @AMDEPBACKSLASH@
	924	@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
	925	@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virt_viewer_CFLAGS) $(CFLAGS) -c -o virt_viewer-virt-viewer-enums.obj `if test -f 'virt-viewer-enums.c'; then $(CYGPATH_W) 'virt-viewer-enums.c'; else $(CYGPATH_W) '$(srcdir)/virt-viewer-enums.c'; fi`
	926
843	927	virt_viewer-virt-viewer-util.o: virt-viewer-util.c
844	928	@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(virt_viewer_CFLAGS) $(CFLAGS) -MT virt_viewer-virt-viewer-util.o -MD -MP -MF $(DEPDIR)/virt_viewer-virt-viewer-util.Tpo -c -o virt_viewer-virt-viewer-util.o `test -f 'virt-viewer-util.c' \|\| echo '$(srcdir)/'`virt-viewer-util.c
845	929	@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/virt_viewer-virt-viewer-util.Tpo $(DEPDIR)/virt_viewer-virt-viewer-util.Po

1085	1169	-rm -rf .libs _libs
1086	1170	install-builderxmlDATA: $(builderxml_DATA)
1087	1171	@$(NORMAL_INSTALL)
1088		test -z "$(builderxmldir)" \|\| $(MKDIR_P) "$(DESTDIR)$(builderxmldir)"
1089	1172	@list='$(builderxml_DATA)'; test -n "$(builderxmldir)" \|\| list=; \
	1173	if test -n "$$list"; then \
	1174	echo " $(MKDIR_P) '$(DESTDIR)$(builderxmldir)'"; \
	1175	$(MKDIR_P) "$(DESTDIR)$(builderxmldir)" \|\| exit 1; \
	1176	fi; \
1090	1177	for p in $$list; do \
1091	1178	if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
1092	1179	echo "$$d$$p"; \

1103	1190	dir='$(DESTDIR)$(builderxmldir)'; $(am__uninstall_files_from_dir)
1104	1191	install-desktopDATA: $(desktop_DATA)
1105	1192	@$(NORMAL_INSTALL)
1106		test -z "$(desktopdir)" \|\| $(MKDIR_P) "$(DESTDIR)$(desktopdir)"
1107	1193	@list='$(desktop_DATA)'; test -n "$(desktopdir)" \|\| list=; \
	1194	if test -n "$$list"; then \
	1195	echo " $(MKDIR_P) '$(DESTDIR)$(desktopdir)'"; \
	1196	$(MKDIR_P) "$(DESTDIR)$(desktopdir)" \|\| exit 1; \
	1197	fi; \
1108	1198	for p in $$list; do \
1109	1199	if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
1110	1200	echo "$$d$$p"; \

1169	1259	&& $(am__cd) $(top_srcdir) \
1170	1260	&& gtags -i $(GTAGS_ARGS) "$$here"
1171	1261
	1262	cscopelist: $(HEADERS) $(SOURCES) $(LISP)
	1263	list='$(SOURCES) $(HEADERS) $(LISP)'; \
	1264	case "$(srcdir)" in \
	1265	[\\/]* \| ?:[\\/]*) sdir="$(srcdir)" ;; \
	1266	*) sdir=$(subdir)/$(srcdir) ;; \
	1267	esac; \
	1268	for i in $$list; do \
	1269	if test -f "$$i"; then \
	1270	echo "$(subdir)/$$i"; \
	1271	else \
	1272	echo "$$sdir/$$i"; \
	1273	fi; \
	1274	done >> $(top_builddir)/cscope.files
	1275
1172	1276	distclean-tags:
1173	1277	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
1174	1278

1203	1307	fi; \
1204	1308	done
1205	1309	check-am: all-am
1206		check: check-am
	1310	check: $(BUILT_SOURCES)
	1311	$(MAKE) $(AM_MAKEFLAGS) check-am
1207	1312	all-am: Makefile $(PROGRAMS) $(DATA)
1208	1313	installdirs:
1209	1314	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(builderxmldir)" "$(DESTDIR)$(desktopdir)"; do \
1210	1315	test -z "$$dir" \|\| $(MKDIR_P) "$$dir"; \
1211	1316	done
1212		install: install-am
	1317	install: $(BUILT_SOURCES)
	1318	$(MAKE) $(AM_MAKEFLAGS) install-am
1213	1319	install-exec: install-exec-am
1214	1320	install-data: install-data-am
1215	1321	uninstall: uninstall-am

1239	1345	maintainer-clean-generic:
1240	1346	@echo "This command is intended for maintainers to use"
1241	1347	@echo "it deletes files that may require special tools to rebuild."
	1348	-test -z "$(BUILT_SOURCES)" \|\| rm -f $(BUILT_SOURCES)
1242	1349	-test -z "$(MAINTAINERCLEANFILES)" \|\| rm -f $(MAINTAINERCLEANFILES)
1243	1350	clean: clean-am
1244	1351

1311	1418	uninstall-am: uninstall-binPROGRAMS uninstall-builderxmlDATA \
1312	1419	uninstall-desktopDATA
1313	1420
1314		.MAKE: install-am install-strip
	1421	.MAKE: all check install install-am install-strip
1315	1422
1316	1423	.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
1317		clean-generic clean-libtool ctags distclean distclean-compile \
1318		distclean-generic distclean-libtool distclean-tags distdir dvi \
1319		dvi-am html html-am info info-am install install-am \
1320		install-binPROGRAMS install-builderxmlDATA install-data \
1321		install-data-am install-desktopDATA install-dvi install-dvi-am \
1322		install-exec install-exec-am install-html install-html-am \
1323		install-info install-info-am install-man install-pdf \
1324		install-pdf-am install-ps install-ps-am install-strip \
1325		installcheck installcheck-am installdirs maintainer-clean \
1326		maintainer-clean-generic mostlyclean mostlyclean-compile \
1327		mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
1328		tags uninstall uninstall-am uninstall-binPROGRAMS \
1329		uninstall-builderxmlDATA uninstall-desktopDATA
1330
	1424	clean-generic clean-libtool cscopelist ctags distclean \
	1425	distclean-compile distclean-generic distclean-libtool \
	1426	distclean-tags distdir dvi dvi-am html html-am info info-am \
	1427	install install-am install-binPROGRAMS install-builderxmlDATA \
	1428	install-data install-data-am install-desktopDATA install-dvi \
	1429	install-dvi-am install-exec install-exec-am install-html \
	1430	install-html-am install-info install-info-am install-man \
	1431	install-pdf install-pdf-am install-ps install-ps-am \
	1432	install-strip installcheck installcheck-am installdirs \
	1433	maintainer-clean maintainer-clean-generic mostlyclean \
	1434	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
	1435	pdf pdf-am ps ps-am tags uninstall uninstall-am \
	1436	uninstall-binPROGRAMS uninstall-builderxmlDATA \
	1437	uninstall-desktopDATA
	1438
	1439
	1440	$(BUILT_SOURCES): %: %.etemplate $(ENUMS_FILES)
	1441	$(AM_V_GEN)$(GLIB_MKENUMS) --template $^ \| \
	1442	sed -e 's/VIRT_TYPE_VIEWER/VIRT_VIEWER_TYPE/' \
	1443	-e 's,#include "$(srcdir)/,#include ",' > $@
1331	1444
1332	1445	@OS_WIN32_TRUE@virt-viewer_rc.$(OBJEXT): $(VIRT_VIEWER_RES) $(ICONDIR)/virt-viewer.ico
1333	1446	@OS_WIN32_TRUE@ $(AM_V_GEN)$(WINDRES) \

+7

-5

src/remote-viewer-main.c less more

183	183	gchar *uri = virt_viewer_session_get_uri(session);
184	184
185	185	recent_add(uri);
	186	g_free(uri);
186	187	}
187	188
188	189	int

202	203	gboolean controller = FALSE;
203	204	#endif
204	205	VirtViewerApp *app;
205		const char *help_msg = N_("Run '" PACKAGE " --help' to see a full list of available command line options");
206	206	const GOptionEntry options [] = {
207	207	{ "version", 'V', G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK,
208	208	remote_viewer_version, N_("Display version information"), NULL },

215	215	{ "debug", '\0', 0, G_OPTION_ARG_NONE, &debug,
216	216	N_("Display debugging information"), NULL },
217	217	{ "full-screen", 'f', G_OPTION_FLAG_OPTIONAL_ARG, G_OPTION_ARG_CALLBACK, option_fullscreen,
218		N_("Open in full screen mode (=<auto-conf>)"), NULL },
	218	N_("Open in full screen mode (auto-conf adjusts guest resolution to fit the client's)."), N_("<auto-conf>") },
219	219	#if HAVE_SPICE_GTK
220	220	{ "spice-controller", '\0', 0, G_OPTION_ARG_NONE, &controller,
221	221	N_("Open connection using Spice controller communication"), NULL },

259	259	#endif
260	260	g_option_context_parse (context, &argc, &argv, &error);
261	261	if (error) {
262		g_printerr("%s\n%s\n",
263		error->message,
264		gettext(help_msg));
	262	char *basename;
	263	basename = g_path_get_basename(argv[0]);
	264	g_printerr(_("%s\nRun '%s --help' to see a full list of available command line options\n"),
	265	error->message, basename);
	266	g_free(basename);
265	267	g_error_free(error);
266	268	goto cleanup;
267	269	}

+56

-0

src/virt-glib-compat.h less more

	0	/*
	1	* Virt Viewer: A virtual machine console viewer
	2	*
	3	* Copyright (C) 2007-2009 Red Hat, Inc.
	4	* Copyright (C) 2009-2012 Daniel P. Berrange
	5	* Copyright (C) 2010 Marc-André Lureau
	6	*
	7	* This program is free software; you can redistribute it and/or modify
	8	* it under the terms of the GNU General Public License as published by
	9	* the Free Software Foundation; either version 2 of the License, or
	10	* (at your option) any later version.
	11	*
	12	* This program is distributed in the hope that it will be useful,
	13	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	14	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	15	* GNU General Public License for more details.
	16	*
	17	* You should have received a copy of the GNU General Public License
	18	* along with this program; if not, write to the Free Software
	19	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
	20	*
	21	* Author: Daniel P. Berrange <berrange@redhat.com>
	22	*/
	23
	24	#include <config.h>
	25
	26	#ifndef _VIRT_GLIB_COMPAT_H
	27	# define _VIRT_GLIB_COMPAT_H 1
	28
	29	#include <glib-object.h>
	30
	31	G_BEGIN_DECLS
	32
	33	#ifndef g_clear_pointer
	34	#define g_clear_pointer(pp, destroy) \
	35	G_STMT_START { \
	36	G_STATIC_ASSERT (sizeof *(pp) == sizeof (gpointer)); \
	37	/* Only one access, please */ \
	38	gpointer _pp = (gpointer ) (pp); \
	39	gpointer _p; \
	40	/* This assignment is needed to avoid a gcc warning */ \
	41	GDestroyNotify _destroy = (GDestroyNotify) (destroy); \
	42	\
	43	(void) (0 ? (gpointer) *(pp) : 0); \
	44	do \
	45	_p = g_atomic_pointer_get (_pp); \
	46	while G_UNLIKELY (!g_atomic_pointer_compare_and_exchange (_pp, _p, NULL)); \
	47	\
	48	if (_p) \
	49	_destroy (_p); \
	50	} G_STMT_END
	51	#endif
	52
	53	G_END_DECLS
	54
	55	#endif // _VIRT_GLIB_COMPAT_H

+55

-12

src/virt-viewer-app.c less more

282	282	GTK_BUTTONS_OK_CANCEL,
283	283	_("This is the last visible display. Do you want to quit?"));
284	284	gint result = gtk_dialog_run (GTK_DIALOG (dialog));
	285	gtk_widget_destroy(dialog);
285	286	switch (result) {
286	287	case GTK_RESPONSE_OK:
287	288	virt_viewer_app_quit(self);

289	290	default:
290	291	break;
291	292	}
292		gtk_widget_destroy(dialog);
293	293	return FALSE;
294	294	} else {
295	295	virt_viewer_app_quit(self);

519	519	DEBUG_LOG("Remove window %d %p", nth, win);
520	520	removed = g_hash_table_steal(self->priv->windows, &nth);
521	521	g_warn_if_fail(removed);
	522	virt_viewer_app_update_menu_displays(self);
522	523
523	524	if (removed)
524	525	g_signal_emit(self, signals[SIGNAL_WINDOW_REMOVED], 0, win);

539	540	DEBUG_LOG("Insert window %d %p", nth, win);
540	541	g_hash_table_insert(self->priv->windows, key, win);
541	542	virt_viewer_app_set_window_subtitle(self, win, nth);
	543	virt_viewer_app_update_menu_displays(self);
542	544
543	545	g_signal_emit(self, signals[SIGNAL_WINDOW_ADDED], 0, win);
544	546	}

608	610	{
609	611	VirtViewerApp *self;
610	612	VirtViewerNotebook *nb = virt_viewer_window_get_notebook(win);
611		gint nth, hint;
	613	gint nth;
	614	guint hint;
612	615
613	616	g_object_get(win,
614	617	"app", &self,

618	621	"show-hint", &hint,
619	622	NULL);
620	623
621		if (hint == VIRT_VIEWER_DISPLAY_SHOW_HINT_HIDE) {
	624	if (hint & VIRT_VIEWER_DISPLAY_SHOW_HINT_DISABLED) {
	625	virt_viewer_window_hide(win);
	626	} else if (hint & VIRT_VIEWER_DISPLAY_SHOW_HINT_READY) {
	627	virt_viewer_notebook_show_display(nb);
	628	virt_viewer_window_show(win);
	629	gtk_window_present(virt_viewer_window_get_window(win));
	630	} else {
622	631	if (win != self->priv->main_window &&
623	632	g_getenv("VIRT_VIEWER_HIDE"))
624	633	virt_viewer_window_hide(win);
625	634	virt_viewer_notebook_show_status(nb, _("Waiting for display %d..."), nth + 1);
626		} else {
627		virt_viewer_notebook_show_display(nb);
628		virt_viewer_window_show(win);
629		gtk_window_present(virt_viewer_window_get_window(win));
630	635	}
631	636
632	637	g_object_unref(self);

655	660	}
656	661
657	662	virt_viewer_window_set_display(window, display);
658		g_signal_connect(display, "notify::show-hint",
659		G_CALLBACK(display_show_hint), window);
	663	virt_viewer_app_update_menu_displays(self);
	664	virt_viewer_signal_connect_object(display, "notify::show-hint",
	665	G_CALLBACK(display_show_hint), window, 0);
660	666	g_object_notify(G_OBJECT(display), "show-hint"); /* call display_show_hint */
661	667	}
662	668

676	682
677	683	if (nth != 0)
678	684	virt_viewer_app_remove_nth_window(self, nth);
	685	}
	686
	687	static void
	688	virt_viewer_app_display_updated(VirtViewerSession *session G_GNUC_UNUSED,
	689	VirtViewerApp *self)
	690	{
	691	virt_viewer_app_update_menu_displays(self);
679	692	}
680	693
681	694	int

728	741	G_CALLBACK(virt_viewer_app_display_added), self);
729	742	g_signal_connect(priv->session, "session-display-removed",
730	743	G_CALLBACK(virt_viewer_app_display_removed), self);
	744	g_signal_connect(priv->session, "session-display-updated",
	745	G_CALLBACK(virt_viewer_app_display_updated), self);
731	746
732	747	g_signal_connect(priv->session, "session-cut-text",
733	748	G_CALLBACK(virt_viewer_app_server_cut_text), self);

1272	1287	priv->session = NULL;
1273	1288	}
1274	1289	g_free(priv->title);
	1290	priv->title = NULL;
	1291	g_free(priv->guest_name);
	1292	priv->guest_name = NULL;
	1293	g_free(priv->pretty_address);
	1294	priv->pretty_address = NULL;
	1295	g_free(priv->guri);
	1296	priv->guri = NULL;
	1297	g_free(priv->title);
	1298	priv->title = NULL;
1275	1299
1276	1300	virt_viewer_app_free_connect_info(self);
1277	1301

1619	1643	while (tmp) {
1620	1644	int *nth = tmp->data;
1621	1645	VirtViewerWindow *vwin = VIRT_VIEWER_WINDOW(g_hash_table_lookup(self->priv->windows, nth));
	1646	VirtViewerDisplay *display = virt_viewer_window_get_display(vwin);
1622	1647	GtkWidget *item;
1623		gboolean visible;
1624
1625		item = gtk_check_menu_item_new_with_label(g_strdup_printf("Display %d", *nth));
	1648	gboolean visible, sensitive = FALSE;
	1649	gchar *label;
	1650
	1651	label = g_strdup_printf(_("Display %d"), *nth + 1);
	1652	item = gtk_check_menu_item_new_with_label(label);
	1653	g_free(label);
	1654
1626	1655	visible = gtk_widget_get_visible(GTK_WIDGET(virt_viewer_window_get_window(vwin)));
1627	1656	gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(item), visible);
	1657
	1658	if (display) {
	1659	guint hint = virt_viewer_display_get_show_hint(display);
	1660
	1661	if (hint & VIRT_VIEWER_DISPLAY_SHOW_HINT_READY)
	1662	sensitive = TRUE;
	1663
	1664	if ((hint & VIRT_VIEWER_DISPLAY_SHOW_HINT_DISABLED) &&
	1665	virt_viewer_display_get_selectable(display))
	1666	sensitive = TRUE;
	1667	}
	1668
	1669	gtk_widget_set_sensitive(item, sensitive);
	1670
1628	1671	g_signal_connect(G_OBJECT(item),
1629	1672	"toggled", G_CALLBACK(menu_display_visible_toggled_cb), vwin);
1630	1673	gtk_menu_shell_append(submenu, item);

+1

-0

src/virt-viewer-auth.c less more

88	88	}
89	89
90	90	gtk_widget_destroy(GTK_WIDGET(dialog));
	91	g_object_unref(G_OBJECT(creds));
91	92
92	93	return response == GTK_RESPONSE_OK ? 0 : -1;
93	94	}

+92

-56

src/virt-viewer-display-spice.c less more

34	34	G_DEFINE_TYPE (VirtViewerDisplaySpice, virt_viewer_display_spice, VIRT_VIEWER_TYPE_DISPLAY)
35	35
36	36	struct _VirtViewerDisplaySpicePrivate {
37		SpiceChannel *channel;
	37	SpiceChannel channel; / weak reference */
38	38	SpiceDisplay *display;
39	39	};
40	40

46	46	static GdkPixbuf virt_viewer_display_spice_get_pixbuf(VirtViewerDisplay display);
47	47	static void virt_viewer_display_spice_release_cursor(VirtViewerDisplay *display);
48	48	static void virt_viewer_display_spice_close(VirtViewerDisplay *display G_GNUC_UNUSED);
	49	static gboolean virt_viewer_display_spice_selectable(VirtViewerDisplay *display);
49	50
50	51	static void
51	52	virt_viewer_display_spice_finalize(GObject *obj)

53	54	VirtViewerDisplaySpice *spice = VIRT_VIEWER_DISPLAY_SPICE(obj);
54	55
55	56	g_object_unref(spice->priv->display);
56		g_object_unref(spice->priv->channel);
57	57
58	58	G_OBJECT_CLASS(virt_viewer_display_spice_parent_class)->finalize(obj);
59	59	}

70	70	dclass->get_pixbuf = virt_viewer_display_spice_get_pixbuf;
71	71	dclass->release_cursor = virt_viewer_display_spice_release_cursor;
72	72	dclass->close = virt_viewer_display_spice_close;
	73	dclass->selectable = virt_viewer_display_spice_selectable;
73	74
74	75	g_type_class_add_private(klass, sizeof(VirtViewerDisplaySpicePrivate));
75	76	}
76	77
	78	static SpiceMainChannel*
	79	get_main(VirtViewerDisplay *self)
	80	{
	81	VirtViewerSessionSpice *session;
	82
	83	session = VIRT_VIEWER_SESSION_SPICE(virt_viewer_display_get_session(self));
	84
	85	return virt_viewer_session_spice_get_main_channel(session);
	86	}
	87
	88	static void
	89	show_hint_changed(VirtViewerDisplay *self)
	90	{
	91	SpiceMainChannel *main_channel = get_main(self);
	92	guint enabled = TRUE;
	93	guint nth;
	94
	95	/* this may happen when finalizing */
	96	if (!main_channel)
	97	return;
	98
	99	g_object_get(self, "nth-display", &nth, NULL);
	100	if (virt_viewer_display_get_show_hint(self) & VIRT_VIEWER_DISPLAY_SHOW_HINT_DISABLED)
	101	enabled = FALSE;
	102
	103	spice_main_set_display_enabled(main_channel, nth, enabled);
	104	}
	105
77	106	static void
78	107	virt_viewer_display_spice_init(VirtViewerDisplaySpice *self G_GNUC_UNUSED)
79	108	{
80	109	self->priv = VIRT_VIEWER_DISPLAY_SPICE_GET_PRIVATE(self);
	110
	111	g_signal_connect(self, "notify::show-hint", G_CALLBACK(show_hint_changed), NULL);
81	112	}
82	113
83	114	static void

105	136	}
106	137
107	138	static void
108		display_mark(SpiceChannel *channel G_GNUC_UNUSED,
109		gint mark,
110		VirtViewerDisplay *display)
111		{
112		DEBUG_LOG("Toggle monitor visibility %p %d", channel, mark);
113
114		virt_viewer_display_set_show_hint(display, mark);
115		}
116
117		static void
118		primary_create(SpiceChannel *channel G_GNUC_UNUSED,
119		gint format G_GNUC_UNUSED,
120		gint width,
121		gint height,
122		gint stride G_GNUC_UNUSED,
123		gint shmid G_GNUC_UNUSED,
124		gpointer imgdata G_GNUC_UNUSED,
125		VirtViewerDisplay *display)
126		{
127		DEBUG_LOG("spice desktop resize %dx%d", width, height);
128
129		virt_viewer_display_set_desktop_size(display, width, height);
130		}
131
	139	display_ready(GObject *display,
	140	GParamSpec *pspec G_GNUC_UNUSED,
	141	VirtViewerDisplay *self)
	142	{
	143	gboolean ready;
	144
	145	g_object_get(display, "ready", &ready, NULL);
	146	DEBUG_LOG("display %p ready:%d", self, ready);
	147
	148	virt_viewer_display_set_show_hint(self, VIRT_VIEWER_DISPLAY_SHOW_HINT_READY, ready);
	149	}
132	150
133	151	static void
134	152	virt_viewer_display_spice_keyboard_grab(SpiceDisplay *display G_GNUC_UNUSED,

161	179	{
162	180	gdouble dw = allocation->width, dh = allocation->height;
163	181	guint zoom = 100;
164		guint channelid;
	182	guint nth;
165	183
166	184	if (virt_viewer_display_get_auto_resize(VIRT_VIEWER_DISPLAY(self)) == FALSE)
	185	return;
	186
	187	if (virt_viewer_display_get_show_hint(VIRT_VIEWER_DISPLAY(self)) & VIRT_VIEWER_DISPLAY_SHOW_HINT_DISABLED)
167	188	return;
168	189
169	190	if (virt_viewer_display_get_zoom(VIRT_VIEWER_DISPLAY(self))) {

173	194	dh /= ((double)zoom / 100.0);
174	195	}
175	196
176		g_object_get(self->priv->channel, "channel-id", &channelid, NULL);
177
178		SpiceMainChannel *main_channel = virt_viewer_session_spice_get_main_channel(
179		VIRT_VIEWER_SESSION_SPICE(virt_viewer_display_get_session(VIRT_VIEWER_DISPLAY(self))));
180		spice_main_set_display(main_channel,
181		channelid,
182		0, 0, dw, dh);
	197	g_object_get(self, "nth-display", &nth, NULL);
	198
	199	spice_main_set_display(get_main(VIRT_VIEWER_DISPLAY(self)),
	200	nth, 0, 0, dw, dh);
183	201	}
184	202
185	203	static void

199	217	GtkWidget *
200	218	virt_viewer_display_spice_new(VirtViewerSessionSpice *session,
201	219	SpiceChannel *channel,
202		SpiceDisplay *display)
	220	gint monitorid)
203	221	{
204	222	VirtViewerDisplaySpice *self;
205	223	VirtViewerApp *app;
206	224	gint channelid;
	225	SpiceSession *s;
207	226
208	227	g_return_val_if_fail(SPICE_IS_DISPLAY_CHANNEL(channel), NULL);
209		g_return_val_if_fail(SPICE_IS_DISPLAY(display), NULL);
210	228
211	229	g_object_get(channel, "channel-id", &channelid, NULL);
	230	// We don't allow monitorid != 0 && channelid != 0
	231	g_return_val_if_fail(channelid == 0 \|\| monitorid == 0, NULL);
212	232
213	233	self = g_object_new(VIRT_VIEWER_TYPE_DISPLAY_SPICE,
214	234	"session", session,
215		"nth-display", channelid,
	235	// either monitorid is always 0 or channelid
	236	// is, we can't have display (0, 2) and (2, 0)
	237	// for example
	238	"nth-display", channelid + monitorid,
216	239	NULL);
217		self->priv->channel = g_object_ref(channel);
218		self->priv->display = g_object_ref(display);
219
220		g_signal_connect(channel, "display-primary-create",
221		G_CALLBACK(primary_create), self);
222		g_signal_connect(channel, "display-mark",
223		G_CALLBACK(display_mark), self);
224
225		gtk_container_add(GTK_CONTAINER(self), GTK_WIDGET(self->priv->display));
	240	self->priv->channel = channel;
	241
	242	g_object_get(session, "spice-session", &s, NULL);
	243	self->priv->display = spice_display_new_with_monitor(s, channelid, monitorid);
	244	g_object_unref(s);
	245
	246	virt_viewer_signal_connect_object(self->priv->display, "notify::ready",
	247	G_CALLBACK(display_ready), self, 0);
	248
	249	gtk_container_add(GTK_CONTAINER(self), g_object_ref(self->priv->display));
226	250	gtk_widget_show(GTK_WIDGET(self->priv->display));
227	251	g_object_set(self->priv->display,
228	252	"grab-keyboard", TRUE,

231	255	"scaling", TRUE,
232	256	NULL);
233	257
234		g_signal_connect(self->priv->display,
235		"keyboard-grab",
236		G_CALLBACK(virt_viewer_display_spice_keyboard_grab), self);
237		g_signal_connect(self->priv->display,
238		"mouse-grab",
239		G_CALLBACK(virt_viewer_display_spice_mouse_grab), self);
240		g_signal_connect(self,
241		"size-allocate",
242		G_CALLBACK(virt_viewer_display_spice_size_allocate), self);
	258	virt_viewer_signal_connect_object(self->priv->display, "keyboard-grab",
	259	G_CALLBACK(virt_viewer_display_spice_keyboard_grab), self, 0);
	260	virt_viewer_signal_connect_object(self->priv->display, "mouse-grab",
	261	G_CALLBACK(virt_viewer_display_spice_mouse_grab), self, 0);
	262	virt_viewer_signal_connect_object(self, "size-allocate",
	263	G_CALLBACK(virt_viewer_display_spice_size_allocate), self, 0);
243	264
244	265
245	266	app = virt_viewer_session_get_app(VIRT_VIEWER_SESSION(session));
246		g_signal_connect(app, "notify::enable-accel", G_CALLBACK(enable_accel_changed), self);
	267	virt_viewer_signal_connect_object(app, "notify::enable-accel",
	268	G_CALLBACK(enable_accel_changed), self, 0);
247	269	enable_accel_changed(app, NULL, self);
248	270
249	271	return GTK_WIDGET(self);

261	283	static void
262	284	virt_viewer_display_spice_close(VirtViewerDisplay *display G_GNUC_UNUSED)
263	285	{
	286	}
	287
	288	static gboolean
	289	virt_viewer_display_spice_selectable(VirtViewerDisplay *self)
	290	{
	291	gboolean agent_connected;
	292	SpiceMainChannel *mainc;
	293
	294	mainc = get_main(self);
	295	g_object_get(mainc,
	296	"agent-connected", &agent_connected,
	297	NULL);
	298
	299	return agent_connected;
264	300	}
265	301
266	302

+1

-3

src/virt-viewer-display-spice.h less more

65	65
66	66	GType virt_viewer_display_spice_get_type(void);
67	67
68		GtkWidget* virt_viewer_display_spice_new(VirtViewerSessionSpice *session,
69		SpiceChannel *channel,
70		SpiceDisplay *display);
	68	GtkWidget* virt_viewer_display_spice_new(VirtViewerSessionSpice session, SpiceChannel channel, gint monitorid);
71	69
72	70	G_END_DECLS
73	71

+59

-11

src/virt-viewer-display.c less more

40	40	guint zoom_level;
41	41	gboolean zoom;
42	42	gint nth_display;
43		gint show_hint;
	43	guint show_hint;
44	44	VirtViewerSession *session;
45	45	gboolean auto_resize;
46	46	};

79	79	PROP_ZOOM_LEVEL,
80	80	PROP_SHOW_HINT,
81	81	PROP_SESSION,
	82	PROP_SELECTABLE,
82	83	};
83	84
84	85	static void

150	151
151	152	g_object_class_install_property(object_class,
152	153	PROP_SHOW_HINT,
153		g_param_spec_int("show-hint",
154		"Show hint",
155		"Show state hint",
156		0,
157		G_MAXINT32,
158		0,
159		G_PARAM_READABLE));
	154	g_param_spec_flags("show-hint",
	155	"Show hint",
	156	"Show state hint",
	157	VIRT_VIEWER_TYPE_DISPLAY_SHOW_HINT_FLAGS,
	158	0,
	159	G_PARAM_READABLE));
160	160
161	161	g_object_class_install_property(object_class,
162	162	PROP_SESSION,

167	167	G_PARAM_READWRITE \|
168	168	G_PARAM_CONSTRUCT_ONLY));
169	169
	170	g_object_class_install_property(object_class,
	171	PROP_SELECTABLE,
	172	g_param_spec_boolean("selectable",
	173	"Selectable",
	174	"Selectable",
	175	FALSE,
	176	G_PARAM_READABLE));
170	177
171	178	g_signal_new("display-pointer-grab",
172	179	G_OBJECT_CLASS_TYPE(object_class),

297	304	g_value_set_int(value, priv->nth_display);
298	305	break;
299	306	case PROP_SHOW_HINT:
300		g_value_set_int(value, priv->show_hint);
	307	g_value_set_flags(value, priv->show_hint);
301	308	break;
302	309	case PROP_SESSION:
303	310	g_value_set_object(value, virt_viewer_display_get_session(display));
	311	break;
	312	case PROP_SELECTABLE:
	313	g_value_set_boolean(value, virt_viewer_display_get_selectable(display));
304	314	break;
305	315
306	316	default:

403	413	DEBUG_LOG("Allocated %dx%d", allocation->width, allocation->height);
404	414	gtk_widget_set_allocation(widget, allocation);
405	415
	416	if (priv->desktopWidth == 0 \|\|
	417	priv->desktopHeight == 0)
	418	goto end;
	419
406	420	desktopAspect = (double)priv->desktopWidth / (double)priv->desktopHeight;
407	421
408	422	if (child && gtk_widget_get_visible(child)) {

427	441	gtk_widget_size_allocate(child, &child_allocation);
428	442	}
429	443
430
	444	end:
431	445	/* This unsets the size request, so that the user can
432	446	* manually resize the window smaller again
433	447	*/

529	543	return VIRT_VIEWER_DISPLAY_GET_CLASS(display)->get_pixbuf(display);
530	544	}
531	545
532		void virt_viewer_display_set_show_hint(VirtViewerDisplay *self, gint hint)
	546	guint virt_viewer_display_get_show_hint(VirtViewerDisplay *self)
	547	{
	548	g_return_val_if_fail(VIRT_VIEWER_IS_DISPLAY(self), 0);
	549
	550	return self->priv->show_hint;
	551	}
	552
	553	void virt_viewer_display_set_show_hint(VirtViewerDisplay *self, guint mask, gboolean enable)
533	554	{
534	555	VirtViewerDisplayPrivate *priv;
	556	guint hint;
535	557	g_return_if_fail(VIRT_VIEWER_IS_DISPLAY(self));
536	558
537	559	priv = self->priv;
	560	hint = priv->show_hint;
	561
	562	if (enable)
	563	hint \|= mask;
	564	else
	565	hint &= ~mask;
	566
538	567	if (priv->show_hint == hint)
539	568	return;
540	569

542	571	g_object_notify(G_OBJECT(self), "show-hint");
543	572	}
544	573
	574	void virt_viewer_display_set_enabled(VirtViewerDisplay *self, gboolean enabled)
	575	{
	576	g_return_if_fail(VIRT_VIEWER_IS_DISPLAY(self));
	577
	578	virt_viewer_display_set_show_hint(self, VIRT_VIEWER_DISPLAY_SHOW_HINT_DISABLED, !enabled);
	579	}
	580
545	581	VirtViewerSession* virt_viewer_display_get_session(VirtViewerDisplay *self)
546	582	{
547	583	g_return_val_if_fail(VIRT_VIEWER_IS_DISPLAY(self), NULL);

575	611	klass->release_cursor(self);
576	612	}
577	613
	614	gboolean virt_viewer_display_get_selectable(VirtViewerDisplay *self)
	615	{
	616	VirtViewerDisplayClass *klass;
	617
	618	g_return_val_if_fail(VIRT_VIEWER_IS_DISPLAY(self), FALSE);
	619
	620	klass = VIRT_VIEWER_DISPLAY_GET_CLASS(self);
	621	if (klass->selectable)
	622	return klass->selectable(self);
	623
	624	return TRUE;
	625	}
578	626
579	627	void virt_viewer_display_close(VirtViewerDisplay *self)
580	628	{

+10

-5

src/virt-viewer-display.h less more

24	24	#define _VIRT_VIEWER_DISPLAY_H
25	25
26	26	#include <gtk/gtk.h>
	27	#include "virt-viewer-enums.h"
27	28
28	29	G_BEGIN_DECLS
29	30

53	54
54	55	typedef struct _VirtViewerDisplayChannel VirtViewerDisplayChannel;
55	56
56		enum {
57		VIRT_VIEWER_DISPLAY_SHOW_HINT_HIDE = 0,
58		VIRT_VIEWER_DISPLAY_SHOW_HINT_READY,
59		};
	57	typedef enum {
	58	VIRT_VIEWER_DISPLAY_SHOW_HINT_READY = 1 << 0,
	59	VIRT_VIEWER_DISPLAY_SHOW_HINT_DISABLED = 1 << 1,
	60	} VirtViewerDisplayShowHintFlags;
60	61
61	62	/* perhaps this become an interface, and be pushed in gtkvnc and spice? */
62	63	struct _VirtViewerDisplay {

75	76	void (release_cursor)(VirtViewerDisplay display);
76	77
77	78	void (close)(VirtViewerDisplay display);
	79	gboolean (selectable)(VirtViewerDisplay display);
78	80
79	81	/* signals */
80	82	void (display_pointer_grab)(VirtViewerDisplay display);

107	109	void virt_viewer_display_send_keys(VirtViewerDisplay *display,
108	110	const guint *keyvals, int nkeyvals);
109	111	GdkPixbuf* virt_viewer_display_get_pixbuf(VirtViewerDisplay *display);
110		void virt_viewer_display_set_show_hint(VirtViewerDisplay *display, gint hint);
	112	void virt_viewer_display_set_show_hint(VirtViewerDisplay *display, guint mask, gboolean enable);
	113	guint virt_viewer_display_get_show_hint(VirtViewerDisplay *display);
111	114	VirtViewerSession* virt_viewer_display_get_session(VirtViewerDisplay *display);
112	115	void virt_viewer_display_set_auto_resize(VirtViewerDisplay *display, gboolean auto_resize);
113	116	gboolean virt_viewer_display_get_auto_resize(VirtViewerDisplay *display);
114	117	void virt_viewer_display_release_cursor(VirtViewerDisplay *display);
115	118
116	119	void virt_viewer_display_close(VirtViewerDisplay *display);
	120	void virt_viewer_display_set_enabled(VirtViewerDisplay *display, gboolean enabled);
	121	gboolean virt_viewer_display_get_selectable(VirtViewerDisplay *display);
117	122
118	123	G_END_DECLS
119	124

+52

-0

src/virt-viewer-enums.c less more

	0
	1	/* Generated data (by glib-mkenums) */
	2
	3	/*
	4	* Virt Viewer: A virtual machine console viewer
	5	*
	6	* Copyright (C) 2007-2012 Red Hat, Inc.
	7	*
	8	* This program is free software; you can redistribute it and/or modify
	9	* it under the terms of the GNU General Public License as published by
	10	* the Free Software Foundation; either version 2 of the License, or
	11	* (at your option) any later version.
	12	*
	13	* This program is distributed in the hope that it will be useful,
	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	16	* GNU General Public License for more details.
	17	*
	18	* You should have received a copy of the GNU General Public License
	19	* along with this program; if not, write to the Free Software
	20	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
	21	*
	22	* Author: Marc-André Lureau <marcandre.lureau@redhat.com>
	23	*/
	24
	25	#include "virt-viewer-enums.h"
	26
	27	#include "virt-viewer-display.h"
	28
	29	GType
	30	virt_viewer_display_show_hint_flags_get_type (void)
	31	{
	32	static volatile gsize g_define_type_id__volatile = 0;
	33
	34	if (g_once_init_enter (&g_define_type_id__volatile))
	35	{
	36	static const GFlagsValue values[] = {
	37	{ VIRT_VIEWER_DISPLAY_SHOW_HINT_READY, "VIRT_VIEWER_DISPLAY_SHOW_HINT_READY", "ready" },
	38	{ VIRT_VIEWER_DISPLAY_SHOW_HINT_DISABLED, "VIRT_VIEWER_DISPLAY_SHOW_HINT_DISABLED", "disabled" },
	39	{ 0, NULL, NULL }
	40	};
	41	GType g_define_type_id =
	42	g_flags_register_static (g_intern_static_string ("VirtViewerDisplayShowHintFlags"), values);
	43	g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
	44	}
	45
	46	return g_define_type_id__volatile;
	47	}
	48
	49
	50	/* Generated data ends here */
	51

+60

-0

src/virt-viewer-enums.c.etemplate less more

	0	/* BEGIN file-header */
	1	/*
	2	* Virt Viewer: A virtual machine console viewer
	3	*
	4	* Copyright (C) 2007-2012 Red Hat, Inc.
	5	*
	6	* This program is free software; you can redistribute it and/or modify
	7	* it under the terms of the GNU General Public License as published by
	8	* the Free Software Foundation; either version 2 of the License, or
	9	* (at your option) any later version.
	10	*
	11	* This program is distributed in the hope that it will be useful,
	12	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	13	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	14	* GNU General Public License for more details.
	15	*
	16	* You should have received a copy of the GNU General Public License
	17	* along with this program; if not, write to the Free Software
	18	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
	19	*
	20	* Author: Marc-André Lureau <marcandre.lureau@redhat.com>
	21	*/
	22
	23	#include "virt-viewer-enums.h"
	24
	25	/* END file-header */
	26
	27	/* BEGIN file-production */
	28	#include "@filename@"
	29	/* END file-production */
	30
	31
	32	/* BEGIN value-header */
	33
	34	GType
	35	@enum_name@_get_type (void)
	36	{
	37	static volatile gsize g_define_type_id__volatile = 0;
	38
	39	if (g_once_init_enter (&g_define_type_id__volatile))
	40	{
	41	static const G@Type@Value values[] = {
	42	/* END value-header */
	43
	44	/* BEGIN value-production */
	45	{ @VALUENAME@, "@VALUENAME@", "@valuenick@" },
	46	/* END value-production */
	47
	48	/* BEGIN value-tail */
	49	{ 0, NULL, NULL }
	50	};
	51	GType g_define_type_id =
	52	g_@type@_register_static (g_intern_static_string ("@EnumName@"), values);
	53	g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
	54	}
	55
	56	return g_define_type_id__volatile;
	57	}
	58
	59	/* END value-tail */

+39

-0

src/virt-viewer-enums.h less more

	0
	1	/* Generated data (by glib-mkenums) */
	2
	3	/*
	4	* Virt Viewer: A virtual machine console viewer
	5	*
	6	* Copyright (C) 2007-2012 Red Hat, Inc.
	7	*
	8	* This program is free software; you can redistribute it and/or modify
	9	* it under the terms of the GNU General Public License as published by
	10	* the Free Software Foundation; either version 2 of the License, or
	11	* (at your option) any later version.
	12	*
	13	* This program is distributed in the hope that it will be useful,
	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	16	* GNU General Public License for more details.
	17	*
	18	* You should have received a copy of the GNU General Public License
	19	* along with this program; if not, write to the Free Software
	20	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
	21	*
	22	* Author: Marc-André Lureau <marcandre.lureau@redhat.com>
	23	*/
	24
	25	#ifndef VIRT_VIEWER_ENUMS_H
	26	#define VIRT_VIEWER_ENUMS_H
	27
	28	#include <glib-object.h>
	29
	30	G_BEGIN_DECLS
	31	GType virt_viewer_display_show_hint_flags_get_type (void) G_GNUC_CONST;
	32	#define VIRT_VIEWER_TYPE_DISPLAY_SHOW_HINT_FLAGS (virt_viewer_display_show_hint_flags_get_type ())
	33	G_END_DECLS
	34
	35	#endif
	36
	37	/* Generated data ends here */
	38

+41

-0

src/virt-viewer-enums.h.etemplate less more

	0	/* BEGIN file-header */
	1	/*
	2	* Virt Viewer: A virtual machine console viewer
	3	*
	4	* Copyright (C) 2007-2012 Red Hat, Inc.
	5	*
	6	* This program is free software; you can redistribute it and/or modify
	7	* it under the terms of the GNU General Public License as published by
	8	* the Free Software Foundation; either version 2 of the License, or
	9	* (at your option) any later version.
	10	*
	11	* This program is distributed in the hope that it will be useful,
	12	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	13	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	14	* GNU General Public License for more details.
	15	*
	16	* You should have received a copy of the GNU General Public License
	17	* along with this program; if not, write to the Free Software
	18	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
	19	*
	20	* Author: Marc-André Lureau <marcandre.lureau@redhat.com>
	21	*/
	22
	23	#ifndef VIRT_VIEWER_ENUMS_H
	24	#define VIRT_VIEWER_ENUMS_H
	25
	26	#include <glib-object.h>
	27
	28	G_BEGIN_DECLS
	29	/* END file-header */
	30
	31	/* BEGIN value-header */
	32	GType @enum_name@_get_type (void) G_GNUC_CONST;
	33	#define @ENUMPREFIX@_TYPE_@ENUMSHORT@ (@enum_name@_get_type ())
	34	/* END value-header */
	35
	36	/* BEGIN file-tail */
	37	G_END_DECLS
	38
	39	#endif
	40	/* END file-tail */

+10

-3

src/virt-viewer-main.c less more

56	56	gboolean reconnect = FALSE;
57	57	gboolean fullscreen = FALSE;
58	58	VirtViewer *viewer = NULL;
59		const char *help_msg = N_("Run '" PACKAGE " --help' to see a full list of available command line options");
	59	char *basename;
	60	char *help_msg = NULL;
60	61	const GOptionEntry options [] = {
61	62	{ "version", 'V', G_OPTION_FLAG_NO_ARG, G_OPTION_ARG_CALLBACK,
62	63	virt_viewer_version, N_("Display version information"), NULL },

94	95
95	96	g_set_application_name(_("Virt Viewer"));
96	97
	98
	99	basename = g_path_get_basename(argv[0]);
	100	help_msg = g_strdup_printf(_("Run '%s --help' to see a full list of available command line options"),
	101	basename);
	102	g_free(basename);
	103
97	104	/* Setup command line options */
98	105	context = g_option_context_new (_("- Virtual machine graphical console"));
99	106	g_option_context_add_main_entries (context, options, NULL);

107	114	g_option_context_parse (context, &argc, &argv, &error);
108	115	if (error) {
109	116	g_printerr("%s\n%s\n",
110		error->message,
111		gettext(help_msg));
	117	error->message, help_msg);
112	118	g_error_free(error);
113	119	goto cleanup;
114	120	}

146	152	g_object_unref(viewer);
147	153	g_free(uri);
148	154	g_strfreev(args);
	155	g_free(help_msg);
149	156
150	157	return ret;
151	158	}

+1

-0

src/virt-viewer-notebook.c less more

85	85	priv->status = gtk_label_new("");
86	86	gtk_notebook_set_show_tabs(GTK_NOTEBOOK(self), FALSE);
87	87	gtk_notebook_set_show_border(GTK_NOTEBOOK(self), FALSE);
	88	gtk_widget_show_all(priv->status);
88	89	gtk_notebook_append_page(GTK_NOTEBOOK(self), priv->status, NULL);
89	90	gdk_color_parse("white", &color);
90	91	gtk_widget_modify_fg(priv->status, GTK_STATE_NORMAL, &color);

+101

-17

src/virt-viewer-session-spice.c less more

32	32	#include "virt-viewer-session-spice.h"
33	33	#include "virt-viewer-display-spice.h"
34	34	#include "virt-viewer-auth.h"
	35	#include "virt-glib-compat.h"
35	36
36	37	#if !GLIB_CHECK_VERSION(2, 26, 0)
37	38	#include "gbinding.h"

324	325	gboolean openfd;
325	326
326	327	g_object_set(self->priv->session, "password", password, NULL);
	328	g_free(password);
327	329	g_object_get(self->priv->session, "client-sockets", &openfd, NULL);
328	330
329	331	if (openfd)

403	405	}
404	406
405	407	static void
406		agent_connected_changed(SpiceChannel *cmain,
	408	agent_connected_changed(SpiceChannel *cmain G_GNUC_UNUSED,
407	409	GParamSpec *pspec G_GNUC_UNUSED,
408	410	VirtViewerSessionSpice *self)
409	411	{
	412	// this will force refresh of application menu
	413	g_signal_emit_by_name(self, "session-display-updated");
	414	}
	415
	416	static void
	417	agent_connected_fullscreen_auto_conf(SpiceChannel *cmain,
	418	GParamSpec *pspec G_GNUC_UNUSED,
	419	VirtViewerSessionSpice *self)
	420	{
410	421	if (virt_viewer_session_spice_fullscreen_auto_conf(self))
411		g_signal_handlers_disconnect_by_func(cmain, agent_connected_changed, self);
	422	g_signal_handlers_disconnect_by_func(cmain, agent_connected_fullscreen_auto_conf, self);
	423	}
	424
	425	static void
	426	destroy_display(gpointer data)
	427	{
	428	VirtViewerDisplay *display = VIRT_VIEWER_DISPLAY(data);
	429	VirtViewerSession *session = virt_viewer_display_get_session(display);
	430
	431	DEBUG_LOG("Destroying spice display %p", display);
	432	virt_viewer_session_remove_display(session, display);
	433	g_object_unref(display);
	434	}
	435
	436	static void
	437	virt_viewer_session_spice_display_monitors(SpiceChannel *channel,
	438	GParamSpec *pspec G_GNUC_UNUSED,
	439	VirtViewerSessionSpice *self)
	440	{
	441	GArray *monitors = NULL;
	442	GPtrArray *displays = NULL;
	443	GtkWidget *display;
	444	guint i, monitors_max;
	445
	446	g_object_get(channel,
	447	"monitors", &monitors,
	448	"monitors-max", &monitors_max,
	449	NULL);
	450	g_return_if_fail(monitors != NULL);
	451	g_return_if_fail(monitors->len <= monitors_max);
	452
	453	displays = g_object_get_data(G_OBJECT(channel), "virt-viewer-displays");
	454	if (displays == NULL) {
	455	displays = g_ptr_array_new();
	456	g_ptr_array_set_free_func(displays, destroy_display);
	457	g_object_set_data_full(G_OBJECT(channel), "virt-viewer-displays",
	458	displays, (GDestroyNotify)g_ptr_array_unref);
	459	}
	460
	461	g_ptr_array_set_size(displays, monitors_max);
	462
	463	for (i = 0; i < monitors_max; i++) {
	464	display = g_ptr_array_index(displays, i);
	465	if (display == NULL) {
	466	display = virt_viewer_display_spice_new(self, channel, i);
	467	DEBUG_LOG("creating spice display (#:%d)", i);
	468	g_ptr_array_index(displays, i) = g_object_ref(display);
	469	}
	470
	471	g_object_freeze_notify(G_OBJECT(display));
	472	virt_viewer_display_set_enabled(VIRT_VIEWER_DISPLAY(display), FALSE);
	473	virt_viewer_session_add_display(VIRT_VIEWER_SESSION(self),
	474	VIRT_VIEWER_DISPLAY(display));
	475	}
	476
	477	for (i = 0; i < monitors->len; i++) {
	478	SpiceDisplayMonitorConfig *monitor = &g_array_index(monitors, SpiceDisplayMonitorConfig, i);
	479	display = g_ptr_array_index(displays, monitor->id);
	480	g_return_if_fail(display != NULL);
	481
	482	if (monitor->width == 0 \|\| monitor->width == 0)
	483	continue;
	484
	485	virt_viewer_display_set_enabled(VIRT_VIEWER_DISPLAY(display), TRUE);
	486	virt_viewer_display_set_desktop_size(VIRT_VIEWER_DISPLAY(display),
	487	monitor->width, monitor->height);
	488	}
	489
	490	for (i = 0; i < monitors_max; i++)
	491	g_object_thaw_notify(g_ptr_array_index(displays, i));
	492
	493	g_clear_pointer(&monitors, g_array_unref);
	494
412	495	}
413	496
414	497	static void

437	520	G_CALLBACK(virt_viewer_session_spice_main_channel_event), self);
438	521	self->priv->main_channel = SPICE_MAIN_CHANNEL(channel);
439	522
440		g_signal_connect(channel, "notify::agent-connected", G_CALLBACK(agent_connected_changed), self);
441		agent_connected_changed(channel, NULL, self);
	523	g_signal_connect(channel, "notify::agent-connected", G_CALLBACK(agent_connected_changed), self);
	524	g_signal_connect(channel, "notify::agent-connected", G_CALLBACK(agent_connected_fullscreen_auto_conf), self);
	525	agent_connected_fullscreen_auto_conf(channel, NULL, self);
	526
	527	g_signal_emit_by_name(session, "session-connected");
442	528	}
443	529
444	530	if (SPICE_IS_DISPLAY_CHANNEL(channel)) {
445		GtkWidget *display;
446
447		g_signal_emit_by_name(session, "session-connected");
448
449		DEBUG_LOG("new display channel (#%d)", id);
450		display = virt_viewer_display_spice_new(self,
451		channel,
452		spice_display_new(s, id));
453
454		virt_viewer_session_add_display(VIRT_VIEWER_SESSION(session),
455		VIRT_VIEWER_DISPLAY(display));
456
457	531	g_signal_emit_by_name(session, "session-initialized");
	532
	533	g_signal_connect(channel, "notify::monitors",
	534	G_CALLBACK(virt_viewer_session_spice_display_monitors), self);
	535
	536	spice_channel_connect(channel);
458	537	}
459	538
460	539	if (SPICE_IS_INPUTS_CHANNEL(channel)) {

499	578
500	579	DEBUG_LOG("Performing full screen auto-conf, %d host monitors",
501	580	gdk_screen_get_n_monitors(screen));
	581	g_object_set(G_OBJECT(cmain),
	582	"disable-display-position", FALSE,
	583	"disable-display-align", TRUE,
	584	NULL);
502	585	spice_main_set_display_enabled(cmain, -1, FALSE);
503	586	for (i = 0; i < gdk_screen_get_n_monitors(screen); i++) {
504	587	gdk_screen_get_monitor_geometry(screen, i, &dest);

532	615	}
533	616
534	617	if (SPICE_IS_DISPLAY_CHANNEL(channel)) {
535		DEBUG_LOG("zap session channel (#%d)", id);
	618	VirtViewerDisplay *display = g_object_get_data(G_OBJECT(channel), "virt-viewer-display");
	619	DEBUG_LOG("zap display channel (#%d, %p)", id, display);
536	620	}
537	621
538	622	if (SPICE_IS_PLAYBACK_CHANNEL(channel) && self->priv->audio) {

+4

-4

src/virt-viewer-session-vnc.c less more

94	94	GtkWidget *display = virt_viewer_display_vnc_new(session->priv->vnc);
95	95	g_signal_emit_by_name(session, "session-connected");
96	96	virt_viewer_display_set_show_hint(VIRT_VIEWER_DISPLAY(display),
97		VIRT_VIEWER_DISPLAY_SHOW_HINT_READY);
	97	VIRT_VIEWER_DISPLAY_SHOW_HINT_READY, TRUE);
98	98	virt_viewer_session_add_display(VIRT_VIEWER_SESSION(session),
99	99	VIRT_VIEWER_DISPLAY(display));
100	100	}

103	103	virt_viewer_session_vnc_disconnected(VncDisplay *vnc G_GNUC_UNUSED,
104	104	VirtViewerSessionVnc *session)
105	105	{
	106	GtkWidget *display = virt_viewer_display_vnc_new(session->priv->vnc);
106	107	DEBUG_LOG("Disconnected");
107	108	g_signal_emit_by_name(session, "session-disconnected");
108		/* TODO perhaps? */
109		/* virt_viewer_display_set_show_hint(VIRT_VIEWER_DISPLAY(session->priv->vnc), */
110		/* VIRT_VIEWER_DISPLAY_SHOW_HINT_HIDE); */
	109	virt_viewer_display_set_show_hint(VIRT_VIEWER_DISPLAY(display),
	110	VIRT_VIEWER_DISPLAY_SHOW_HINT_READY, FALSE);
111	111	}
112	112
113	113	static void

+13

-0

src/virt-viewer-session.c less more

232	232	1,
233	233	VIRT_VIEWER_TYPE_DISPLAY);
234	234
	235	g_signal_new("session-display-updated",
	236	G_OBJECT_CLASS_TYPE(object_class),
	237	G_SIGNAL_RUN_LAST \| G_SIGNAL_NO_HOOKS,
	238	G_STRUCT_OFFSET(VirtViewerSessionClass, session_display_updated),
	239	NULL,
	240	NULL,
	241	g_cclosure_marshal_VOID__VOID,
	242	G_TYPE_NONE,
	243	0);
	244
235	245	g_signal_new("session-cut-text",
236	246	G_OBJECT_CLASS_TYPE(object_class),
237	247	G_SIGNAL_RUN_LAST \| G_SIGNAL_NO_HOOKS,

281	291	void virt_viewer_session_add_display(VirtViewerSession *session,
282	292	VirtViewerDisplay *display)
283	293	{
	294	if (g_list_find(session->priv->displays, display))
	295	return;
	296
284	297	session->priv->displays = g_list_append(session->priv->displays, display);
285	298	g_object_ref(display);
286	299	g_signal_emit_by_name(session, "session-display-added", display);

+1

-0

src/virt-viewer-session.h less more

87	87	VirtViewerDisplay *display);
88	88	void (session_display_removed)(VirtViewerSession session,
89	89	VirtViewerDisplay *display);
	90	void (session_display_updated)(VirtViewerSession session);
90	91
91	92	void (session_cut_text)(VirtViewerSession session, const gchar *str);
92	93	void (session_bell)(VirtViewerSession session);

+117

-0

src/virt-viewer-util.c less more

135	135	return 0;
136	136	}
137	137
	138	typedef struct {
	139	GObject *instance;
	140	GObject *observer;
	141	GClosure *closure;
	142	gulong handler_id;
	143	} WeakHandlerCtx;
	144
	145	static WeakHandlerCtx *
	146	whc_new(GObject *instance,
	147	GObject *observer)
	148	{
	149	WeakHandlerCtx *ctx = g_slice_new0(WeakHandlerCtx);
	150
	151	ctx->instance = instance;
	152	ctx->observer = observer;
	153
	154	return ctx;
	155	}
	156
	157	static void
	158	whc_free(WeakHandlerCtx *ctx)
	159	{
	160	g_slice_free(WeakHandlerCtx, ctx);
	161	}
	162
	163	static void observer_destroyed_cb(gpointer, GObject *);
	164	static void closure_invalidated_cb(gpointer, GClosure *);
	165
	166	/*
	167	* If signal handlers are removed before the object is destroyed, this
	168	* callback will never get triggered.
	169	*/
	170	static void
	171	instance_destroyed_cb(gpointer ctx_,
	172	GObject *where_the_instance_was G_GNUC_UNUSED)
	173	{
	174	WeakHandlerCtx *ctx = ctx_;
	175
	176	/* No need to disconnect the signal here, the instance has gone away. */
	177	g_object_weak_unref(ctx->observer, observer_destroyed_cb, ctx);
	178	g_closure_remove_invalidate_notifier(ctx->closure, ctx,
	179	closure_invalidated_cb);
	180	whc_free(ctx);
	181	}
	182
	183	/* Triggered when the observer is destroyed. */
	184	static void
	185	observer_destroyed_cb(gpointer ctx_,
	186	GObject *where_the_observer_was G_GNUC_UNUSED)
	187	{
	188	WeakHandlerCtx *ctx = ctx_;
	189
	190	g_closure_remove_invalidate_notifier(ctx->closure, ctx,
	191	closure_invalidated_cb);
	192	g_signal_handler_disconnect(ctx->instance, ctx->handler_id);
	193	g_object_weak_unref(ctx->instance, instance_destroyed_cb, ctx);
	194	whc_free(ctx);
	195	}
	196
	197	/* Triggered when either object is destroyed or the handler is disconnected. */
	198	static void
	199	closure_invalidated_cb(gpointer ctx_,
	200	GClosure *where_the_closure_was G_GNUC_UNUSED)
	201	{
	202	WeakHandlerCtx *ctx = ctx_;
	203
	204	g_object_weak_unref(ctx->instance, instance_destroyed_cb, ctx);
	205	g_object_weak_unref(ctx->observer, observer_destroyed_cb, ctx);
	206	whc_free(ctx);
	207	}
	208
	209	/* Copied from tp_g_signal_connect_object. */
	210	/**
	211	* virt_viewer_signal_connect_object: (skip)
	212	* @instance: the instance to connect to.
	213	* @detailed_signal: a string of the form "signal-name::detail".
	214	* @c_handler: the #GCallback to connect.
	215	* @gobject: the object to pass as data to @c_handler.
	216	* @connect_flags: a combination of #GConnectFlags.
	217	*
	218	* Similar to g_signal_connect_object() but will delete connection
	219	* when any of the objects is destroyed.
	220	*
	221	* Returns: the handler id.
	222	*/
	223	gulong virt_viewer_signal_connect_object(gpointer instance,
	224	const gchar *detailed_signal,
	225	GCallback c_handler,
	226	gpointer gobject,
	227	GConnectFlags connect_flags)
	228	{
	229	GObject *instance_obj = G_OBJECT(instance);
	230	WeakHandlerCtx *ctx = whc_new(instance_obj, gobject);
	231
	232	g_return_val_if_fail(G_TYPE_CHECK_INSTANCE (instance), 0);
	233	g_return_val_if_fail(detailed_signal != NULL, 0);
	234	g_return_val_if_fail(c_handler != NULL, 0);
	235	g_return_val_if_fail(G_IS_OBJECT (gobject), 0);
	236	g_return_val_if_fail((connect_flags & ~(G_CONNECT_AFTER\|G_CONNECT_SWAPPED)) == 0, 0);
	237
	238	if (connect_flags & G_CONNECT_SWAPPED)
	239	ctx->closure = g_cclosure_new_object_swap(c_handler, gobject);
	240	else
	241	ctx->closure = g_cclosure_new_object(c_handler, gobject);
	242
	243	ctx->handler_id = g_signal_connect_closure(instance, detailed_signal,
	244	ctx->closure, (connect_flags & G_CONNECT_AFTER) ? TRUE : FALSE);
	245
	246	g_object_weak_ref(instance_obj, instance_destroyed_cb, ctx);
	247	g_object_weak_ref(gobject, observer_destroyed_cb, ctx);
	248	g_closure_add_invalidate_notifier(ctx->closure, ctx,
	249	closure_invalidated_cb);
	250
	251	return ctx->handler_id;
	252	}
	253
	254
138	255	/*
139	256	* Local variables:
140	257	* c-indent-level: 4

+6

-0

src/virt-viewer-util.h less more

39	39	char **user,
40	40	int *port);
41	41
	42	gulong virt_viewer_signal_connect_object(gpointer instance,
	43	const gchar *detailed_signal,
	44	GCallback c_handler,
	45	gpointer gobject,
	46	GConnectFlags connect_flags);
	47
42	48	#endif
43	49
44	50	/*

+60

-17

src/virt-viewer-window.c less more

111	111	virt_viewer_window_get_property (GObject *object, guint property_id,
112	112	GValue value, GParamSpec pspec)
113	113	{
114		VirtViewerWindowPrivate *priv = VIRT_VIEWER_WINDOW(object)->priv;
	114	VirtViewerWindow *self = VIRT_VIEWER_WINDOW(object);
	115	VirtViewerWindowPrivate *priv = self->priv;
115	116
116	117	switch (property_id) {
117	118	case PROP_SUBTITLE:

123	124	break;
124	125
125	126	case PROP_DISPLAY:
126		g_value_set_object(value, priv->display);
	127	g_value_set_object(value, virt_viewer_window_get_display(self));
127	128	break;
128	129
129	130	case PROP_CONTAINER:

171	172	virt_viewer_window_dispose (GObject *object)
172	173	{
173	174	VirtViewerWindowPrivate *priv = VIRT_VIEWER_WINDOW(object)->priv;
	175	GSList *it;
	176
174	177	G_OBJECT_CLASS (virt_viewer_window_parent_class)->dispose (object);
175	178
176	179	if (priv->display) {

189	192	priv->builder = NULL;
190	193	}
191	194
	195	for (it = priv->accel_list ; it != NULL ; it = it->next) {
	196	g_object_unref(G_OBJECT(it->data));
	197	}
	198	g_slist_free(priv->accel_list);
	199	priv->accel_list = NULL;
	200
192	201	g_free(priv->subtitle);
193	202	priv->subtitle = NULL;
	203
	204	g_value_unset(&priv->accel_setting);
194	205	}
195	206
196	207	static void

421	432	gdk_screen_get_monitor_at_window
422	433	(screen, gtk_widget_get_window(priv->window)),
423	434	&fullscreen);
	435
	436	g_return_if_fail(fullscreen.height > 128);
	437	g_return_if_fail(fullscreen.width > 128);
	438	g_return_if_fail(desktopWidth > 0);
	439	g_return_if_fail(desktopHeight > 0);
424	440
425	441	desktopAspect = (double)desktopWidth / (double)desktopHeight;
426	442	screenAspect = (double)(fullscreen.width - 128) / (double)(fullscreen.height - 128);

991	1007	GParamSpec *pspec G_GNUC_UNUSED,
992	1008	VirtViewerWindow *self)
993	1009	{
994		gboolean hint;
	1010	guint hint;
995	1011
996	1012	g_object_get(display, "show-hint", &hint, NULL);
	1013
	1014	hint = (hint & VIRT_VIEWER_DISPLAY_SHOW_HINT_READY);
	1015
997	1016	gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(self->priv->builder, "menu-send")), hint);
998	1017	gtk_widget_set_sensitive(GTK_WIDGET(gtk_builder_get_object(self->priv->builder, "menu-file-screenshot")), hint);
999	1018	gtk_widget_set_sensitive(self->priv->toolbar_send_key, hint);

1020	1039	virt_viewer_display_set_zoom_level(VIRT_VIEWER_DISPLAY(priv->display), priv->zoomlevel);
1021	1040	virt_viewer_display_set_auto_resize(VIRT_VIEWER_DISPLAY(priv->display), priv->auto_resize);
1022	1041
	1042	gtk_widget_show_all(GTK_WIDGET(display));
1023	1043	gtk_notebook_append_page(GTK_NOTEBOOK(priv->notebook), GTK_WIDGET(display), NULL);
1024		gtk_widget_show_all(GTK_WIDGET(display));
1025
1026		g_signal_connect(display, "display-pointer-grab",
1027		G_CALLBACK(virt_viewer_window_pointer_grab), self);
1028		g_signal_connect(display, "display-pointer-ungrab",
1029		G_CALLBACK(virt_viewer_window_pointer_ungrab), self);
1030		g_signal_connect(display, "display-keyboard-grab",
1031		G_CALLBACK(virt_viewer_window_keyboard_grab), self);
1032		g_signal_connect(display, "display-keyboard-ungrab",
1033		G_CALLBACK(virt_viewer_window_keyboard_ungrab), self);
1034		g_signal_connect(display, "display-desktop-resize",
1035		G_CALLBACK(virt_viewer_window_desktop_resize), self);
1036		g_signal_connect(display, "notify::show-hint",
1037		G_CALLBACK(display_show_hint), self);
	1044	/* switch back to non-display if not ready */
	1045	if (!(virt_viewer_display_get_show_hint(display) &
	1046	VIRT_VIEWER_DISPLAY_SHOW_HINT_READY))
	1047	gtk_notebook_set_current_page(GTK_NOTEBOOK(priv->notebook), 0);
	1048
	1049	virt_viewer_signal_connect_object(display, "display-pointer-grab",
	1050	G_CALLBACK(virt_viewer_window_pointer_grab), self, 0);
	1051	virt_viewer_signal_connect_object(display, "display-pointer-ungrab",
	1052	G_CALLBACK(virt_viewer_window_pointer_ungrab), self, 0);
	1053	virt_viewer_signal_connect_object(display, "display-keyboard-grab",
	1054	G_CALLBACK(virt_viewer_window_keyboard_grab), self, 0);
	1055	virt_viewer_signal_connect_object(display, "display-keyboard-ungrab",
	1056	G_CALLBACK(virt_viewer_window_keyboard_ungrab), self, 0);
	1057	virt_viewer_signal_connect_object(display, "display-desktop-resize",
	1058	G_CALLBACK(virt_viewer_window_desktop_resize), self, 0);
	1059	virt_viewer_signal_connect_object(display, "notify::show-hint",
	1060	G_CALLBACK(display_show_hint), self, 0);
1038	1061	}
1039	1062	}
1040	1063

1042	1065	virt_viewer_window_show(VirtViewerWindow *self)
1043	1066	{
1044	1067	gtk_widget_show(self->priv->window);
	1068
	1069	if (self->priv->display)
	1070	virt_viewer_display_set_enabled(self->priv->display, TRUE);
1045	1071
1046	1072	if (self->priv->desktop_resize_pending) {
1047	1073	virt_viewer_window_resize(self);

1053	1079	virt_viewer_window_hide(VirtViewerWindow *self)
1054	1080	{
1055	1081	gtk_widget_hide(self->priv->window);
	1082
	1083	if (self->priv->display) {
	1084	VirtViewerDisplay *display = self->priv->display;
	1085	guint nth;
	1086
	1087	g_object_get(display, "nth-display", &nth, NULL);
	1088	if (nth != 0)
	1089	virt_viewer_display_set_enabled(display, FALSE);
	1090	}
1056	1091	}
1057	1092
1058	1093	void

1084	1119	g_return_val_if_fail(VIRT_VIEWER_IS_WINDOW(self), NULL);
1085	1120
1086	1121	return self->priv->builder;
	1122	}
	1123
	1124	VirtViewerDisplay*
	1125	virt_viewer_window_get_display(VirtViewerWindow *self)
	1126	{
	1127	g_return_val_if_fail(VIRT_VIEWER_WINDOW(self), FALSE);
	1128
	1129	return self->priv->display;
1087	1130	}
1088	1131
1089	1132	/*

+1

-0

src/virt-viewer-window.h less more

62	62	GtkWindow* virt_viewer_window_get_window (VirtViewerWindow* window);
63	63	VirtViewerNotebook* virt_viewer_window_get_notebook (VirtViewerWindow* window);
64	64	void virt_viewer_window_set_display(VirtViewerWindow self, VirtViewerDisplay display);
	65	VirtViewerDisplay* virt_viewer_window_get_display(VirtViewerWindow *self);
65	66	void virt_viewer_window_set_usb_options_sensitive(VirtViewerWindow *self, gboolean sensitive);
66	67	void virt_viewer_window_update_title(VirtViewerWindow *self);
67	68	void virt_viewer_window_show(VirtViewerWindow *self);

+3

-3

src/virt-viewer.rc less more

8	8	BEGIN
9	9	VALUE "CompanyName", "virt-manager.org"
10	10	VALUE "FileDescription", "A remote desktop client"
11		VALUE "FileVersion", "0.5.3"
12		VALUE "InternalName", "virt-viewer 0.5.3"
	11	VALUE "FileVersion", "0.5.4"
	12	VALUE "InternalName", "virt-viewer 0.5.4"
13	13	VALUE "LegalCopyright", "Copyright (C) 2007-2012 Red Hat, Inc."
14	14	VALUE "OriginalFilename", "virt-viewer.exe"
15	15	VALUE "ProductName", "VirtViewer"
16		VALUE "ProductVersion", "0.5.3"
	16	VALUE "ProductVersion", "0.5.4"
17	17	END
18	18	END
19	19

+4

-3

virt-viewer.spec less more

23	23	%endif
24	24
25	25	Name: virt-viewer
26		Version: 0.5.3
	26	Version: 0.5.4
27	27	Release: 1%{?dist}%{?extra_release}
28	28	Summary: Virtual Machine Viewer
29	29	Group: Applications/System

37	37	Requires(post): desktop-file-utils
38	38	Requires(postun): desktop-file-utils
39	39
	40	BuildRequires: glib2-devel >= 2.22
40	41	%if %{with_gtk3}
41	42	BuildRequires: gtk3-devel >= 3.0.0
42	43	%else

51	52	%endif
52	53	%if %{with_spice}
53	54	%if %{with_gtk3}
54		BuildRequires: spice-gtk3-devel >= 0.11
	55	BuildRequires: spice-gtk3-devel >= 0.12.101
55	56	%else
56		BuildRequires: spice-gtk-devel >= 0.11
	57	BuildRequires: spice-gtk-devel >= 0.12.101
57	58	%endif
58	59	BuildRequires: spice-protocol >= 0.10.1
59	60	%endif

+3

-2

virt-viewer.spec.in less more

37	37	Requires(post): desktop-file-utils
38	38	Requires(postun): desktop-file-utils
39	39
	40	BuildRequires: glib2-devel >= 2.22
40	41	%if %{with_gtk3}
41	42	BuildRequires: gtk3-devel >= 3.0.0
42	43	%else

51	52	%endif
52	53	%if %{with_spice}
53	54	%if %{with_gtk3}
54		BuildRequires: spice-gtk3-devel >= 0.11
	55	BuildRequires: spice-gtk3-devel >= 0.12.101
55	56	%else
56		BuildRequires: spice-gtk-devel >= 0.11
	57	BuildRequires: spice-gtk-devel >= 0.12.101
57	58	%endif
58	59	BuildRequires: spice-protocol >= 0.10.1
59	60	%endif