Merge lp:~jamesodhunt/upstart/always-distribute-udev-bridge into lp:upstart

Proposed by James Hunt on 2013-08-15
Status: Merged
Merged at revision: 1517
Proposed branch: lp:~jamesodhunt/upstart/always-distribute-udev-bridge
Merge into: lp:upstart
Diff against target: 65 lines (+17/-3)
3 files modified
ChangeLog (+8/-0)
configure.ac (+7/-1)
extra/Makefile.am (+2/-2)
To merge this branch: bzr merge lp:~jamesodhunt/upstart/always-distribute-udev-bridge
Reviewer Review Type Date Requested Status
Dimitri John Ledkov 2013-08-15 Approve on 2013-08-15
Review via email: mp+180308@code.launchpad.net

Description of the change

* configure.ac:
  - Allow udev bridge to be disabled.
* extra/Makefile.am: Ensure source for upstart-udev-bridge is
  distributed, regardless of whether the local system is able to build
  it, or has disabled building it.

To post a comment you must log in.
Dimitri John Ledkov (xnox) wrote :

i approved this offline, in real life. why do I need to type this here?! =)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ChangeLog'
2--- ChangeLog 2013-07-31 09:28:48 +0000
3+++ ChangeLog 2013-08-15 09:56:18 +0000
4@@ -1,3 +1,11 @@
5+2013-08-15 James Hunt <james.hunt@ubuntu.com>
6+
7+ * configure.ac:
8+ - Allow udev bridge to be disabled.
9+ * extra/Makefile.am: Ensure source for upstart-udev-bridge is
10+ distributed, regardless of whether the local system is able to build
11+ it, or has disabled building it.
12+
13 2013-07-31 James Hunt <james.hunt@ubuntu.com>
14
15 * init/quiesce.c: quiesce_finalise(): Move cleanup to main()
16
17=== modified file 'configure.ac'
18--- configure.ac 2013-07-16 08:45:58 +0000
19+++ configure.ac 2013-08-15 09:56:18 +0000
20@@ -31,7 +31,13 @@
21 PKG_CHECK_MODULES([NIH_DBUS], [libnih-dbus >= 1.0.0])
22 PKG_CHECK_MODULES([DBUS], [dbus-1 >= 1.2.16])
23 PKG_CHECK_MODULES([UDEV], [libudev >= 146], [have_udev=yes], [have_udev=no])
24-AM_CONDITIONAL([HAVE_UDEV], [test "$have_udev" = yes])
25+
26+AC_ARG_ENABLE([udev-bridge],
27+ AS_HELP_STRING([--disable-udev-bridge],
28+ [Disable building of upstart-udev-bridge even if required dependencies available]),
29+ [udev_bridge=no], [udev_bridge=yes])
30+
31+AM_CONDITIONAL([ENABLE_UDEV_BRIDGE], [test "$have_udev" = yes && test "$udev_bridge" = yes])
32
33 # Reasons for requiring this library version:
34 #
35
36=== modified file 'extra/Makefile.am'
37--- extra/Makefile.am 2013-07-25 19:44:38 +0000
38+++ extra/Makefile.am 2013-08-15 09:56:18 +0000
39@@ -102,13 +102,13 @@
40 $(NIH_DBUS_LIBS) \
41 $(DBUS_LIBS)
42
43-if HAVE_UDEV
44 dist_init_DATA += \
45 conf/upstart-udev-bridge.conf
46
47 dist_man_MANS += \
48 man/upstart-udev-bridge.8
49
50+if ENABLE_UDEV_BRIDGE
51 sbin_PROGRAMS += \
52 upstart-udev-bridge
53
54@@ -137,10 +137,10 @@
55
56 else
57 EXTRA_DIST = \
58+ upstart-udev-bridge.c \
59 man/upstart-udev-bridge.8
60 endif
61
62-
63 com_ubuntu_Upstart_OUTPUTS = \
64 com.ubuntu.Upstart.c \
65 com.ubuntu.Upstart.h

Subscribers

People subscribed via source and target branches