From: Paul Seidler <pl.seidler@googlemail.com>
To: linux-bluetooth@vger.kernel.org
Subject: [PATCH] build: modifing behavior of systemdunitdir switch
Date: Mon, 13 Feb 2012 17:50:24 +0100 [thread overview]
Message-ID: <1329151824-15856-1-git-send-email-pl.seidler@googlemail.com> (raw)
In-Reply-To: <20120203202837.GB29936@samus>
Currently it's not possible to disable the installation of the systemd
service file. If you use --without the file get installed into /no/.
Changes with this patch:
--without-systemdunitdir disables the installation of the service file
--with-systemdunitdir installs the file in the directory reported by
pkg-config
--with-systemdunitdir=/foo installs the file to /foo
Without giving the systemdunitdir switch, pkg-config checks for systemd and
installs the file if available.
---
configure.ac | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/configure.ac b/configure.ac
index 5b81f28..b96dc5d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -62,14 +62,18 @@ if (test "${enable_capng}" = "yes"); then
AC_DEFINE(HAVE_CAPNG, 1, [Define to 1 if you have capabilities library.])
fi
-AC_ARG_WITH([systemdunitdir], AC_HELP_STRING([--with-systemdunitdir=DIR],
- [path to systemd system service directory]), [path_systemdunit=${withval}],
- [path_systemdunit="`$PKG_CONFIG --variable=systemdsystemunitdir systemd`"])
-if (test -n "${path_systemdunit}"); then
- SYSTEMD_UNITDIR="${path_systemdunit}"
- AC_SUBST(SYSTEMD_UNITDIR)
-fi
-AM_CONDITIONAL(SYSTEMD, test -n "${path_systemdunit}")
+AC_ARG_WITH([systemdunitdir],
+ AC_HELP_STRING([--with-systemdunitdir@<:@=DIR@:>@],
+ [Installing systemd service file (auto)
+ @<:@path to systemd system service directory@:>@]),
+ [path_systemdunit="${withval}"],
+ [PKG_CHECK_MODULES(SYSTEMD, systemd,
+ path_systemdunit=yes, path_systemdunit=no)])
+AS_IF([test "${path_systemdunit}" = yes],
+ [path_systemdunit="`$PKG_CONFIG --variable=systemdsystemunitdir systemd`"])
+AS_IF([test "${path_systemdunit}" != no],
+ [AC_SUBST(SYSTEMD_UNITDIR,["${path_systemdunit}"])])
+AM_CONDITIONAL(SYSTEMD, test "${path_systemdunit}" != no)
AC_OUTPUT(Makefile scripts/bluetooth.rules doc/version.xml
src/bluetoothd.8 src/bluetooth.service bluez.pc)
--
1.7.8.1
prev parent reply other threads:[~2012-02-13 16:50 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-29 20:54 [PATCH] build: modifing behavior of systemdunitdir switch Paul Seidler
2012-02-03 20:28 ` Vinicius Costa Gomes
2012-02-13 16:50 ` Paul Seidler [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1329151824-15856-1-git-send-email-pl.seidler@googlemail.com \
--to=pl.seidler@googlemail.com \
--cc=linux-bluetooth@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox