[virt-tools-list] [virt-viewer v2 2/2] build-sys: Always prepend '-' to BUILDID

Christophe Fergeau cfergeau at redhat.com
Tue Jun 2 15:07:34 UTC 2015


This was removed by commit 28a6bd6 as WINDOWS_PRODUCTVERSION
needs a buildid without a dash. Apart from this variable,
all other uses of buildid/BUILDID in virt-viewer source tree
need a dash between the version number and the buildid to avoid getting
output like "3.01" instead of "3.0-1"

Rather than patching every location where BUILDID is used, this commit
appends the "-" before substituting/defining BUILDID in configure.ac.
This does not modifies the buildid configure.ac variable, this way
WINDOWS_PRODUCTVERSION won't get an unwanted '-'.
---

New version of my previous attempt to achieve that which was breaking
WINDOWS_PRODUCTVERSION.


 configure.ac | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index df9ba12..ad98a51 100644
--- a/configure.ac
+++ b/configure.ac
@@ -235,8 +235,8 @@ AC_ARG_WITH([buildid],
     [buildid="$with_buildid"], [buildid="0"])
 
 if test "x$buildid" != "x0"; then
-    AC_DEFINE_UNQUOTED([BUILDID], "$buildid", [Build version details])
-    AC_SUBST([BUILDID], "$buildid")
+    AC_DEFINE_UNQUOTED([BUILDID], "-$buildid", [Build version details])
+    AC_SUBST([BUILDID], "-$buildid")
 else
     AC_DEFINE_UNQUOTED([BUILDID], "", [Build version details])
 fi
-- 
2.4.2




More information about the virt-tools-list mailing list