[virt-tools-list] [virt-viewer 2/2] build-sys: Don't substitute buildid when it was not set
Christophe Fergeau
cfergeau at redhat.com
Tue Jun 2 14:18:59 UTC 2015
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
major=`echo $PACKAGE_VERSION | cut -d. -f1`
minor=`echo $PACKAGE_VERSION | cut -d. -f2`
--
2.4.2
More information about the virt-tools-list
mailing list