[gnome-disk-utility] Migrate from libsystemd-login to libsystemd

[Michael Catanzaro <mcatanzaro src gnome org>]

commit 22e93802878e9a5e4a110e6abed399af8aeb90d6
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Sat May 23 15:28:16 2015 -0500

    Migrate from libsystemd-login to libsystemd
    
    Thanks to Michael Biebl for providing an initial patch.
    
    http://lists.freedesktop.org/archives/systemd-devel/2014-February/017146.html
    
    https://bugzilla.gnome.org/show_bug.cgi?id=748603

 configure.ac           |   34 ++++++++++++++++------------------
 src/disks/Makefile.am  |    4 ++--
 src/libgdu/Makefile.am |    4 ++--
 src/libgdu/gduutils.c  |    5 ++---
 4 files changed, 22 insertions(+), 25 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 8a935b8..7bc745b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -125,26 +125,24 @@ GLIB_GSETTINGS
 
 AC_PATH_PROG(GLIB_COMPILE_RESOURCES, glib-compile-resources)
 
-dnl **********************************
-dnl *** Check for libsystemd-login ***
-dnl **********************************
-
-AC_ARG_ENABLE(libsystemd_login, AS_HELP_STRING([--disable-libsystemd-login],[build without 
liblibsystemd-login]))
-msg_libsystemd_login=no
-LIBSYSTEMD_LOGIN_LIBS=
-LIBSYSTEMD_LOGIN_CFLAGS=
-LIBSYSTEMD_LOGIN_REQUIRED=44
-
-if test "x$enable_libsystemd_login" != "xno"; then
-  PKG_CHECK_EXISTS([libsystemd-login >= $LIBSYSTEMD_LOGIN_REQUIRED], msg_libsystemd_login=yes)
-
-  if test "x$msg_libsystemd_login" = "xyes"; then
-    PKG_CHECK_MODULES([LIBSYSTEMD_LOGIN],[libsystemd-login >= $LIBSYSTEMD_LOGIN_REQUIRED])
-    AC_DEFINE(HAVE_LIBSYSTEMD_LOGIN, 1, [Define to 1 if liblibsystemd_login is available])
+dnl ****************************
+dnl *** Check for libsystemd ***
+dnl ****************************
+
+AC_ARG_ENABLE(libsystemd, AS_HELP_STRING([--disable-libsystemd], [build without libsystemd]))
+msg_libsystemd=no
+LIBSYSTEMD_REQUIRED=209
+
+if test "x$enable_libsystemd" != "xno"; then
+  PKG_CHECK_EXISTS([libsystemd >= $LIBSYSTEMD_REQUIRED], msg_libsystemd=yes)
+
+  if test "x$msg_libsystemd" = "xyes"; then
+    PKG_CHECK_MODULES([LIBSYSTEMD], [libsystemd >= $LIBSYSTEMD_REQUIRED])
+    AC_DEFINE(HAVE_LIBSYSTEMD, 1, [Define to 1 if libsystemd is available])
   fi
 fi
 
-AM_CONDITIONAL(USE_LIBSYSTEMD_LOGIN, [test "$msg_libsystemd_login" = "yes"])
+AM_CONDITIONAL(USE_LIBSYSTEMD, [test "$msg_libsystemd" = "yes"])
 
 dnl *************************************
 dnl *** gnome-settings-daemon plug-in ***
@@ -218,7 +216,7 @@ echo "
         sysconfdir:                 ${sysconfdir}
         localstatedir:              ${localstatedir}
 
-        Use libsystem-login:        ${msg_libsystemd_login}
+        Use libsystemd:             ${msg_libsystemd}
         Build g-s-d plug-in:        ${msg_gsd_plugin}
 
         compiler:                   ${CC}
diff --git a/src/disks/Makefile.am b/src/disks/Makefile.am
index f9ff763..16804a8 100644
--- a/src/disks/Makefile.am
+++ b/src/disks/Makefile.am
@@ -77,7 +77,7 @@ gnome_disks_CFLAGS =                                  \
        $(UDISKS2_CFLAGS)                               \
        $(GTK3_CFLAGS)                                  \
        $(LIBSECRET1_CFLAGS)                            \
-       $(LIBSYSTEMD_LOGIN_CFLAGS)                      \
+       $(LIBSYSTEMD_CFLAGS)                            \
        $(PWQUALITY_CFLAGS)                             \
        $(CANBERRA_CFLAGS)                              \
        $(LIBDVDREAD_CFLAGS)                            \
@@ -91,7 +91,7 @@ gnome_disks_LDADD =                                   \
        $(UDISKS2_LIBS)                                 \
        $(GTK3_LIBS)                                    \
        $(LIBSECRET1_LIBS)                              \
-       $(LIBSYSTEMD_LOGIN_LIBS)                        \
+       $(LIBSYSTEMD_LIBS)                              \
        $(PWQUALITY_LIBS)                               \
        $(CANBERRA_LIBS)                                \
        $(LIBDVDREAD_LIBS)                              \
diff --git a/src/libgdu/Makefile.am b/src/libgdu/Makefile.am
index 042f9ae..b4d5ee1 100644
--- a/src/libgdu/Makefile.am
+++ b/src/libgdu/Makefile.am
@@ -43,7 +43,7 @@ libgdu_la_CFLAGS =                                    \
        $(UDISKS2_CFLAGS)                               \
        $(GTK3_CFLAGS)                                  \
        $(LIBSECRET1_CFLAGS)                            \
-       $(LIBSYSTEMD_LOGIN_CFLAGS)                      \
+       $(LIBSYSTEMD_CFLAGS)                            \
        $(PWQUALITY_CFLAGS)                             \
        $(WARN_CFLAGS)                                  \
        -lm                                             \
@@ -54,7 +54,7 @@ libgdu_la_LIBADD =                                    \
        $(UDISKS2_LIBS)                                 \
        $(GTK3_LIBS)                                    \
        $(LIBSECRET1_LIBS)                              \
-       $(LIBSYSTEMD_LOGIN_LIBS)                        \
+       $(LIBSYSTEMD_LIBS)                              \
        $(PWQUALITY_LIBS)                               \
        $(NULL)
 
diff --git a/src/libgdu/gduutils.c b/src/libgdu/gduutils.c
index 05d5846..ad8de17 100644
--- a/src/libgdu/gduutils.c
+++ b/src/libgdu/gduutils.c
@@ -19,7 +19,7 @@
 # include <features.h>
 #endif
 
-#if defined(HAVE_LIBSYSTEMD_LOGIN)
+#if defined(HAVE_LIBSYSTEMD)
 #include <systemd/sd-login.h>
 #endif
 
@@ -391,8 +391,7 @@ gdu_options_update_entry_option (GtkWidget       *options_entry,
   g_free (opts);
 }
 
-#if defined(HAVE_LIBSYSTEMD_LOGIN)
-#include <systemd/sd-login.h>
+#if defined(HAVE_LIBSYSTEMD)
 
 const gchar *
 gdu_utils_get_seat (void)