NetworkManager: add systemd build option (on by default).

srcpkgs/NetworkManager/template

@@ -1,17 +1,16 @@
 # Template file for 'NetworkManager'
 pkgname=NetworkManager
 version=0.9.8.10
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-dhcpcd=/usr/sbin/dhcpcd --with-dhclient=no
  --with-system-ca-path=/etc/ssl/certs --enable-more-warnings=no
  --with-crypto=gnutls --disable-static --enable-ppp --enable-concheck
  --with-systemdsystemunitdir=/usr/lib/systemd/system
- --with-session-tracking=systemd --with-udev-dir=/usr/lib/udev
+ --with-udev-dir=/usr/lib/udev
  --with-kernel-firmware-dir=/usr/lib/firmware --disable-wimax
  --with-pppd-plugin-dir=/usr/lib/pppd/2.4.6 --enable-modify-system
  --with-modem-manager-1 --with-resolvconf=/usr/bin/resolvconf
- --with-suspend-resume=systemd
  ac_cv_file__etc_redhat_release=no ac_cv_file__etc_gentoo_release=no
  ac_cv_file__etc_fedora_release=no ac_cv_file__etc_mandriva_release=no
  ac_cv_file__etc_SuSE_release=no ac_cv_file__etc_debian_version=no"
@@ -27,7 +26,7 @@ hostmakedepends="
  dbus iproute2 dhcpcd wpa_supplicant bluez"
 makedepends="libuuid-devel gnutls-devel dbus-glib-devel libgudev-devel
  libnl3-devel polkit-devel ppp-devel>=2.4.6 iptables-devel libsoup-devel
- systemd-devel ModemManager-devel mobile-broadband-provider-info"
+ ModemManager-devel mobile-broadband-provider-info"
 
 lib32disabled=yes
 depends="dbus iproute2 dhcpcd>=5.5.4_1 wpa_supplicant ModemManager mobile-broadband-provider-info"
@@ -35,12 +34,14 @@ conf_files="/etc/${pkgname}/${pkgname}.conf"
 systemd_services="${pkgname}.service on ${pkgname}-dispatcher.service on"
 
 # Package build options
-build_options="gir"
+build_options="gir systemd"
+build_options_default="systemd"
 desc_option_gir="Enable support for building gobject introspection data"
+desc_option_systemd="Enable support for systemd"
 
 # Disable gir for cross builds.
 if [ -z "$CROSS_BUILD" ]; then
-	build_options_default="gir"
+	build_options_default+=" gir"
 fi
 
 if [ "$build_option_gir" ]; then
@@ -50,6 +51,13 @@ else
 	configure_args+=" --disable-introspection"
 fi
 
+if [ "$build_option_systemd" ]; then
+	configure_args+=" --with-session-tracking=systemd --with-suspend-resume=systemd"
+	makedepends+=" systemd-devel"
+else
+	configure_args+=" --with-session-tracking=consolekit --with-suspend-resume=upower"
+fi
+
 pre_configure() {
 	libtoolize -f