[gtk-vnc] Fix test suite

[Daniel P. Berrange <dberrange src gnome org>]

commit 3f7b794a287203525a4aab659f0f866e2c411000
Author: Daniel P. Berrange <berrange redhat com>
Date:   Tue Jul 13 15:11:20 2010 +0100

    Fix test suite
    
    * Makefile.am: list files in build-aux instead of wildcarding
    * vc-list-files: Move to build-aux
    * gnulib/lib/Makefile.am: Point to build-aux for vc-list-files
    * gtk-vnc.spec.in: Run tests during RPM build
    * tools/gvnccapture.c: Remove bogus N_ annotation. Not yet
      ready for i18n support.

 Makefile.am                              |    9 ++++++++-
 vc-list-files => build-aux/vc-list-files |    0
 gnulib/lib/Makefile.am                   |    2 +-
 gtk-vnc.spec.in                          |    4 ++++
 tools/gvnccapture.c                      |    4 ++--
 5 files changed, 15 insertions(+), 4 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 85119ae..21c626e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -50,7 +50,14 @@ MAINTAINERCLEANFILES = 		\
 	m4/ltoptions.m4			\
 	m4/ltsugar.m4			\
 	m4/ltversion.m4			\
-	build-aux/*			\
+	build-aux/compile		\
+	build-aux/config.guess		\
+	build-aux/config.sub		\
+	build-aux/depcomp		\
+	build-aux/install-sh		\
+	build-aux/ltmain.sh		\
+	build-aux/missing		\
+	build-aux/mkinstalldirs		\
 	`find "$(srcdir)" -type f -name Makefile.in -print`
 
 GITIGNOREFILES = plugin/gtk-vnc-plugin.la plugin/gtk-vnc-plugin.so
diff --git a/vc-list-files b/build-aux/vc-list-files
similarity index 100%
rename from vc-list-files
rename to build-aux/vc-list-files
diff --git a/gnulib/lib/Makefile.am b/gnulib/lib/Makefile.am
index b32ddcd..6646823 100644
--- a/gnulib/lib/Makefile.am
+++ b/gnulib/lib/Makefile.am
@@ -552,7 +552,7 @@ EXTRA_libgnu_la_SOURCES += asnprintf.c printf-args.c printf-parse.c vasnprintf.c
 ## begin gnulib module vc-list-files
 
 
-EXTRA_DIST += $(top_srcdir)/./vc-list-files
+EXTRA_DIST += $(top_srcdir)/build-aux/vc-list-files
 
 ## end   gnulib module vc-list-files
 
diff --git a/gtk-vnc.spec.in b/gtk-vnc.spec.in
index 8dbe7e9..dc37a1e 100644
--- a/gtk-vnc.spec.in
+++ b/gtk-vnc.spec.in
@@ -137,6 +137,10 @@ rm -f %{buildroot}%{_libdir}/mozilla/plugins/%{name}-plugin.la
 %endif
 %find_lang %{name}
 
+
+%check
+make check
+
 %clean
 rm -fr %{buildroot}
 
diff --git a/tools/gvnccapture.c b/tools/gvnccapture.c
index 787089d..da94173 100644
--- a/tools/gvnccapture.c
+++ b/tools/gvnccapture.c
@@ -443,9 +443,9 @@ int main(int argc, char **argv)
 	gboolean quiet = FALSE;
 	const GOptionEntry options [] = {
 		{ "debug", 'd', G_OPTION_FLAG_NO_ARG,  G_OPTION_ARG_CALLBACK,
-		  vnc_debug_option_arg, N_("Enables debug output"), NULL },
+		  vnc_debug_option_arg, "Enables debug output", NULL },
 		{ "quiet", 'q', 0, G_OPTION_ARG_NONE,
-		  &quiet, N_("Don't print any status to console"), NULL },
+		  &quiet, "Don't print any status to console", NULL },
 		{ G_OPTION_REMAINING, '\0', 0, G_OPTION_ARG_STRING_ARRAY, &args,
 		  NULL, "HOSTNAME[:DISPLAY] FILENAME" },
 		{ NULL, 0, 0, G_OPTION_ARG_NONE, NULL, NULL, 0 }