summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Martin Szulecki2014-10-16 15:03:39 +0200
committerGravatar Martin Szulecki2014-10-16 15:03:39 +0200
commit657e5b0e896999a5efb9df127470498b65e7a10a (patch)
tree726eab95209dac3d1230702ab26b5920a5167a48
parent2036d74b796135dc1abcf9672fd3c9ab3e7b809d (diff)
downloadusbmuxd-657e5b0e896999a5efb9df127470498b65e7a10a.tar.gz
usbmuxd-657e5b0e896999a5efb9df127470498b65e7a10a.tar.bz2
Rename HAVE_SYSTEMD conditional into WANT_SYSTEMD
-rw-r--r--configure.ac2
-rw-r--r--systemd/Makefile.am2
2 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 0a99a56..fe0c27f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -72,7 +72,7 @@ AC_ARG_WITH([systemdsystemunitdir],
72if test "x$with_systemdsystemunitdir" != xno; then 72if test "x$with_systemdsystemunitdir" != xno; then
73 AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir]) 73 AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])
74fi 74fi
75AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != xno -a "x$with_systemd" = "xyes" ]) 75AM_CONDITIONAL(WANT_SYSTEMD, [test -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != xno -a "x$with_systemd" = "xyes" ])
76 76
77if test "x$with_systemd" = xyes; then 77if test "x$with_systemd" = xyes; then
78 udev_activation_rule="TAG+=\"systemd\", ENV{SYSTEMD_WANTS}=\"usbmuxd.service\"" 78 udev_activation_rule="TAG+=\"systemd\", ENV{SYSTEMD_WANTS}=\"usbmuxd.service\""
diff --git a/systemd/Makefile.am b/systemd/Makefile.am
index 6626d60..a23f1d1 100644
--- a/systemd/Makefile.am
+++ b/systemd/Makefile.am
@@ -4,7 +4,7 @@ edit = \
4 -e 's|@localstatedir[@]|$(localstatedir)|g' \ 4 -e 's|@localstatedir[@]|$(localstatedir)|g' \
5 < $< > $@ || rm $@ 5 < $< > $@ || rm $@
6 6
7if HAVE_SYSTEMD 7if WANT_SYSTEMD
8 8
9systemdsystemunit_DATA = \ 9systemdsystemunit_DATA = \
10 usbmuxd.service 10 usbmuxd.service