Merge lp:~xnox/upstart/disable-bridges into lp:upstart

Proposed by Dimitri John Ledkov on 2013-11-03
Status: Merged
Merged at revision: 1548
Proposed branch: lp:~xnox/upstart/disable-bridges
Merge into: lp:upstart
Diff against target: 95 lines (+34/-3)
2 files modified
configure.ac (+17/-0)
extra/Makefile.am (+17/-3)
To merge this branch: bzr merge lp:~xnox/upstart/disable-bridges
Reviewer Review Type Date Requested Status
Upstart Reviewers 2013-11-03 Pending
Review via email: mp+193686@code.launchpad.net

Description of the change

allow disabling more optional bridges at compile time.

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

self-merged by accident =) oh well it's trivial and passed auto-builds in virt & non-virt ppas.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'configure.ac'
2--- configure.ac 2013-09-12 23:44:17 +0000
3+++ configure.ac 2013-11-03 00:06:21 +0000
4@@ -34,6 +34,8 @@
5 PKG_CHECK_MODULES([UDEV], [libudev >= 146], [have_udev=yes], [have_udev=no])
6 PKG_CHECK_MODULES([DCONF], [dconf >= 0.14], [have_dconf=yes], [have_dconf=no])
7
8+AC_CHECK_HEADER([sys/epoll.h], [have_epoll=yes], [have_epoll=no])
9+
10 AC_ARG_ENABLE([udev-bridge],
11 AS_HELP_STRING([--disable-udev-bridge],
12 [Disable building of upstart-udev-bridge even if required dependencies available]),
13@@ -41,6 +43,21 @@
14
15 AM_CONDITIONAL([ENABLE_UDEV_BRIDGE], [test "$have_udev" = yes && test "$udev_bridge" = yes])
16
17+AC_ARG_ENABLE([socket-bridge],
18+ AS_HELP_STRING([--disable-socket-bridge],
19+ [Disable building of upstart-socket-bridge even if required dependencies available]),
20+ [socket_bridge=no], [socket_bridge=yes])
21+
22+AM_CONDITIONAL([ENABLE_SOCKET_BRIDGE], [test "$have_epoll" = yes && test "$socket_bridge" = yes])
23+
24+AC_ARG_ENABLE([local-bridge],
25+ AS_HELP_STRING([--disable-local-bridge],
26+ [Disable building of upstart-local-bridge even if required dependencies available]),
27+ [local_bridge=no], [local_bridge=yes])
28+
29+AM_CONDITIONAL([ENABLE_LOCAL_BRIDGE], [test "$local_bridge" = yes])
30+
31+
32 AC_ARG_ENABLE([dconf-bridge],
33 AS_HELP_STRING([--disable-dconf-bridge],
34 [Disable building of upstart-dconf-bridge even if required dependencies available]),
35
36=== modified file 'extra/Makefile.am'
37--- extra/Makefile.am 2013-09-13 08:23:06 +0000
38+++ extra/Makefile.am 2013-11-03 00:06:21 +0000
39@@ -27,11 +27,9 @@
40 conf-session/upstart-dbus-system-bridge.conf
41
42 sbin_PROGRAMS = \
43- upstart-socket-bridge \
44 upstart-event-bridge \
45 upstart-file-bridge \
46- upstart-dbus-bridge \
47- upstart-local-bridge
48+ upstart-dbus-bridge
49
50 dist_init_DATA = \
51 conf/upstart-socket-bridge.conf \
52@@ -49,6 +47,10 @@
53 man/file-event.7 \
54 man/dbus-event.7
55
56+if ENABLE_SOCKET_BRIDGE
57+sbin_PROGRAMS += \
58+ upstart-socket-bridge
59+
60 upstart_socket_bridge_SOURCES = \
61 upstart-socket-bridge.c
62 nodist_upstart_socket_bridge_SOURCES = \
63@@ -59,6 +61,10 @@
64 $(NIH_LIBS) \
65 $(NIH_DBUS_LIBS) \
66 $(DBUS_LIBS)
67+else
68+EXTRA_DIST += \
69+ upstart-socket-bridge.c
70+endif
71
72 upstart_event_bridge_SOURCES = \
73 upstart-event-bridge.c
74@@ -93,6 +99,10 @@
75 $(NIH_DBUS_LIBS) \
76 $(DBUS_LIBS)
77
78+if ENABLE_LOCAL_BRIDGE
79+sbin_PROGRAMS += \
80+ upstart-local-bridge
81+
82 upstart_local_bridge_SOURCES = \
83 upstart-local-bridge.c
84 nodist_upstart_local_bridge_SOURCES = \
85@@ -103,6 +113,10 @@
86 $(NIH_LIBS) \
87 $(NIH_DBUS_LIBS) \
88 $(DBUS_LIBS)
89+else
90+EXTRA_DIST += \
91+ upstart-local-bridge.c
92+endif
93
94 dist_sessions_DATA += \
95 conf-session/upstart-dconf-bridge.conf

Subscribers

People subscribed via source and target branches