[virt-tools-list] [virt-viewer 2/2] build-sys: Don't substitute buildid when it was not set

[Daniel P. Berrange]

On Tue, Jun 02, 2015 at 04:18:59PM +0200, Christophe Fergeau wrote:
> Since it defaults to being 0, we'll get a spurious 0 on remote-viewer
> --version if we AC_DEFINE/AC_SUBST it when the user did not specify it.
> ---
>  configure.ac | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/configure.ac b/configure.ac
> index ef13477..2933d89 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -233,8 +233,12 @@ fi
>  AC_ARG_WITH([buildid],
>      AS_HELP_STRING([--with-buildid=id], [Set additional build version details]),
>      [buildid="-$with_buildid"], [buildid="0"])
> -AC_DEFINE_UNQUOTED([BUILDID], "$buildid", [Build version details])
> -AC_SUBST([BUILDID], "$buildid")
> +if test "x$buildid" != "x0"; then
> +    AC_DEFINE_UNQUOTED([BUILDID], "$buildid", [Build version details])
> +    AC_SUBST([BUILDID], "$buildid")
> +else
> +    AC_DEFINE_UNQUOTED([BUILDID], "", [Build version details])
> +fi

Again, this impacts the WINDOWS_PRODUCTVERSION variable - we want to
have the 0

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 :|