Attachment 604421 Details for Bug 848102 – patch 3

[patch] patch 3

0003-Add-with-init-script-with-systemd-support.patch (text/plain), 3.87 KB, created by Marc-Andre Lureau on 2012-08-14 19:24:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marc-Andre Lureau

Created: 2012-08-14 19:24:34 UTC

Size: 3.87 KB

patch

obsolete

>From eeebf0698ceff54959f2fce435a14e150bb05afa Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
>Date: Thu, 28 Jun 2012 03:28:00 +0200
>Subject: [PATCH 3/4] Add --with-init-script with systemd support
>
>---
> Makefile.am  |   20 +++++++++++++++++---
> configure.ac |   43 ++++++++++++++++++++++++++++++++++++++++++-
> 2 files changed, 59 insertions(+), 4 deletions(-)
>
>diff --git a/Makefile.am b/Makefile.am
>index 9a89594..28329c7 100644
>--- a/Makefile.am
>+++ b/Makefile.am
>@@ -38,9 +38,6 @@ xdgautostart_DATA = $(top_srcdir)/data/spice-vdagent.desktop
> gdmautostartdir = $(datadir)/gdm/autostart/LoginWindow
> gdmautostart_DATA = $(top_srcdir)/data/spice-vdagent.desktop
> 
>-initdir = $(sysconfdir)/rc.d/init.d
>-init_SCRIPTS = $(top_srcdir)/data/spice-vdagentd
>-
> install-data-local:
> 	$(mkdir_p) $(DESTDIR)$(localstatedir)/log/spice-vdagentd
> 	$(mkdir_p) $(DESTDIR)$(localstatedir)/run/spice-vdagentd
>@@ -49,6 +46,19 @@ install-data-local:
> tmpfilesdir = $(sysconfdir)/tmpfiles.d
> tmpfiles_DATA = $(top_srcdir)/data/tmpfiles.d/spice-vdagentd.conf
> 
>+modulesdir = $(sysconfdir)/modules-load.d
>+modules_DATA = $(top_srcdir)/data/modules-load.d/spice-vdagentd.conf
>+
>+if INIT_SCRIPT_RED_HAT
>+initdir = $(sysconfdir)/rc.d/init.d
>+init_SCRIPTS = $(top_srcdir)/data/spice-vdagentd
>+endif
>+
>+if INIT_SCRIPT_SYSTEMD
>+systemdunitdir = $(SYSTEMDSYSTEMUNITDIR)
>+systemdunit_DATA = $(top_srcdir)/data/spice-vdagentd.service
>+endif
>+
> EXTRA_DIST =					\
> 	README.RHEL-5				\
> 	data/modules-load.d/spice-vdagentd.conf	\
>@@ -59,3 +69,7 @@ EXTRA_DIST =					\
> 	data/tmpfiles.d/spice-vdagentd.conf	\
> 	data/xorg.conf.RHEL-5			\
> 	$(NULL)
>+
>+DISTCHECK_CONFIGURE_FLAGS =			\
>+	--with-init-script=redhat		\
>+	$(NULL)
>diff --git a/configure.ac b/configure.ac
>index 41042b3..593e928 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -13,6 +13,7 @@ AC_HEADER_STDC
> AC_PROG_INSTALL
> AC_PROG_LN_S
> AC_DEFINE(_GNU_SOURCE, [1], [Enable GNU extensions])
>+PKG_PROG_PKG_CONFIG
> 
> AC_ARG_WITH([session-info],
>   [AS_HELP_STRING([--with-session-info=@<:@auto/console-kit/systemd/none@:>@],
>@@ -23,6 +24,47 @@ AC_ARG_WITH([session-info],
>    esac],
>   [with_session_info="auto"])
> 
>+dnl based on libvirt configure --init-script
>+AC_MSG_CHECKING([for init script flavor])
>+AC_ARG_WITH([init-script],
>+            [AC_HELP_STRING([--with-init-script@<:@=STYLE@:>@],
>+                            [Style of init script to install: redhat, systemd, systemd+redhat,
>+                             check, none @<:@default=check@:>@])],[],[with_init_script=check])
>+init_redhat=no
>+init_systemd=no
>+case "$with_init_script" in
>+    systemd+redhat)
>+       init_redhat=yes
>+       init_systemd=yes
>+       ;;
>+    systemd)
>+       init_systemd=yes
>+       ;;
>+    redhat)
>+       init_redhat=yes
>+       ;;
>+    none)
>+       ;;
>+    check)
>+       with_init_script=none
>+       if test "$cross_compiling" != yes && test -f /etc/redhat-release; then
>+          init_redhat=yes
>+          with_init_script=redhat
>+       fi
>+       ;;
>+    *)
>+       AC_MSG_ERROR([Unknown initscript flavour $with_init_script])
>+    ;;
>+esac
>+AM_CONDITIONAL([INIT_SCRIPT_RED_HAT], test "$init_redhat" = "yes")
>+AM_CONDITIONAL([INIT_SCRIPT_SYSTEMD], test "$init_systemd" = "yes")
>+AC_MSG_RESULT($with_init_script)
>+
>+if test "x$init_systemd" = "xyes"; then
>+  SYSTEMDSYSTEMUNITDIR=`${PKG_CONFIG} systemd --variable=systemdsystemunitdir`
>+  AC_SUBST(SYSTEMDSYSTEMUNITDIR)
>+fi
>+
> AC_ARG_ENABLE([pciaccess],
>               [AS_HELP_STRING([--enable-pciaccess], [Enable libpciaccess use for auto generation of Xinerama xorg.conf (default: yes)])],
>               [enable_pciaccess="$enableval"],
>@@ -33,7 +75,6 @@ AC_ARG_ENABLE([static-uinput],
>               [enable_static_uinput="$enableval"],
>               [enable_static_uinput="no"])
> 
>-PKG_PROG_PKG_CONFIG
> PKG_CHECK_MODULES(X, [xfixes xrandr xinerama x11])
> PKG_CHECK_MODULES(SPICE, [spice-protocol >= 0.8.0])
> 
>-- 
>1.7.10.4
>

Actions: View | Diff

Attachments on bug 848102: 604416 | 604417 | 604421 | 604422