[PATCH] Don't install systemd scripts with --without-systemdsystemunitdir

[PATCH] Don't install systemd scripts with --without-systemdsystemunitdir

[Michael Forney]

Currently, the scripts get installed to /no/ if that option is
specified.
---
 configure.ac |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 0a18bb6..31c5b18 100644
--- a/configure.ac
+++ b/configure.ac
@@ -66,8 +66,10 @@ AC_SUBST([FIRMWARE_PATH], [$FIRMWARE_PATH])
 AC_ARG_WITH([systemdsystemunitdir],
 	AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),
 	[], [with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)])
-AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])
-AM_CONDITIONAL(WITH_SYSTEMD, [test -n "$with_systemdsystemunitdir"])
+if test "x$with_systemdsystemunitdir" != xno; then
+    AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])
+fi
+AM_CONDITIONAL(WITH_SYSTEMD, [test -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != xno ])
 
 AC_ARG_ENABLE([extras],
 	AS_HELP_STRING([--disable-extras], [disable extras with external dependencies]),
-- 
1.7.2.2

Re: [PATCH] Don't install systemd scripts with

[Martin Pitt]

Hello Michael,

Michael Forney [2010-08-26 19:10 -0700]:
> Currently, the scripts get installed to /no/ if that option is
> specified.

I can't reproduce this: I tried

  ./configure --prefix=/usr --without-systemdsystemunitdir
  make
  make install DESTDIR=/tmp/x/

and I don't get a /tmp/x/no, nor does grepping for SYSTEMD reveal any
assignment to "no".

What's the particular configure command you are using?

Martin

-- 
Martin Pitt                        | http://www.piware.de
Ubuntu Developer (www.ubuntu.com)  | Debian Developer  (www.debian.org)

Re: [PATCH] Don't install systemd scripts with --without-systemdsystemunitdir

[Michael Forney]

[-- Attachment #1: Type: text/plain, Size: 1508 bytes --]

Excerpts from Martin Pitt's message of Mon Aug 30 23:58:47 -0700 2010:
> Hello Michael,
> 
> Michael Forney [2010-08-26 19:10 -0700]:
> > Currently, the scripts get installed to /no/ if that option is
> > specified.
> 
> I can't reproduce this: I tried
> 
>   ./configure --prefix=/usr --without-systemdsystemunitdir
>   make
>   make install DESTDIR=/tmp/x/
> 
> and I don't get a /tmp/x/no, nor does grepping for SYSTEMD reveal any
> assignment to "no".
> 
> What's the particular configure command you are using?
> 
> Martin

Hi Martin,

I am not sure why you are having trouble reproducing it. I ran the same
commands and still saw the issue I described. I have attached a log for
reference.

Logically though, what is happening is when
--without-systemdsystemunitdir gets passed to configure,
with_systemdsystemunitdir gets assigned the value 'no'. Configure then
checks if this string is non-zero (which it is), and enables
WITH_SYSTEMD. This causes the scripts to get installed to the directory
$(systemdsystemunitdir) which is 'no'.

This seems to be a problem with several projects using this option,
including NetworkManager, which has been fixed
(https://bugzilla.gnome.org/show_bug.cgi?id=628439), and dbus, which has
been not yet commented on
(https://bugs.freedesktop.org/attachment.cgi?id=38319).

I just tested this with master and I still see the problem. Are you sure
your build directory is clean?

Thanks for taking the time to look at my patch!

-- 
Michael Forney <mforney@mforney.org>

[-- Attachment #2: udev.log --]
[-- Type: application/octet-stream, Size: 29356 bytes --]

Re: [PATCH] Don't install systemd scripts with

[Martin Pitt]

[-- Attachment #1: Type: text/plain, Size: 750 bytes --]

Hello Michael,

Michael Forney [2010-09-01 22:43 -0700]:
> I am not sure why you are having trouble reproducing it. I ran the same
> commands and still saw the issue I described. I have attached a log for
> reference.

Ah, it seems that you are using an older autoconf and automake; I
already get the non-verbose output by default, like

   CC     libudev/libudev-util.lo
 
and no trace of /no/. I suppose the newer auto* tools just fixed this
once and for all.

Anyway, stuff still works with your patch (I tested both --without and
with an actual directory), so I applied it. Thanks!

Martin
-- 
Martin Pitt                        | http://www.piware.de
Ubuntu Developer (www.ubuntu.com)  | Debian Developer  (www.debian.org)

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]