From: Andy Wingo <wingo@pobox.com>
Date: Sun, 19 Apr 2015 14:33:42 +0000 (+0200)
Subject: Remove gudev check
X-Git-Tag: v219.0~27
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=d2754bc70c701255ea5b595f82147d3b8eea9acc

Remove gudev check
---

diff --git a/configure.ac b/configure.ac
index 568d56c95..08edb04fc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -528,12 +528,9 @@ AM_CONDITIONAL(ENABLE_KDBUS, [test "$have_kdbus" = "yes"])
 AC_CHECK_HEADERS_ONCE([valgrind/memcheck.h valgrind/valgrind.h])
 
 # ------------------------------------------------------------------------------
-AC_ARG_ENABLE([gudev],
-       AS_HELP_STRING([--disable-gudev], [disable Gobject libudev support @<:@default=enabled@:>@]),
-       [], [enable_gudev=yes])
-AS_IF([test "x$enable_gudev" = "xyes"], [ PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.22.0 gobject-2.0 >= 2.22.0 gio-2.0]) ])
-AM_CONDITIONAL([ENABLE_GUDEV], [test "x$enable_gudev" = "xyes"])
-AS_IF([test "x$enable_gudev" = "xyes"], [ AC_DEFINE(HAVE_GLIB, 1, [Define if glib is available]) ])
+PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.22.0 gobject-2.0 >= 2.22.0 gio-2.0],
+                  [have_glib=yes], [have_glib=no])
+AS_IF([test "x$have_glib" = "xyes"], [ AC_DEFINE(HAVE_GLIB, 1, [Define if glib is available]) ])
 
 # ------------------------------------------------------------------------------
 AC_ARG_ENABLE(hwdb, [AC_HELP_STRING([--disable-hwdb], [disable hardware database support])],
@@ -714,7 +711,6 @@ AC_MSG_RESULT([
         polkit:                  ${have_polkit}
         blkid:                   ${have_blkid}
         dbus:                    ${have_dbus}
-        gudev:                   ${enable_gudev}
         hwdb:                    ${enable_hwdb}
         kdbus:                   ${have_kdbus}
         Python:                  ${have_python}
diff --git a/man/custom-html.xsl b/man/custom-html.xsl
index 5730bed4a..0d4763f5f 100644
--- a/man/custom-html.xsl
+++ b/man/custom-html.xsl
@@ -219,30 +219,6 @@
       <xsl:text>index.html</xsl:text>
     </xsl:attribute>
     <xsl:text>Index </xsl:text>
-  </a>·
-  <a>
-    <xsl:attribute name="href">
-      <xsl:text>systemd.directives.html</xsl:text>
-    </xsl:attribute>
-    <xsl:text>Directives </xsl:text>
-  </a>·
-  <a>
-    <xsl:attribute name="href">
-      <xsl:text>../python-systemd/index.html</xsl:text>
-    </xsl:attribute>
-    <xsl:text>Python </xsl:text>
-  </a>·
-  <a>
-    <xsl:attribute name="href">
-      <xsl:text>../libudev/index.html</xsl:text>
-    </xsl:attribute>
-    <xsl:text>libudev </xsl:text>
-  </a>·
-  <a>
-    <xsl:attribute name="href">
-      <xsl:text>../libudev/index.html</xsl:text>
-    </xsl:attribute>
-    <xsl:text>gudev </xsl:text>
   </a>
 
   <span style="float:right">