Dmitrijs Ledkovs has proposed merging lp:~xnox/upstart/disable-bridges into lp:upstart.
Requested reviews: Upstart Reviewers (upstart-reviewers) For more details, see: https://code.launchpad.net/~xnox/upstart/disable-bridges/+merge/193686 allow disabling more optional bridges at compile time. -- https://code.launchpad.net/~xnox/upstart/disable-bridges/+merge/193686 Your team Upstart Reviewers is requested to review the proposed merge of lp:~xnox/upstart/disable-bridges into lp:upstart.
=== 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 @@ PKG_CHECK_MODULES([UDEV], [libudev >= 146], [have_udev=yes], [have_udev=no]) PKG_CHECK_MODULES([DCONF], [dconf >= 0.14], [have_dconf=yes], [have_dconf=no]) +AC_CHECK_HEADER([sys/epoll.h], [have_epoll=yes], [have_epoll=no]) + AC_ARG_ENABLE([udev-bridge], AS_HELP_STRING([--disable-udev-bridge], [Disable building of upstart-udev-bridge even if required dependencies available]), @@ -41,6 +43,21 @@ AM_CONDITIONAL([ENABLE_UDEV_BRIDGE], [test "$have_udev" = yes && test "$udev_bridge" = yes]) +AC_ARG_ENABLE([socket-bridge], + AS_HELP_STRING([--disable-socket-bridge], + [Disable building of upstart-socket-bridge even if required dependencies available]), + [socket_bridge=no], [socket_bridge=yes]) + +AM_CONDITIONAL([ENABLE_SOCKET_BRIDGE], [test "$have_epoll" = yes && test "$socket_bridge" = yes]) + +AC_ARG_ENABLE([local-bridge], + AS_HELP_STRING([--disable-local-bridge], + [Disable building of upstart-local-bridge even if required dependencies available]), + [local_bridge=no], [local_bridge=yes]) + +AM_CONDITIONAL([ENABLE_LOCAL_BRIDGE], [test "$local_bridge" = yes]) + + AC_ARG_ENABLE([dconf-bridge], AS_HELP_STRING([--disable-dconf-bridge], [Disable building of upstart-dconf-bridge even if required dependencies available]), === 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 @@ conf-session/upstart-dbus-system-bridge.conf sbin_PROGRAMS = \ - upstart-socket-bridge \ upstart-event-bridge \ upstart-file-bridge \ - upstart-dbus-bridge \ - upstart-local-bridge + upstart-dbus-bridge dist_init_DATA = \ conf/upstart-socket-bridge.conf \ @@ -49,6 +47,10 @@ man/file-event.7 \ man/dbus-event.7 +if ENABLE_SOCKET_BRIDGE +sbin_PROGRAMS += \ + upstart-socket-bridge + upstart_socket_bridge_SOURCES = \ upstart-socket-bridge.c nodist_upstart_socket_bridge_SOURCES = \ @@ -59,6 +61,10 @@ $(NIH_LIBS) \ $(NIH_DBUS_LIBS) \ $(DBUS_LIBS) +else +EXTRA_DIST += \ + upstart-socket-bridge.c +endif upstart_event_bridge_SOURCES = \ upstart-event-bridge.c @@ -93,6 +99,10 @@ $(NIH_DBUS_LIBS) \ $(DBUS_LIBS) +if ENABLE_LOCAL_BRIDGE +sbin_PROGRAMS += \ + upstart-local-bridge + upstart_local_bridge_SOURCES = \ upstart-local-bridge.c nodist_upstart_local_bridge_SOURCES = \ @@ -103,6 +113,10 @@ $(NIH_LIBS) \ $(NIH_DBUS_LIBS) \ $(DBUS_LIBS) +else +EXTRA_DIST += \ + upstart-local-bridge.c +endif dist_sessions_DATA += \ conf-session/upstart-dconf-bridge.conf
-- upstart-devel mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/upstart-devel
