diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2012-12-11 15:09:31 +0100 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2012-12-11 15:09:31 +0100 |
| commit | 89e2de32f5dad95eb6043e1aa13f2fa1a15fa628 (patch) | |
| tree | 8af21603442cc8aaea7a36d592109abd9b8eb6e1 /configure.ac | |
| parent | a7d4c2296f05787c5318236a467c3716ef4675ac (diff) | |
| download | bluez-89e2de32f5dad95eb6043e1aa13f2fa1a15fa628.tar.gz | |
build: Cleanup of systemd unit directory options
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index e71dc3414..fcc166c25 100644 --- a/configure.ac +++ b/configure.ac @@ -168,9 +168,11 @@ AM_CONDITIONAL(CLIENT, test "${enable_client}" != "no" && AC_ARG_ENABLE(systemd, AC_HELP_STRING([--disable-systemd], [disable systemd integration]), [enable_systemd=${enableval}]) +AM_CONDITIONAL(SYSTEMD, test "${enable_systemd}" != "no") + AC_ARG_WITH([systemdsystemunitdir], AC_HELP_STRING([--with-systemdsystemunitdir=DIR], - [path to systemd system unit directory]), + [path to systemd system unit directory]), [path_systemunitdir=${withval}]) if (test "${enable_systemd}" != "no" && test -z "${path_systemunitdir}"); then AC_MSG_CHECKING([sytemd system unit dir]) @@ -179,12 +181,12 @@ if (test "${enable_systemd}" != "no" && test -z "${path_systemunitdir}"); then AC_MSG_ERROR(systemd system unit directory is required) fi AC_MSG_RESULT([${path_systemunitdir}]) - SYSTEMD_SYSTEMUNITDIR="${path_systemunitdir}" - AC_SUBST(SYSTEMD_SYSTEMUNITDIR) + AC_SUBST(SYSTEMD_SYSTEMUNITDIR, [${path_systemunitdir}]) fi + AC_ARG_WITH([systemduserunitdir], AC_HELP_STRING([--with-systemduserunitdir=DIR], - [path to systemd user unit directory]), + [path to systemd user unit directory]), [path_userunitdir=${withval}]) if (test "${enable_systemd}" != "no" && test -z "${path_userunitdir}"); then AC_MSG_CHECKING([sytemd user unit dir]) @@ -192,11 +194,9 @@ if (test "${enable_systemd}" != "no" && test -z "${path_userunitdir}"); then if (test -z "${path_userunitdir}"); then AC_MSG_ERROR(systemd user unit directory is required) fi - SYSTEMD_USERUNITDIR="${path_userunitdir}" AC_MSG_RESULT([${path_userunitdir}]) - AC_SUBST(SYSTEMD_USERUNITDIR) + AC_SUBST(SYSTEMD_USERUNITDIR, [${path_userunitdir}]) fi -AM_CONDITIONAL(SYSTEMD, test "${enable_systemd}" != "no") AC_ARG_ENABLE(datafiles, AC_HELP_STRING([--disable-datafiles], [do not install configuration and data files]), |