build: Add ./configure --enable-install-daemon

If enabled, then the daemon will be installed in $sbindir
(eg. /usr/sbin/guestfsd).  The default is off, as now.

This option should be used by packagers when building the libguestfs
live service.

diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 67589b4..3fe8c88 100644 (file)
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -86,7 +86,12 @@ errnostring.h: $(libsrcdir)/errnostring.h
        rm -f $@
        ln $< $@
 
        rm -f $@
        ln $< $@
 

+if INSTALL_DAEMON
+sbin_PROGRAMS = guestfsd
+else

 noinst_PROGRAMS = guestfsd
 noinst_PROGRAMS = guestfsd

+endif
+

 guestfsd_SOURCES = \
        9p.c \
        actions.h \
 guestfsd_SOURCES = \
        9p.c \
        actions.h \

diff --git a/daemon/configure.ac b/daemon/configure.ac
index e5eb89b..7a6c04a 100644 (file)
--- a/daemon/configure.ac
+++ b/daemon/configure.ac
@@ -39,6 +39,16 @@ AC_ARG_ENABLE([packet-dump],
         [AC_DEFINE([ENABLE_PACKET_DUMP],[1],[Enable packet dumps in verbose mode.])],
         [])
 
         [AC_DEFINE([ENABLE_PACKET_DUMP],[1],[Enable packet dumps in verbose mode.])],
         [])
 

+dnl Install the daemon (for libguestfs live service)
+AC_MSG_CHECKING([if we should install the daemon])
+AC_ARG_ENABLE([install-daemon],
+        [AS_HELP_STRING([--enable-install-daemon],
+          [enable installing the daemon under $sbindir @<:@default=no@:>@])],
+        [],
+        [enable_install_daemon=no])
+AM_CONDITIONAL([INSTALL_DAEMON],[test "x$enable_install_daemon" = "xyes"])
+AC_MSG_RESULT([$enable_install_daemon])
+

 dnl For strchrnul(3), asprintf(3), futimens(2) and getline(3).
 AC_GNU_SOURCE
 
 dnl For strchrnul(3), asprintf(3), futimens(2) and getline(3).
 AC_GNU_SOURCE