[virt-tools-list] [virt-viewer] Use build id in Windows .rc file

[Christophe Fergeau]

This ensures version+build id will be available when looking at
remote-viewer.exe properties in Windows.
---
 configure.ac          | 3 +++
 src/virt-viewer.rc.in | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index b1d532b..e71cf45 100644
--- a/configure.ac
+++ b/configure.ac
@@ -177,6 +177,9 @@ fi
 AC_ARG_WITH([buildid],
     AS_HELP_STRING([--with-buildid=id], [Set additional build version details]))
 AC_DEFINE_UNQUOTED([BUILDID], "$with_buildid", [Build version details])
+if test "x$with_buildid" != x; then
+    AC_SUBST([BUILDID], [-"$with_buildid"])
+fi
 
 AC_CONFIG_FILES([
     Makefile
diff --git a/src/virt-viewer.rc.in b/src/virt-viewer.rc.in
index 196e631..576f093 100644
--- a/src/virt-viewer.rc.in
+++ b/src/virt-viewer.rc.in
@@ -9,12 +9,12 @@ BEGIN
     BEGIN
       VALUE "CompanyName", "virt-manager.org"
       VALUE "FileDescription", "A remote desktop client"
-      VALUE "FileVersion", "@VERSION@"
+      VALUE "FileVersion", "@VERSION@@BUILDID@"
       VALUE "InternalName", "@PACKAGE_STRING@"
       VALUE "LegalCopyright", "Copyright (C) 2007-2012 Red Hat, Inc."
       VALUE "OriginalFilename", "virt-viewer.exe"
       VALUE "ProductName", "VirtViewer"
-      VALUE "ProductVersion", "@VERSION@"
+      VALUE "ProductVersion", "@VERSION@@BUILDID@"
     END
   END
 
-- 
1.8.1.4