upstart

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

  1. disable-bridges
  2. Merge into trunk
Proposed by Dimitri John Ledkov
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 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.
Revision history for this message
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
=== modified file 'configure.ac'
--- configure.ac 2013-09-12 23:44:17 +0000
+++ configure.ac 2013-11-03 00:06:21 +0000
@@ -34,6 +34,8 @@
34PKG_CHECK_MODULES([UDEV], [libudev >= 146], [have_udev=yes], [have_udev=no])34PKG_CHECK_MODULES([UDEV], [libudev >= 146], [have_udev=yes], [have_udev=no])
35PKG_CHECK_MODULES([DCONF], [dconf >= 0.14], [have_dconf=yes], [have_dconf=no])35PKG_CHECK_MODULES([DCONF], [dconf >= 0.14], [have_dconf=yes], [have_dconf=no])
3636
37AC_CHECK_HEADER([sys/epoll.h], [have_epoll=yes], [have_epoll=no])
38
37AC_ARG_ENABLE([udev-bridge],39AC_ARG_ENABLE([udev-bridge],
38 AS_HELP_STRING([--disable-udev-bridge],40 AS_HELP_STRING([--disable-udev-bridge],
39 [Disable building of upstart-udev-bridge even if required dependencies available]),41 [Disable building of upstart-udev-bridge even if required dependencies available]),
@@ -41,6 +43,21 @@
4143
42AM_CONDITIONAL([ENABLE_UDEV_BRIDGE], [test "$have_udev" = yes && test "$udev_bridge" = yes])44AM_CONDITIONAL([ENABLE_UDEV_BRIDGE], [test "$have_udev" = yes && test "$udev_bridge" = yes])
4345
46AC_ARG_ENABLE([socket-bridge],
47 AS_HELP_STRING([--disable-socket-bridge],
48 [Disable building of upstart-socket-bridge even if required dependencies available]),
49 [socket_bridge=no], [socket_bridge=yes])
50
51AM_CONDITIONAL([ENABLE_SOCKET_BRIDGE], [test "$have_epoll" = yes && test "$socket_bridge" = yes])
52
53AC_ARG_ENABLE([local-bridge],
54 AS_HELP_STRING([--disable-local-bridge],
55 [Disable building of upstart-local-bridge even if required dependencies available]),
56 [local_bridge=no], [local_bridge=yes])
57
58AM_CONDITIONAL([ENABLE_LOCAL_BRIDGE], [test "$local_bridge" = yes])
59
60
44AC_ARG_ENABLE([dconf-bridge],61AC_ARG_ENABLE([dconf-bridge],
45 AS_HELP_STRING([--disable-dconf-bridge],62 AS_HELP_STRING([--disable-dconf-bridge],
46 [Disable building of upstart-dconf-bridge even if required dependencies available]),63 [Disable building of upstart-dconf-bridge even if required dependencies available]),
4764
=== modified file 'extra/Makefile.am'
--- extra/Makefile.am 2013-09-13 08:23:06 +0000
+++ extra/Makefile.am 2013-11-03 00:06:21 +0000
@@ -27,11 +27,9 @@
27 conf-session/upstart-dbus-system-bridge.conf27 conf-session/upstart-dbus-system-bridge.conf
2828
29sbin_PROGRAMS = \29sbin_PROGRAMS = \
30 upstart-socket-bridge \
31 upstart-event-bridge \30 upstart-event-bridge \
32 upstart-file-bridge \31 upstart-file-bridge \
33 upstart-dbus-bridge \32 upstart-dbus-bridge
34 upstart-local-bridge
3533
36dist_init_DATA = \34dist_init_DATA = \
37 conf/upstart-socket-bridge.conf \35 conf/upstart-socket-bridge.conf \
@@ -49,6 +47,10 @@
49 man/file-event.7 \47 man/file-event.7 \
50 man/dbus-event.748 man/dbus-event.7
5149
50if ENABLE_SOCKET_BRIDGE
51sbin_PROGRAMS += \
52 upstart-socket-bridge
53
52upstart_socket_bridge_SOURCES = \54upstart_socket_bridge_SOURCES = \
53 upstart-socket-bridge.c55 upstart-socket-bridge.c
54nodist_upstart_socket_bridge_SOURCES = \56nodist_upstart_socket_bridge_SOURCES = \
@@ -59,6 +61,10 @@
59 $(NIH_LIBS) \61 $(NIH_LIBS) \
60 $(NIH_DBUS_LIBS) \62 $(NIH_DBUS_LIBS) \
61 $(DBUS_LIBS)63 $(DBUS_LIBS)
64else
65EXTRA_DIST += \
66 upstart-socket-bridge.c
67endif
6268
63upstart_event_bridge_SOURCES = \69upstart_event_bridge_SOURCES = \
64 upstart-event-bridge.c70 upstart-event-bridge.c
@@ -93,6 +99,10 @@
93 $(NIH_DBUS_LIBS) \99 $(NIH_DBUS_LIBS) \
94 $(DBUS_LIBS)100 $(DBUS_LIBS)
95101
102if ENABLE_LOCAL_BRIDGE
103sbin_PROGRAMS += \
104 upstart-local-bridge
105
96upstart_local_bridge_SOURCES = \106upstart_local_bridge_SOURCES = \
97 upstart-local-bridge.c107 upstart-local-bridge.c
98nodist_upstart_local_bridge_SOURCES = \108nodist_upstart_local_bridge_SOURCES = \
@@ -103,6 +113,10 @@
103 $(NIH_LIBS) \113 $(NIH_LIBS) \
104 $(NIH_DBUS_LIBS) \114 $(NIH_DBUS_LIBS) \
105 $(DBUS_LIBS)115 $(DBUS_LIBS)
116else
117EXTRA_DIST += \
118 upstart-local-bridge.c
119endif
106120
107dist_sessions_DATA += \121dist_sessions_DATA += \
108 conf-session/upstart-dconf-bridge.conf122 conf-session/upstart-dconf-bridge.conf

Subscribers

People subscribed via source and target branches