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

[Daniel P. Berrange]

On Tue, Jun 02, 2015 at 05:07:34PM +0200, Christophe Fergeau wrote:
> 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

ACK both patches

Regards,
Daniel
-- 
|: http://berrange.com      -o-    http://www.flickr.com/photos/dberrange/ :|
|: http://libvirt.org              -o-             http://virt-manager.org :|
|: http://autobuild.org       -o-         http://search.cpan.org/~danberr/ :|
|: http://entangle-photo.org       -o-       http://live.gnome.org/gtk-vnc :|