James Hunt has proposed merging lp:~jamesodhunt/upstart/always-distribute-udev-bridge into lp:upstart.
Requested reviews: Upstart Reviewers (upstart-reviewers) For more details, see: https://code.launchpad.net/~jamesodhunt/upstart/always-distribute-udev-bridge/+merge/180308 * 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. -- https://code.launchpad.net/~jamesodhunt/upstart/always-distribute-udev-bridge/+merge/180308 Your team Upstart Reviewers is requested to review the proposed merge of lp:~jamesodhunt/upstart/always-distribute-udev-bridge into lp:upstart.
=== modified file 'ChangeLog' --- ChangeLog 2013-07-31 09:28:48 +0000 +++ ChangeLog 2013-08-15 09:56:18 +0000 @@ -1,3 +1,11 @@ +2013-08-15 James Hunt <[email protected]> + + * 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. + 2013-07-31 James Hunt <[email protected]> * init/quiesce.c: quiesce_finalise(): Move cleanup to main() === modified file 'configure.ac' --- configure.ac 2013-07-16 08:45:58 +0000 +++ configure.ac 2013-08-15 09:56:18 +0000 @@ -31,7 +31,13 @@ PKG_CHECK_MODULES([NIH_DBUS], [libnih-dbus >= 1.0.0]) PKG_CHECK_MODULES([DBUS], [dbus-1 >= 1.2.16]) PKG_CHECK_MODULES([UDEV], [libudev >= 146], [have_udev=yes], [have_udev=no]) -AM_CONDITIONAL([HAVE_UDEV], [test "$have_udev" = yes]) + +AC_ARG_ENABLE([udev-bridge], + AS_HELP_STRING([--disable-udev-bridge], + [Disable building of upstart-udev-bridge even if required dependencies available]), + [udev_bridge=no], [udev_bridge=yes]) + +AM_CONDITIONAL([ENABLE_UDEV_BRIDGE], [test "$have_udev" = yes && test "$udev_bridge" = yes]) # Reasons for requiring this library version: # === modified file 'extra/Makefile.am' --- extra/Makefile.am 2013-07-25 19:44:38 +0000 +++ extra/Makefile.am 2013-08-15 09:56:18 +0000 @@ -102,13 +102,13 @@ $(NIH_DBUS_LIBS) \ $(DBUS_LIBS) -if HAVE_UDEV dist_init_DATA += \ conf/upstart-udev-bridge.conf dist_man_MANS += \ man/upstart-udev-bridge.8 +if ENABLE_UDEV_BRIDGE sbin_PROGRAMS += \ upstart-udev-bridge @@ -137,10 +137,10 @@ else EXTRA_DIST = \ + upstart-udev-bridge.c \ man/upstart-udev-bridge.8 endif - com_ubuntu_Upstart_OUTPUTS = \ com.ubuntu.Upstart.c \ com.ubuntu.Upstart.h
-- upstart-devel mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/upstart-devel
