[Pkg-libvirt-commits] [libguestfs] 32/54: build: Don't allow --disable-daemon and --enable-appliance together.

[Hilko Bengen]

This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to branch debian
in repository libguestfs.

commit 46bca2aa95f5a903ad319a789b5b66ce42421678
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Mon Mar 3 13:41:59 2014 +0000

    build: Don't allow --disable-daemon and --enable-appliance together.
    
    This makes no sense, since the daemon is contained in the appliance so
    you cannot build a (meaningful) appliance without having a daemon.
    
    (cherry picked from commit a6d72be984498e07f455c643e07a51b977603fc2)
---
 configure.ac | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/configure.ac b/configure.ac
index 6ee6807..cb40b1c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -447,6 +447,12 @@ AM_CONDITIONAL([ENABLE_APPLIANCE],[test "x$ENABLE_APPLIANCE" = "xyes"])
 AC_MSG_RESULT([$ENABLE_APPLIANCE])
 AC_SUBST([ENABLE_APPLIANCE])
 
+if test "x$enable_daemon" != "xyes" && test "x$ENABLE_APPLIANCE" = "xyes" ; then
+    AC_MSG_FAILURE([conflicting ./configure arguments: if you --disable-daemon
+then you have to --disable-appliance as well, since the appliance contains
+the daemon inside it.])
+fi
+
 dnl Check for supermin >= 4.1.0 or febootstrap >= 3.20.
 AC_CHECK_PROGS([SUPERMIN],
                [supermin febootstrap],[no])

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libguestfs.git