diff options
| author | Martin Pitt <martinpitt@gnome.org> | 2013-03-21 07:16:56 +0100 |
|---|---|---|
| committer | Martin Pitt <martinpitt@gnome.org> | 2013-03-21 07:16:56 +0100 |
| commit | 1540b08f9c18a395e6b84b6f347f998c16f9fb03 (patch) | |
| tree | 68aa3d247b31854b5f0b707a14e4a41297ed56bc | |
| parent | ff39d23ff4dc5735dedcb7d0942bd1ebfec0afb7 (diff) | |
| download | upower-1540b08f9c18a395e6b84b6f347f998c16f9fb03.tar.gz | |
Drop --enable-systemd and linking to libsystemd-daemon
logind is now being detected at runtime (see previous commit ff39d23), so we do
not need to link against libsystemd-daemon any more. Drop --enable-systemd
configure option as well.
| -rw-r--r-- | configure.ac | 32 | ||||
| -rw-r--r-- | src/Makefile.am | 4 | ||||
| -rw-r--r-- | src/linux/Makefile.am | 2 |
3 files changed, 3 insertions, 35 deletions
diff --git a/configure.ac b/configure.ac index 56db585..51dc080 100644 --- a/configure.ac +++ b/configure.ac @@ -151,38 +151,6 @@ PKG_CHECK_MODULES(GIO, [gio-2.0 >= 2.16.1]) dnl ==================================================================== dnl Check for systemd dnl ==================================================================== -AC_ARG_ENABLE([systemd], - AS_HELP_STRING([--enable-systemd], [Use systemd]), - [enable_systemd=$enableval], - [enable_systemd=auto]) - -PKG_CHECK_MODULES(SYSTEMD, - [libsystemd-daemon], - [have_systemd=yes], [have_systemd=no]) - -AC_MSG_CHECKING([whether to use systemd]) - -if test x$enable_systemd = xauto ; then - if test x$have_systemd = xno ; then - enable_systemd=no - else - enable_systemd=yes - fi -fi -AC_MSG_RESULT($enable_systemd) - -if test x$enable_systemd = xyes; then - if test x$have_systemd = xno; then - AC_MSG_ERROR([Systemd support explicitly required, but systemd not found]) - fi - AC_DEFINE(HAVE_SYSTEMD, 1, [Define if systemd is used for session tracking]) -fi - -AC_SUBST(SYSTEMD_CFLAGS) -AC_SUBST(SYSTEMD_LIBS) - -AM_CONDITIONAL(HAVE_SYSTEMD, [test "$with_systemd" = "yes"], [Using systemd]) - AC_ARG_WITH([systemdutildir], AS_HELP_STRING([--with-systemdutildir=DIR], [Directory for systemd utilities]), [], diff --git a/src/Makefile.am b/src/Makefile.am index 4ee3daa..698d738 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -123,7 +123,7 @@ upowerd_LDADD += \ $(USB_LIBS) \ $(GUDEV_LIBS) \ $(IDEVICE_LIBS) \ - $(SYSTEMD_LIBS) + $(NULL) if HAVE_SYSTEMDUTILDIR systemsleepdir = $(systemdutildir)/system-sleep @@ -232,7 +232,7 @@ EXTRA_DIST = \ $(dbusservice_in_files) \ $(dbusconf_in_files) -if HAVE_SYSTEMD +if HAVE_SYSTEMDSYSTEMUNITDIR EXTRA_DIST += $(systemdservice_in_files) endif diff --git a/src/linux/Makefile.am b/src/linux/Makefile.am index 5b58183..35e00eb 100644 --- a/src/linux/Makefile.am +++ b/src/linux/Makefile.am @@ -13,7 +13,7 @@ AM_CPPFLAGS = \ $(POLKIT_CFLAGS) \ $(GLIB_CFLAGS) \ $(IDEVICE_CFLAGS) \ - $(SYSTEMD_CFLAGS) + $(NULL) if BACKEND_TYPE_LINUX noinst_LTLIBRARIES = libupshared.la |